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>

34 files changed, 67 insertions, 67 deletions

diff --git a/chart2/source/controller/dialogs/ChartResourceGroups.cxx b/chart2/source/controller/dialogs/ChartResourceGroups.cxx
index 9ab5dff70f20..bc1ccc81e7c9 100644
--- a/chart2/source/controller/dialogs/ChartResourceGroups.cxx
+++ b/chart2/source/controller/dialogs/ChartResourceGroups.cxx
@@ -75,7 +75,7 @@ void Dim3DLookResourceGroup::fillParameter(ChartTypeParameter& rParameter)
     }
 }
 
-IMPL_LINK_NOARG(Dim3DLookResourceGroup, Dim3DLookCheckHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(Dim3DLookResourceGroup, Dim3DLookCheckHdl, weld::Toggleable&, void)
 {
     if (m_pChangeListener)
         m_pChangeListener->stateChanged();
@@ -110,7 +110,7 @@ void SortByXValuesResourceGroup::fillParameter(ChartTypeParameter& rParameter)
     rParameter.bSortByXValues = m_xCB_XValueSorting->get_active();
 }
 
-IMPL_LINK_NOARG(SortByXValuesResourceGroup, SortByXValuesCheckHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SortByXValuesResourceGroup, SortByXValuesCheckHdl, weld::Toggleable&, void)
 {
     if (m_pChangeListener)
         m_pChangeListener->stateChanged();
@@ -184,7 +184,7 @@ void StackingResourceGroup::fillParameter(ChartTypeParameter& rParameter)
         rParameter.eStackMode = GlobalStackMode_STACK_Z;
 }
 
-IMPL_LINK(StackingResourceGroup, StackingChangeHdl, weld::ToggleButton&, rRadio, void)
+IMPL_LINK(StackingResourceGroup, StackingChangeHdl, weld::Toggleable&, rRadio, void)
 {
     //for each radio click there are coming two change events
     //first uncheck of previous button -> ignore that call
@@ -193,7 +193,7 @@ IMPL_LINK(StackingResourceGroup, StackingChangeHdl, weld::ToggleButton&, rRadio,
         m_pChangeListener->stateChanged();
 }
 
-IMPL_LINK_NOARG(StackingResourceGroup, StackingEnableHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(StackingResourceGroup, StackingEnableHdl, weld::Toggleable&, void)
 {
     if (m_pChangeListener)
         m_pChangeListener->stateChanged();
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 857d2b5295db..841b75d2f9ef 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -221,7 +221,7 @@ IMPL_LINK(DataLabelResources, NumberFormatDialogHdl, weld::Button&, rButton, voi
     }
 }
 
-IMPL_LINK_NOARG(DataLabelResources, CheckHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(DataLabelResources, CheckHdl, weld::Toggleable&, void)
 {
     EnableControls();
 }
diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx
index dde594b620d6..094291dc9a23 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.hxx
@@ -84,7 +84,7 @@ private:
     std::unique_ptr<weld::CheckButton> m_xCBCustomLeaderLines;
 
     DECL_LINK(NumberFormatDialogHdl, weld::Button&, void );
-    DECL_LINK(CheckHdl, weld::ToggleButton&, void );
+    DECL_LINK(CheckHdl, weld::Toggleable&, void );
     void EnableControls();
 };
 
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index aaa1c6eedb8b..39ee44909e61 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -339,7 +339,7 @@ IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen2, weld::ComboBox&, void )
    CategoryChosen(*m_xRbConst);
 }
 
-IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen, weld::ToggleButton&, void )
+IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen, weld::Toggleable&, void )
 {
     m_bErrorKindUnique = true;
     SvxChartKindError eOldError = m_eErrorKind;
@@ -392,7 +392,7 @@ IMPL_LINK_NOARG( ErrorBarResources, CategoryChosen, weld::ToggleButton&, void )
     UpdateControlStates();
 }
 
