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>

24 files changed, 54 insertions, 54 deletions

diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx
index a81e2b3fc234..2640184846e3 100644
--- a/svx/inc/galbrws2.hxx
+++ b/svx/inc/galbrws2.hxx
@@ -107,7 +107,7 @@ private:
 
                         DECL_LINK( SelectObjectHdl, weld::TreeView&, void );
                         DECL_LINK( SelectObjectValueSetHdl, ValueSet*, void );
-                        DECL_LINK( SelectTbxHdl, weld::ToggleButton&, void );
+                        DECL_LINK( SelectTbxHdl, weld::Toggleable&, void );
                         DECL_LINK( PopupMenuHdl, const CommandEvent&, bool );
                         DECL_LINK( KeyInputHdl, const KeyEvent&, bool );
                         DECL_LINK( RowActivatedHdl, weld::TreeView&, bool );
diff --git a/svx/source/dialog/ClassificationDialog.cxx b/svx/source/dialog/ClassificationDialog.cxx
index 412265fefc29..27f972a1d658 100644
--- a/svx/source/dialog/ClassificationDialog.cxx
+++ b/svx/source/dialog/ClassificationDialog.cxx
@@ -670,7 +670,7 @@ IMPL_LINK_NOARG(ClassificationDialog, OkHdl, weld::Button&, void)
     m_xDialog->response(RET_OK);
 }
 
-IMPL_LINK_NOARG(ClassificationDialog, SelectToolboxHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ClassificationDialog, SelectToolboxHdl, weld::Toggleable&, void)
 {
     m_xEditWindow->InvertSelectionWeight();
 }
diff --git a/svx/source/dialog/SafeModeDialog.cxx b/svx/source/dialog/SafeModeDialog.cxx
index b9affc0a755e..9ebb269d0b7e 100644
--- a/svx/source/dialog/SafeModeDialog.cxx
+++ b/svx/source/dialog/SafeModeDialog.cxx
@@ -196,7 +196,7 @@ void SafeModeDialog::applyChanges()
         css::uno::Reference< css::task::XInteractionHandler >());
 }
 
-IMPL_LINK(SafeModeDialog, RadioBtnHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SafeModeDialog, RadioBtnHdl, weld::Toggleable&, rButton, void)
 {
     if (!rButton.get_active())
         return;
@@ -324,7 +324,7 @@ IMPL_LINK(SafeModeDialog, CreateZipBtnHdl, weld::Button&, /*rBtn*/, void)
     aDialog.run();
 }
 
-IMPL_LINK(SafeModeDialog, CheckBoxHdl, weld::ToggleButton&, /*pCheckBox*/, void)
+IMPL_LINK(SafeModeDialog, CheckBoxHdl, weld::Toggleable&, /*pCheckBox*/, void)
 {
     const bool bEnable(
         mxCBCheckProfilesafeConfig->get_active() ||
diff --git a/svx/source/dialog/SafeModeDialog.hxx b/svx/source/dialog/SafeModeDialog.hxx
index fca3bd9249b4..0f90c1e29647 100644
--- a/svx/source/dialog/SafeModeDialog.hxx
+++ b/svx/source/dialog/SafeModeDialog.hxx
@@ -56,8 +56,8 @@ private:
     void enableDisableWidgets();
     void applyChanges();
 
-    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(CreateZipBtnHdl, weld::Button&, void);
     DECL_LINK(DialogBtnHdl, weld::Button&, void);
 };
diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx
index a74e6273d4e2..4a4aedc722c8 100644
--- a/svx/source/dialog/_bmpmask.cxx
+++ b/svx/source/dialog/_bmpmask.cxx
@@ -172,8 +172,8 @@ public:
     bool        IsExecReady() const { return bExecState; }
 
                 DECL_LINK( PipetteHdl, const OString&, void );
-                DECL_LINK( CbxHdl, weld::ToggleButton&, void);
-                DECL_LINK( CbxTransHdl, weld::ToggleButton&, void );
+                DECL_LINK( CbxHdl, weld::Toggleable&, void);
+                DECL_LINK( CbxTransHdl, weld::Toggleable&, void );
                 DECL_LINK( FocusLbHdl, weld::Widget&, void );
                 DECL_LINK(ExecHdl, weld::Button&, void);
 };
