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>

26 files changed, 68 insertions, 69 deletions

diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index cbd57662b76d..9bef54ae1f78 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -835,7 +835,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams )
 }
 
 // Clickhandler for the radiobuttons of the design-selection
-IMPL_LINK( SdPublishingDlg, DesignHdl, weld::ToggleButton&, rButton, void )
+IMPL_LINK( SdPublishingDlg, DesignHdl, weld::Toggleable&, rButton, void )
 {
     if (!rButton.get_active())
         return;
@@ -904,7 +904,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, DesignDeleteHdl, weld::Button&, void)
 }
 
 // Clickhandler for the other servertypes
-IMPL_LINK(SdPublishingDlg, WebServerHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SdPublishingDlg, WebServerHdl, weld::Toggleable&, rButton, void)
 {
     if (!rButton.get_active())
         return;
@@ -916,7 +916,7 @@ IMPL_LINK(SdPublishingDlg, WebServerHdl, weld::ToggleButton&, rButton, void)
 }
 
 // Clickhandler for the Radiobuttons of the graphicformat choice
-IMPL_LINK(SdPublishingDlg, GfxFormatHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SdPublishingDlg, GfxFormatHdl, weld::Toggleable&, rButton, void)
 {
     if (!rButton.get_active())
         return;
@@ -928,7 +928,7 @@ IMPL_LINK(SdPublishingDlg, GfxFormatHdl, weld::ToggleButton&, rButton, void)
 }
 
 // Clickhandler for the Radiobuttons Standard/Frames
-IMPL_LINK(SdPublishingDlg, BaseHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SdPublishingDlg, BaseHdl, weld::Toggleable&, rButton, void)
 {
     if (!rButton.get_active())
         return;
@@ -937,7 +937,7 @@ IMPL_LINK(SdPublishingDlg, BaseHdl, weld::ToggleButton&, rButton, void)
 }
 
 // Clickhandler for the Checkbox of the Title page
-IMPL_LINK_NOARG(SdPublishingDlg, ContentHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SdPublishingDlg, ContentHdl, weld::Toggleable&, void)
 {
     if(m_xPage2_Content->get_active())
     {
@@ -958,7 +958,7 @@ IMPL_LINK_NOARG(SdPublishingDlg, ContentHdl, weld::ToggleButton&, void)
 }
 
 // Clickhandler for the Resolution Radiobuttons
-IMPL_LINK( SdPublishingDlg, ResolutionHdl, weld::ToggleButton&, rButton, void )
+IMPL_LINK( SdPublishingDlg, ResolutionHdl, weld::Toggleable&, rButton, void )
 {
     if (!rButton.get_active())
         return;
@@ -1017,7 +1017,7 @@ IMPL_LINK( SdPublishingDlg, ColorHdl, weld::Button&, rButton, void)
     m_xPage6_Preview->Invalidate();
 }
 
-IMPL_LINK(SdPublishingDlg, SlideChgHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SdPublishingDlg, SlideChgHdl, weld::Toggleable&, rButton, void)
 {
     if (!rButton.get_active())
         return;
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 2c7df6d9242a..074ff05d10f4 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -2241,7 +2241,7 @@ sal_Int32 CustomAnimationPane::fillAnimationLB( bool bHasText )
     return nFirstEffect;
 }
 
-IMPL_LINK(CustomAnimationPane, implToggleHdl, weld::ToggleButton&, rBtn, void)
+IMPL_LINK(CustomAnimationPane, implToggleHdl, weld::Toggleable&, rBtn, void)
 {
     implControlHdl(&rBtn);
 }
diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx
index 5a509fb448a9..0fc198a9c316 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -1046,7 +1046,7 @@ void SlideTransitionPane::updateVariants( size_t nPresetOffset )
     }
 }
 
