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>

51 files changed, 167 insertions, 166 deletions

diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index 2bef906093f7..4a0a20f11759 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -55,7 +55,7 @@ void SwBreakDlg::rememberResult()
     }
 }
 
-IMPL_LINK_NOARG(SwBreakDlg, ToggleHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwBreakDlg, ToggleHdl, weld::Toggleable&, void)
 {
     CheckEnable();
 }
@@ -66,7 +66,7 @@ IMPL_LINK_NOARG(SwBreakDlg, ChangeHdl, weld::ComboBox&, void)
 }
 
 // Handler for Change Page Number
-IMPL_LINK(SwBreakDlg, PageNumHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(SwBreakDlg, PageNumHdl, weld::Toggleable&, rBox, void)
 {
     if (rBox.get_active())
         m_xPageNumEdit->set_value(1);
@@ -136,7 +136,7 @@ SwBreakDlg::SwBreakDlg(weld::Window *pParent, SwWrtShell &rS)
     , nKind(0)
     , bHtmlMode(0 != ::GetHtmlMode(rS.GetView().GetDocShell()))
 {
-    Link<weld::ToggleButton&,void> aLk = LINK(this, SwBreakDlg, ToggleHdl);
+    Link<weld::Toggleable&,void> aLk = LINK(this, SwBreakDlg, ToggleHdl);
     m_xPageBtn->connect_toggled(aLk);
     m_xLineBtn->connect_toggled(aLk);
     m_xColumnBtn->connect_toggled(aLk);
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 9c42b44228e4..5f0731b12810 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -587,7 +587,7 @@ void  SwDropCapsPage::Reset(const SfxItemSet *rSet)
     bModified = false;
 }
 
-IMPL_LINK_NOARG(SwDropCapsPage, ClickHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwDropCapsPage, ClickHdl, weld::Toggleable&, void)
 {
     bool bChecked = m_xDropCapsBox->get_active();
 
@@ -615,7 +615,7 @@ IMPL_LINK_NOARG(SwDropCapsPage, ClickHdl, weld::ToggleButton&, void)
     bModified = true;
 }
 
-IMPL_LINK_NOARG(SwDropCapsPage, WholeWordHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwDropCapsPage, WholeWordHdl, weld::Toggleable&, void)
 {
     m_xDropCapsField->set_sensitive(!m_xWholeWordCB->get_active());
     m_xSwitchText->set_sensitive(!m_xWholeWordCB->get_active());
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index 9a8d7e8c87d9..4f1cbdcc0135 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -273,14 +273,14 @@ void SwParagraphNumTabPage::EnableNewStart()
     m_xNewStartBX->show();
 }
 
-IMPL_LINK_NOARG(SwParagraphNumTabPage, NewStartHdl_Impl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwParagraphNumTabPage, NewStartHdl_Impl, weld::Toggleable&, void)
 {
     bool bEnable = m_xNewStartCB->get_active();
     m_xNewStartNumberCB->set_sensitive(bEnable);
     m_xNewStartNF->set_sensitive(bEnable && m_xNewStartNumberCB->get_active());
 }
 
-IMPL_LINK_NOARG(SwParagraphNumTabPage, LineCountHdl_Impl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwParagraphNumTabPage, LineCountHdl_Impl, weld::Toggleable&, void)
 {
     m_xRestartParaCountCB->set_sensitive(m_xCountParaCB->get_active());
 
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index 81bebf9c0253..f42ba0364c45 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -92,9 +92,9 @@ class SwAuthenticationSettingsDialog : public SfxDialogController
     std::unique_ptr<weld::Button>      m_xOKPB;
 
     DECL_LINK(OKHdl_Impl, weld::Button&, void);
-    DECL_LINK(CheckBoxHdl_Impl, weld::ToggleButton&, void);
-    DECL_LINK(RadioButtonHdl_Impl, weld::ToggleButton&, void);
-    DECL_LINK(InServerHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(CheckBoxHdl_Impl, weld::Toggleable&, void);
+    DECL_LINK(RadioButtonHdl_Impl, weld::Toggleable&, void);
+    DECL_LINK(InServerHdl_Impl, weld::Toggleable&, void);
 
 public:
     SwAuthenticationSettingsDialog(weld::Window* pParent, SwMailMergeConfigItem& rItem);
@@ -175,7 +175,7 @@ void SwMailConfigPage::Reset( const SfxItemSet* /*rSet*/ )
     m_xSecureCB->save_state();
 }
 
-IMPL_LINK(SwMailConfigPage, ReplyToHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(SwMailConfigPage, ReplyToHdl, weld::Toggleable&, rBox, void)
 {
     bool bEnable = rBox.get_active();
     m_xReplyToFT->set_sensitive(bEnable);
@@ -196,7 +196,7 @@ IMPL_LINK_NOARG(SwMailConfigPage, TestHdl, weld::Button&, void)
     aDlg.run();
 }
 
-IMPL_LINK(SwMailConfigPage, SecureHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(SwMailConfigPage, SecureHdl, weld::Toggleable&, rBox, void)
 {
     bool bEnable = rBox.get_active();
     m_pConfigItem->SetSecureConnection(bEnable);
@@ -387,7 +387,7 @@ SwAuthenticationSettingsDialog::SwAuthenticationSettingsDialog(
     , m_xOKPB(m_xBuilder->weld_button("ok"))
 {
     m_xAuthenticationCB->connect_toggled( LINK( this, SwAuthenticationSettingsDialog, CheckBoxHdl_Impl));
-    Link<weld::ToggleButton&,void> aRBLink = LINK( this, SwAuthenticationSettingsDialog, RadioButtonHdl_Impl );
+    Link<weld::Toggleable&,void> aRBLink = LINK( this, SwAuthenticationSettingsDialog, RadioButtonHdl_Impl );
     m_xSeparateAuthenticationRB->connect_toggled( aRBLink );
     m_xSMTPAfterPOPRB->connect_toggled( aRBLink );
     m_xOKPB->connect_clicked( LINK( this, SwAuthenticationSettingsDialog, OKHdl_Impl));
@@ -427,7 +427,7 @@ IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, OKHdl_Impl, weld::Button&, void)
     m_xDialog->response(RET_OK);
 }
 
-IMPL_LINK( SwAuthenticationSettingsDialog, CheckBoxHdl_Impl, weld::ToggleButton&, rBox, void)
+IMPL_LINK( SwAuthenticationSettingsDialog, CheckBoxHdl_Impl, weld::Toggleable&, rBox, void)
 {
     bool bChecked = rBox.get_active();
     m_xSeparateAuthenticationRB->set_sensitive(bChecked);
@@ -435,7 +435,7 @@ IMPL_LINK( SwAuthenticationSettingsDialog, CheckBoxHdl_Impl, weld::ToggleButton&
     RadioButtonHdl_Impl(*m_xSeparateAuthenticationRB);
 }
 
-IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, RadioButtonHdl_Impl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, RadioButtonHdl_Impl, weld::Toggleable&, void)
 {
     bool bSeparate = m_xSeparateAuthenticationRB->get_active();
     bool bIsEnabled = m_xSeparateAuthenticationRB->get_sensitive();
@@ -472,7 +472,7 @@ IMPL_LINK_NOARG(SwAuthenticationSettingsDialog, RadioButtonHdl_Impl, weld::Toggl
     m_xInPasswordED->set_sensitive(bNotSeparate);
 }
 
-IMPL_LINK_NOARG( SwAuthenticationSettingsDialog, InServerHdl_Impl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG( SwAuthenticationSettingsDialog, InServerHdl_Impl, weld::Toggleable&, void)
 {
     bool bPOP = m_xPOP3RB->get_active();
     m_rConfigItem.SetInServerPOP(bPOP);
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 6639024a8baf..af0765ab11d3 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -144,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::ToggleButton&, void)
+IMPL_LINK_NOARG(SwLoadOptPage, StandardizedPageCountCheckHdl, weld::Toggleable&, void)
 {
     m_xStandardizedPageSizeNF->set_sensitive(m_xShowStandardizedPageCount->get_active());
 }
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index cb68fc883c63..95eaf4acf213 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -279,12 +279,12 @@ bool SwContentOptPage::FillItemSet(SfxItemSet* rSet)
     return bRet;
 }
 
-IMPL_LINK(SwContentOptPage, VertRulerHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(SwContentOptPage, VertRulerHdl, weld::Toggleable&, rBox, void)
 {
     m_xVRulerRightCBox->set_sensitive(rBox.get_sensitive() && rBox.get_active());
 }
 
-IMPL_LINK(SwContentOptPage, ShowOutlineContentVisibilityButtonHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(SwContentOptPage, ShowOutlineContentVisibilityButtonHdl, weld::Toggleable&, rBox, void)
 {
     m_xTreatSubOutlineLevelsAsContent->set_sensitive(rBox.get_active());
 }
@@ -317,7 +317,7 @@ SwAddPrinterTabPage::SwAddPrinterTabPage(weld::Container* pPage, weld::DialogCon
     , m_xPaperFromSetupCB(m_xBuilder->weld_check_button("papertray"))
     , m_xFaxLB(m_xBuilder->weld_combo_box("fax"))
 {
-    Link<weld::ToggleButton&,void> aLk = LINK( this, SwAddPrinterTabPage, AutoClickHdl);
+    Link<weld::Toggleable&,void> aLk = LINK( this, SwAddPrinterTabPage, AutoClickHdl);
     m_xGrfCB->connect_toggled( aLk );
     m_xRightPageCB->connect_toggled( aLk );
     m_xLeftPageCB->connect_toggled( aLk );
@@ -454,7 +454,7 @@ void    SwAddPrinterTabPage::Reset( const SfxItemSet*  )
         m_xProspectCB_RTL->set_sensitive( false );
 }
 
-IMPL_LINK_NOARG(SwAddPrinterTabPage, AutoClickHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwAddPrinterTabPage, AutoClickHdl, weld::Toggleable&, void)
 {
     bAttrModified = true;
     bool bIsProspect = m_xProspectCB->get_active();
@@ -1028,7 +1028,7 @@ SwTableOptionsTabPage::SwTableOptionsTabPage(weld::Container* pPage, weld::Dialo
     , m_xFixPropRB(m_xBuilder->weld_radio_button("fixprop"))
     , m_xVarRB(m_xBuilder->weld_radio_button("var"))
 {
-    Link<weld::ToggleButton&,void> aLnk(LINK(this, SwTableOptionsTabPage, CheckBoxHdl));
+    Link<weld::Toggleable&,void> aLnk(LINK(this, SwTableOptionsTabPage, CheckBoxHdl));
     m_xNumFormattingCB->connect_toggled(aLnk);
     m_xNumFormatFormattingCB->connect_toggled(aLnk);
     m_xHeaderCB->connect_toggled(aLnk);
@@ -1195,7 +1195,7 @@ void SwTableOptionsTabPage::Reset( const SfxItemSet* rSet)
     CheckBoxHdl(*m_xHeaderCB);
 }
 
-IMPL_LINK_NOARG(SwTableOptionsTabPage, CheckBoxHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwTableOptionsTabPage, CheckBoxHdl, weld::Toggleable&, void)
 {
     m_xNumFormatFormattingCB->set_sensitive(m_xNumFormattingCB->get_active());
     m_xNumAlignmentCB->set_sensitive(m_xNumFormattingCB->get_active());
@@ -2017,7 +2017,7 @@ SwCompareOptionsTabPage::SwCompareOptionsTabPage(weld::Container* pPage, weld::D
     , m_xLenNF(m_xBuilder->weld_spin_button("ignorelen"))
     , m_xStoreRsidCB(m_xBuilder->weld_check_button("storeRSID"))
 {
-    Link<weld::ToggleButton&,void> aLnk( LINK( this, SwCompareOptionsTabPage, ComparisonHdl ) );
+    Link<weld::Toggleable&,void> aLnk( LINK( this, SwCompareOptionsTabPage, ComparisonHdl ) );
     m_xAutoRB->connect_toggled( aLnk );
     m_xWordRB->connect_toggled( aLnk );
     m_xCharRB->connect_toggled( aLnk );
@@ -2125,7 +2125,7 @@ void SwCompareOptionsTabPage::Reset( const SfxItemSet* )
     m_xStoreRsidCB->save_state();
 }
 
-IMPL_LINK(SwCompareOptionsTabPage, ComparisonHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SwCompareOptionsTabPage, ComparisonHdl, weld::Toggleable&, rButton, void)
 {
     if (!rButton.get_active())
         return;
@@ -2136,7 +2136,7 @@ IMPL_LINK(SwCompareOptionsTabPage, ComparisonHdl, weld::ToggleButton&, rButton,
     m_xLenNF->set_sensitive( bChecked && m_xIgnoreCB->get_active() );
 }
 
-IMPL_LINK_NOARG(SwCompareOptionsTabPage, IgnoreHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwCompareOptionsTabPage, IgnoreHdl, weld::Toggleable&, void)
 {
     m_xLenNF->set_sensitive(m_xIgnoreCB->get_active());
 }
@@ -2215,7 +2215,7 @@ void SwTestTabPage::Reset( const SfxItemSet* )
 void SwTestTabPage::Init()
 {
     // handler
-    Link<weld::ToggleButton&,void> aLk = LINK( this, SwTestTabPage, AutoClickHdl );
+    Link<weld::Toggleable&,void> aLk = LINK( this, SwTestTabPage, AutoClickHdl );
     m_xTest1CBox->connect_toggled( aLk );
     m_xTest2CBox->connect_toggled( aLk );
     m_xTest3CBox->connect_toggled( aLk );
@@ -2228,7 +2228,7 @@ void SwTestTabPage::Init()
     m_xTest10CBox->connect_toggled( aLk );
 }
 
-IMPL_LINK_NOARG(SwTestTabPage, AutoClickHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwTestTabPage, AutoClickHdl, weld::Toggleable&, void)
 {
     bAttrModified = true;
 }
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index b9047f92201d..6e4d47ca9190 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -387,14 +387,15 @@ SwInsertDBColAutoPilot::~SwInsertDBColAutoPilot()
 {
 }
 
-IMPL_LINK( SwInsertDBColAutoPilot, PageHdl, weld::ToggleButton&, rButton, void )
+IMPL_LINK( SwInsertDBColAutoPilot, PageHdl, weld::Toggleable&, rButton, void )
 {
     if (!rButton.get_active())
         return;
 
     bool bShowTable = m_xRbAsTable->get_active();
 
-    m_xHeadFrame->set_label(MnemonicGenerator::EraseAllMnemonicChars(rButton.get_label().replace('_', '~')));
+    weld::RadioButton& rRadio = dynamic_cast<weld::RadioButton&>(rButton);
+    m_xHeadFrame->set_label(MnemonicGenerator::EraseAllMnemonicChars(rRadio.get_label().replace('_', '~')));
 
     m_xLbTextDbColumn->set_visible( !bShowTable );
     m_xIbDbcolToEdit->set_visible( !bShowTable );
@@ -421,7 +422,7 @@ IMPL_LINK( SwInsertDBColAutoPilot, PageHdl, weld::ToggleButton&, rButton, void )
     TVSelectHdl( bShowTable ? *m_xLbTableDbColumn : *m_xLbTextDbColumn );
 }
 
-IMPL_LINK( SwInsertDBColAutoPilot, DBFormatHdl, weld::ToggleButton&, rButton, void )
+IMPL_LINK( SwInsertDBColAutoPilot, DBFormatHdl, weld::Toggleable&, rButton, void )
 {
     if (!rButton.get_active())
         return;
@@ -801,7 +802,7 @@ IMPL_LINK_NOARG(SwInsertDBColAutoPilot, CBSelectHdl, weld::ComboBox&, void)
     }
 }
 
-IMPL_LINK_NOARG(SwInsertDBColAutoPilot, HeaderHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwInsertDBColAutoPilot, HeaderHdl, weld::Toggleable&, void)
 {
     bool bEnable = m_xCbTableHeadon->get_active();
     m_xRbHeadlColnms->set_sensitive( bEnable );
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index ec7f7ae75108..3217a01147d5 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -230,7 +230,7 @@ void SwMailMergeAddressBlockPage::EnableAddressBlock(bool bAll, bool bSelective)
     m_xStep4->set_sensitive(bSelective);
 }
 
-IMPL_LINK(SwMailMergeAddressBlockPage, AddressBlockHdl_Impl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(SwMailMergeAddressBlockPage, AddressBlockHdl_Impl, weld::Toggleable&, rBox, void)
 {
     EnableAddressBlock(rBox.get_sensitive(), rBox.get_active());
     SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
@@ -251,7 +251,7 @@ IMPL_LINK_NOARG(SwMailMergeAddressBlockPage, AddressBlockSelectHdl_Impl, LinkPar
     GetWizard()->enableButtons(WizardButtonFlags::NEXT, GetWizard()->isStateEnabled(MM_GREETINGSPAGE));
 }
 
-IMPL_LINK(SwMailMergeAddressBlockPage, HideParagraphsHdl_Impl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(SwMailMergeAddressBlockPage, HideParagraphsHdl_Impl, weld::Toggleable&, rBox, void)
 {
     SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
     rConfigItem.SetHideEmptyParagraphs(rBox.get_active());
@@ -333,7 +333,7 @@ SwSelectAddressBlockDialog::SwSelectAddressBlockDialog(weld::Window* pParent, Sw
 
     m_xDeletePB->connect_clicked(LINK(this, SwSelectAddressBlockDialog, DeleteHdl_Impl));
 
-    Link<weld::ToggleButton&,void> aLk = LINK(this, SwSelectAddressBlockDialog, IncludeHdl_Impl);
+    Link<weld::Toggleable&,void> aLk = LINK(this, SwSelectAddressBlockDialog, IncludeHdl_Impl);
     m_xNeverRB->connect_toggled(aLk);
     m_xAlwaysRB->connect_toggled(aLk);
     m_xDependentRB->connect_toggled(aLk);
@@ -435,7 +435,7 @@ IMPL_LINK(SwSelectAddressBlockDialog, NewCustomizeHdl_Impl, weld::Button&, rButt
     m_xDeletePB->set_sensitive(m_aAddressBlocks.getLength() > 1);
 }
 
-IMPL_LINK_NOARG(SwSelectAddressBlockDialog, IncludeHdl_Impl, weld::ToggleButton&,  void)
+IMPL_LINK_NOARG(SwSelectAddressBlockDialog, IncludeHdl_Impl, weld::Toggleable&,  void)
 {
     m_xCountryED->set_sensitive(m_xDependentRB->get_active());
 }
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index 1ab100c9539b..65071c11d7a6 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -69,10 +69,10 @@ class SwMailMergeAddressBlockPage : public vcl::OWizardPage
     DECL_LINK(AddressListHdl_Impl, weld::Button&, void);
     DECL_LINK(SettingsHdl_Impl, weld::Button&, void);
     DECL_LINK(AssignHdl_Impl, weld::Button&, void);
-    DECL_LINK(AddressBlockHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(AddressBlockHdl_Impl, weld::Toggleable&, void);
     DECL_LINK(InsertDataHdl_Impl, weld::Button&, void);
     DECL_LINK(AddressBlockSelectHdl_Impl, LinkParamNone*, void);
-    DECL_LINK(HideParagraphsHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(HideParagraphsHdl_Impl, weld::Toggleable&, void);
 
     void                EnableAddressBlock(bool bAll, bool bSelective);
 
@@ -103,7 +103,7 @@ class SwSelectAddressBlockDialog : public SfxDialogController
 
     DECL_LINK(NewCustomizeHdl_Impl, weld::Button&, void);
     DECL_LINK(DeleteHdl_Impl, weld::Button&, void);
-    DECL_LINK(IncludeHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(IncludeHdl_Impl, weld::Toggleable&, void);
 
 public:
     SwSelectAddressBlockDialog(weld::Window* pParent, SwMailMergeConfigItem& rConfig);
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx
index 5ef0ee737f3a..cfed29e5a49d 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -56,7 +56,7 @@ SwMailMergeDocSelectPage::SwMailMergeDocSelectPage(weld::Container* pPage, SwMai
     m_xCurrentDocRB->set_active(true);
     DocSelectHdl(*m_xNewDocRB);
 
-    Link<weld::ToggleButton&,void> aDocSelectLink = LINK(this, SwMailMergeDocSelectPage, DocSelectHdl);
+    Link<weld::Toggleable&,void> aDocSelectLink = LINK(this, SwMailMergeDocSelectPage, DocSelectHdl);
     m_xCurrentDocRB->connect_toggled(aDocSelectLink);
     m_xNewDocRB->connect_toggled(aDocSelectLink);
     m_xLoadDocRB->connect_toggled(aDocSelectLink);
@@ -87,7 +87,7 @@ SwMailMergeDocSelectPage::~SwMailMergeDocSelectPage()
 {
 }
 
-IMPL_LINK_NOARG(SwMailMergeDocSelectPage, DocSelectHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwMailMergeDocSelectPage, DocSelectHdl, weld::Toggleable&, void)
 {
     m_xRecentDocLB->set_sensitive(m_xRecentDocRB->get_active());
     m_pWizard->UpdateRoadmap();
diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx
index 5220c3fd7fe2..d1cdca67d330 100644
--- a/sw/source/ui/dbui/mmdocselectpage.hxx
+++ b/sw/source/ui/dbui/mmdocselectpage.hxx
@@ -42,7 +42,7 @@ class SwMailMergeDocSelectPage : public vcl::OWizardPage
     std::unique_ptr<weld::Label> m_xDataSourceWarningFT;
     std::unique_ptr<weld::Button> m_xExchangeDatabasePB;
 
-    DECL_LINK(DocSelectHdl, weld::ToggleButton&, void);
+    DECL_LINK(DocSelectHdl, weld::Toggleable&, void);
     DECL_LINK(FileSelectHdl, weld::Button&, void);
     DECL_LINK(ExchangeDatabaseHdl, weld::Button&, void);
 
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx
index 8287e064ec43..77e9242ba2d2 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -56,7 +56,7 @@ static void lcl_StoreGreetingsBox(const weld::ComboBox& rBox,
     rConfig.SetCurrentGreeting(eType, rBox.get_active());
 }
 
-IMPL_LINK_NOARG(SwGreetingsHandler, IndividualHdl_Impl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwGreetingsHandler, IndividualHdl_Impl, weld::Toggleable&, void)
 {
     bool bIndividual = m_xPersonalizedCB->get_sensitive() && m_xPersonalizedCB->get_active();
     m_xFemaleFT->set_sensitive(bIndividual);
@@ -216,7 +216,7 @@ SwMailMergeGreetingsPage::SwMailMergeGreetingsPage(weld::Container* pPage, SwMai
     m_bIsTabPage = true;
 
     m_xGreetingLineCB->connect_toggled(LINK(this, SwMailMergeGreetingsPage, ContainsHdl_Impl));
-    Link<weld::ToggleButton&,void> aIndividualLink = LINK(this, SwGreetingsHandler, IndividualHdl_Impl);
+    Link<weld::Toggleable&,void> aIndividualLink = LINK(this, SwGreetingsHandler, IndividualHdl_Impl);
     m_xPersonalizedCB->connect_toggled(aIndividualLink);
     Link<weld::Button&,void> aGreetingLink = LINK(this, SwGreetingsHandler, GreetingHdl_Impl);
     m_xFemalePB->connect_clicked(aGreetingLink);
@@ -303,7 +303,7 @@ bool SwMailMergeGreetingsPage::commitPage( ::vcl::WizardTypes::CommitPageReason
     return true;
 }
 
-IMPL_LINK(SwMailMergeGreetingsPage, ContainsHdl_Impl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(SwMailMergeGreetingsPage, ContainsHdl_Impl, weld::Toggleable&, rBox, void)
 {
     bool bContainsGreeting = rBox.get_active();
     SwGreetingsHandler::Contains(bContainsGreeting);
@@ -349,7 +349,7 @@ SwMailBodyDialog::SwMailBodyDialog(weld::Window* pParent)
     m_xBodyMLE->set_size_request(m_xBodyMLE->get_approximate_digit_width() * 45,
                                  m_xBodyMLE->get_height_rows(6));
     m_xGreetingLineCB->connect_toggled(LINK(this, SwMailBodyDialog, ContainsHdl_Impl));
-    Link<weld::ToggleButton&,void> aIndividualLink = LINK(this, SwGreetingsHandler, IndividualHdl_Impl);
+    Link<weld::Toggleable&,void> aIndividualLink = LINK(this, SwGreetingsHandler, IndividualHdl_Impl);
     m_xPersonalizedCB->connect_toggled(aIndividualLink);
     Link<weld::Button&,void> aGreetingLink = LINK(this, SwGreetingsHandler, GreetingHdl_Impl);
     m_xFemalePB->connect_clicked(aGreetingLink);
@@ -387,7 +387,7 @@ SwMailBodyDialog::~SwMailBodyDialog()
 {
 }
 
-IMPL_LINK(SwMailBodyDialog, ContainsHdl_Impl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(SwMailBodyDialog, ContainsHdl_Impl, weld::Toggleable&, rBox, void)
 {
     SwGreetingsHandler::Contains(rBox.get_active());
     m_rConfigItem.SetGreetingLine(rBox.get_active(), true);
diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx
index 3fd55ea2b002..86aaf9c553f2 100644
--- a/sw/source/ui/dbui/mmgreetingspage.hxx
+++ b/sw/source/ui/dbui/mmgreetingspage.hxx
@@ -76,7 +76,7 @@ protected:
 
     ~SwGreetingsHandler() {}
 
-    DECL_LINK(IndividualHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(IndividualHdl_Impl, weld::Toggleable&, void);
     DECL_LINK(GreetingHdl_Impl, weld::Button&, void);
 
     void Contains(bool bContainsGreeting);
@@ -95,7 +95,7 @@ class SwMailMergeGreetingsPage : public vcl::OWizardPage, public SwGreetingsHand
 
     OUString m_sDocument;
 
-    DECL_LINK(ContainsHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(ContainsHdl_Impl, weld::Toggleable&, void);
     DECL_LINK(InsertDataHdl_Impl, weld::Button&, void);
     DECL_LINK(GreetingSelectComboBoxHdl_Impl, weld::ComboBox&, void);
     DECL_LINK(GreetingSelectListBoxHdl_Impl, weld::ComboBox&, void);
@@ -116,7 +116,7 @@ class SwMailBodyDialog : public SfxDialogController, public SwGreetingsHandler
     std::unique_ptr<weld::TextView> m_xBodyMLE;
     std::unique_ptr<weld::Button> m_xOK;
 
-    DECL_LINK(ContainsHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(ContainsHdl_Impl, weld::Toggleable&, void);
     DECL_LINK(OKHdl, weld::Button&, void);
 
 public:
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index b31025719351..7d12b35e5e68 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -683,7 +683,7 @@ IMPL_LINK(SwMailMergeLayoutPage, GreetingsHdl_Impl, weld::Button&, rButton, void
     m_xExampleFrame->Invalidate();
 }
 
-IMPL_LINK(SwMailMergeLayoutPage, AlignToTextHdl_Impl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(SwMailMergeLayoutPage, AlignToTextHdl_Impl, weld::Toggleable&, rBox, void)
 {
     bool bCheck = rBox.get_active() && rBox.get_sensitive();
     m_xLeftFT->set_sensitive(!bCheck);
diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx
index a0f732e8af28..abec12bb2c52 100644
--- a/sw/source/ui/dbui/mmlayoutpage.hxx
+++ b/sw/source/ui/dbui/mmlayoutpage.hxx
@@ -60,7 +60,7 @@ class SwMailMergeLayoutPage : public vcl::OWizardPage
     DECL_LINK(ZoomHdl_Impl, weld::ComboBox&, void);
     DECL_LINK(ChangeAddressHdl_Impl, weld::MetricSpinButton&, void);
     DECL_LINK(GreetingsHdl_Impl, weld::Button&, void);
-    DECL_LINK(AlignToTextHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(AlignToTextHdl_Impl, weld::Toggleable&, void);
 
     static SwFrameFormat* InsertAddressFrame(
                             SwWrtShell& rShell,
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index d55275d02ff7..660c9ea74384 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -45,7 +45,7 @@ SwMailMergeOutputTypePage::SwMailMergeOutputTypePage(weld::Container* pPage, SwM
     , m_xLetterHint(m_xBuilder->weld_label("letterft"))
     , m_xMailHint(m_xBuilder->weld_label("emailft"))
 {
-    Link<weld::ToggleButton&,void> aLink = LINK(this, SwMailMergeOutputTypePage, TypeHdl_Impl);
+    Link<weld::Toggleable&,void> aLink = LINK(this, SwMailMergeOutputTypePage, TypeHdl_Impl);
     m_xLetterRB->connect_toggled(aLink);
     m_xMailRB->connect_toggled(aLink);
 
@@ -61,7 +61,7 @@ SwMailMergeOutputTypePage::~SwMailMergeOutputTypePage()
 {
 }
 
-IMPL_LINK_NOARG(SwMailMergeOutputTypePage, TypeHdl_Impl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwMailMergeOutputTypePage, TypeHdl_Impl, weld::Toggleable&, void)
 {
     bool bLetter = m_xLetterRB->get_active();
     m_xLetterHint->set_visible(bLetter);
diff --git a/sw/source/ui/dbui/mmoutputtypepage.hxx b/sw/source/ui/dbui/mmoutputtypepage.hxx
index eccd2bb9d08f..0fa6c00d0fdc 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.hxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.hxx
@@ -32,7 +32,7 @@ class SwMailMergeOutputTypePage : public vcl::OWizardPage
     std::unique_ptr<weld::Label> m_xLetterHint;
     std::unique_ptr<weld::Label> m_xMailHint;
 
-    DECL_LINK(TypeHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(TypeHdl_Impl, weld::Toggleable&, void);
 
 public:
     SwMailMergeOutputTypePage(weld::Container* pPage, SwMailMergeWizard* pWizard);
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index d726c1c2d830..6e081c68a9a1 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -257,7 +257,7 @@ SwMMResultSaveDialog::SwMMResultSaveDialog(weld::Window* pParent)
     , m_xToNF(m_xBuilder->weld_spin_button("to"))
     , m_xOKButton(m_xBuilder->weld_button("ok"))
 {
-    Link<weld::ToggleButton&,void> aLink = LINK(this, SwMMResultSaveDialog, DocumentSelectionHdl_Impl);
+    Link<weld::Toggleable&,void> aLink = LINK(this, SwMMResultSaveDialog, DocumentSelectionHdl_Impl);
     m_xSaveAsOneRB->connect_toggled(aLink);
     m_xSaveIndividualRB->connect_toggled(aLink);
     m_xFromRB->connect_toggled(aLink);
@@ -295,7 +295,7 @@ SwMMResultPrintDialog::SwMMResultPrintDialog(weld::Window* pParent)
     m_xPrinterLB->connect_changed(LINK(this, SwMMResultPrintDialog, PrinterChangeHdl_Impl));
     m_xPrinterSettingsPB->connect_clicked(LINK(this, SwMMResultPrintDialog, PrinterSetupHdl_Impl));
 
-    Link<weld::ToggleButton&,void> aLink = LINK(this, SwMMResultPrintDialog, DocumentSelectionHdl_Impl);
+    Link<weld::Toggleable&,void> aLink = LINK(this, SwMMResultPrintDialog, DocumentSelectionHdl_Impl);
     m_xPrintAllRB->connect_toggled(aLink);
     m_xFromRB->connect_toggled(aLink);
     // m_pPrintAllRB is the default, so disable m_xFromNF and m_xToNF initially.
@@ -338,7 +338,7 @@ SwMMResultEmailDialog::SwMMResultEmailDialog(weld::Window* pParent)
     m_xSendAsLB->connect_changed(LINK(this, SwMMResultEmailDialog, SendTypeHdl_Impl));
     m_xPasswordCB->connect_toggled( LINK( this, SwMMResultEmailDialog, CheckHdl ));
 
-    Link<weld::ToggleButton&,void> aLink = LINK(this, SwMMResultEmailDialog, DocumentSelectionHdl_Impl);
+    Link<weld::Toggleable&,void> aLink = LINK(this, SwMMResultEmailDialog, DocumentSelectionHdl_Impl);
     m_xSendAllRB->connect_toggled(aLink);
     m_xFromRB->connect_toggled(aLink);
     // m_xSendAllRB is the default, so disable m_xFromNF and m_xToNF initially.
@@ -455,7 +455,7 @@ void SwMMResultEmailDialog::FillInEmailSettings()
     m_xToNF->set_value(nCount);
 }
 
-IMPL_LINK_NOARG(SwMMResultSaveDialog, DocumentSelectionHdl_Impl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwMMResultSaveDialog, DocumentSelectionHdl_Impl, weld::Toggleable&, void)
 {
     bool bEnableFromTo = m_xFromRB->get_active();
     m_xFromNF->set_sensitive(bEnableFromTo);
@@ -463,7 +463,7 @@ IMPL_LINK_NOARG(SwMMResultSaveDialog, DocumentSelectionHdl_Impl, weld::ToggleBut
     m_xToNF->set_sensitive(bEnableFromTo);
 }
 
-IMPL_LINK_NOARG(SwMMResultEmailDialog, CheckHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwMMResultEmailDialog, CheckHdl, weld::Toggleable&, void)
 {
     bool bEnable = m_xPasswordCB->get_active();
 
@@ -471,7 +471,7 @@ IMPL_LINK_NOARG(SwMMResultEmailDialog, CheckHdl, weld::ToggleButton&, void)
     m_xPasswordLB->set_sensitive(bEnable);
 }
 
-IMPL_LINK_NOARG(SwMMResultPrintDialog, DocumentSelectionHdl_Impl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwMMResultPrintDialog, DocumentSelectionHdl_Impl, weld::Toggleable&, void)
 {
     bool bEnableFromTo = m_xFromRB->get_active();
     m_xFromNF->set_sensitive(bEnableFromTo);
@@ -479,7 +479,7 @@ IMPL_LINK_NOARG(SwMMResultPrintDialog, DocumentSelectionHdl_Impl, weld::ToggleBu
     m_xToNF->set_sensitive(bEnableFromTo);
 }
 
-IMPL_LINK_NOARG(SwMMResultEmailDialog, DocumentSelectionHdl_Impl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwMMResultEmailDialog, DocumentSelectionHdl_Impl, weld::Toggleable&, void)
 {
     bool bEnableFromTo = m_xFromRB->get_active();
     m_xFromNF->set_sensitive(bEnableFromTo);
diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx
index dc02888cf0fb..afd6f1892474 100644
--- a/sw/source/ui/dialog/ascfldlg.cxx
+++ b/sw/source/ui/dialog/ascfldlg.cxx
@@ -425,7 +425,7 @@ IMPL_LINK_NOARG(SwAsciiFilterDlg, CharSetSelHdl, weld::ComboBox&, void)
     UpdateIncludeBOMSensitiveState();
 }
 
-IMPL_LINK(SwAsciiFilterDlg, LineEndHdl, weld::ToggleButton&, rBtn, void)
+IMPL_LINK(SwAsciiFilterDlg, LineEndHdl, weld::Toggleable&, rBtn, void)
 {
     if (m_bSaveLineStatus)
         rBtn.save_state();
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 18c3d6f2476a..fd0d32801caa 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -398,7 +398,7 @@ SwEditRegionDlg::SwEditRegionDlg(weld::Window* pParent, SwWrtShell& rWrtSh)
     bDontCheckPasswd = false;
 }
 
-bool SwEditRegionDlg::CheckPasswd(weld::ToggleButton* pBox)
+bool SwEditRegionDlg::CheckPasswd(weld::Toggleable* pBox)
 {
     if (bDontCheckPasswd)
         return true;
@@ -799,7 +799,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl, weld::Button&, void)
 }
 
 // Toggle protect
-IMPL_LINK(SwEditRegionDlg, ChangeProtectHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SwEditRegionDlg, ChangeProtectHdl, weld::Toggleable&, rButton, void)
 {
     if (!CheckPasswd(&rButton))
         return;
@@ -816,7 +816,7 @@ IMPL_LINK(SwEditRegionDlg, ChangeProtectHdl, weld::ToggleButton&, rButton, void)
 }
 
 // Toggle hide
-IMPL_LINK( SwEditRegionDlg, ChangeHideHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK( SwEditRegionDlg, ChangeHideHdl, weld::Toggleable&, rButton, void)
 {
     if (!CheckPasswd(&rButton))
         return;
@@ -834,7 +834,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeHideHdl, weld::ToggleButton&, rButton, void)
 }
 
 // Toggle edit in readonly
-IMPL_LINK(SwEditRegionDlg, ChangeEditInReadonlyHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SwEditRegionDlg, ChangeEditInReadonlyHdl, weld::Toggleable&, rButton, void)
 {
     if (!CheckPasswd(&rButton))
         return;
@@ -920,7 +920,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl, weld::Button&, void)
 }
 
 // link CheckBox to file?
-IMPL_LINK(SwEditRegionDlg, UseFileHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SwEditRegionDlg, UseFileHdl, weld::Toggleable&, rButton, void)
 {
     if (!CheckPasswd(&rButton))
         return;
@@ -1131,7 +1131,7 @@ IMPL_LINK(SwEditRegionDlg, FileNameEntryHdl, weld::Entry&, rEdit, void)
     }
 }
 
-IMPL_LINK(SwEditRegionDlg, DDEHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SwEditRegionDlg, DDEHdl, weld::Toggleable&, rButton, void)
 {
     if (!CheckPasswd(&rButton))
         return;
@@ -1231,7 +1231,7 @@ void SwEditRegionDlg::ChangePasswd(bool bChange)
     });
 }
 
-IMPL_LINK_NOARG(SwEditRegionDlg, TogglePasswdHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwEditRegionDlg, TogglePasswdHdl, weld::Toggleable&, void)
 {
     ChangePasswd(false);
 }
@@ -1593,14 +1593,14 @@ std::unique_ptr<SfxTabPage> SwInsertSectionTabPage::Create(weld::Container* pPag
     return std::make_unique<SwInsertSectionTabPage>(pPage, pController, *rAttrSet);
 }
 
-IMPL_LINK(SwInsertSectionTabPage, ChangeHideHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(SwInsertSectionTabPage, ChangeHideHdl, weld::Toggleable&, rBox, void)
 {
     bool bHide = rBox.get_active();
     m_xConditionED->set_sensitive(bHide);
     m_xConditionFT->set_sensitive(bHide);
 }
 
-IMPL_LINK(SwInsertSectionTabPage, ChangeProtectHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(SwInsertSectionTabPage, ChangeProtectHdl, weld::Toggleable&, rBox, void)
 {
     bool bCheck = rBox.get_active();
     m_xPasswdCB->set_sensitive(bCheck);
@@ -1639,7 +1639,7 @@ void SwInsertSectionTabPage::ChangePasswd(bool bChange)
         m_aNewPasswd.realloc(0);
 }
 
-IMPL_LINK_NOARG(SwInsertSectionTabPage, TogglePasswdHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwInsertSectionTabPage, TogglePasswdHdl, weld::Toggleable&, void)
 {
     ChangePasswd(false);
 }
@@ -1657,7 +1657,7 @@ IMPL_LINK_NOARG(SwInsertSectionTabPage, NameEditHdl, weld::ComboBox&, void)
             m_xCurName->find_text(aName) == -1);
 }
 
-IMPL_LINK(SwInsertSectionTabPage, UseFileHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SwInsertSectionTabPage, UseFileHdl, weld::Toggleable&, rButton, void)
 {
     if (rButton.get_active())
     {
@@ -1698,7 +1698,7 @@ IMPL_LINK_NOARG(SwInsertSectionTabPage, FileSearchHdl, weld::Button&, void)
     m_pDocInserter->StartExecuteModal( LINK( this, SwInsertSectionTabPage, DlgClosedHdl ) );
 }
 
-IMPL_LINK( SwInsertSectionTabPage, DDEHdl, weld::ToggleButton&, rButton, void )
+IMPL_LINK( SwInsertSectionTabPage, DDEHdl, weld::Toggleable&, rButton, void )
 {
     bool bDDE = rButton.get_active();
     bool bFile = m_xFileCB->get_active();
@@ -1774,7 +1774,7 @@ SwSectionFootnoteEndTabPage::SwSectionFootnoteEndTabPage(weld::Container* pPage,
     m_xFootnoteNumViewBox->Reload(SwInsertNumTypes::Extended);
     m_xEndNumViewBox->Reload(SwInsertNumTypes::Extended);
 
-    Link<weld::ToggleButton&,void> aLk( LINK( this, SwSectionFootnoteEndTabPage, FootEndHdl));
+    Link<weld::Toggleable&,void> aLk( LINK( this, SwSectionFootnoteEndTabPage, FootEndHdl));
     m_xFootnoteNtAtTextEndCB->connect_toggled( aLk );
     m_xFootnoteNtNumCB->connect_toggled( aLk );
     m_xEndNtAtTextEndCB->connect_toggled( aLk );
@@ -1931,7 +1931,7 @@ std::unique_ptr<SfxTabPage> SwSectionFootnoteEndTabPage::Create( weld::Container
     return std::make_unique<SwSectionFootnoteEndTabPage>(pPage, pController, *rAttrSet);
 }
 
-IMPL_LINK( SwSectionFootnoteEndTabPage, FootEndHdl, weld::ToggleButton&, rBox, void )
+IMPL_LINK( SwSectionFootnoteEndTabPage, FootEndHdl, weld::Toggleable&, rBox, void )
 {
     bool bFoot = m_xFootnoteNtAtTextEndCB.get() == &rBox || m_xFootnoteNtNumCB.get() == &rBox ||
                     m_xFootnoteNtNumFormatCB.get() == &rBox ;
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index 121a523479c5..5e27412aca59 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -256,7 +256,7 @@ IMPL_LINK_NOARG(SwEnvPage, FieldHdl, weld::Button&, void)
     m_xAddrEdit->select_region(nStartPos, nEndPos);
 }
 
-IMPL_LINK_NOARG(SwEnvPage, SenderHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwEnvPage, SenderHdl, weld::Toggleable&, void)
 {
     const bool bEnable = m_xSenderBox->get_active();
     GetParentSwEnvDlg()->aEnvItem.m_bSend = bEnable;
diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index 43dd2f1a9b8d..a55ef0d526a2 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -76,7 +76,7 @@ SwEnvPrtPage::~SwEnvPrtPage()
     m_xPrt.clear();
 }
 
-IMPL_LINK_NOARG(SwEnvPrtPage, ClickHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwEnvPrtPage, ClickHdl, weld::Toggleable&, void)
 {
     // Envelope from bottom, otherwise Envelope from top
     const bool bLowerActive = m_xBottomButton->get_active();
@@ -84,7 +84,7 @@ IMPL_LINK_NOARG(SwEnvPrtPage, ClickHdl, weld::ToggleButton&, void)
     m_xLower->set_visible(bLowerActive);
 }
 
-IMPL_LINK(SwEnvPrtPage, LowerHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SwEnvPrtPage, LowerHdl, weld::Toggleable&, rButton, void)
 {
     for (int i = ENV_HOR_LEFT; i <= ENV_VER_RGHT; ++i)
     {
@@ -96,7 +96,7 @@ IMPL_LINK(SwEnvPrtPage, LowerHdl, weld::ToggleButton&, rButton, void)
     }
 }
 
-IMPL_LINK(SwEnvPrtPage, UpperHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SwEnvPrtPage, UpperHdl, weld::Toggleable&, rButton, void)
 {
     for (int i = ENV_HOR_LEFT; i <= ENV_VER_RGHT; ++i)
     {
diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx
index 4fde994f6eeb..078efa0995c4 100644
--- a/sw/source/ui/envelp/envprt.hxx
+++ b/sw/source/ui/envelp/envprt.hxx
@@ -45,9 +45,9 @@ class SwEnvPrtPage : public SfxTabPage
 
     VclPtr<Printer> m_xPrt;
 
-    DECL_LINK(LowerHdl, weld::ToggleButton&, void);
-    DECL_LINK(UpperHdl, weld::ToggleButton&, void);
-    DECL_LINK(ClickHdl, weld::ToggleButton&, void);
+    DECL_LINK(LowerHdl, weld::Toggleable&, void);
+    DECL_LINK(UpperHdl, weld::Toggleable&, void);
+    DECL_LINK(ClickHdl, weld::Toggleable&, void);
     DECL_LINK(ButtonHdl, weld::Button&, void);
 
     SwEnvDlg* GetParentSwEnvDlg() { return static_cast<SwEnvDlg*>(GetDialogController()); }
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 54cc0ff0a61f..31d2ffddd6be 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -280,7 +280,7 @@ void SwLabPage::SetToBusinessCard()
     m_xAddressFrame->hide();
 };
 
-IMPL_LINK_NOARG(SwLabPage, AddrHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwLabPage, AddrHdl, weld::Toggleable&, void)
 {
     OUString aWriting;
 
@@ -323,7 +323,7 @@ IMPL_LINK_NOARG(SwLabPage, FieldHdl, weld::Button&, void)
     m_xWritingEdit->select_region(nStartPos, nEndPos);
 }
 
-IMPL_LINK_NOARG(SwLabPage, PageHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwLabPage, PageHdl, weld::Toggleable&, void)
 {
     MakeHdl(*m_xMakeBox);
 }
diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx
index b145fa3187b2..893da83a9d7a 100644
--- a/sw/source/ui/envelp/labprt.cxx
+++ b/sw/source/ui/envelp/labprt.cxx
@@ -41,7 +41,7 @@ SwLabPrtPage::SwLabPrtPage(weld::Container* pPage, weld::DialogController* pCont
     SetExchangeSupport();
 
     // Install handlers
-    Link<weld::ToggleButton&,void> aLk = LINK(this, SwLabPrtPage, CountHdl);
+    Link<weld::Toggleable&,void> aLk = LINK(this, SwLabPrtPage, CountHdl);
     m_xPageButton->connect_toggled(aLk);
     m_xSingleButton->connect_toggled(aLk);
     m_xPrtSetup->connect_clicked(LINK(this, SwLabPrtPage, PrtSetupHdl));
@@ -71,7 +71,7 @@ IMPL_LINK( SwLabPrtPage, PrtSetupHdl, weld::Button&, rButton, void )
     m_xPrinterInfo->set_label(pPrinter->GetName());
 }
 
-IMPL_LINK(SwLabPrtPage, CountHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SwLabPrtPage, CountHdl, weld::Toggleable&, rButton, void)
 {
     if (!rButton.get_active())
         return;
diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx
index 79b1e95f023f..de3cac2e4cfa 100644
--- a/sw/source/ui/envelp/labprt.hxx
+++ b/sw/source/ui/envelp/labprt.hxx
@@ -40,7 +40,7 @@ class SwLabPrtPage : public SfxTabPage
     std::unique_ptr<weld::Label> m_xPrinterInfo;
     std::unique_ptr<weld::Button> m_xPrtSetup;
 
-    DECL_LINK(CountHdl, weld::ToggleButton&, void);
+    DECL_LINK(CountHdl, weld::Toggleable&, void);
     DECL_LINK(PrtSetupHdl, weld::Button&, void);
 
     SwLabDlg* GetParentSwLabDlg() { return static_cast<SwLabDlg*>(GetDialogController()); }
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 19c570514a25..acd73a741757 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -354,7 +354,7 @@ IMPL_LINK_NOARG(SwMailMergeDlg, ButtonHdl, weld::Button&, void)
         m_xDialog->response(RET_OK);
 }
 
-IMPL_LINK_NOARG(SwMailMergeDlg, OutputTypeHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwMailMergeDlg, OutputTypeHdl, weld::Toggleable&, void)
 {
     bool bPrint = m_xPrinterRB->get_active();
     m_xSingleJobsCB->set_sensitive(bPrint);
@@ -380,7 +380,7 @@ IMPL_LINK_NOARG(SwMailMergeDlg, OutputTypeHdl, weld::ToggleButton&, void)
     }
 }
 
-IMPL_LINK_NOARG(SwMailMergeDlg, SaveTypeHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwMailMergeDlg, SaveTypeHdl, weld::Toggleable&, void)
 {
     bool bIndividual = m_xSaveIndividualRB->get_active();
 
@@ -404,7 +404,7 @@ IMPL_LINK_NOARG(SwMailMergeDlg, SaveTypeHdl, weld::ToggleButton&, void)
     }
 }
 
-IMPL_LINK( SwMailMergeDlg, FilenameHdl, weld::ToggleButton&, rBox, void )
+IMPL_LINK( SwMailMergeDlg, FilenameHdl, weld::Toggleable&, rBox, void )
 {
     bool bEnable = rBox.get_active();
     m_xColumnFT->set_sensitive( bEnable );
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index b4229e0c22c8..be438ecb82d4 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -44,10 +44,10 @@ class SwLabPage : public SfxTabPage
     std::unique_ptr<weld::ComboBox> m_xHiddenSortTypeBox;
     std::unique_ptr<weld::Label> m_xFormatInfo;
 
-    DECL_LINK(AddrHdl, weld::ToggleButton&, void);
+    DECL_LINK(AddrHdl, weld::Toggleable&, void);
     DECL_LINK(DatabaseHdl, weld::ComboBox&, void);
     DECL_LINK(FieldHdl, weld::Button&, void);
-    DECL_LINK(PageHdl, weld::ToggleButton&, void);
+    DECL_LINK(PageHdl, weld::Toggleable&, void);
     DECL_LINK(MakeHdl, weld::ComboBox&, void);
     DECL_LINK(TypeHdl, weld::ComboBox&, void);
 
diff --git a/sw/source/ui/fldui/javaedit.cxx b/sw/source/ui/fldui/javaedit.cxx
index 4cd9f3a39c85..15f2544fa81a 100644
--- a/sw/source/ui/fldui/javaedit.cxx
+++ b/sw/source/ui/fldui/javaedit.cxx
@@ -53,7 +53,7 @@ SwJavaEditDialog::SwJavaEditDialog(weld::Window* pParent, SwWrtShell* pWrtSh)
     m_xNextBtn->connect_clicked( LINK( this, SwJavaEditDialog, NextHdl ) );
     m_xOKBtn->connect_clicked( LINK( this, SwJavaEditDialog, OKHdl ) );
 
-    Link<weld::ToggleButton&,void> aLk = LINK(this, SwJavaEditDialog, RadioButtonHdl);
+    Link<weld::Toggleable&,void> aLk = LINK(this, SwJavaEditDialog, RadioButtonHdl);
     m_xUrlRB->connect_toggled(aLk);
     m_xEditRB->connect_toggled(aLk);
     m_xUrlPB->connect_clicked(LINK(this, SwJavaEditDialog, InsertFileHdl));
@@ -197,7 +197,7 @@ bool SwJavaEditDialog::IsUpdate() const
     return m_pField && ( sal_uInt32(m_bIsUrl ? 1 : 0) != m_pField->GetFormat() || m_pField->GetPar2() != m_aType || m_pField->GetPar1() != m_aText );
 }
 
-IMPL_LINK(SwJavaEditDialog, RadioButtonHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SwJavaEditDialog, RadioButtonHdl, weld::Toggleable&, rButton, void)
 {
     if (!rButton.get_active())
         return;
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 9dbe84c5e5f1..80a290a9bcc9 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -1015,7 +1015,7 @@ IMPL_LINK(SwColumnPage, EdModify, weld::MetricSpinButton&, rEdit, void)
 
 // Handler behind the Checkbox for automatic width. When the box is checked
 // no explicit values for the column width can be entered.
-IMPL_LINK(SwColumnPage, AutoWidthHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(SwColumnPage, AutoWidthHdl, weld::Toggleable&, rBox, void)
 {
     tools::Long nDist = static_cast< tools::Long >(m_xDistEd1->DenormalizePercent(m_xDistEd1->get_value(FieldUnit::TWIP)));
     m_xColMgr->SetCount(m_nCols, static_cast<sal_uInt16>(nDist));
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index e7c6b268ba2e..0708a639e6c7 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -696,7 +696,7 @@ SwFramePage::SwFramePage(weld::Container* pPage, weld::DialogController* pContro
     m_xAtVertPosED->connect_value_changed( aLk3 );
     m_xFollowTextFlowCB->connect_toggled(LINK(this, SwFramePage, RangeModifyClickHdl));
 
-    Link<weld::ToggleButton&,void> aLk2 = LINK(this, SwFramePage, AnchorTypeHdl);
+    Link<weld::Toggleable&,void> aLk2 = LINK(this, SwFramePage, AnchorTypeHdl);
     m_xAnchorAtPageRB->connect_toggled( aLk2 );
     m_xAnchorAtParaRB->connect_toggled( aLk2 );
     m_xAnchorAtCharRB->connect_toggled( aLk2 );
@@ -1716,13 +1716,13 @@ DeactivateRC SwFramePage::DeactivatePage(SfxItemSet * _pSet)
 }
 
 // swap left/right with inside/outside
-IMPL_LINK_NOARG(SwFramePage, MirrorHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwFramePage, MirrorHdl, weld::Toggleable&, void)
 {
     RndStdIds eId = GetAnchor();
     InitPos(eId, -1, 0, -1, 0, LONG_MAX, LONG_MAX);
 }
 
-IMPL_LINK( SwFramePage, RelSizeClickHdl, weld::ToggleButton&, rBtn, void )
+IMPL_LINK( SwFramePage, RelSizeClickHdl, weld::Toggleable&, rBtn, void )
 {
     if (&rBtn == m_xRelWidthCB.get())
     {
@@ -1748,7 +1748,7 @@ IMPL_LINK( SwFramePage, RelSizeClickHdl, weld::ToggleButton&, rBtn, void )
 }
 
 // range check
-IMPL_LINK_NOARG(SwFramePage, RangeModifyClickHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwFramePage, RangeModifyClickHdl, weld::Toggleable&, void)
 {
     RangeModifyHdl();
 }
@@ -1873,7 +1873,7 @@ void SwFramePage::RangeModifyHdl()
         m_xAtVertPosED->set_value(m_xAtVertPosED->normalize(aVal.nVPos), FieldUnit::TWIP);
 }
 
-IMPL_LINK_NOARG(SwFramePage, AnchorTypeHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwFramePage, AnchorTypeHdl, weld::Toggleable&, void)
 {
     m_xMirrorPagesCB->set_sensitive(!m_xAnchorAsCharRB->get_active());
 
@@ -2036,13 +2036,13 @@ IMPL_LINK_NOARG(SwFramePage, RealSizeHdl, weld::Button&, void)
     UpdateExample();
 }
 
-IMPL_LINK_NOARG(SwFramePage, AutoWidthClickHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwFramePage, AutoWidthClickHdl, weld::Toggleable&, void)
 {
     if( !IsInGraficMode() )
         HandleAutoCB( m_xAutoWidthCB->get_active(), *m_xWidthFT, *m_xWidthAutoFT, *m_xWidthED->get() );
 }
 
-IMPL_LINK_NOARG(SwFramePage, AutoHeightClickHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwFramePage, AutoHeightClickHdl, weld::Toggleable&, void)
 {
     if (!IsInGraficMode())
         HandleAutoCB(m_xAutoHeightCB->get_active(), *m_xHeightFT, *m_xHeightAutoFT, *m_xWidthED->get());
@@ -2563,7 +2563,7 @@ IMPL_LINK_NOARG(SwGrfExtPage, BrowseHdl, weld::Button&, void)
 
 }
 
-IMPL_LINK_NOARG(SwGrfExtPage, MirrorHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwGrfExtPage, MirrorHdl, weld::Toggleable&, void)
 {
     bool bEnable = m_xMirrorHorzBox->get_active();
 
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index bf4029269154..95df8eeb85d0 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -102,7 +102,7 @@ SwWrapTabPage::SwWrapTabPage(weld::Container* pPage, weld::DialogController* pCo
     m_xTopMarginED->connect_value_changed(aLk);
     m_xBottomMarginED->connect_value_changed(aLk);
 
-    Link<weld::ToggleButton&,void> aLk2 = LINK(this, SwWrapTabPage, WrapTypeHdl);
+    Link<weld::Toggleable&,void> aLk2 = LINK(this, SwWrapTabPage, WrapTypeHdl);
     m_xNoWrapRB->connect_toggled(aLk2);
     m_xWrapLeftRB->connect_toggled(aLk2);
     m_xWrapRightRB->connect_toggled(aLk2);
@@ -580,7 +580,7 @@ IMPL_LINK(SwWrapTabPage, RangeModifyHdl, weld::MetricSpinButton&, rEdit, void)
     }
 }
 
-IMPL_LINK_NOARG(SwWrapTabPage, WrapTypeHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwWrapTabPage, WrapTypeHdl, weld::Toggleable&, void)
 {
     bool bWrapThrough = m_xWrapThroughRB->get_active();
     m_xWrapTransparentCB->set_sensitive(bWrapThrough && !m_bHtmlMode);
@@ -594,7 +594,7 @@ IMPL_LINK_NOARG(SwWrapTabPage, WrapTypeHdl, weld::ToggleButton&, void)
     ContourHdl(*m_xWrapOutlineCB);
 }
 
-IMPL_LINK_NOARG(SwWrapTabPage, ContourHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwWrapTabPage, ContourHdl, weld::Toggleable&, void)
 {
     bool bEnable = !(m_xWrapOutlineCB->get_active() && m_xWrapOutlineCB->get_sensitive());
 
diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx
index 18151a810f99..72d86389ac8e 100644
--- a/sw/source/ui/inc/mmresultdialogs.hxx
+++ b/sw/source/ui/inc/mmresultdialogs.hxx
@@ -44,7 +44,7 @@ class SwMMResultSaveDialog : public SfxDialogController
     std::unique_ptr<weld::Button> m_xOKButton;
 
     DECL_LINK(SaveOutputHdl_Impl, weld::Button& , void);
-    DECL_LINK(DocumentSelectionHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(DocumentSelectionHdl_Impl, weld::Toggleable&, void);
 
 public:
     SwMMResultSaveDialog(weld::Window* pParent);
@@ -69,7 +69,7 @@ class SwMMResultPrintDialog : public SfxDialogController
     DECL_LINK(PrinterChangeHdl_Impl, weld::ComboBox&, void );
     DECL_LINK(PrintHdl_Impl, weld::Button&, void);
     DECL_LINK(PrinterSetupHdl_Impl, weld::Button&, void );
-    DECL_LINK(DocumentSelectionHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(DocumentSelectionHdl_Impl, weld::Toggleable&, void);
 
     void FillInPrinterSettings();
 
@@ -110,8 +110,8 @@ class SwMMResultEmailDialog : public SfxDialogController
     DECL_LINK(SendTypeHdl_Impl, weld::ComboBox&, void);
     DECL_LINK(SendAsHdl_Impl, weld::Button&, void);
     DECL_LINK(SendDocumentsHdl_Impl, weld::Button&, void);
-    DECL_LINK(DocumentSelectionHdl_Impl, weld::ToggleButton&, void);
-    DECL_LINK(CheckHdl, weld::ToggleButton&, void );
+    DECL_LINK(DocumentSelectionHdl_Impl, weld::Toggleable&, void);
+    DECL_LINK(CheckHdl, weld::Toggleable&, void );
 
     void FillInEmailSettings();
 
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 5aceedce652b..71ed6cb64e2d 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -406,7 +406,7 @@ std::unique_ptr<SwTOXDescription> SwMultiTOXTabDialog::CreateTOXDescFromTOXBase(
     return pDesc;
 }
 
-IMPL_LINK_NOARG(SwMultiTOXTabDialog, ShowPreviewHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwMultiTOXTabDialog, ShowPreviewHdl, weld::Toggleable&, void)
 {
     if (m_xShowExampleCB->get_active())
     {
@@ -765,7 +765,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(weld::Container* pPage, weld::DialogContr
     m_xAutoMarkPB->connect_toggled(LINK(this, SwTOXSelectTabPage, MenuEnableHdl));
     m_xAutoMarkPB->connect_selected(LINK(this, SwTOXSelectTabPage, MenuExecuteHdl));
 
-    Link<weld::ToggleButton&,void> aLk =  LINK(this, SwTOXSelectTabPage, CheckBoxHdl);
+    Link<weld::Toggleable&,void> aLk =  LINK(this, SwTOXSelectTabPage, CheckBoxHdl);
     m_xAddStylesCB->connect_toggled(aLk);
     m_xFromHeadingsCB->connect_toggled(aLk);
     m_xTOXMarksCB->connect_toggled(aLk);
@@ -1252,7 +1252,7 @@ IMPL_LINK_NOARG(SwTOXSelectTabPage, ModifySpinHdl, weld::SpinButton&, void)
     ModifyHdl();
 }
 
-IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl, weld::Toggleable&, rButton, void)
 {
     SwMultiTOXTabDialog* pTOXDlg = static_cast<SwMultiTOXTabDialog*>(GetDialogController());
     const CurTOXType aCurType = pTOXDlg->GetCurrentTOXType();
@@ -1280,7 +1280,7 @@ IMPL_LINK(SwTOXSelectTabPage, CheckBoxHdl, weld::ToggleButton&, rButton, void)
     ModifyHdl();
 };
 
-IMPL_LINK_NOARG(SwTOXSelectTabPage, RadioButtonHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwTOXSelectTabPage, RadioButtonHdl, weld::Toggleable&, void)
 {
     bool bEnable = m_xFromCaptionsRB->get_active();
     m_xCaptionSequenceFT->set_sensitive(bEnable);
@@ -1331,7 +1331,7 @@ IMPL_LINK_NOARG(SwTOXSelectTabPage, AddStylesHdl, weld::Button&, void)
     ModifyHdl();
 }
 
-IMPL_LINK_NOARG(SwTOXSelectTabPage, MenuEnableHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwTOXSelectTabPage, MenuEnableHdl, weld::Toggleable&, void)
 {
     m_xAutoMarkPB->set_item_sensitive("edit", !sAutoMarkURL.isEmpty());
 }
@@ -1905,7 +1905,7 @@ SwTOXEntryTabPage::~SwTOXEntryTabPage()
     m_xTokenWIN.reset();
 }
 
-IMPL_LINK_NOARG(SwTOXEntryTabPage, ModifyClickHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwTOXEntryTabPage, ModifyClickHdl, weld::Toggleable&, void)
 {
     OnModify(true);
 }
@@ -2281,7 +2281,7 @@ IMPL_LINK(SwTOXEntryTabPage, LevelHdl, weld::TreeView&, rBox, void)
     rBox.grab_focus();
 }
 
-IMPL_LINK_NOARG(SwTOXEntryTabPage, SortKeyHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwTOXEntryTabPage, SortKeyHdl, weld::Toggleable&, void)
 {
     bool bEnable = m_xSortContentRB->get_active();
     m_xSortKeyFrame->set_sensitive(bEnable);
@@ -2493,7 +2493,7 @@ IMPL_LINK(SwTOXEntryTabPage, FillCharHdl, weld::ComboBox&, rBox, void)
     ModifyHdl(nullptr);
 }
 
-IMPL_LINK(SwTOXEntryTabPage, AutoRightHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(SwTOXEntryTabPage, AutoRightHdl, weld::Toggleable&, rBox, void)
 {
     //the most right style::TabStop is usually right aligned
     SwTOXWidget* pCurCtrl = m_xTokenWIN->GetActiveControl();
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index 7b988a4cbec6..40e62f9b7d7b 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -666,7 +666,7 @@ IMPL_LINK_NOARG(SwIndexMarkPane, NewUserIdxHdl, weld::Button&, void)
     }
 }
 
-IMPL_LINK( SwIndexMarkPane, SearchTypeHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK( SwIndexMarkPane, SearchTypeHdl, weld::Toggleable&, rBox, void)
 {
     const bool bEnable = rBox.get_active() && rBox.get_sensitive();
     m_xSearchCaseWordOnlyCB->set_sensitive(bEnable);
@@ -1091,7 +1091,7 @@ class SwCreateAuthEntryDlg_Impl : public weld::GenericDialogController
     DECL_LINK(ShortNameHdl, weld::Entry&, void);
     DECL_LINK(EnableHdl, weld::ComboBox&, void);
     DECL_LINK(BrowseHdl, weld::Button&, void);
-    DECL_LINK(PageNumHdl, weld::ToggleButton&, void);
+    DECL_LINK(PageNumHdl, weld::Toggleable&, void);
 
 public:
     SwCreateAuthEntryDlg_Impl(weld::Window* pParent,
@@ -1373,7 +1373,7 @@ IMPL_LINK(SwAuthorMarkPane, CreateEntryHdl, weld::Button&, rButton, void)
     }
 }
 
-IMPL_LINK_NOARG(SwAuthorMarkPane, ChangeSourceHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwAuthorMarkPane, ChangeSourceHdl, weld::Toggleable&, void)
 {
     bool bFromComp = m_xFromComponentRB->get_active();
     bIsFromComponent = bFromComp;
@@ -1856,7 +1856,7 @@ IMPL_LINK_NOARG(SwCreateAuthEntryDlg_Impl, BrowseHdl, weld::Button&, void)
     }
 };
 
-IMPL_LINK_NOARG(SwCreateAuthEntryDlg_Impl, PageNumHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwCreateAuthEntryDlg_Impl, PageNumHdl, weld::Toggleable&, void)
 {
     if (m_xPageCB->get_active())
     {
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 60c5d3737b23..1eeca19769c5 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -220,7 +220,7 @@ IMPL_LINK_NOARG(SwInsertBookmarkDlg, InsertHdl, weld::Button&, void)
     m_xDialog->response(RET_OK);
 }
 
-IMPL_LINK(SwInsertBookmarkDlg, ChangeHideHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(SwInsertBookmarkDlg, ChangeHideHdl, weld::Toggleable&, rBox, void)
 {
     bool bHide = rBox.get_active();
     m_xConditionED->set_sensitive(bHide);
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index af45f76e9bbe..dbc733d87d1e 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -257,7 +257,7 @@ void SwEndNoteOptionPage::SetShell( SwWrtShell &rShell )
                         pSh->GetView().GetDocShell(), true);
 }
 
-IMPL_LINK(SwEndNoteOptionPage, ToggleHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SwEndNoteOptionPage, ToggleHdl, weld::Toggleable&, rButton, void)
 {
     if (!rButton.get_active())
         return;
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index eb05d93a92a1..75da931ab6bc 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -411,7 +411,7 @@ IMPL_LINK( SwGlossaryDlg, NameDoubleClick, weld::TreeView&, rBox, bool )
     return true;
 }
 
-IMPL_LINK_NOARG( SwGlossaryDlg, EnableHdl, weld::ToggleButton&, void )
+IMPL_LINK_NOARG( SwGlossaryDlg, EnableHdl, weld::Toggleable&, void )
 {
     std::unique_ptr<weld::TreeIter> xEntry = m_xCategoryBox->make_iterator();
     bool bEntry = m_xCategoryBox->get_selected(xEntry.get());
@@ -822,7 +822,7 @@ IMPL_LINK_NOARG(SwNewGlosNameDlg, Rename, weld::Button&, void)
         m_xDialog->response(RET_OK);
 }
 
-IMPL_LINK(SwGlossaryDlg, CheckBoxHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(SwGlossaryDlg, CheckBoxHdl, weld::Toggleable&, rBox, void)
 {
     SvxAutoCorrCfg& rCfg = SvxAutoCorrCfg::Get();
     bool bCheck = rBox.get_active();
diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx
index 7b32c6677686..9119ff148022 100644
--- a/sw/source/ui/misc/impfnote.hxx
+++ b/sw/source/ui/misc/impfnote.hxx
@@ -56,7 +56,7 @@ class SwEndNoteOptionPage : public SfxTabPage
     inline void SelectNumbering(SwFootnoteNum eNum);
     SwFootnoteNum GetNumbering() const;
 
-    DECL_LINK(ToggleHdl, weld::ToggleButton&, void);
+    DECL_LINK(ToggleHdl, weld::Toggleable&, void);
     DECL_LINK(NumCountHdl, weld::ComboBox&, void);
 
 public:
diff --git a/sw/source/ui/misc/insfnote.cxx b/sw/source/ui/misc/insfnote.cxx
index ec3efba6bd32..a7b16b1e1868 100644
--- a/sw/source/ui/misc/insfnote.cxx
+++ b/sw/source/ui/misc/insfnote.cxx
@@ -74,7 +74,7 @@ IMPL_LINK_NOARG(SwInsFootNoteDlg, NumberEditHdl, weld::Entry&, void)
     m_xOkBtn->set_sensitive( !m_xNumberCharEdit->get_text().isEmpty() );
 }
 
-IMPL_LINK(SwInsFootNoteDlg, NumberToggleHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SwInsFootNoteDlg, NumberToggleHdl, weld::Toggleable&, rButton, void)
 {
     if (!rButton.get_active())
         return;
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index ec107202aba0..f04efd98bfe6 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -250,7 +250,7 @@ IMPL_LINK_NOARG(SwLineNumberingDlg, ModifyHdl, weld::Entry&, void)
 }
 
 // On/Off
-IMPL_LINK_NOARG(SwLineNumberingDlg, LineOnOffHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwLineNumberingDlg, LineOnOffHdl, weld::Toggleable&, void)
 {
     bool bEnable = m_xNumberingOnCB->get_active();
     m_xBodyContent->set_sensitive(bEnable);
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index cb2cf60e95d6..df91dd6e6096 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -646,7 +646,7 @@ IMPL_LINK(SwNumPositionTabPage, DistanceHdl, weld::MetricSpinButton&, rField, vo
         m_xDistBorderMF->set_text(OUString());
 }
 
-IMPL_LINK( SwNumPositionTabPage, RelativeHdl, weld::ToggleButton&, rBox, void )
+IMPL_LINK( SwNumPositionTabPage, RelativeHdl, weld::Toggleable&, rBox, void )
 {
     bool bOn = rBox.get_active();
     bool bSingleSelection = m_xLevelLB->n_children() == 1 && USHRT_MAX != nActNumLvl;
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 69e2887c1af2..8c03aef47a4e 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -206,7 +206,7 @@ IMPL_LINK_NOARG(SwOutlineTabDialog, CancelHdl, weld::Button&, void)
     m_xDialog->response(RET_CANCEL);
 }
 
-IMPL_LINK_NOARG(SwOutlineTabDialog, FormHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwOutlineTabDialog, FormHdl, weld::Toggleable&, void)
 {
     if (!m_xMenuButton->get_active())
         return;
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index 51b41703a82c..608f54492b45 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -45,13 +45,13 @@ const sal_uInt16 SwFootNotePage::aPageRg[] = {
 
 // handler to switch between the different possibilities how the footnote
 // region's height can be set.
-IMPL_LINK_NOARG(SwFootNotePage, HeightPage, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwFootNotePage, HeightPage, weld::Toggleable&, void)
 {
     if (m_xMaxHeightPageBtn->get_active())
         m_xMaxHeightEdit->set_sensitive(false);
 }
 
-IMPL_LINK_NOARG(SwFootNotePage, HeightMetric, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwFootNotePage, HeightMetric, weld::Toggleable&, void)
 {
     if (m_xMaxHeightBtn->get_active())
     {
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 19faefe56827..20a964eceaf7 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -76,7 +76,7 @@ SwTextGridPage::SwTextGridPage(weld::Container* pPage, weld::DialogController* p
     m_xRubySizeMF->connect_value_changed(aSizeLink);
     m_xCharWidthMF->connect_value_changed(aSizeLink);
 
-    Link<weld::ToggleButton&,void> aGridTypeHdl = LINK(this, SwTextGridPage, GridTypeHdl);
+    Link<weld::Toggleable&,void> aGridTypeHdl = LINK(this, SwTextGridPage, GridTypeHdl);
     m_xNoGridRB->connect_toggled(aGridTypeHdl);
     m_xLinesGridRB->connect_toggled(aGridTypeHdl);
     m_xCharsGridRB->connect_toggled(aGridTypeHdl);
@@ -434,7 +434,7 @@ IMPL_LINK(SwTextGridPage, TextSizeChangedHdl, weld::MetricSpinButton&, rField, v
     GridModifyHdl();
 }
 
-IMPL_LINK(SwTextGridPage, GridTypeHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SwTextGridPage, GridTypeHdl, weld::Toggleable&, rButton, void)
 {
     bool bEnable = m_xNoGridRB.get() != &rButton;
     m_xLayoutFL->set_sensitive(bEnable);
@@ -460,14 +460,14 @@ IMPL_LINK(SwTextGridPage, GridTypeHdl, weld::ToggleButton&, rButton, void)
     GridModifyHdl();
 }
 
-IMPL_LINK_NOARG(SwTextGridPage, DisplayGridHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwTextGridPage, DisplayGridHdl, weld::Toggleable&, void)
 {
     bool bChecked = m_xDisplayCB->get_active();
     m_xPrintCB->set_sensitive(bChecked);
     m_xPrintCB->set_active(bChecked);
 }
 
-IMPL_LINK_NOARG(SwTextGridPage, GridModifyClickHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwTextGridPage, GridModifyClickHdl, weld::Toggleable&, void)
 {
     GridModifyHdl();
 }
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index 3e46ea05a1eb..5f03f9c6ea56 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -146,7 +146,7 @@ SwSortDlg::SwSortDlg(weld::Window* pParent, SwWrtShell &rShell)
     m_xColEdt3->set_accessible_name(m_xColLbl->get_label());
 
     // initialise
-    Link<weld::ToggleButton&,void> aLk = LINK(this, SwSortDlg, CheckHdl);
+    Link<weld::Toggleable&,void> aLk = LINK(this, SwSortDlg, CheckHdl);
     m_xKeyCB1->connect_toggled( aLk );
     m_xKeyCB2->connect_toggled( aLk );
     m_xKeyCB3->connect_toggled( aLk );
@@ -314,7 +314,7 @@ void SwSortDlg::Apply()
     }
 }
 
-IMPL_LINK( SwSortDlg, DelimHdl, weld::ToggleButton&, rButton, void )
+IMPL_LINK( SwSortDlg, DelimHdl, weld::Toggleable&, rButton, void )
 {
     bool bEnable = &rButton == m_xDelimFreeRB.get() && m_xDelimFreeRB->get_sensitive();
     m_xDelimEdt->set_sensitive( bEnable );
@@ -335,7 +335,7 @@ IMPL_LINK_NOARG(SwSortDlg, DelimCharHdl, weld::Button&, void)
     }
 }
 
-IMPL_LINK( SwSortDlg, CheckHdl, weld::ToggleButton&, rControl, void )
+IMPL_LINK( SwSortDlg, CheckHdl, weld::Toggleable&, rControl, void )
 {
     if (&rControl == m_xRowRB.get())
     {
diff --git a/sw/source/ui/misc/titlepage.cxx b/sw/source/ui/misc/titlepage.cxx
index 33b7743d90e9..03a630a13a28 100644
--- a/sw/source/ui/misc/titlepage.cxx
+++ b/sw/source/ui/misc/titlepage.cxx
@@ -209,7 +209,7 @@ SwTitlePageDlg::SwTitlePageDlg(weld::Window *pParent)
     m_xDocumentStartRB->set_active(true);
     m_xPageStartNF->set_sensitive(false);
     m_xPageStartNF->set_value(lcl_GetCurrentPage(mrSh));
-    Link<weld::ToggleButton&,void> aStartPageHdl = LINK(this, SwTitlePageDlg, StartPageHdl);
+    Link<weld::Toggleable&,void> aStartPageHdl = LINK(this, SwTitlePageDlg, StartPageHdl);
     m_xDocumentStartRB->connect_toggled(aStartPageHdl);
     m_xPageStartRB->connect_toggled(aStartPageHdl);
 
@@ -235,17 +235,17 @@ IMPL_LINK_NOARG(SwTitlePageDlg, ValueChangeHdl, weld::SpinButton&, void)
         FillList();
 }
 
-IMPL_LINK_NOARG(SwTitlePageDlg, RestartNumberingHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwTitlePageDlg, RestartNumberingHdl, weld::Toggleable&, void)
 {
     m_xRestartNumberingNF->set_sensitive(m_xRestartNumberingCB->get_active());
 }
 
-IMPL_LINK_NOARG(SwTitlePageDlg, SetPageNumberHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwTitlePageDlg, SetPageNumberHdl, weld::Toggleable&, void)
 {
     m_xSetPageNumberNF->set_sensitive(m_xSetPageNumberCB->get_active());
 }
 
-IMPL_LINK_NOARG(SwTitlePageDlg, StartPageHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwTitlePageDlg, StartPageHdl, weld::Toggleable&, void)
 {
     m_xPageStartNF->set_sensitive(m_xPageStartRB->get_active());
 }
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx
index cd14678bf704..629b6c4f1607 100644
--- a/sw/source/ui/table/convert.cxx
+++ b/sw/source/ui/table/convert.cxx
@@ -138,7 +138,7 @@ SwConvertTableDlg::SwConvertTableDlg(SwView& rView, bool bToTable)
     }
     m_xKeepColumn->save_state();
 
-    Link<weld::ToggleButton&, void> aLk(LINK(this, SwConvertTableDlg, BtnHdl));
+    Link<weld::Toggleable&, void> aLk(LINK(this, SwConvertTableDlg, BtnHdl));
     m_xTabBtn->connect_toggled(aLk);
     m_xSemiBtn->connect_toggled(aLk);
     m_xParaBtn->connect_toggled(aLk);
@@ -172,7 +172,7 @@ IMPL_LINK_NOARG(SwConvertTableDlg, AutoFormatHdl, weld::Button&, void)
         mxTAutoFormat = pDlg->FillAutoFormatOfIndex();
 }
 
-IMPL_LINK(SwConvertTableDlg, BtnHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SwConvertTableDlg, BtnHdl, weld::Toggleable&, rButton, void)
 {
     if (!rButton.get_active())
         return;
@@ -188,13 +188,13 @@ IMPL_LINK(SwConvertTableDlg, BtnHdl, weld::ToggleButton&, rButton, void)
     m_xOtherEd->set_sensitive(m_xOtherBtn->get_active());
 }
 
-IMPL_LINK_NOARG(SwConvertTableDlg, CheckBoxHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwConvertTableDlg, CheckBoxHdl, weld::Toggleable&, void)
 {
     m_xRepeatHeaderCB->set_sensitive(m_xHeaderCB->get_active());
     RepeatHeaderCheckBoxHdl(*m_xRepeatHeaderCB);
 }
 
-IMPL_LINK_NOARG(SwConvertTableDlg, RepeatHeaderCheckBoxHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwConvertTableDlg, RepeatHeaderCheckBoxHdl, weld::Toggleable&, void)
 {
     bool bEnable = m_xHeaderCB->get_active() && m_xRepeatHeaderCB->get_active();
     m_xRepeatRows->set_sensitive(bEnable);
diff --git a/sw/source/ui/table/instable.cxx b/sw/source/ui/table/instable.cxx
index 6ba513c4f2fb..6ace6f4bc10d 100644
--- a/sw/source/ui/table/instable.cxx
+++ b/sw/source/ui/table/instable.cxx
@@ -277,13 +277,13 @@ IMPL_LINK( SwInsTableDlg, ModifyRowCol, weld::Entry&, rEdit, void )
         m_xRepeatHeaderNF->set_value(std::min(nEnteredValRepeatHeaderNF, nMax));
 }
 
-IMPL_LINK_NOARG(SwInsTableDlg, CheckBoxHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwInsTableDlg, CheckBoxHdl, weld::Toggleable&, void)
 {
     m_xRepeatHeaderCB->set_sensitive(m_xHeaderCB->get_active());
     RepeatHeaderCheckBoxHdl(*m_xRepeatHeaderCB);
 }
 
-IMPL_LINK_NOARG(SwInsTableDlg, RepeatHeaderCheckBoxHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwInsTableDlg, RepeatHeaderCheckBoxHdl, weld::Toggleable&, void)
 {
     m_xRepeatGroup->set_sensitive(m_xHeaderCB->get_active() && m_xRepeatHeaderCB->get_active());
 }
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 6ab262e7eca1..836a3499f50e 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -128,7 +128,7 @@ void  SwFormatTablePage::Init()
     m_xRightMF->SetMetricFieldMin(-999999);
 
     //handler
-    Link<weld::ToggleButton&,void> aLk2 = LINK( this, SwFormatTablePage, AutoClickHdl );
+    Link<weld::Toggleable&,void> aLk2 = LINK( this, SwFormatTablePage, AutoClickHdl );
     m_xFullBtn->connect_toggled( aLk2 );
     m_xFreeBtn->connect_toggled( aLk2 );
     m_xLeftBtn->connect_toggled( aLk2 );
@@ -146,7 +146,7 @@ void  SwFormatTablePage::Init()
     m_xRelWidthCB->connect_toggled(LINK( this, SwFormatTablePage, RelWidthClickHdl ));
 }
 
-IMPL_LINK( SwFormatTablePage, RelWidthClickHdl, weld::ToggleButton&, rBtn, void )
+IMPL_LINK( SwFormatTablePage, RelWidthClickHdl, weld::Toggleable&, rBtn, void )
 {
     OSL_ENSURE(pTableData, "table data not available?");
     bool bIsChecked = rBtn.get_active();
@@ -180,7 +180,7 @@ IMPL_LINK( SwFormatTablePage, RelWidthClickHdl, weld::ToggleButton&, rBtn, void
     bModified = true;
 }
 
-IMPL_LINK_NOARG(SwFormatTablePage, AutoClickHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwFormatTablePage, AutoClickHdl, weld::Toggleable&, void)
 {
     bool bRestore = true,
          bLeftEnable = false,
@@ -873,7 +873,7 @@ void  SwTableColumnPage::Init(bool bWeb)
     m_xUpBtn->connect_clicked(aClickLk);
     m_xDownBtn->connect_clicked(aClickLk);
 
-    Link<weld::ToggleButton&,void> aToggleLk = LINK(this, SwTableColumnPage, ModeHdl);
+    Link<weld::Toggleable&,void> aToggleLk = LINK(this, SwTableColumnPage, ModeHdl);
     m_xModifyTableCB->connect_toggled(aToggleLk);
     m_xProportionalCB->connect_toggled(aToggleLk);
 }
@@ -916,7 +916,7 @@ IMPL_LINK(SwTableColumnPage, ValueChangedHdl, weld::MetricSpinButton&, rEdit, vo
     ModifyHdl(&rEdit);
 }
 
-IMPL_LINK(SwTableColumnPage, ModeHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(SwTableColumnPage, ModeHdl, weld::Toggleable&, rBox, void)
 {
     const bool bCheck = rBox.get_active();
     if (&rBox == m_xProportionalCB.get())
@@ -1636,7 +1636,7 @@ void SwTextFlowPage::SetShell(SwWrtShell* pSh)
     }
 }
 
-IMPL_LINK_NOARG(SwTextFlowPage, PageBreakHdl_Impl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwTextFlowPage, PageBreakHdl_Impl, weld::Toggleable&, void)
 {
     if (m_xPgBrkCB->get_active())
     {
@@ -1672,7 +1672,7 @@ IMPL_LINK_NOARG(SwTextFlowPage, PageBreakHdl_Impl, weld::ToggleButton&, void)
     }
 }
 
-IMPL_LINK_NOARG(SwTextFlowPage, ApplyCollClickHdl_Impl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwTextFlowPage, ApplyCollClickHdl_Impl, weld::Toggleable&, void)
 {
     bool bEnable = false;
     if (m_xPageCollCB->get_active() && m_xPageCollLB->get_count())
@@ -1692,7 +1692,7 @@ IMPL_LINK_NOARG(SwTextFlowPage, ApplyCollClickHdl_Impl, weld::ToggleButton&, voi
     }
 }
 
-IMPL_LINK_NOARG(SwTextFlowPage, PageBreakPosHdl_Impl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwTextFlowPage, PageBreakPosHdl_Impl, weld::Toggleable&, void)
 {
     if (!m_xPgBrkCB->get_active())
         return;
@@ -1720,7 +1720,7 @@ IMPL_LINK_NOARG(SwTextFlowPage, PageBreakPosHdl_Impl, weld::ToggleButton&, void)
     }
 }
 
-IMPL_LINK_NOARG(SwTextFlowPage, PageBreakTypeHdl_Impl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwTextFlowPage, PageBreakTypeHdl_Impl, weld::Toggleable&, void)
 {
     if (m_xColBrkRB->get_active() || m_xPgBrkAfterRB->get_active())
     {
@@ -1734,17 +1734,17 @@ IMPL_LINK_NOARG(SwTextFlowPage, PageBreakTypeHdl_Impl, weld::ToggleButton&, void
         PageBreakPosHdl_Impl(*m_xPgBrkBeforeRB);
 }
 
-IMPL_LINK_NOARG(SwTextFlowPage, PageNoClickHdl_Impl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwTextFlowPage, PageNoClickHdl_Impl, weld::Toggleable&, void)
 {
     m_xPageNoNF->set_sensitive(m_xPageNoCB->get_active());
 }
 
-IMPL_LINK(SwTextFlowPage, SplitHdl_Impl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(SwTextFlowPage, SplitHdl_Impl, weld::Toggleable&, rBox, void)
 {
     m_xSplitRowCB->set_sensitive(rBox.get_active());
 }
 
-IMPL_LINK_NOARG(SwTextFlowPage, HeadLineCBClickHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SwTextFlowPage, HeadLineCBClickHdl, weld::Toggleable&, void)
 {
     m_xRepeatHeaderCombo->set_sensitive(m_xHeadLineCB->get_active());
 }
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index 169d38f228cc..8dbc965e80ba 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -111,7 +111,7 @@ SwAutoFormatDlg::~SwAutoFormatDlg()
 
 void SwAutoFormatDlg::Init( const SwTableAutoFormat* pSelFormat )
 {
-    Link<weld::ToggleButton&, void> aLk(LINK(this, SwAutoFormatDlg, CheckHdl));
+    Link<weld::Toggleable&, void> aLk(LINK(this, SwAutoFormatDlg, CheckHdl));
     m_xBtnBorder->connect_toggled(aLk);
     m_xBtnFont->connect_toggled(aLk);
     m_xBtnPattern->connect_toggled(aLk);
@@ -176,7 +176,7 @@ std::unique_ptr<SwTableAutoFormat> SwAutoFormatDlg::FillAutoFormatOfIndex() cons
 }
 
 // Handler:
-IMPL_LINK(SwAutoFormatDlg, CheckHdl, weld::ToggleButton&, rBtn, void)
+IMPL_LINK(SwAutoFormatDlg, CheckHdl, weld::Toggleable&, rBtn, void)
 {
     if (m_nIndex == 255)
         return;