@@ -198,7 +198,7 @@ IMPL_LINK( MaskData, PipetteHdl, const OString&, rId, void )
             { &aBItem });
 }
 
-IMPL_LINK( MaskData, CbxHdl, weld::ToggleButton&, rCbx, void )
+IMPL_LINK( MaskData, CbxHdl, weld::Toggleable&, rCbx, void )
 {
     bIsReady =  pMask->m_xCbx1->get_active() || pMask->m_xCbx2->get_active() ||
                 pMask->m_xCbx3->get_active() || pMask->m_xCbx4->get_active();
@@ -230,7 +230,7 @@ IMPL_LINK( MaskData, CbxHdl, weld::ToggleButton&, rCbx, void )
     PipetteHdl("pipette");
 }
 
-IMPL_LINK( MaskData, CbxTransHdl, weld::ToggleButton&, rCbx, void )
+IMPL_LINK( MaskData, CbxTransHdl, weld::Toggleable&, rCbx, void )
 {
     bIsReady = rCbx.get_active();
     if ( bIsReady )
diff --git a/svx/source/dialog/compressgraphicdialog.cxx b/svx/source/dialog/compressgraphicdialog.cxx
index 4c244d8eacef..30af216be404 100644
--- a/svx/source/dialog/compressgraphicdialog.cxx
+++ b/svx/source/dialog/compressgraphicdialog.cxx
@@ -289,7 +289,7 @@ IMPL_LINK_NOARG( CompressGraphicsDialog, ResolutionModifiedHdl, weld::ComboBox&,
     Update();
 }
 
-IMPL_LINK_NOARG( CompressGraphicsDialog, ToggleCompressionRB, weld::ToggleButton&, void )
+IMPL_LINK_NOARG( CompressGraphicsDialog, ToggleCompressionRB, weld::Toggleable&, void )
 {
     bool choice = m_xLosslessRB->get_active();
     m_xCompressionMF->set_sensitive(choice);
@@ -299,7 +299,7 @@ IMPL_LINK_NOARG( CompressGraphicsDialog, ToggleCompressionRB, weld::ToggleButton
     Update();
 }
 
-IMPL_LINK_NOARG( CompressGraphicsDialog, ToggleReduceResolutionRB, weld::ToggleButton&, void )
+IMPL_LINK_NOARG( CompressGraphicsDialog, ToggleReduceResolutionRB, weld::Toggleable&, void )
 {
     bool choice = m_xReduceResolutionCB->get_active();
     m_xMFNewWidth->set_sensitive(choice);
diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx
index 0a472b2074f1..3797df20d398 100644
--- a/svx/source/dialog/ctredlin.cxx
+++ b/svx/source/dialog/ctredlin.cxx
@@ -526,7 +526,7 @@ SvxTPFilter::SvxTPFilter(weld::Container* pParent)
     m_xIbClock2->connect_clicked( LINK( this, SvxTPFilter,TimeHdl) );
     m_xBtnRange->connect_clicked( LINK( this, SvxTPFilter, RefHandle));
 
-    Link<weld::ToggleButton&,void> aLink=LINK( this, SvxTPFilter, RowEnableHdl) ;
+    Link<weld::Toggleable&,void> aLink=LINK( this, SvxTPFilter, RowEnableHdl) ;
     m_xCbDate->connect_toggled(aLink);
     m_xCbAuthor->connect_toggled(aLink);
     m_xCbRange->connect_toggled(aLink);
@@ -839,7 +839,7 @@ IMPL_LINK_NOARG(SvxTPFilter, SelDateHdl, weld::ComboBox&, void)
     bModified = true;
 }
 
-IMPL_LINK(SvxTPFilter, RowEnableHdl, weld::ToggleButton&, rCB, void)
+IMPL_LINK(SvxTPFilter, RowEnableHdl, weld::Toggleable&, rCB, void)
 {
     if (&rCB == m_xCbDate.get())
     {
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 06605ce2efcf..1189cab8ae55 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -452,7 +452,7 @@ void SvxHFPage::InitHandler()
     m_xBackgroundBtn->connect_clicked(LINK(this,SvxHFPage, BackgroundHdl));
 }
 
-void SvxHFPage::TurnOn(const weld::ToggleButton* pBox)
+void SvxHFPage::TurnOn(const weld::Toggleable* pBox)
 {
     if (m_xTurnOnBox->get_active())
     {
@@ -522,7 +522,7 @@ void SvxHFPage::TurnOn(const weld::ToggleButton* pBox)
     UpdateExample();
 }
 
-IMPL_LINK(SvxHFPage, TurnOnHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(SvxHFPage, TurnOnHdl, weld::Toggleable&, rBox, void)
 {
     TurnOn(&rBox);
 }
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index 598aacb420e9..3262e7819abf 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -126,7 +126,7 @@ SvxGridTabPage::SvxGridTabPage(weld::Container* pPage, weld::DialogController* p
 
 
     m_xCbxRotate->connect_toggled(LINK(this, SvxGridTabPage, ClickRotateHdl_Impl));
-    Link<weld::ToggleButton&,void> aLink = LINK(this, SvxGridTabPage, ChangeGridsnapHdl_Impl);
+    Link<weld::Toggleable&,void> aLink = LINK(this, SvxGridTabPage, ChangeGridsnapHdl_Impl);
     m_xCbxUseGridsnap->connect_toggled(aLink);
     m_xCbxSynchronize->connect_toggled(aLink);
     m_xCbxGridVisible->connect_toggled(aLink);
@@ -260,7 +260,7 @@ IMPL_LINK(SvxGridTabPage, ChangeDrawHdl_Impl, weld::MetricSpinButton&, rField, v
     }
 }
 
-IMPL_LINK_NOARG(SvxGridTabPage, ClickRotateHdl_Impl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SvxGridTabPage, ClickRotateHdl_Impl, weld::Toggleable&, void)
 {
     if (m_xCbxRotate->get_active())
         m_xMtrFldAngle->set_sensitive(true);
@@ -280,7 +280,7 @@ IMPL_LINK(SvxGridTabPage, ChangeDivisionHdl_Impl, weld::SpinButton&, rField, voi
     }
 }
 
-IMPL_LINK_NOARG(SvxGridTabPage, ChangeGridsnapHdl_Impl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SvxGridTabPage, ChangeGridsnapHdl_Impl, weld::Toggleable&, void)
 {
     bAttrModified = true;
 }
diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx
index 7736efae4a38..76ccbd333599 100644
--- a/svx/source/dialog/srchdlg.cxx
+++ b/svx/source/dialog/srchdlg.cxx
@@ -646,7 +646,7 @@ void SvxSearchDialog::InitControls_Impl()
     m_xSearchComponent1PB->connect_clicked( aLink2 );
     m_xSearchComponent2PB->connect_clicked( aLink2 );
 
-    Link<weld::ToggleButton&,void> aLink3 = LINK( this, SvxSearchDialog, FlagHdl_Impl );
+    Link<weld::Toggleable&,void> aLink3 = LINK( this, SvxSearchDialog, FlagHdl_Impl );
     m_xReplaceBackwardsCB->connect_toggled( aLink3 );
     m_xWordBtn->connect_toggled( aLink3 );
     m_xSelectionBtn->connect_toggled( aLink3 );
@@ -804,7 +804,7 @@ void SvxSearchDialog::Init_Impl( bool bSearchPattern )
     {
         m_xCalcGrid->show();
         m_xSearchFormattedCB->set_active( aOpt.IsSearchFormatted() );
-        Link<weld::ToggleButton&,void> aLink = LINK( this, SvxSearchDialog, FlagHdl_Impl );
+        Link<weld::Toggleable&,void> aLink = LINK( this, SvxSearchDialog, FlagHdl_Impl );
         m_xCalcSearchInLB->connect_changed( LINK( this, SvxSearchDialog, LBSelectHdl_Impl ) );
         m_xRowsBtn->connect_toggled( aLink );
         m_xColumnsBtn->connect_toggled( aLink );
@@ -1125,7 +1125,7 @@ IMPL_LINK( SvxSearchDialog, LBSelectHdl_Impl, weld::ComboBox&, rCtrl, void )
     ClickHdl_Impl(&rCtrl);
 }
 
-IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, weld::ToggleButton&, rCtrl, void )
+IMPL_LINK( SvxSearchDialog, FlagHdl_Impl, weld::Toggleable&, rCtrl, void )
 {
     ClickHdl_Impl(&rCtrl);
 }
@@ -1479,7 +1479,7 @@ IMPL_LINK( SvxSearchDialog, ModifyHdl_Impl, weld::ComboBox&, rEd, void )
     }
 }
 
-IMPL_LINK_NOARG(SvxSearchDialog, TemplateHdl_Impl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SvxSearchDialog, TemplateHdl_Impl, weld::Toggleable&, void)
 {
     if ( pImpl->bSaveToModule )
         SaveToModule_Impl();
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index 28b9ac9909ca..26de48ed4315 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -2194,7 +2194,7 @@ void Svx3DWin::Resize()
     SfxDockingWindow::Resize();
 }
 
-IMPL_LINK_NOARG(Svx3DWin, ClickUpdateHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(Svx3DWin, ClickUpdateHdl, weld::Toggleable&, void)
 {
     bUpdate = m_xBtnUpdate->get_active();
 
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index a9f4c02b1ab5..56b85adbea38 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -1268,7 +1268,7 @@ namespace svxform
         Link<const OString&, void> aLink1 = LINK( this, DataNavigatorWindow, MenuSelectHdl );
         m_xModelBtn->connect_selected(aLink1);
         m_xInstanceBtn->connect_selected(aLink1);
-        Link<weld::ToggleButton&,void> aLink2 = LINK( this, DataNavigatorWindow, MenuActivateHdl );
+        Link<weld::Toggleable&,void> aLink2 = LINK( this, DataNavigatorWindow, MenuActivateHdl );
         m_xModelBtn->connect_toggled( aLink2 );
         m_xInstanceBtn->connect_toggled( aLink2 );
         m_xTabCtrl->connect_enter_page( LINK( this, DataNavigatorWindow, ActivatePageHdl ) );
@@ -1641,7 +1641,7 @@ namespace svxform
         return rIdent.startsWith("additional");
     }
 
-    IMPL_LINK( DataNavigatorWindow, MenuActivateHdl, weld::ToggleButton&, rBtn, void )
+    IMPL_LINK( DataNavigatorWindow, MenuActivateHdl, weld::Toggleable&, rBtn, void )
     {
         if (m_xInstanceBtn.get() == &rBtn)
         {
@@ -2115,12 +2115,12 @@ namespace svxform
         }
     }
 
-    IMPL_LINK(AddDataItemDialog, CheckHdl, weld::ToggleButton&, rBox, void)
+    IMPL_LINK(AddDataItemDialog, CheckHdl, weld::Toggleable&, rBox, void)
     {
         Check(&rBox);
     }
 
-    void AddDataItemDialog::Check(const weld::ToggleButton* pBox)
+    void AddDataItemDialog::Check(const weld::Toggleable* pBox)
     {
         // Condition buttons are only enable if their check box is checked
         m_xReadonlyBtn->set_sensitive( m_xReadonlyCB->get_active() );
@@ -2293,7 +2293,7 @@ namespace svxform
     void AddDataItemDialog::InitDialog()
     {
         // set handler
-        Link<weld::ToggleButton&,void> aLink = LINK( this, AddDataItemDialog, CheckHdl );
+        Link<weld::Toggleable&,void> aLink = LINK( this, AddDataItemDialog, CheckHdl );
         m_xRequiredCB->connect_toggled( aLink );
         m_xRelevantCB->connect_toggled( aLink );
         m_xConstraintCB->connect_toggled( aLink );
diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx
index da0df464d71f..b644a2d51422 100644
--- a/svx/source/gallery2/galbrws2.cxx
+++ b/svx/source/gallery2/galbrws2.cxx
@@ -1239,7 +1239,7 @@ IMPL_LINK_NOARG(GalleryBrowser2, SelectObjectHdl, weld::TreeView&, void)
     ImplUpdateSelection();
 }
 
-IMPL_LINK(GalleryBrowser2, SelectTbxHdl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(GalleryBrowser2, SelectTbxHdl, weld::Toggleable&, rBox, void)
 {
     if (&rBox == mxIconButton.get())
         SetMode(rBox.get_active() ? GALLERYBROWSERMODE_ICON : GALLERYBROWSERMODE_LIST);
diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx
index 3899fc3d3745..762059515a87 100644
--- a/svx/source/inc/datanavi.hxx
+++ b/svx/source/inc/datanavi.hxx
@@ -281,7 +281,7 @@ namespace svxform
 
         DECL_LINK(            ModelSelectListBoxHdl, weld::ComboBox&, void );
         DECL_LINK(            MenuSelectHdl, const OString&, void );
-        DECL_LINK(            MenuActivateHdl, weld::ToggleButton&, void );
+        DECL_LINK(            MenuActivateHdl, weld::Toggleable&, void );
         DECL_LINK(            ActivatePageHdl, const OString&, void);
         DECL_LINK(            UpdateHdl, Timer *, void);
         void ModelSelectHdl(const weld::ComboBox*);
@@ -379,8 +379,8 @@ namespace svxform
         std::unique_ptr<weld::Button> m_xCalculateBtn;
         std::unique_ptr<weld::Button> m_xOKBtn;
 
-        void Check(const weld::ToggleButton* pBox);
-        DECL_LINK(CheckHdl, weld::ToggleButton&, void);
+        void Check(const weld::Toggleable* pBox);
+        DECL_LINK(CheckHdl, weld::Toggleable&, void);
         DECL_LINK(ConditionHdl, weld::Button&, void);
         DECL_LINK(OKHdl, weld::Button&, void);
 
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index f77046e0614e..8139b3dc4d69 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -428,7 +428,7 @@ IMPL_LINK_NOARG( PosSizePropertyPanel, ChangePosYHdl, weld::MetricSpinButton&, v
     }
 }
 
-IMPL_LINK_NOARG( PosSizePropertyPanel, ClickAutoHdl, weld::ToggleButton&, void )
+IMPL_LINK_NOARG( PosSizePropertyPanel, ClickAutoHdl, weld::Toggleable&, void )
 {
     if ( mxCbxScale->get_active() )
     {
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index 0bac867d7c55..088290557d9a 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -159,7 +159,7 @@ private:
     DECL_LINK( ChangePosYHdl, weld::MetricSpinButton&, void );
     DECL_LINK( ChangeWidthHdl, weld::MetricSpinButton&, void );
     DECL_LINK( ChangeHeightHdl, weld::MetricSpinButton&, void );
-    DECL_LINK( ClickAutoHdl, weld::ToggleButton&, void );
+    DECL_LINK( ClickAutoHdl, weld::Toggleable&, void );
     DECL_LINK( RotationHdl, svx::DialControl&, void );
     DECL_STATIC_LINK( PosSizePropertyPanel, ClickChartEditHdl, weld::Button&, void );
 
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
index dd3477c5868f..ff21110a2007 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.cxx
@@ -96,7 +96,7 @@ void ShadowPropertyPanel::Initialize()
     InsertAngleValues();
 }
 
-IMPL_LINK_NOARG(ShadowPropertyPanel, ClickShadowHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ShadowPropertyPanel, ClickShadowHdl, weld::Toggleable&, void)
 {
     if( mxShowShadow->get_state() == TRISTATE_FALSE )
     {
diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
index ef4438cd5cdb..a68405eb0c1b 100644
--- a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
+++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx
@@ -73,7 +73,7 @@ private:
     void UpdateControls();
     void ModifyShadowDistance();
 
-    DECL_LINK(ClickShadowHdl, weld::ToggleButton&, void);
+    DECL_LINK(ClickShadowHdl, weld::Toggleable&, void);
     DECL_LINK(ModifyShadowColorHdl, ColorListBox&, void);
     DECL_LINK(ModifyShadowTransMetricHdl, weld::MetricSpinButton&, void);
     DECL_LINK(ModifyShadowAngleHdl, weld::ComboBox&, void);
diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index 1f407f53d8b6..6e040da5b1dd 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -232,7 +232,7 @@ IMPL_LINK_NOARG(ExtrusionDirectionWindow, SelectValueSetHdl, ValueSet*, void)
     mxControl->EndPopupMode();
 }
 
-IMPL_LINK_NOARG(ExtrusionDirectionWindow, SelectToolbarMenuHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ExtrusionDirectionWindow, SelectToolbarMenuHdl, weld::Toggleable&, void)
 {
     int nProjection = mxPerspective->get_active() ? 0 : 1;
 
@@ -443,7 +443,7 @@ void ExtrusionDepthWindow::statusChanged(
     }
 }
 
-IMPL_LINK(ExtrusionDepthWindow, SelectHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(ExtrusionDepthWindow, SelectHdl, weld::Toggleable&, rButton, void)
 {
     if (mbSettingValue || !rButton.get_active())
         return;
@@ -709,7 +709,7 @@ IMPL_LINK_NOARG(ExtrusionLightingWindow, SelectValueSetHdl, ValueSet*, void)
     mxControl->EndPopupMode();
 }
 
-IMPL_LINK(ExtrusionLightingWindow, SelectToolbarMenuHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(ExtrusionLightingWindow, SelectToolbarMenuHdl, weld::Toggleable&, rButton, void)
 {
     if (!rButton.get_active())
         return;
@@ -846,7 +846,7 @@ void ExtrusionSurfaceWindow::statusChanged(
     }
 }
 
-IMPL_LINK(ExtrusionSurfaceWindow, SelectHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(ExtrusionSurfaceWindow, SelectHdl, weld::Toggleable&, rButton, void)
 {
     if (!rButton.get_active())
         return;
diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx
index 440ef8874597..0f0f54dbf457 100644
--- a/svx/source/tbxctrls/extrusioncontrols.hxx
+++ b/svx/source/tbxctrls/extrusioncontrols.hxx
@@ -65,7 +65,7 @@ private:
 
     Image       maImgDirection[9];
 
-    DECL_LINK( SelectToolbarMenuHdl, weld::ToggleButton&, void );
+    DECL_LINK( SelectToolbarMenuHdl, weld::Toggleable&, void );
     DECL_LINK( SelectValueSetHdl, ValueSet*, void );
 
     void implSetDirection( sal_Int32 nSkew, bool bEnabled );
@@ -105,7 +105,7 @@ private:
     double      mfDepth;
     bool        mbSettingValue;
 
-    DECL_LINK( SelectHdl, weld::ToggleButton&, void );
+    DECL_LINK( SelectHdl, weld::Toggleable&, void );
 
     void    implFillStrings( FieldUnit eUnit );
     void    implSetDepth( double fDepth );
@@ -150,7 +150,7 @@ private:
     void    implSetIntensity( int nLevel, bool bEnabled );
     void    implSetDirection( int nDirection, bool bEnabled );
 
-    DECL_LINK( SelectToolbarMenuHdl, weld::ToggleButton&, void );
+    DECL_LINK( SelectToolbarMenuHdl, weld::Toggleable&, void );
     DECL_LINK( SelectValueSetHdl, ValueSet*, void );
 public:
     ExtrusionLightingWindow(svt::PopupWindowController* pControl, weld::Widget* pParentWindow);
@@ -185,7 +185,7 @@ private:
     std::unique_ptr<weld::RadioButton> mxPlastic;
     std::unique_ptr<weld::RadioButton> mxMetal;
 
-    DECL_LINK( SelectHdl, weld::ToggleButton&, void );
+    DECL_LINK( SelectHdl, weld::Toggleable&, void );
 
     void    implSetSurface( int nSurface, bool bEnabled );
 
diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx
index 5c6ac0d1bb7f..341ad3957151 100644
--- a/svx/source/tbxctrls/fontworkgallery.cxx
+++ b/svx/source/tbxctrls/fontworkgallery.cxx
@@ -289,7 +289,7 @@ private:
     std::unique_ptr<weld::RadioButton> mxStretch;
     bool mbSettingValue;
 
-    DECL_LINK( SelectHdl, weld::ToggleButton&, void );
+    DECL_LINK( SelectHdl, weld::Toggleable&, void );
 
     void    implSetAlignment( int nAlignmentMode, bool bEnabled );
 };
@@ -351,7 +351,7 @@ void FontworkAlignmentWindow::statusChanged( const css::frame::FeatureStateEvent
     }
 }
 
-IMPL_LINK(FontworkAlignmentWindow, SelectHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(FontworkAlignmentWindow, SelectHdl, weld::Toggleable&, rButton, void)
 {
     if (mbSettingValue || !rButton.get_active())
         return;
@@ -479,8 +479,8 @@ private:
     std::unique_ptr<weld::CheckButton> mxKernPairs;
     bool mbSettingValue;
 
-    DECL_LINK( KernSelectHdl, weld::ToggleButton&, void );
-    DECL_LINK( SelectHdl, weld::ToggleButton&, void );
+    DECL_LINK( KernSelectHdl, weld::Toggleable&, void );
+    DECL_LINK( SelectHdl, weld::Toggleable&, void );
 
     void    implSetCharacterSpacing( sal_Int32 nCharacterSpacing, bool bEnabled );
     void    implSetKernCharacterPairs(bool bKernOnOff, bool bEnabled);
@@ -602,7 +602,7 @@ void FontworkCharacterSpacingWindow::statusChanged( const css::frame::FeatureSta
     }
 }
 
-IMPL_LINK_NOARG(FontworkCharacterSpacingWindow, KernSelectHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(FontworkCharacterSpacingWindow, KernSelectHdl, weld::Toggleable&, void)
 {
     if (mbSettingValue)
         return;
@@ -619,7 +619,7 @@ IMPL_LINK_NOARG(FontworkCharacterSpacingWindow, KernSelectHdl, weld::ToggleButto
     mxControl->EndPopupMode();
 }
 
-IMPL_LINK(FontworkCharacterSpacingWindow, SelectHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(FontworkCharacterSpacingWindow, SelectHdl, weld::Toggleable&, rButton, void)
 {
     if (!rButton.get_active())
         return;
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index f72141d85214..1b94df39887d 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3843,7 +3843,7 @@ ColorListBox::ColorListBox(std::unique_ptr<weld::MenuButton> pControl, TopLevelP
     ShowPreview(m_aSelectedColor);
 }
 
-IMPL_LINK(ColorListBox, ToggleHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(ColorListBox, ToggleHdl, weld::Toggleable&, rButton, void)
 {
     if (rButton.get_active())
         getColorWindow()->GrabFocus();
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
index 5a693a90cc76..6dc50fd1900f 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx
@@ -423,7 +423,7 @@ void ChineseDictionaryDialog::setDirectionAndTextConversionOptions( bool bDirect
     updateAfterDirectionChange();
 }
 
-IMPL_LINK_NOARG(ChineseDictionaryDialog, DirectionHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ChineseDictionaryDialog, DirectionHdl, weld::Toggleable&, void)
 {
     updateAfterDirectionChange();
 }
diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
index f333545e479f..0213c53da380 100644
--- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
+++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx
@@ -108,7 +108,7 @@ public:
     virtual short run() override;
 
 private:
-    DECL_LINK( DirectionHdl, weld::ToggleButton&, void );
+    DECL_LINK( DirectionHdl, weld::Toggleable&, void );
     DECL_LINK( EditFieldsHdl, weld::Entry&, void );
     DECL_LINK( EditFieldsListBoxHdl, weld::ComboBox&, void );
     DECL_LINK( MappingSelectHdl, weld::TreeView&, void );