-IMPL_LINK_NOARG(SlideTransitionPane, AdvanceSlideRadioButtonToggled, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SlideTransitionPane, AdvanceSlideRadioButtonToggled, weld::Toggleable&, void)
 {
     updateControlState();
     applyToSelectedPages(false);
@@ -1090,12 +1090,12 @@ IMPL_LINK_NOARG(SlideTransitionPane, SoundListBoxSelected, weld::ComboBox&, void
     applyToSelectedPages();
 }
 
-IMPL_LINK_NOARG(SlideTransitionPane, LoopSoundBoxChecked, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SlideTransitionPane, LoopSoundBoxChecked, weld::Toggleable&, void)
 {
     applyToSelectedPages();
 }
 
-IMPL_LINK_NOARG(SlideTransitionPane, AutoPreviewClicked, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SlideTransitionPane, AutoPreviewClicked, weld::Toggleable&, void)
 {
     SdOptions* pOptions = SD_MOD()->GetSdOptions(DocumentType::Impress);
     pOptions->SetPreviewTransitions( mxCB_AUTO_PREVIEW->get_active() );
diff --git a/sd/source/ui/dlg/BulletAndPositionDlg.cxx b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
index 9523e711a911..d298ec829a66 100644
--- a/sd/source/ui/dlg/BulletAndPositionDlg.cxx
+++ b/sd/source/ui/dlg/BulletAndPositionDlg.cxx
@@ -872,7 +872,7 @@ IMPL_LINK(SvxBulletAndPositionDlg, GraphicHdl_Impl, const OString&, rIdent, void
     aInvalidateTimer.Start();
 }
 
-IMPL_LINK_NOARG(SvxBulletAndPositionDlg, PopupActivateHdl_Impl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SvxBulletAndPositionDlg, PopupActivateHdl_Impl, weld::Toggleable&, void)
 {
     if (m_xGalleryMenu)
         return;
@@ -1056,7 +1056,7 @@ IMPL_LINK(SvxBulletAndPositionDlg, SizeHdl_Impl, weld::MetricSpinButton&, rField
     SetModified(bRepaint);
 }
 
-IMPL_LINK(SvxBulletAndPositionDlg, RatioHdl_Impl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(SvxBulletAndPositionDlg, RatioHdl_Impl, weld::Toggleable&, rBox, void)
 {
     if (rBox.get_active())
     {
@@ -1067,7 +1067,7 @@ IMPL_LINK(SvxBulletAndPositionDlg, RatioHdl_Impl, weld::ToggleButton&, rBox, voi
     }
 }
 
-IMPL_LINK(SvxBulletAndPositionDlg, SelectLeftAlignmentHdl_Impl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SvxBulletAndPositionDlg, SelectLeftAlignmentHdl_Impl, weld::Toggleable&, rButton, void)
 {
     if (rButton.get_active())
     {
@@ -1080,8 +1080,7 @@ IMPL_LINK(SvxBulletAndPositionDlg, SelectLeftAlignmentHdl_Impl, weld::ToggleButt
     }
 }
 
-IMPL_LINK(SvxBulletAndPositionDlg, SelectCenterAlignmentHdl_Impl, weld::ToggleButton&, rButton,
-          void)
+IMPL_LINK(SvxBulletAndPositionDlg, SelectCenterAlignmentHdl_Impl, weld::Toggleable&, rButton, void)
 {
     if (rButton.get_active())
     {
@@ -1094,7 +1093,7 @@ IMPL_LINK(SvxBulletAndPositionDlg, SelectCenterAlignmentHdl_Impl, weld::ToggleBu
     }
 }
 
-IMPL_LINK(SvxBulletAndPositionDlg, SelectRightAlignmentHdl_Impl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SvxBulletAndPositionDlg, SelectRightAlignmentHdl_Impl, weld::Toggleable&, rButton, void)
 {
     if (rButton.get_active())
     {
@@ -1122,7 +1121,7 @@ void SvxBulletAndPositionDlg::SetAlignmentHdl_Impl(SvxAdjust eAdjust)
     }
 }
 
-IMPL_LINK(SvxBulletAndPositionDlg, ApplyToMasterHdl_Impl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SvxBulletAndPositionDlg, ApplyToMasterHdl_Impl, weld::Toggleable&, rButton, void)
 {
     bApplyToMaster = rButton.get_active();
 }
@@ -1196,7 +1195,7 @@ IMPL_LINK(SvxBulletAndPositionDlg, DistanceHdl_Impl, weld::MetricSpinButton&, rF
     m_aPreviewWIN.set_size_request(aLastLevelLSpace, 300);
 }
 
-IMPL_LINK(SvxBulletAndPositionDlg, RelativeHdl_Impl, weld::ToggleButton&, rBox, void)
+IMPL_LINK(SvxBulletAndPositionDlg, RelativeHdl_Impl, weld::Toggleable&, rBox, void)
 {
     bool bOn = rBox.get_active();
     bool bSingleSelection = m_xLevelLB->count_selected_rows() == 1 && SAL_MAX_UINT16 != nActNumLvl;
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index e6ccdfa8b083..001e7c5d02e0 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -361,7 +361,7 @@ IMPL_LINK_NOARG(AnimationWindow, ClickLastHdl, weld::Button&, void)
     UpdateControl();
 }
 
-IMPL_LINK_NOARG(AnimationWindow, ClickRbtHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(AnimationWindow, ClickRbtHdl, weld::Toggleable&, void)
 {
     if (m_FrameList.empty() || m_xRbtGroup->get_active())
     {
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index 7fee1ae5030e..afa9e0be21be 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -100,7 +100,7 @@ void SdCustomShowDlg::CheckState()
         pCustomShowList->Seek( nPos );
 }
 
-IMPL_LINK( SdCustomShowDlg, ToggleButtonHdl, weld::ToggleButton&, r, void )
+IMPL_LINK( SdCustomShowDlg, ToggleButtonHdl, weld::Toggleable&, r, void )
 {
     SelectHdl(&r);
 }
diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx
index 58a98f32352b..9b1383089218 100644
--- a/sd/source/ui/dlg/dlgsnap.cxx
+++ b/sd/source/ui/dlg/dlgsnap.cxx
@@ -105,7 +105,7 @@ SdSnapLineDlg::~SdSnapLineDlg()
 /**
  * fills provided item sets with dialog box attributes
  */
-IMPL_LINK(SdSnapLineDlg, ToggleHdl, weld::ToggleButton&, rBtn, void)
+IMPL_LINK(SdSnapLineDlg, ToggleHdl, weld::Toggleable&, rBtn, void)
 {
     if (!rBtn.get_active())
         return;
diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx
index bd073ba9207f..3320ed06b9e3 100644
--- a/sd/source/ui/dlg/headerfooterdlg.cxx
+++ b/sd/source/ui/dlg/headerfooterdlg.cxx
@@ -146,7 +146,7 @@ private:
     std::unique_ptr<weld::CustomWeld> mxCTPreviewWin;
 
 
-    DECL_LINK( UpdateOnToggleHdl, weld::ToggleButton&, void );
+    DECL_LINK( UpdateOnToggleHdl, weld::Toggleable&, void );
     DECL_LINK( LanguageChangeHdl, weld::ComboBox&, void );
 
     void FillFormatList(sal_Int32 nSelectedPos);
@@ -510,7 +510,7 @@ void HeaderFooterTabPage::update()
     mxCTPreview->update( aSettings );
 }
 
-IMPL_LINK_NOARG(HeaderFooterTabPage, UpdateOnToggleHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(HeaderFooterTabPage, UpdateOnToggleHdl, weld::Toggleable&, void)
 {
     update();
 }
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index 423e191f9928..1dd236a50e47 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -47,7 +47,7 @@ private:
     std::unique_ptr<weld::CheckButton> m_xNewStartNumberCB;
     std::unique_ptr<weld::SpinButton> m_xNewStartNF;
 
-    DECL_LINK( ImplNewStartHdl, weld::ToggleButton&, void );
+    DECL_LINK( ImplNewStartHdl, weld::Toggleable&, void );
 };
 
 }
@@ -132,7 +132,7 @@ void SdParagraphNumTabPage::Reset( const SfxItemSet* rSet )
     mbModified = false;
 }
 
-IMPL_LINK_NOARG(SdParagraphNumTabPage, ImplNewStartHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SdParagraphNumTabPage, ImplNewStartHdl, weld::Toggleable&, void)
 {
     bool bEnable = m_xNewStartCB->get_active();
     m_xNewStartNumberCB->set_sensitive(bEnable);
diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index 7db0b22562ef..73932ba622bd 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -64,7 +64,7 @@ SdStartPresentationDlg::SdStartPresentationDlg(weld::Window* pWindow, const SfxI
     m_xFormatter->SetExtFormat(ExtTimeFieldFormat::LongDuration);
     m_xFormatter->EnableEmptyField(false);
 
-    Link<weld::ToggleButton&,void> aLink( LINK( this, SdStartPresentationDlg, ChangeRangeHdl ) );
+    Link<weld::Toggleable&,void> aLink( LINK( this, SdStartPresentationDlg, ChangeRangeHdl ) );
 
     m_xRbtAll->connect_toggled( aLink );
     m_xRbtAtDia->connect_toggled( aLink );
@@ -277,7 +277,7 @@ void SdStartPresentationDlg::GetAttr( SfxItemSet& rAttr )
 /**
  *      Handler: Enabled/Disabled Listbox "Dias"
  */
-IMPL_LINK_NOARG(SdStartPresentationDlg, ChangeRangeHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SdStartPresentationDlg, ChangeRangeHdl, weld::Toggleable&, void)
 {
     m_xLbDias->set_sensitive( m_xRbtAtDia->get_active() );
     m_xLbCustomshow->set_sensitive( m_xRbtCustomshow->get_active() );
@@ -286,7 +286,7 @@ IMPL_LINK_NOARG(SdStartPresentationDlg, ChangeRangeHdl, weld::ToggleButton&, voi
 /**
  *      Handler: Enabled/Disabled Checkbox "AlwaysOnTop"
  */
-IMPL_LINK_NOARG(SdStartPresentationDlg, ClickWindowPresentationHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SdStartPresentationDlg, ClickWindowPresentationHdl, weld::Toggleable&, void)
 {
     const bool bAuto = m_xRbtAuto->get_active();
     const bool bWindow = m_xRbtWindow->get_active();
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index e15262806609..d3145f681c95 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -48,7 +48,7 @@ SdPrintOptions::SdPrintOptions(weld::Container* pPage, weld::DialogController* p
     , m_xCbxBack(m_xBuilder->weld_check_button("backcb"))
     , m_xCbxPaperbin(m_xBuilder->weld_check_button("papertryfrmprntrcb"))
 {
-    Link<weld::ToggleButton&,void> aLink = LINK( this, SdPrintOptions, ClickBookletHdl );
+    Link<weld::Toggleable&,void> aLink = LINK( this, SdPrintOptions, ClickBookletHdl );
     m_xRbtDefault->connect_toggled( aLink );
     m_xRbtPagesize->connect_toggled( aLink );
     m_xRbtPagetile->connect_toggled( aLink );
@@ -181,7 +181,7 @@ std::unique_ptr<SfxTabPage> SdPrintOptions::Create( weld::Container* pPage, weld
     return std::make_unique<SdPrintOptions>( pPage, pController, *rOutAttrs );
 }
 
-IMPL_LINK(SdPrintOptions, ClickCheckboxHdl, weld::ToggleButton&, rCbx, void)
+IMPL_LINK(SdPrintOptions, ClickCheckboxHdl, weld::Toggleable&, rCbx, void)
 {
     // there must be at least one of them checked
     if( !m_xCbxDraw->get_active() && !m_xCbxNotes->get_active() && !m_xCbxOutline->get_active() && !m_xCbxHandout->get_active() )
@@ -190,7 +190,7 @@ IMPL_LINK(SdPrintOptions, ClickCheckboxHdl, weld::ToggleButton&, rCbx, void)
     updateControls();
 }
 
-IMPL_LINK_NOARG(SdPrintOptions, ClickBookletHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SdPrintOptions, ClickBookletHdl, weld::Toggleable&, void)
 {
     updateControls();
 }
diff --git a/sd/source/ui/dlg/vectdlg.cxx b/sd/source/ui/dlg/vectdlg.cxx
index 704a0f77862b..2db041e7e7e3 100644
--- a/sd/source/ui/dlg/vectdlg.cxx
+++ b/sd/source/ui/dlg/vectdlg.cxx
@@ -262,7 +262,7 @@ IMPL_LINK_NOARG(SdVectorizeDlg, ClickOKHdl, weld::Button&, void)
     m_xDialog->response(RET_OK);
 }
 
-IMPL_LINK( SdVectorizeDlg, ToggleHdl, weld::ToggleButton&, rCb, void )
+IMPL_LINK( SdVectorizeDlg, ToggleHdl, weld::Toggleable&, rCb, void )
 {
     if (rCb.get_active())
     {
diff --git a/sd/source/ui/inc/BulletAndPositionDlg.hxx b/sd/source/ui/inc/BulletAndPositionDlg.hxx
index d6f5a69c3de3..6b33aff7098f 100644
--- a/sd/source/ui/inc/BulletAndPositionDlg.hxx
+++ b/sd/source/ui/inc/BulletAndPositionDlg.hxx
@@ -101,12 +101,12 @@ class SvxBulletAndPositionDlg : public weld::GenericDialogController
     std::unique_ptr<weld::CheckButton> m_xRelativeCB;
     std::unique_ptr<weld::Label> m_xIndentFT;
     std::unique_ptr<weld::MetricSpinButton> m_xIndentMF;
-    std::unique_ptr<weld::ToggleButton> m_xLeftTB;
-    std::unique_ptr<weld::ToggleButton> m_xCenterTB;
-    std::unique_ptr<weld::ToggleButton> m_xRightTB;
+    std::unique_ptr<weld::Toggleable> m_xLeftTB;
+    std::unique_ptr<weld::Toggleable> m_xCenterTB;
+    std::unique_ptr<weld::Toggleable> m_xRightTB;
     std::unique_ptr<weld::RadioButton> m_xSlideRB;
     std::unique_ptr<weld::RadioButton> m_xSelectionRB;
-    std::unique_ptr<weld::ToggleButton> m_xApplyToMaster;
+    std::unique_ptr<weld::Toggleable> m_xApplyToMaster;
     std::unique_ptr<weld::Button> m_xReset;
 
     void InitControls();
@@ -119,21 +119,21 @@ class SvxBulletAndPositionDlg : public weld::GenericDialogController
 
     DECL_LINK(NumberTypeSelectHdl_Impl, weld::ComboBox&, void);
     DECL_LINK(LevelHdl_Impl, weld::TreeView&, void);
-    DECL_LINK(PopupActivateHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(PopupActivateHdl_Impl, weld::Toggleable&, void);
     DECL_LINK(GraphicHdl_Impl, const OString&, void);
     DECL_LINK(BulletHdl_Impl, weld::Button&, void);
     DECL_LINK(SizeHdl_Impl, weld::MetricSpinButton&, void);
-    DECL_LINK(RatioHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(RatioHdl_Impl, weld::Toggleable&, void);
     DECL_LINK(EditModifyHdl_Impl, weld::Entry&, void);
     DECL_LINK(BulColorHdl_Impl, ColorListBox&, void);
     DECL_LINK(BulRelSizeHdl_Impl, weld::MetricSpinButton&, void);
     DECL_LINK(PreviewInvalidateHdl_Impl, Timer*, void);
     DECL_LINK(DistanceHdl_Impl, weld::MetricSpinButton&, void);
-    DECL_LINK(RelativeHdl_Impl, weld::ToggleButton&, void);
-    DECL_LINK(SelectLeftAlignmentHdl_Impl, weld::ToggleButton&, void);
-    DECL_LINK(SelectCenterAlignmentHdl_Impl, weld::ToggleButton&, void);
-    DECL_LINK(SelectRightAlignmentHdl_Impl, weld::ToggleButton&, void);
-    DECL_LINK(ApplyToMasterHdl_Impl, weld::ToggleButton&, void);
+    DECL_LINK(RelativeHdl_Impl, weld::Toggleable&, void);
+    DECL_LINK(SelectLeftAlignmentHdl_Impl, weld::Toggleable&, void);
+    DECL_LINK(SelectCenterAlignmentHdl_Impl, weld::Toggleable&, void);
+    DECL_LINK(SelectRightAlignmentHdl_Impl, weld::Toggleable&, void);
+    DECL_LINK(ApplyToMasterHdl_Impl, weld::Toggleable&, void);
     DECL_LINK(ResetHdl_Impl, weld::Button&, void);
     void EditModifyHdl_Impl(const weld::Entry*);
     void InitPosAndSpaceMode();
diff --git a/sd/source/ui/inc/CustomAnimationPane.hxx b/sd/source/ui/inc/CustomAnimationPane.hxx
index 80d2aa4eef10..5e2d69658f77 100644
--- a/sd/source/ui/inc/CustomAnimationPane.hxx
+++ b/sd/source/ui/inc/CustomAnimationPane.hxx
@@ -102,7 +102,7 @@ private:
 
     DECL_LINK( implControlListBoxHdl, weld::ComboBox&, void );
     DECL_LINK( implClickHdl, weld::Button&, void );
-    DECL_LINK( implToggleHdl, weld::ToggleButton&, void );
+    DECL_LINK( implToggleHdl, weld::Toggleable&, void );
     DECL_LINK( implPropertyHdl, LinkParamNone*, void );
     DECL_LINK( EventMultiplexerListener, tools::EventMultiplexerEvent&, void );
     DECL_LINK( lateInitCallback, Timer *, void );
diff --git a/sd/source/ui/inc/SlideTransitionPane.hxx b/sd/source/ui/inc/SlideTransitionPane.hxx
index 8145a0623fbe..b10fef8a26c0 100644
--- a/sd/source/ui/inc/SlideTransitionPane.hxx
+++ b/sd/source/ui/inc/SlideTransitionPane.hxx
@@ -82,16 +82,16 @@ private:
 
     DECL_LINK( ApplyToAllButtonClicked, weld::Button&, void );
     DECL_LINK( PlayButtonClicked, weld::Button&, void );
-    DECL_LINK( AutoPreviewClicked, weld::ToggleButton&, void );
+    DECL_LINK( AutoPreviewClicked, weld::Toggleable&, void );
 
     DECL_LINK( TransitionSelected, ValueSet*, void );
-    DECL_LINK( AdvanceSlideRadioButtonToggled, weld::ToggleButton&, void );
+    DECL_LINK( AdvanceSlideRadioButtonToggled, weld::Toggleable&, void );
     DECL_LINK( AdvanceTimeModified, weld::MetricSpinButton&, void );
     DECL_LINK( VariantListBoxSelected, weld::ComboBox&, void );
     DECL_LINK( DurationModifiedHdl, weld::MetricSpinButton&, void );
     DECL_LINK( DurationLoseFocusHdl, weld::Widget&, void );
     DECL_LINK( SoundListBoxSelected, weld::ComboBox&, void );
-    DECL_LINK( LoopSoundBoxChecked, weld::ToggleButton&, void );
+    DECL_LINK( LoopSoundBoxChecked, weld::Toggleable&, void );
     DECL_LINK( EventMultiplexerListener, tools::EventMultiplexerEvent&, void );
     DECL_LINK(LateInitCallback, Timer *, void);
 
diff --git a/sd/source/ui/inc/TableDesignPane.hxx b/sd/source/ui/inc/TableDesignPane.hxx
index 60d53f701cb5..a39894b1c501 100644
--- a/sd/source/ui/inc/TableDesignPane.hxx
+++ b/sd/source/ui/inc/TableDesignPane.hxx
@@ -81,7 +81,7 @@ private:
 
     DECL_LINK(EventMultiplexerListener, tools::EventMultiplexerEvent&, void);
     DECL_LINK(implValueSetHdl, ValueSet*, void);
-    DECL_LINK(implCheckBoxHdl, weld::ToggleButton&, void);
+    DECL_LINK(implCheckBoxHdl, weld::Toggleable&, void);
 
     ViewShellBase& mrBase;
 
diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx
index 2588e4cd31a9..af304228af42 100644
--- a/sd/source/ui/inc/animobjs.hxx
+++ b/sd/source/ui/inc/animobjs.hxx
@@ -129,7 +129,7 @@ private:
     DECL_LINK( ClickLastHdl, weld::Button&, void );
     DECL_LINK( ClickGetObjectHdl, weld::Button&, void );
     DECL_LINK( ClickRemoveBitmapHdl, weld::Button&, void );
-    DECL_LINK( ClickRbtHdl, weld::ToggleButton&, void );
+    DECL_LINK( ClickRbtHdl, weld::Toggleable&, void );
     DECL_LINK( ClickHelpHdl, weld::Button&, void );
     DECL_LINK( ClickCreateGroupHdl, weld::Button&, void );
     DECL_LINK( ModifyBitmapHdl, weld::SpinButton&, void );
diff --git a/sd/source/ui/inc/custsdlg.hxx b/sd/source/ui/inc/custsdlg.hxx
index ed28cd21fb4e..3ef3cfb1cd66 100644
--- a/sd/source/ui/inc/custsdlg.hxx
+++ b/sd/source/ui/inc/custsdlg.hxx
@@ -45,7 +45,7 @@ private:
     void            CheckState();
 
     DECL_LINK( ClickButtonHdl, weld::Button&, void );
-    DECL_LINK( ToggleButtonHdl, weld::ToggleButton&, void );
+    DECL_LINK( ToggleButtonHdl, weld::Toggleable&, void );
     DECL_LINK( SelectListBoxHdl, weld::TreeView&, void );
     DECL_LINK( StartShowHdl, weld::Button&, void );
     void SelectHdl(void const *);
diff --git a/sd/source/ui/inc/dlgsnap.hxx b/sd/source/ui/inc/dlgsnap.hxx
index e67bc0ec8689..97fe09ccbb08 100644
--- a/sd/source/ui/inc/dlgsnap.hxx
+++ b/sd/source/ui/inc/dlgsnap.hxx
@@ -50,7 +50,7 @@ private:
     std::unique_ptr<weld::Button> m_xBtnDelete;
 
     DECL_LINK(ClickHdl, weld::Button&, void);
-    DECL_LINK(ToggleHdl, weld::ToggleButton&, void);
+    DECL_LINK(ToggleHdl, weld::Toggleable&, void);
 
 public:
     SdSnapLineDlg(weld::Window* pWindow, const SfxItemSet& rInAttrs, ::sd::View const * pView);
diff --git a/sd/source/ui/inc/present.hxx b/sd/source/ui/inc/present.hxx
index 99286b9cbc37..00c78ac79328 100644
--- a/sd/source/ui/inc/present.hxx
+++ b/sd/source/ui/inc/present.hxx
@@ -63,8 +63,8 @@ private:
     std::unique_ptr<weld::Label> m_xMonitorExternal;
     std::unique_ptr<weld::Label> m_xExternal;
 
-    DECL_LINK(ChangeRangeHdl, weld::ToggleButton&, void);
-    DECL_LINK(ClickWindowPresentationHdl, weld::ToggleButton&, void);
+    DECL_LINK(ChangeRangeHdl, weld::Toggleable&, void);
+    DECL_LINK(ClickWindowPresentationHdl, weld::Toggleable&, void);
     void ChangePause();
     DECL_LINK(ChangePauseHdl, weld::FormattedSpinButton&, void);
 
diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx
index 6d0d4d843a77..99bb6139cc6f 100644
--- a/sd/source/ui/inc/prntopts.hxx
+++ b/sd/source/ui/inc/prntopts.hxx
@@ -46,8 +46,8 @@ private:
     std::unique_ptr<weld::CheckButton> m_xCbxBack;
     std::unique_ptr<weld::CheckButton> m_xCbxPaperbin;
 
-    DECL_LINK(ClickCheckboxHdl, weld::ToggleButton&, void);
-    DECL_LINK(ClickBookletHdl, weld::ToggleButton&, void);
+    DECL_LINK(ClickCheckboxHdl, weld::Toggleable&, void);
+    DECL_LINK(ClickBookletHdl, weld::Toggleable&, void);
 
     void updateControls();
 
diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx
index cfd521e4a1ca..22091b2c63e5 100644
--- a/sd/source/ui/inc/pubdlg.hxx
+++ b/sd/source/ui/inc/pubdlg.hxx
@@ -183,17 +183,17 @@ private:
     DECL_LINK(NextPageHdl, weld::Button&, void);
     DECL_LINK(LastPageHdl, weld::Button&, void);
 
-    DECL_LINK(DesignHdl, weld::ToggleButton&, void);
+    DECL_LINK(DesignHdl, weld::Toggleable&, void);
     DECL_LINK(DesignSelectHdl, weld::TreeView&, void);
     DECL_LINK(DesignDeleteHdl, weld::Button&, void);
-    DECL_LINK(BaseHdl, weld::ToggleButton&, void);
-    DECL_LINK(ContentHdl, weld::ToggleButton&, void);
-    DECL_LINK(GfxFormatHdl, weld::ToggleButton&, void);
-    DECL_LINK(ResolutionHdl, weld::ToggleButton&, void);
+    DECL_LINK(BaseHdl, weld::Toggleable&, void);
+    DECL_LINK(ContentHdl, weld::Toggleable&, void);
+    DECL_LINK(GfxFormatHdl, weld::Toggleable&, void);
+    DECL_LINK(ResolutionHdl, weld::Toggleable&, void);
     DECL_LINK(ButtonsHdl, ValueSet*, void);
     DECL_LINK(ColorHdl, weld::Button&, void);
-    DECL_LINK(WebServerHdl, weld::ToggleButton&, void);
-    DECL_LINK(SlideChgHdl, weld::ToggleButton&, void);
+    DECL_LINK(WebServerHdl, weld::Toggleable&, void);
+    DECL_LINK(SlideChgHdl, weld::Toggleable&, void);
 
 public:
     SdPublishingDlg(weld::Window* pWindow, DocumentType eDocType);
diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx
index fe3991cc4ca7..67df42ce6707 100644
--- a/sd/source/ui/inc/vectdlg.hxx
+++ b/sd/source/ui/inc/vectdlg.hxx
@@ -66,7 +66,7 @@ class SdVectorizeDlg : public weld::GenericDialogController
     DECL_LINK( ProgressHdl, tools::Long, void );
     DECL_LINK( ClickPreviewHdl, weld::Button&, void );
     DECL_LINK( ClickOKHdl, weld::Button&, void );
-    DECL_LINK( ToggleHdl, weld::ToggleButton&, void );
+    DECL_LINK( ToggleHdl, weld::Toggleable&, void );
     DECL_LINK( ModifyHdl, weld::SpinButton&, void );
     DECL_LINK( MetricModifyHdl, weld::MetricSpinButton&, void );
 
diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx
index 033304ac0bc8..e225d4548952 100644
--- a/sd/source/ui/sidebar/SlideBackground.cxx
+++ b/sd/source/ui/sidebar/SlideBackground.cxx
@@ -1205,14 +1205,14 @@ IMPL_LINK_NOARG(SlideBackground, CloseMasterHdl, weld::Button&, void)
     GetBindings()->GetDispatcher()->Execute( SID_CLOSE_MASTER_VIEW, SfxCallMode::RECORD );
 }
 
-IMPL_LINK_NOARG(SlideBackground, DspBackground, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SlideBackground, DspBackground, weld::Toggleable&, void)
 {
     bool IsChecked = mxDspMasterBackground->get_active();
     const SfxBoolItem aBoolItem(SID_DISPLAY_MASTER_BACKGROUND, IsChecked);
     GetBindings()->GetDispatcher()->ExecuteList(SID_DISPLAY_MASTER_BACKGROUND, SfxCallMode::RECORD, { &aBoolItem });
 }
 
-IMPL_LINK_NOARG(SlideBackground, DspObjects, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SlideBackground, DspObjects, weld::Toggleable&, void)
 {
     bool IsChecked = mxDspMasterObjects->get_active();
     const SfxBoolItem aBoolItem(SID_DISPLAY_MASTER_OBJECTS,IsChecked);
diff --git a/sd/source/ui/sidebar/SlideBackground.hxx b/sd/source/ui/sidebar/SlideBackground.hxx
index 0b28fdc60756..9cb3e448b112 100644
--- a/sd/source/ui/sidebar/SlideBackground.hxx
+++ b/sd/source/ui/sidebar/SlideBackground.hxx
@@ -144,8 +144,8 @@ private:
     DECL_LINK(PaperSizeModifyHdl, weld::ComboBox&, void);
     DECL_LINK(FillColorHdl, ColorListBox&, void);
     DECL_LINK(AssignMasterPage, weld::ComboBox&, void);
-    DECL_LINK(DspBackground, weld::ToggleButton&, void);
-    DECL_LINK(DspObjects, weld::ToggleButton&, void);
+    DECL_LINK(DspBackground, weld::Toggleable&, void);
+    DECL_LINK(DspObjects, weld::Toggleable&, void);
     DECL_LINK(CloseMasterHdl, weld::Button&, void);
     DECL_LINK(EditMasterHdl, weld::Button&, void);
     DECL_LINK(SelectBgHdl, weld::Button&, void);
diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx
index 01e615d103dd..82d4485fb937 100644
--- a/sd/source/ui/table/TableDesignPane.cxx
+++ b/sd/source/ui/table/TableDesignPane.cxx
@@ -200,7 +200,7 @@ void TableDesignWidget::ApplyStyle()
     }
 }
 
-IMPL_LINK_NOARG(TableDesignWidget, implCheckBoxHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(TableDesignWidget, implCheckBoxHdl, weld::Toggleable&, void)
 {
     ApplyOptions();
     FillDesignPreviewControl();