-IMPL_LINK_NOARG(ErrorBarResources, SynchronizePosAndNeg, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ErrorBarResources, SynchronizePosAndNeg, weld::Toggleable&, void)
 {
     UpdateControlStates();
     PosValueChanged( *m_xMfPositive );
@@ -412,7 +412,7 @@ IMPL_LINK_NOARG(ErrorBarResources, PosValueChanged, weld::MetricSpinButton&, voi
     }
 }
 
-IMPL_LINK_NOARG(ErrorBarResources, IndicatorChanged, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ErrorBarResources, IndicatorChanged, weld::Toggleable&, void)
 {
     m_bIndicatorUnique = true;
     if( m_xRbBoth->get_active())
diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx
index 50ac0602baef..5ad9fe1ac63d 100644
--- a/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -158,7 +158,7 @@ void LegendPositionResources::writeToModel( const css::uno::Reference< frame::XM
     }
 }
 
-IMPL_LINK_NOARG(LegendPositionResources, PositionEnableHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(LegendPositionResources, PositionEnableHdl, weld::Toggleable&, void)
 {
     bool bEnable = !m_xCbxShow || m_xCbxShow->get_active();
 
@@ -218,7 +218,7 @@ void LegendPositionResources::writeToItemSet( SfxItemSet& rOutAttrs ) const
     rOutAttrs.Put( SfxBoolItem(SCHATTR_LEGEND_SHOW, !m_xCbxShow || m_xCbxShow->get_active()) );
 }
 
-IMPL_LINK (LegendPositionResources, PositionChangeHdl, weld::ToggleButton&, rRadio, void)
+IMPL_LINK (LegendPositionResources, PositionChangeHdl, weld::Toggleable&, rRadio, void)
 {
     //for each radio click there are coming two change events
     //first uncheck of previous button -> ignore that call
diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx
index e1ccd666414c..8fc5e63ee2be 100644
--- a/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -83,7 +83,7 @@ TrendlineResources::TrendlineResources(weld::Builder& rBuilder, const SfxItemSet
     rInterceptFormatter.ClearMinValue();
     rInterceptFormatter.ClearMaxValue();
 
-    Link<weld::ToggleButton&,void> aLink = LINK(this, TrendlineResources, SelectTrendLine);
+    Link<weld::Toggleable&,void> aLink = LINK(this, TrendlineResources, SelectTrendLine);
     m_xRB_Linear->connect_toggled( aLink );
     m_xRB_Logarithmic->connect_toggled( aLink );
     m_xRB_Exponential->connect_toggled( aLink );
@@ -105,7 +105,7 @@ TrendlineResources::TrendlineResources(weld::Builder& rBuilder, const SfxItemSet
 TrendlineResources::~TrendlineResources()
 {}
 
-IMPL_LINK_NOARG(TrendlineResources, SelectTrendLine, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(TrendlineResources, SelectTrendLine, weld::Toggleable&, void)
 {
     if (m_xRB_Linear->get_active())
         m_eTrendLineType = SvxChartRegress::Linear;
@@ -427,7 +427,7 @@ void TrendlineResources::SetNbPoints( sal_Int32 nNbPoints )
     UpdateControlStates();
 }
 
-IMPL_LINK_NOARG(TrendlineResources, ShowEquation, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(TrendlineResources, ShowEquation, weld::Toggleable&, void)
 {
     m_xEE_XName->set_sensitive(m_xCB_ShowEquation->get_active());
     m_xEE_YName->set_sensitive(m_xCB_ShowEquation->get_active());
diff --git a/chart2/source/controller/dialogs/res_Trendline.hxx b/chart2/source/controller/dialogs/res_Trendline.hxx
index 2327b05c355d..e520d6da3bc8 100644
--- a/chart2/source/controller/dialogs/res_Trendline.hxx
+++ b/chart2/source/controller/dialogs/res_Trendline.hxx
@@ -30,7 +30,7 @@ namespace weld { class FormattedSpinButton; }
 namespace weld { class Image; }
 namespace weld { class RadioButton; }
 namespace weld { class SpinButton; }
-namespace weld { class ToggleButton; }
+namespace weld { class Toggleable; }
 
 class SvNumberFormatter;
 
@@ -87,10 +87,10 @@ private:
     std::unique_ptr<weld::ComboBox> m_xCB_RegressionMovingType;
 
     void UpdateControlStates();
-    DECL_LINK(SelectTrendLine, weld::ToggleButton&, void);
+    DECL_LINK(SelectTrendLine, weld::Toggleable&, void);
     DECL_LINK(ChangeSpinValue, weld::SpinButton&, void);
     DECL_LINK(ChangeFormattedValue, weld::FormattedSpinButton&, void);
-    DECL_LINK(ShowEquation, weld::ToggleButton&, void);
+    DECL_LINK(ShowEquation, weld::Toggleable&, void);
 };
 
 } //  namespace chart
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index 2ca07dd15676..707c0eff3617 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -288,7 +288,7 @@ IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectSchemeHdl, weld::ComboBox&
     initControlsFromModel();
 }
 
-IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectShading, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectShading, weld::Toggleable&, void)
 {
     if( !m_bUpdateOtherControls )
         return;
@@ -297,7 +297,7 @@ IMPL_LINK_NOARG(ThreeD_SceneAppearance_TabPage, SelectShading, weld::ToggleButto
     updateScheme();
 }
 
-IMPL_LINK(ThreeD_SceneAppearance_TabPage, SelectRoundedEdgeOrObjectLines, weld::ToggleButton&, rCheckBox, void)
+IMPL_LINK(ThreeD_SceneAppearance_TabPage, SelectRoundedEdgeOrObjectLines, weld::Toggleable&, rCheckBox, void)
 {
     if( !m_bUpdateOtherControls )
         return;
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
index 305c895c0e46..1f13240b0015 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx
@@ -38,8 +38,8 @@ public:
 
 private:
     DECL_LINK( SelectSchemeHdl, weld::ComboBox&, void );
-    DECL_LINK( SelectShading, weld::ToggleButton&, void );
-    DECL_LINK( SelectRoundedEdgeOrObjectLines, weld::ToggleButton&, void );
+    DECL_LINK( SelectShading, weld::Toggleable&, void );
+    DECL_LINK( SelectRoundedEdgeOrObjectLines, weld::Toggleable&, void );
 
     void initControlsFromModel();
     void applyShadeModeToModel();
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index 238df9a00787..fca47ad13d45 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -209,13 +209,13 @@ IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, PerspectiveChanged, Timer *, void)
     applyPerspectiveToModel();
 }
 
-IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, PerspectiveToggled, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, PerspectiveToggled, weld::Toggleable&, void)
 {
     m_xMFPerspective->set_sensitive(m_xCbxPerspective->get_active());
     applyPerspectiveToModel();
 }
 
-IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ThreeD_SceneGeometry_TabPage, RightAngledAxesToggled, weld::Toggleable&, void)
 {
     ControllerLockHelperGuard aGuard( m_rControllerLockHelper );
 
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
index e0ccfd4f8fd3..ca7f75ebea0d 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx
@@ -47,8 +47,8 @@ public:
     DECL_LINK( PerspectiveChanged, Timer *, void);
     // is called immediately when a field changes
     DECL_LINK( PerspectiveEdited, weld::MetricSpinButton&, void );
-    DECL_LINK( PerspectiveToggled, weld::ToggleButton&, void );
-    DECL_LINK( RightAngledAxesToggled, weld::ToggleButton&, void );
+    DECL_LINK( PerspectiveToggled, weld::Toggleable&, void );
+    DECL_LINK( RightAngledAxesToggled, weld::Toggleable&, void );
 
 private:
     void applyAnglesToModel();
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index de028152e386..9871bfa4187a 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -270,7 +270,7 @@ void SchAxisLabelTabPage::SetComplexCategories( bool bComplexCategories )
 
 // event handling routines
 
-IMPL_LINK_NOARG(SchAxisLabelTabPage, StackedToggleHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SchAxisLabelTabPage, StackedToggleHdl, weld::Toggleable&, void)
 {
     bool bActive = m_xCbStacked->get_active() && m_xCbStacked->get_sensitive();
     m_xNfRotate->set_sensitive(!bActive);
@@ -279,7 +279,7 @@ IMPL_LINK_NOARG(SchAxisLabelTabPage, StackedToggleHdl, weld::ToggleButton&, void
     m_xFtRotate->set_sensitive(!bActive);
 }
 
-IMPL_LINK_NOARG(SchAxisLabelTabPage, ToggleShowLabel, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SchAxisLabelTabPage, ToggleShowLabel, weld::Toggleable&, void)
 {
     bool bEnable = ( m_xCbShowDescription->get_state() != TRISTATE_FALSE );
 
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
index 0923c91118d5..a94a030fe9a1 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
@@ -65,8 +65,8 @@ private:
     std::unique_ptr<svx::DialControl> m_xCtrlDial;
     std::unique_ptr<weld::CustomWeld> m_xCtrlDialWin;
 
-    DECL_LINK(StackedToggleHdl, weld::ToggleButton&, void);
-    DECL_LINK(ToggleShowLabel, weld::ToggleButton&, void);
+    DECL_LINK(StackedToggleHdl, weld::Toggleable&, void);
+    DECL_LINK(ToggleShowLabel, weld::Toggleable&, void);
 
 public:
     SchAxisLabelTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 8821fe6b5ece..e0ceccec2fe0 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -316,12 +316,12 @@ IMPL_LINK_NOARG(RangeChooserTabPage, ControlEditedHdl, weld::Entry&, void)
     isValid();
 }
 
-IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedRadioHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedRadioHdl, weld::Toggleable&, void)
 {
     ControlChangedHdl(*m_xED_Range);
 }
 
-IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedCheckBoxHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(RangeChooserTabPage, ControlChangedCheckBoxHdl, weld::Toggleable&, void)
 {
     ControlChangedHdl(*m_xED_Range);
 }
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
index 3af72bf86258..7d4e1a4183c2 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
@@ -64,8 +64,8 @@ private:
 
     DECL_LINK( ChooseRangeHdl, weld::Button&, void );
     DECL_LINK( ControlChangedHdl, weld::Entry&, void );
-    DECL_LINK( ControlChangedCheckBoxHdl, weld::ToggleButton&, void );
-    DECL_LINK( ControlChangedRadioHdl, weld::ToggleButton&, void );
+    DECL_LINK( ControlChangedCheckBoxHdl, weld::Toggleable&, void );
+    DECL_LINK( ControlChangedRadioHdl, weld::Toggleable&, void );
     DECL_LINK( ControlEditedHdl, weld::Entry&, void );
 
     sal_Int32       m_nChangingControlCalls;
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index b9b31019803d..db2ba248ee8e 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -168,7 +168,7 @@ void ScaleTabPage::EnableControls()
     EnableValueHdl(*m_xCbx_AutoTimeResolution);
 }
 
-IMPL_LINK( ScaleTabPage, EnableValueHdl, weld::ToggleButton&, rCbx, void )
+IMPL_LINK( ScaleTabPage, EnableValueHdl, weld::Toggleable&, rCbx, void )
 {
     bool bEnable = !rCbx.get_active() && rCbx.get_sensitive();
     if (&rCbx == m_xCbxAutoMin.get())
diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx
index 98814e2560c3..101e6df1cede 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hxx
+++ b/chart2/source/controller/dialogs/tp_Scale.hxx
@@ -83,7 +83,7 @@ private:
     void EnableControls();
 
     DECL_LINK(SelectAxisTypeHdl, weld::ComboBox&, void);
-    DECL_LINK(EnableValueHdl, weld::ToggleButton&, void);
+    DECL_LINK(EnableValueHdl, weld::Toggleable&, void);
 
     /** shows a warning window due to an invalid input.
 
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index 36d86c4873ef..15976e89fea8 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -60,7 +60,7 @@ SchOptionTabPage::~SchOptionTabPage()
 {
 }
 
-IMPL_LINK_NOARG(SchOptionTabPage, EnableHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SchOptionTabPage, EnableHdl, weld::Toggleable&, void)
 {
     if( m_nAllSeriesAxisIndex == 0 )
         m_xCBAxisSideBySide->set_sensitive( m_xRbtAxis2->get_active());
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
index 011e88a4f045..6b163f3c8815 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
@@ -47,7 +47,7 @@ private: //methods
     void AdaptControlPositionsAndVisibility();
 
 private: //member
-    DECL_LINK(EnableHdl, weld::ToggleButton&, void );
+    DECL_LINK(EnableHdl, weld::Toggleable&, void );
 
     sal_Int32   m_nAllSeriesAxisIndex;
 
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index ede27edbac9d..8ff1c926d091 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -60,7 +60,7 @@ SchAlignmentTabPage::SchAlignmentTabPage(weld::Container* pPage, weld::DialogCon
     }
 }
 
-IMPL_LINK_NOARG(SchAlignmentTabPage, StackedToggleHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(SchAlignmentTabPage, StackedToggleHdl, weld::Toggleable&, void)
 {
     bool bActive = m_xCbStacked->get_active();
     m_xNfRotate->set_sensitive(!bActive);
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
index 0ae3c2ddbc26..b303e4d3596c 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
@@ -45,7 +45,7 @@ private:
     std::unique_ptr<svx::DialControl> m_xCtrlDial;
     std::unique_ptr<weld::CustomWeld> m_xCtrlDialWin;
 
-    DECL_LINK(StackedToggleHdl, weld::ToggleButton&, void);
+    DECL_LINK(StackedToggleHdl, weld::Toggleable&, void);
 
 public:
     SchAlignmentTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs, bool bWithRotation = true);
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index 66301e2cd606..f99fd203b231 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -132,7 +132,7 @@ void TitlesAndObjectsTabPage::commitToModel()
     }
 }
 
-IMPL_LINK_NOARG(TitlesAndObjectsTabPage, ChangeCheckBoxHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(TitlesAndObjectsTabPage, ChangeCheckBoxHdl, weld::Toggleable&, void)
 {
     ChangeHdl(nullptr);
 }
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
index ede45464e9d5..b31231633a21 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
@@ -49,7 +49,7 @@ private:
     void commitToModel();
     DECL_LINK( ChangeHdl, LinkParamNone*, void );
     DECL_LINK( ChangeEditHdl, weld::Entry&, void );
-    DECL_LINK( ChangeCheckBoxHdl, weld::ToggleButton&, void );
+    DECL_LINK( ChangeCheckBoxHdl, weld::Toggleable&, void );
 
     std::unique_ptr< TitleResources >            m_xTitleResources;
     std::unique_ptr< LegendPositionResources >   m_xLegendPositionResources;
diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx
index 00a75e9204ed..09380c921d3c 100644
--- a/chart2/source/controller/inc/res_ErrorBar.hxx
+++ b/chart2/source/controller/inc/res_ErrorBar.hxx
@@ -36,7 +36,7 @@ namespace weld { class Image; }
 namespace weld { class Label; }
 namespace weld { class MetricSpinButton; }
 namespace weld { class RadioButton; }
-namespace weld { class ToggleButton; }
+namespace weld { class Toggleable; }
 namespace weld { class Widget; }
 
 namespace chart
@@ -124,11 +124,11 @@ private:
     std::unique_ptr<weld::Label> m_xUIStringNeg;
     std::unique_ptr<weld::Label> m_xUIStringRbRange;
 
-    DECL_LINK( CategoryChosen, weld::ToggleButton&, void );
+    DECL_LINK( CategoryChosen, weld::Toggleable&, void );
     DECL_LINK( CategoryChosen2, weld::ComboBox&, void );
-    DECL_LINK( SynchronizePosAndNeg, weld::ToggleButton&, void );
+    DECL_LINK( SynchronizePosAndNeg, weld::Toggleable&, void );
     DECL_LINK( PosValueChanged, weld::MetricSpinButton&, void );
-    DECL_LINK( IndicatorChanged, weld::ToggleButton&, void );
+    DECL_LINK( IndicatorChanged, weld::Toggleable&, void );
     DECL_LINK( ChooseRange, weld::Button&, void );
     DECL_LINK( RangeChanged, weld::Entry&, void );
 
diff --git a/chart2/source/controller/inc/res_LegendPosition.hxx b/chart2/source/controller/inc/res_LegendPosition.hxx
index cfe3a12435fe..87b96ab558fc 100644
--- a/chart2/source/controller/inc/res_LegendPosition.hxx
+++ b/chart2/source/controller/inc/res_LegendPosition.hxx
@@ -26,7 +26,7 @@ namespace com::sun::star::uno { class XComponentContext; }
 namespace weld { class Builder; }
 namespace weld { class CheckButton; }
 namespace weld { class RadioButton; }
-namespace weld { class ToggleButton; }
+namespace weld { class Toggleable; }
 
 namespace chart
 {
@@ -50,8 +50,8 @@ public:
 
     void SetChangeHdl( const Link<LinkParamNone*,void>& rLink );
 
-    DECL_LINK( PositionEnableHdl, weld::ToggleButton&, void );
-    DECL_LINK( PositionChangeHdl, weld::ToggleButton&, void );
+    DECL_LINK( PositionEnableHdl, weld::Toggleable&, void );
+    DECL_LINK( PositionChangeHdl, weld::Toggleable&, void );
 
 private:
     void impl_setRadioButtonToggleHdl();
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.cxx b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
index ccab43770b8f..c5e4d91c54e2 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.cxx
@@ -244,7 +244,7 @@ void ChartAxisPanel::Initialize()
 
     updateData();
 
-    Link<weld::ToggleButton&,void> aLink = LINK(this, ChartAxisPanel, CheckBoxHdl);
+    Link<weld::Toggleable&,void> aLink = LINK(this, ChartAxisPanel, CheckBoxHdl);
     mxCBShowLabel->connect_toggled(aLink);
     mxCBReverse->connect_toggled(aLink);
 
@@ -345,7 +345,7 @@ void ChartAxisPanel::selectionChanged(bool bCorrectType)
         updateData();
 }
 
-IMPL_LINK(ChartAxisPanel, CheckBoxHdl, weld::ToggleButton&, rCheckbox, void)
+IMPL_LINK(ChartAxisPanel, CheckBoxHdl, weld::Toggleable&, rCheckbox, void)
 {
     OUString aCID = getCID(mxModel);
     bool bChecked = rCheckbox.get_active();
diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.hxx b/chart2/source/controller/sidebar/ChartAxisPanel.hxx
index 4134b76c20dd..0185f4b9431f 100644
--- a/chart2/source/controller/sidebar/ChartAxisPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartAxisPanel.hxx
@@ -83,7 +83,7 @@ private:
     void Initialize();
     void doUpdateModel(css::uno::Reference<css::frame::XModel> xModel);
 
-    DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void);
+    DECL_LINK(CheckBoxHdl, weld::Toggleable&, void);
     DECL_LINK(ListBoxHdl, weld::ComboBox&, void);
     DECL_LINK(TextRotationHdl, weld::MetricSpinButton&, void);
 };
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.cxx b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
index 59afe8cbb7d4..7bf6663243f7 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.cxx
@@ -378,7 +378,7 @@ void ChartElementsPanel::Initialize()
     xBroadcaster->addModifyListener(mxListener);
     updateData();
 
-    Link<weld::ToggleButton&,void> aLink = LINK(this, ChartElementsPanel, CheckBoxHdl);
+    Link<weld::Toggleable&,void> aLink = LINK(this, ChartElementsPanel, CheckBoxHdl);
     mxCBTitle->connect_toggled(aLink);
     mxCBSubtitle->connect_toggled(aLink);
     mxCBXAxis->connect_toggled(aLink);
@@ -586,7 +586,7 @@ void ChartElementsPanel::updateModel(css::uno::Reference<css::frame::XModel> xMo
     doUpdateModel(xModel);
 }
 
-IMPL_LINK(ChartElementsPanel, CheckBoxHdl, weld::ToggleButton&, rCheckBox, void)
+IMPL_LINK(ChartElementsPanel, CheckBoxHdl, weld::Toggleable&, rCheckBox, void)
 {
     bool bChecked = rCheckBox.get_active();
     if (&rCheckBox == mxCBTitle.get())
diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.hxx b/chart2/source/controller/sidebar/ChartElementsPanel.hxx
index b53aa715f583..ff8516e3e4c8 100644
--- a/chart2/source/controller/sidebar/ChartElementsPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartElementsPanel.hxx
@@ -106,7 +106,7 @@ private:
 
     void setTitleVisible(TitleHelper::eTitleType eTitle, bool bVisible);
 
-    DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void);
+    DECL_LINK(CheckBoxHdl, weld::Toggleable&, void);
     DECL_LINK(EditHdl, weld::Entry&, void);
     DECL_LINK(LegendPosHdl, weld::ComboBox&, void);
 };
diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
index 1b3f35551382..0cb228bc1222 100644
--- a/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.cxx
@@ -273,7 +273,7 @@ void ChartErrorBarPanel::Initialize()
 
     updateData();
 
-    Link<weld::ToggleButton&,void> aLink = LINK(this, ChartErrorBarPanel, RadioBtnHdl);
+    Link<weld::Toggleable&,void> aLink = LINK(this, ChartErrorBarPanel, RadioBtnHdl);
     mxRBPosAndNeg->connect_toggled(aLink);
     mxRBPos->connect_toggled(aLink);
     mxRBNeg->connect_toggled(aLink);
@@ -393,7 +393,7 @@ void ChartErrorBarPanel::updateModel(css::uno::Reference<css::frame::XModel> xMo
     doUpdateModel(xModel);
 }
 
-IMPL_LINK_NOARG(ChartErrorBarPanel, RadioBtnHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ChartErrorBarPanel, RadioBtnHdl, weld::Toggleable&, void)
 {
     OUString aCID = getCID(mxModel);
     bool bPos = mxRBPosAndNeg->get_active() || mxRBPos->get_active();
diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
index e87a65d845b9..c1bb6b4f8b94 100644
--- a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx
@@ -80,7 +80,7 @@ private:
     void Initialize();
     void doUpdateModel(css::uno::Reference<css::frame::XModel> xModel);
 
-    DECL_LINK(RadioBtnHdl, weld::ToggleButton&, void);
+    DECL_LINK(RadioBtnHdl, weld::Toggleable&, void);
     DECL_LINK(ListBoxHdl, weld::ComboBox&, void);
     DECL_LINK(NumericFieldHdl, weld::SpinButton&, void);
 };
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
index fe2452572985..0550463e4d3c 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
@@ -327,13 +327,13 @@ void ChartSeriesPanel::Initialize()
 
     updateData();
 
-    Link<weld::ToggleButton&,void> aLink = LINK(this, ChartSeriesPanel, CheckBoxHdl);
+    Link<weld::Toggleable&,void> aLink = LINK(this, ChartSeriesPanel, CheckBoxHdl);
     mxCBLabel->connect_toggled(aLink);
     mxCBTrendline->connect_toggled(aLink);
     mxCBXError->connect_toggled(aLink);
     mxCBYError->connect_toggled(aLink);
 
-    Link<weld::ToggleButton&,void> aLink2 = LINK(this, ChartSeriesPanel, RadioBtnHdl);
+    Link<weld::Toggleable&,void> aLink2 = LINK(this, ChartSeriesPanel, RadioBtnHdl);
     mxRBPrimaryAxis->connect_toggled(aLink2);
     mxRBSecondaryAxis->connect_toggled(aLink2);
 
@@ -444,7 +444,7 @@ void ChartSeriesPanel::selectionChanged(bool bCorrectType)
         updateData();
 }
 
-IMPL_LINK(ChartSeriesPanel, CheckBoxHdl, weld::ToggleButton&, rCheckBox, void)
+IMPL_LINK(ChartSeriesPanel, CheckBoxHdl, weld::Toggleable&, rCheckBox, void)
 {
     bool bChecked = rCheckBox.get_active();
     OUString aCID = getCID(mxModel);
@@ -458,7 +458,7 @@ IMPL_LINK(ChartSeriesPanel, CheckBoxHdl, weld::ToggleButton&, rCheckBox, void)
         setErrorBarVisible(mxModel, aCID, true, bChecked);
 }
 
-IMPL_LINK_NOARG(ChartSeriesPanel, RadioBtnHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ChartSeriesPanel, RadioBtnHdl, weld::Toggleable&, void)
 {
     OUString aCID = getCID(mxModel);
     bool bChecked = mxRBPrimaryAxis->get_active();
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
index 64bc5315bfaa..3c573d91464c 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx
@@ -100,8 +100,8 @@ private:
     void Initialize();
     void doUpdateModel(css::uno::Reference<css::frame::XModel> xModel);
 
-    DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void);
-    DECL_LINK(RadioBtnHdl, weld::ToggleButton&, void);
+    DECL_LINK(CheckBoxHdl, weld::Toggleable&, void);
+    DECL_LINK(RadioBtnHdl, weld::Toggleable&, void);
     DECL_LINK(ListBoxHdl, weld::ComboBox&, void);
 };
 
diff --git a/chart2/source/inc/ChartResourceGroups.hxx b/chart2/source/inc/ChartResourceGroups.hxx
index 62857fdbf724..2a81b5cfd3cc 100644
--- a/chart2/source/inc/ChartResourceGroups.hxx
+++ b/chart2/source/inc/ChartResourceGroups.hxx
@@ -49,7 +49,7 @@ public:
     void fillParameter(ChartTypeParameter& rParameter);
 
 private:
-    DECL_LINK(Dim3DLookCheckHdl, weld::ToggleButton&, void);
+    DECL_LINK(Dim3DLookCheckHdl, weld::Toggleable&, void);
     DECL_LINK(SelectSchemeHdl, weld::ComboBox&, void);
 
 private:
@@ -68,7 +68,7 @@ public:
     void fillParameter(ChartTypeParameter& rParameter);
 
 private:
-    DECL_LINK(SortByXValuesCheckHdl, weld::ToggleButton&, void);
+    DECL_LINK(SortByXValuesCheckHdl, weld::Toggleable&, void);
 
 private:
     std::unique_ptr<weld::CheckButton> m_xCB_XValueSorting;
@@ -85,8 +85,8 @@ public:
     void fillParameter(ChartTypeParameter& rParameter);
 
 private:
-    DECL_LINK(StackingChangeHdl, weld::ToggleButton&, void);
-    DECL_LINK(StackingEnableHdl, weld::ToggleButton&, void);
+    DECL_LINK(StackingChangeHdl, weld::Toggleable&, void);
+    DECL_LINK(StackingEnableHdl, weld::Toggleable&, void);
 
 private:
     std::unique_ptr<weld::CheckButton> m_xCB_Stacked;