diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-05-20 17:27:49 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-05-21 18:19:58 +0200 |
| commit | 9940f077fdfc0c271aa66ad64578ae2236a2ca81 (patch) | |
| tree | a52b00f3ba98d78f88a0d2aa5a02605746f8e6c7 | |
| parent | drop unused suppression (diff) | |
| download | core-9940f077fdfc0c271aa66ad64578ae2236a2ca81.tar.gz core-9940f077fdfc0c271aa66ad64578ae2236a2ca81.zip | |
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>
468 files changed, 1218 insertions, 1161 deletions
diff --git a/basctl/source/basicide/brkdlg.cxx b/basctl/source/basicide/brkdlg.cxx index 74d5be8542ca..6a79d0e1da54 100644 --- a/basctl/source/basicide/brkdlg.cxx +++ b/basctl/source/basicide/brkdlg.cxx @@ -138,7 +138,7 @@ void BreakPointDialog::CheckButtons() } } -IMPL_LINK(BreakPointDialog, CheckBoxHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(BreakPointDialog, CheckBoxHdl, weld::Toggleable&, rButton, void) { BreakPoint* pBrk = GetSelectedBreakPoint(); if (pBrk) diff --git a/basctl/source/basicide/brkdlg.hxx b/basctl/source/basicide/brkdlg.hxx index d3674c371a55..89406d2c0c67 100644 --- a/basctl/source/basicide/brkdlg.hxx +++ b/basctl/source/basicide/brkdlg.hxx @@ -37,7 +37,7 @@ class BreakPointDialog final : public weld::GenericDialogController std::unique_ptr<weld::SpinButton> m_xNumericField; void CheckButtons(); - DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void); + DECL_LINK(CheckBoxHdl, weld::Toggleable&, void); DECL_LINK(EditModifyHdl, weld::ComboBox&, void); DECL_LINK(FieldModifyHdl, weld::SpinButton&, void); DECL_LINK(ButtonHdl, weld::Button&, void); 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; diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx index 4666aeac49ce..2e24ac9a4727 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1253,7 +1253,7 @@ IMPL_LINK(SfxAcceleratorConfigPage, SelectHdl, weld::TreeView&, rListBox, void) } } -IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RadioHdl, weld::Toggleable&, void) { uno::Reference<ui::XAcceleratorConfiguration> xOld = m_xAct; diff --git a/cui/source/dialogs/FontFeaturesDialog.cxx b/cui/source/dialogs/FontFeaturesDialog.cxx index 04255cb13a6b..aaa9eb86136a 100644 --- a/cui/source/dialogs/FontFeaturesDialog.cxx +++ b/cui/source/dialogs/FontFeaturesDialog.cxx @@ -126,7 +126,7 @@ int FontFeaturesDialog::fillGrid(std::vector<vcl::font::Feature> const& rFontFea Link<weld::ComboBox&, void> aComboBoxSelectHandler = LINK(this, FontFeaturesDialog, ComboBoxSelectedHdl); - Link<weld::ToggleButton&, void> aCheckBoxToggleHandler + Link<weld::Toggleable&, void> aCheckBoxToggleHandler = LINK(this, FontFeaturesDialog, CheckBoxToggledHdl); if (aDefinition.getType() == vcl::font::FeatureParameterType::ENUM) @@ -172,7 +172,7 @@ void FontFeaturesDialog::updateFontPreview() m_aPreviewWindow.SetFont(rPreviewFont, rPreviewFontCJK, rPreviewFontCTL); } -IMPL_LINK_NOARG(FontFeaturesDialog, CheckBoxToggledHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(FontFeaturesDialog, CheckBoxToggledHdl, weld::Toggleable&, void) { updateFontPreview(); } diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index a8e20608d285..338990b31628 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -448,7 +448,7 @@ IMPL_LINK( SpellDialog, ExtClickHdl, weld::Button&, rBtn, void ) } } -IMPL_LINK_NOARG(SpellDialog, CheckGrammarHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SpellDialog, CheckGrammarHdl, weld::Toggleable&, void) { rParent.SetGrammarChecking(m_xCheckGrammarCB->get_active()); Impl_Restore(true); diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx index a341c193c890..3f1bb0e8c53d 100644 --- a/cui/source/dialogs/colorpicker.cxx +++ b/cui/source/dialogs/colorpicker.cxx @@ -773,7 +773,7 @@ public: DECL_LINK(ColorModifyMetricHdl, weld::MetricSpinButton&, void); DECL_LINK(ColorModifySpinHdl, weld::SpinButton&, void); DECL_LINK(ColorModifyEditHdl, weld::Entry&, void); - DECL_LINK(ModeModifyHdl, weld::ToggleButton&, void); + DECL_LINK(ModeModifyHdl, weld::Toggleable&, void); Color GetColor() const; @@ -840,7 +840,7 @@ ColorPickerDialog::ColorPickerDialog(weld::Window* pParent, Color nColor, sal_In m_xEDHex->connect_changed(LINK(this, ColorPickerDialog, ColorModifyEditHdl)); - Link<weld::ToggleButton&,void> aLink2 = LINK( this, ColorPickerDialog, ModeModifyHdl ); + Link<weld::Toggleable&,void> aLink2 = LINK( this, ColorPickerDialog, ModeModifyHdl ); m_xRBRed->connect_toggled( aLink2 ); m_xRBGreen->connect_toggled( aLink2 ); m_xRBBlue->connect_toggled( aLink2 ); @@ -1120,7 +1120,7 @@ IMPL_LINK(ColorPickerDialog, ColorModifySpinHdl, weld::SpinButton&, rEdit, void) } -IMPL_LINK_NOARG(ColorPickerDialog, ModeModifyHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ColorPickerDialog, ModeModifyHdl, weld::Toggleable&, void) { ColorMode eMode = HUE; diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx index 2433d0d8445d..050dc31dc14b 100644 --- a/cui/source/dialogs/cuifmsearch.cxx +++ b/cui/source/dialogs/cuifmsearch.cxx @@ -240,14 +240,14 @@ short FmSearchDialog::run() return nRet; } -IMPL_LINK(FmSearchDialog, OnToggledSearchRadio, weld::ToggleButton&, rButton, void) +IMPL_LINK(FmSearchDialog, OnToggledSearchRadio, weld::Toggleable&, rButton, void) { if (!rButton.get_active()) return; EnableSearchForDependees(true); } -IMPL_LINK(FmSearchDialog, OnToggledFieldRadios, weld::ToggleButton&, rButton, void) +IMPL_LINK(FmSearchDialog, OnToggledFieldRadios, weld::Toggleable&, rButton, void) { if (!rButton.get_active()) return; @@ -369,7 +369,7 @@ IMPL_LINK_NOARG(FmSearchDialog, OnFieldSelected, weld::ComboBox&, void) m_arrContextFields[nCurrentContext] = m_plbField->get_active_text(); } -IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, weld::ToggleButton&, rBox, void) +IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, weld::Toggleable&, rBox, void) { bool bChecked = rBox.get_active(); diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index f39aa3b32ea7..aa764baff52d 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -857,7 +857,7 @@ void TPGalleryThemeProperties::TakeFiles() } } -IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickPreviewHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickPreviewHdl, weld::Toggleable&, void) { if ( !bInputAllowed ) return; diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx index e5597dae8265..4f86d6e1a186 100644 --- a/cui/source/dialogs/cuigrfflt.cxx +++ b/cui/source/dialogs/cuigrfflt.cxx @@ -175,7 +175,7 @@ GraphicFilterMosaic::GraphicFilterMosaic(weld::Window* pParent, const Graphic& r mxMtrWidth->grab_focus(); } -IMPL_LINK_NOARG(GraphicFilterMosaic, CheckBoxModifyHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(GraphicFilterMosaic, CheckBoxModifyHdl, weld::Toggleable&, void) { GetModifyHdl().Call(nullptr); } @@ -276,7 +276,7 @@ GraphicFilterSolarize::GraphicFilterSolarize(weld::Window* pParent, const Graphi mxCbxInvert->connect_toggled(LINK(this, GraphicFilterSolarize, CheckBoxModifyHdl)); } -IMPL_LINK_NOARG(GraphicFilterSolarize, CheckBoxModifyHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(GraphicFilterSolarize, CheckBoxModifyHdl, weld::Toggleable&, void) { GetModifyHdl().Call(nullptr); } diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 049a14b448ed..05d921dca867 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -205,7 +205,7 @@ namespace svx void set_active(bool active) { m_xControl->set_active(active); } bool get_active() const { return m_xControl->get_active(); } - void connect_toggled(const Link<weld::ToggleButton&, void>& rLink) { m_xControl->connect_toggled(rLink); } + void connect_toggled(const Link<weld::Toggleable&, void>& rLink) { m_xControl->connect_toggled(rLink); } private: Size GetOptimalSize() const; @@ -527,7 +527,7 @@ namespace svx m_xFind->connect_clicked(rHdl); } - void HangulHanjaConversionDialog::SetConversionFormatChangedHdl( const Link<weld::ToggleButton&,void>& rHdl ) + void HangulHanjaConversionDialog::SetConversionFormatChangedHdl( const Link<weld::Toggleable&,void>& rHdl ) { m_xSimpleConversion->connect_toggled( rHdl ); m_xHangulBracketed->connect_toggled( rHdl ); @@ -538,7 +538,7 @@ namespace svx m_xHangulBelow->connect_toggled( rHdl ); } - void HangulHanjaConversionDialog::SetClickByCharacterHdl( const Link<weld::ToggleButton&,void>& _rHdl ) + void HangulHanjaConversionDialog::SetClickByCharacterHdl( const Link<weld::Toggleable&,void>& _rHdl ) { m_aClickByCharacterLink = _rHdl; } @@ -558,14 +558,14 @@ namespace svx m_xReplaceAll->set_sensitive( m_bDocumentMode && bSameLen ); } - IMPL_LINK(HangulHanjaConversionDialog, ClickByCharacterHdl, weld::ToggleButton&, rBox, void) + IMPL_LINK(HangulHanjaConversionDialog, ClickByCharacterHdl, weld::Toggleable&, rBox, void) { m_aClickByCharacterLink.Call(rBox); bool bByCharacter = rBox.get_active(); m_xSuggestions->DisplayListBox( !bByCharacter ); } - IMPL_LINK(HangulHanjaConversionDialog, OnConversionDirectionClicked, weld::ToggleButton&, rBox, void) + IMPL_LINK(HangulHanjaConversionDialog, OnConversionDirectionClicked, weld::Toggleable&, rBox, void) { weld::CheckButton* pOtherBox = nullptr; if (&rBox == m_xHangulOnly.get()) diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 21762ec0c5e1..afa7b3e4e602 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -67,7 +67,7 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp(weld::Container* pParent, m_xRbtLinktypInternet->set_active(true); // set handlers - Link<weld::ToggleButton&, void> aLink( LINK ( this, SvxHyperlinkInternetTp, Click_SmartProtocol_Impl ) ); + Link<weld::Toggleable&, void> aLink( LINK ( this, SvxHyperlinkInternetTp, Click_SmartProtocol_Impl ) ); m_xRbtLinktypInternet->connect_toggled( aLink ); m_xRbtLinktypFTP->connect_toggled( aLink ); m_xCbAnonymous->connect_toggled( LINK ( this, SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl ) ); @@ -314,7 +314,7 @@ INetProtocol SvxHyperlinkInternetTp::GetSmartProtocolFromButtons() const |* Click on Radiobutton : Internet or FTP |* |************************************************************************/ -IMPL_LINK(SvxHyperlinkInternetTp, Click_SmartProtocol_Impl, weld::ToggleButton&, rButton, void) +IMPL_LINK(SvxHyperlinkInternetTp, Click_SmartProtocol_Impl, weld::Toggleable&, rButton, void) { if (!rButton.get_active()) return; @@ -327,7 +327,7 @@ IMPL_LINK(SvxHyperlinkInternetTp, Click_SmartProtocol_Impl, weld::ToggleButton&, |* Click on Checkbox : Anonymous user |* |************************************************************************/ -IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ClickAnonymousHdl_Impl, weld::Toggleable&, void) { // disable login-editfields if checked if ( m_xCbAnonymous->get_active() ) diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx index 266710a83e4c..29c8d7cfb081 100644 --- a/cui/source/dialogs/insdlg.cxx +++ b/cui/source/dialogs/insdlg.cxx @@ -105,7 +105,7 @@ IMPL_LINK_NOARG(SvInsertOleDlg, BrowseHdl, weld::Button&, void) } } -IMPL_LINK(SvInsertOleDlg, RadioHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(SvInsertOleDlg, RadioHdl, weld::Toggleable&, rButton, void) { if (!rButton.get_active()) return; @@ -140,7 +140,7 @@ SvInsertOleDlg::SvInsertOleDlg(weld::Window* pParent, const Reference<embed::XSt m_xLbObjecttype->get_height_rows(6)); m_xLbObjecttype->connect_row_activated(LINK(this, SvInsertOleDlg, DoubleClickHdl)); m_xBtnFilepath->connect_clicked(LINK( this, SvInsertOleDlg, BrowseHdl)); - Link<weld::ToggleButton&,void> aLink( LINK( this, SvInsertOleDlg, RadioHdl ) ); + Link<weld::Toggleable&,void> aLink( LINK( this, SvInsertOleDlg, RadioHdl ) ); m_xRbNewObject->connect_toggled( aLink ); m_xRbObjectFromfile->connect_toggled( aLink ); m_xRbNewObject->set_active(true); @@ -361,7 +361,7 @@ void SfxInsertFloatingFrameDialog::Init() m_xNMMarginHeight = m_xBuilder->weld_spin_button("height"); m_xCBMarginHeightDefault = m_xBuilder->weld_check_button("defaultheight"); - Link<weld::ToggleButton&, void> aLink(LINK(this, SfxInsertFloatingFrameDialog, CheckHdl)); + Link<weld::Toggleable&, void> aLink(LINK(this, SfxInsertFloatingFrameDialog, CheckHdl)); m_xCBMarginWidthDefault->connect_toggled(aLink); m_xCBMarginHeightDefault->connect_toggled(aLink); @@ -548,7 +548,7 @@ short SfxInsertFloatingFrameDialog::run() return nRet; } -IMPL_LINK(SfxInsertFloatingFrameDialog, CheckHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(SfxInsertFloatingFrameDialog, CheckHdl, weld::Toggleable&, rButton, void) { weld::CheckButton& rCB = dynamic_cast<weld::CheckButton&>(rButton); if (&rCB == m_xCBMarginWidthDefault.get()) diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index b452526e8376..dedac54049d7 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -221,7 +221,7 @@ IMPL_LINK_NOARG( SvBaseLinksDlg, LinksDoubleClickHdl, weld::TreeView&, bool ) return true; } -IMPL_LINK(SvBaseLinksDlg, ToggleHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(SvBaseLinksDlg, ToggleHdl, weld::Toggleable&, rButton, void) { if (!rButton.get_active()) return; diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx index 9f7986482596..d84595ac89a7 100644 --- a/cui/source/dialogs/passwdomdlg.cxx +++ b/cui/source/dialogs/passwdomdlg.cxx @@ -159,7 +159,7 @@ bool PasswordToOpenModifyDialog::IsRecommendToOpenReadonly() const return m_xOpenReadonlyCB->get_active(); } -IMPL_LINK_NOARG(PasswordToOpenModifyDialog, ReadonlyOnOffHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(PasswordToOpenModifyDialog, ReadonlyOnOffHdl, weld::Toggleable&, void) { bool bEnable = m_xOpenReadonlyCB->get_active(); m_xPasswdToModifyED->set_sensitive(bEnable); diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx index 45511a59b794..14146b44c373 100644 --- a/cui/source/dialogs/splitcelldlg.cxx +++ b/cui/source/dialogs/splitcelldlg.cxx @@ -50,7 +50,7 @@ SvxSplitTableDlg::SvxSplitTableDlg(weld::Window *pParent, bool bIsTableVertical, } } -IMPL_LINK(SvxSplitTableDlg, ToggleHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(SvxSplitTableDlg, ToggleHdl, weld::Toggleable&, rButton, void) { if (!rButton.get_active()) return; diff --git a/cui/source/dialogs/toolbarmodedlg.cxx b/cui/source/dialogs/toolbarmodedlg.cxx index 4f5df939e948..e3064451cae3 100644 --- a/cui/source/dialogs/toolbarmodedlg.cxx +++ b/cui/source/dialogs/toolbarmodedlg.cxx @@ -98,7 +98,7 @@ ToolbarmodeDialog::ToolbarmodeDialog(weld::Window* pParent) { static_assert(SAL_N_ELEMENTS(m_pRadioButtons) == SAL_N_ELEMENTS(TOOLBARMODES_ARRAY)); - Link<weld::ToggleButton&, void> aLink = LINK(this, ToolbarmodeDialog, SelectToolbarmode); + Link<weld::Toggleable&, void> aLink = LINK(this, ToolbarmodeDialog, SelectToolbarmode); const OUString sCurrentMode = GetCurrentMode(); for (tools::ULong i = 0; i < SAL_N_ELEMENTS(m_pRadioButtons); i++) @@ -161,7 +161,7 @@ void ToolbarmodeDialog::UpdateImage(std::u16string_view sFileName) } } -IMPL_LINK_NOARG(ToolbarmodeDialog, SelectToolbarmode, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ToolbarmodeDialog, SelectToolbarmode, weld::Toggleable&, void) { const int i = GetActiveRadioButton(); if (i > -1) diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index 54b40e55857f..90999d96798a 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -138,14 +138,14 @@ SvxZoomDialog::SvxZoomDialog(weld::Window* pParent, const SfxItemSet& rCoreSet) , m_xBookModeChk(m_xBuilder->weld_check_button("bookmode")) , m_xOKBtn(m_xBuilder->weld_button("ok")) { - Link<weld::ToggleButton&, void> aLink = LINK(this, SvxZoomDialog, UserHdl); + Link<weld::Toggleable&, void> aLink = LINK(this, SvxZoomDialog, UserHdl); m_x100Btn->connect_toggled(aLink); m_xOptimalBtn->connect_toggled(aLink); m_xPageWidthBtn->connect_toggled(aLink); m_xWholePageBtn->connect_toggled(aLink); m_xUserBtn->connect_toggled(aLink); - Link<weld::ToggleButton&, void> aViewLayoutLink = LINK(this, SvxZoomDialog, ViewLayoutUserHdl); + Link<weld::Toggleable&, void> aViewLayoutLink = LINK(this, SvxZoomDialog, ViewLayoutUserHdl); m_xAutomaticBtn->connect_toggled(aViewLayoutLink); m_xSingleBtn->connect_toggled(aViewLayoutLink); m_xColumnsBtn->connect_toggled(aViewLayoutLink); @@ -154,7 +154,7 @@ SvxZoomDialog::SvxZoomDialog(weld::Window* pParent, const SfxItemSet& rCoreSet) = LINK(this, SvxZoomDialog, ViewLayoutSpinHdl); m_xColumnsEdit->connect_value_changed(aViewLayoutSpinLink); - Link<weld::ToggleButton&, void> aViewLayoutCheckLink + Link<weld::Toggleable&, void> aViewLayoutCheckLink = LINK(this, SvxZoomDialog, ViewLayoutCheckHdl); m_xBookModeChk->connect_toggled(aViewLayoutCheckLink); @@ -273,7 +273,7 @@ SvxZoomDialog::SvxZoomDialog(weld::Window* pParent, const SfxItemSet& rCoreSet) } } -IMPL_LINK_NOARG(SvxZoomDialog, UserHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxZoomDialog, UserHdl, weld::Toggleable&, void) { m_bModified = true; @@ -296,7 +296,7 @@ IMPL_LINK_NOARG(SvxZoomDialog, SpinHdl, weld::MetricSpinButton&, void) m_bModified = true; } -IMPL_LINK_NOARG(SvxZoomDialog, ViewLayoutUserHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxZoomDialog, ViewLayoutUserHdl, weld::Toggleable&, void) { m_bModified = true; @@ -332,7 +332,7 @@ IMPL_LINK_NOARG(SvxZoomDialog, ViewLayoutSpinHdl, weld::SpinButton&, void) m_bModified = true; } -IMPL_LINK_NOARG(SvxZoomDialog, ViewLayoutCheckHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxZoomDialog, ViewLayoutCheckHdl, weld::Toggleable&, void) { if (!m_xColumnsBtn->get_active()) return; diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 52ab08fb3a42..ebfd9bfb0ea5 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -458,12 +458,12 @@ void AbstractHangulHanjaConversionDialog_Impl::SetChangeAllHdl( const Link<weld: m_xDlg->SetChangeAllHdl(rHdl); } -void AbstractHangulHanjaConversionDialog_Impl::SetClickByCharacterHdl( const Link<weld::ToggleButton&,void>& _rHdl ) +void AbstractHangulHanjaConversionDialog_Impl::SetClickByCharacterHdl( const Link<weld::Toggleable&,void>& _rHdl ) { m_xDlg->SetClickByCharacterHdl(_rHdl ); } -void AbstractHangulHanjaConversionDialog_Impl::SetConversionFormatChangedHdl(const Link<weld::ToggleButton&,void>& rHdl) +void AbstractHangulHanjaConversionDialog_Impl::SetConversionFormatChangedHdl(const Link<weld::Toggleable&,void>& rHdl) { m_xDlg->SetConversionFormatChangedHdl(rHdl); } diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 452bd08feba4..1e16414f3b85 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -192,8 +192,8 @@ public: virtual void SetIgnoreAllHdl( const Link<weld::Button&,void>& _rHdl ) override ; virtual void SetChangeHdl( const Link<weld::Button&,void>& _rHdl ) override ; virtual void SetChangeAllHdl( const Link<weld::Button&,void>& rHdl ) override ; - virtual void SetClickByCharacterHdl( const Link<weld::ToggleButton&,void>& rHdl ) override ; - virtual void SetConversionFormatChangedHdl( const Link<weld::ToggleButton&,void>& _rHdl ) override ; + virtual void SetClickByCharacterHdl( const Link<weld::Toggleable&,void>& rHdl ) override ; + virtual void SetConversionFormatChangedHdl( const Link<weld::Toggleable&,void>& _rHdl ) override ; virtual void SetFindHdl( const Link<weld::Button&,void>& _rHdl ) override; virtual bool GetUseBothDirections( ) const override; virtual editeng::HangulHanjaConversion::ConversionDirection diff --git a/cui/source/inc/FontFeaturesDialog.hxx b/cui/source/inc/FontFeaturesDialog.hxx index 337014bd8c0d..aee4da9f3c72 100644 --- a/cui/source/inc/FontFeaturesDialog.hxx +++ b/cui/source/inc/FontFeaturesDialog.hxx @@ -59,7 +59,7 @@ private: int fillGrid(std::vector<vcl::font::Feature> const& rFontFeatures); DECL_LINK(ComboBoxSelectedHdl, weld::ComboBox&, void); - DECL_LINK(CheckBoxToggledHdl, weld::ToggleButton&, void); + DECL_LINK(CheckBoxToggledHdl, weld::Toggleable&, void); public: FontFeaturesDialog(weld::Window* pParent, OUString const& rFontName); diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index 678f09729e3e..69f491fc6586 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -172,7 +172,7 @@ private: DECL_LINK(ChangeAllHdl, weld::Button&, void); DECL_LINK(IgnoreAllHdl, weld::Button&, void); DECL_LINK(IgnoreHdl, weld::Button&, void); - DECL_LINK(CheckGrammarHdl, weld::ToggleButton&, void); + DECL_LINK(CheckGrammarHdl, weld::Toggleable&, void); DECL_LINK(ExtClickHdl, weld::Button&, void); DECL_LINK(CancelHdl, weld::Button&, void); DECL_LINK(ModifyHdl, LinkParamNone*, void); diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx index f4b72bed8585..ee9e56222113 100644 --- a/cui/source/inc/acccfg.hxx +++ b/cui/source/inc/acccfg.hxx @@ -122,7 +122,7 @@ private: DECL_LINK(Save, weld::Button&, void); DECL_LINK(Load, weld::Button&, void); DECL_LINK(Default, weld::Button&, void); - DECL_LINK(RadioHdl, weld::ToggleButton&, void); + DECL_LINK(RadioHdl, weld::Toggleable&, void); DECL_LINK(ImplUpdateDataHdl, Timer*, void); DECL_LINK(FocusOut_Impl, weld::Widget&, void); DECL_LINK(TimeOut_Impl, Timer*, void); diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index d88fc28dce29..61d31cd00a65 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -65,11 +65,11 @@ private: bool HasAlignmentChanged( const SfxItemSet& rNew, sal_uInt16 nWhich ) const; DECL_LINK(UpdateEnableHdl, weld::ComboBox&, void); - DECL_LINK(StackedClickHdl, weld::ToggleButton&, void); - DECL_LINK(AsianModeClickHdl, weld::ToggleButton&, void); - DECL_LINK(WrapClickHdl, weld::ToggleButton&, void); - DECL_LINK(HyphenClickHdl, weld::ToggleButton&, void); - DECL_LINK(ShrinkClickHdl, weld::ToggleButton&, void); + DECL_LINK(StackedClickHdl, weld::Toggleable&, void); + DECL_LINK(AsianModeClickHdl, weld::Toggleable&, void); + DECL_LINK(WrapClickHdl, weld::Toggleable&, void); + DECL_LINK(HyphenClickHdl, weld::Toggleable&, void); + DECL_LINK(ShrinkClickHdl, weld::Toggleable&, void); private: weld::TriStateEnabled m_aStackedState; diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx index b084bdbd685a..ca7d778830ea 100644 --- a/cui/source/inc/autocdlg.hxx +++ b/cui/source/inc/autocdlg.hxx @@ -340,7 +340,7 @@ private: std::unique_ptr<weld::TreeView> m_xLBEntries; std::unique_ptr<weld::Button> m_xPBEntries; - DECL_LINK(CheckHdl, weld::ToggleButton&, void); + DECL_LINK(CheckHdl, weld::Toggleable&, void); DECL_LINK(KeyReleaseHdl, const KeyEvent&, bool); public: @@ -388,7 +388,7 @@ private: Enables/disables all controls in the tab page (except from the check box. */ - DECL_LINK(CheckHdl, weld::ToggleButton&, void); + DECL_LINK(CheckHdl, weld::Toggleable&, void); /** Handler for the push button diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index 8637f6e8943b..1bac9a24bfbf 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -165,8 +165,8 @@ private: DECL_LINK(LinesChanged_Impl, LinkParamNone*, void); DECL_LINK(ModifyDistanceHdl_Impl, weld::MetricSpinButton&, void); DECL_LINK(ModifyWidthHdl_Impl, weld::MetricSpinButton&, void); - DECL_LINK(SyncHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(RemoveAdjacentCellBorderHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(SyncHdl_Impl, weld::Toggleable&, void); + DECL_LINK(RemoveAdjacentCellBorderHdl_Impl, weld::Toggleable&, void); sal_uInt16 GetPresetImageId(sal_uInt16 nValueSetIdx) const; const char* GetPresetStringId(sal_uInt16 nValueSetIdx) const; diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index bbf227f492fe..31bf955b13ae 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -205,10 +205,10 @@ private: void SelectHdl_Impl(const weld::ComboBox*); DECL_LINK(SelectListBoxHdl_Impl, weld::ComboBox&, void); - DECL_LINK(OutlineBtnClickHdl, weld::ToggleButton&, void); - DECL_LINK(ShadowBtnClickHdl, weld::ToggleButton&, void); - DECL_LINK(HiddenBtnClickHdl, weld::ToggleButton&, void); - DECL_LINK(CbClickHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(OutlineBtnClickHdl, weld::Toggleable&, void); + DECL_LINK(ShadowBtnClickHdl, weld::Toggleable&, void); + DECL_LINK(HiddenBtnClickHdl, weld::Toggleable&, void); + DECL_LINK(CbClickHdl_Impl, weld::Toggleable&, void); DECL_LINK(ColorBoxSelectHdl_Impl, ColorListBox&, void); DECL_LINK(ModifyFontTransparencyHdl_Impl, weld::MetricSpinButton&, void); @@ -272,10 +272,10 @@ private: void UpdatePreview_Impl( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc ); void SetEscapement_Impl( SvxEscapement nEsc ); - DECL_LINK(PositionHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(RotationHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(AutoPositionHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(FitToLineHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(PositionHdl_Impl, weld::Toggleable&, void); + DECL_LINK(RotationHdl_Impl, weld::Toggleable&, void); + DECL_LINK(AutoPositionHdl_Impl, weld::Toggleable&, void); + DECL_LINK(FitToLineHdl_Impl, weld::Toggleable&, void); DECL_LINK(KerningModifyHdl_Impl, weld::MetricSpinButton&, void); DECL_LINK(ValueChangedHdl_Impl, weld::MetricSpinButton&, void); DECL_LINK(ScaleWidthModifyHdl_Impl, weld::MetricSpinButton&, void); @@ -317,7 +317,7 @@ private: void SelectCharacter(weld::TreeView* pBox); void SetBracket(sal_Unicode cBracket, bool bStart); - DECL_LINK(TwoLinesHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(TwoLinesHdl_Impl, weld::Toggleable&, void); DECL_LINK(CharacterMapHdl_Impl, weld::TreeView&, void); public: diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index 0aed39b1aef4..46284c6d8d4d 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -148,8 +148,8 @@ private: void SaveParams() const; // Handler for the Controls - DECL_LINK(OnToggledSearchRadio, weld::ToggleButton&, void); - DECL_LINK(OnToggledFieldRadios, weld::ToggleButton&, void); + DECL_LINK(OnToggledSearchRadio, weld::Toggleable&, void); + DECL_LINK(OnToggledFieldRadios, weld::Toggleable&, void); DECL_LINK(OnClickedSearchAgain, weld::Button&, void); DECL_LINK(OnClickedSpecialSettings, weld::Button&, void); @@ -159,7 +159,7 @@ private: DECL_LINK(OnFieldSelected, weld::ComboBox&, void); DECL_LINK(OnFocusGrabbed, weld::Widget&, void); - DECL_LINK(OnCheckBoxToggled, weld::ToggleButton&, void); + DECL_LINK(OnCheckBoxToggled, weld::Toggleable&, void); DECL_LINK(OnContextSelection, weld::ComboBox&, void); diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 4a20724ffd81..0850cd0bcb02 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -251,7 +251,7 @@ class TPGalleryThemeProperties : public SfxTabPage void DoPreview(); void EndSearchProgressHdl(sal_Int32 nResult); - DECL_LINK(ClickPreviewHdl, weld::ToggleButton&, void); + DECL_LINK(ClickPreviewHdl, weld::Toggleable&, void); DECL_LINK(ClickSearchHdl, weld::Button&, void); DECL_LINK(ClickTakeHdl, weld::Button&, void); DECL_LINK(ClickTakeAllHdl, weld::Button&, void); diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index 05cc36292882..122ac87724da 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -101,7 +101,7 @@ private: std::unique_ptr<weld::MetricSpinButton> mxMtrWidth; std::unique_ptr<weld::MetricSpinButton> mxMtrHeight; std::unique_ptr<weld::CheckButton> mxCbxEdges; - DECL_LINK(CheckBoxModifyHdl, weld::ToggleButton&, void); + DECL_LINK(CheckBoxModifyHdl, weld::Toggleable&, void); DECL_LINK(EditModifyHdl, weld::MetricSpinButton&, void); public: @@ -117,7 +117,7 @@ class GraphicFilterSolarize : public GraphicFilterDialog private: std::unique_ptr<weld::MetricSpinButton> mxMtrThreshold; std::unique_ptr<weld::CheckButton> mxCbxInvert; - DECL_LINK(CheckBoxModifyHdl, weld::ToggleButton&, void); + DECL_LINK(CheckBoxModifyHdl, weld::Toggleable&, void); DECL_LINK(EditModifyHdl, weld::MetricSpinButton&, void); public: diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index 5498e19c8689..651604bb3c37 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -39,8 +39,8 @@ class ButtonBox { private: sal_Int32 mnCurrentButton; - std::vector<weld::ToggleButton*> maButtonList; - std::map<weld::ToggleButton*, sal_Int32 > maButtonToPos; + std::vector<weld::Toggleable*> maButtonList; + std::map<weld::Toggleable*, sal_Int32 > maButtonToPos; void SelectButtonImpl( sal_Int32 nPos ) { if(mnCurrentButton != NO_BUTTON_SELECTED) @@ -55,21 +55,21 @@ class ButtonBox { mnCurrentButton = NO_BUTTON_SELECTED; }; - void AddButton(weld::ToggleButton* pButton) + void AddButton(weld::Toggleable* pButton) { maButtonList.push_back(pButton); maButtonToPos.insert( std::make_pair(pButton, maButtonList.size() - 1) ); } sal_Int32 GetCurrentButtonPos() const { return mnCurrentButton; } - sal_Int32 GetButtonPos(weld::ToggleButton* pButton) + sal_Int32 GetButtonPos(weld::Toggleable* pButton) { - std::map<weld::ToggleButton*, sal_Int32>::const_iterator aBtnPos = maButtonToPos.find(pButton); + std::map<weld::Toggleable*, sal_Int32>::const_iterator aBtnPos = maButtonToPos.find(pButton); if(aBtnPos != maButtonToPos.end()) return aBtnPos->second; else return -1; } - void SelectButton(weld::ToggleButton* pButton) + void SelectButton(weld::Toggleable* pButton) { sal_Int32 nPos = GetButtonPos(pButton); if(nPos != -1) @@ -168,9 +168,9 @@ class SvxTransparenceTabPage : public SfxTabPage std::unique_ptr<weld::CustomWeld> m_xCtlBitmapPreview; std::unique_ptr<weld::CustomWeld> m_xCtlXRectPreview; - DECL_LINK(ClickTransOffHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(ClickTransLinearHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(ClickTransGradientHdl_Impl, weld::ToggleButton&, void ); + DECL_LINK(ClickTransOffHdl_Impl, weld::Toggleable&, void); + DECL_LINK(ClickTransLinearHdl_Impl, weld::Toggleable&, void); + DECL_LINK(ClickTransGradientHdl_Impl, weld::Toggleable&, void ); DECL_LINK(ModifyTransparentHdl_Impl, weld::MetricSpinButton&, void); DECL_LINK(ModifiedTrgrEditHdl_Impl, weld::MetricSpinButton&, void); DECL_LINK(ModifiedTrgrListBoxHdl_Impl, weld::ComboBox&, void); @@ -235,22 +235,22 @@ private: protected: std::unique_ptr<weld::Container> m_xFillTab; - std::unique_ptr<weld::ToggleButton> m_xBtnNone; - std::unique_ptr<weld::ToggleButton> m_xBtnColor; - std::unique_ptr<weld::ToggleButton> m_xBtnGradient; - std::unique_ptr<weld::ToggleButton> m_xBtnHatch; - std::unique_ptr<weld::ToggleButton> m_xBtnBitmap; - std::unique_ptr<weld::ToggleButton> m_xBtnPattern; + std::unique_ptr<weld::Toggleable> m_xBtnNone; + std::unique_ptr<weld::Toggleable> m_xBtnColor; + std::unique_ptr<weld::Toggleable> m_xBtnGradient; + std::unique_ptr<weld::Toggleable> m_xBtnHatch; + std::unique_ptr<weld::Toggleable> m_xBtnBitmap; + std::unique_ptr<weld::Toggleable> m_xBtnPattern; void SetOptimalSize(weld::DialogController* pController); - void SelectFillType( weld::ToggleButton& rButton, const SfxItemSet* _pSet = nullptr ); + void SelectFillType( weld::Toggleable& rButton, const SfxItemSet* _pSet = nullptr ); SfxTabPage* GetFillTabPage() { return m_xFillTabPage.get(); } bool IsBtnClicked() const { return m_bBtnClicked; } private: - DECL_LINK(SelectFillTypeHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(SelectFillTypeHdl_Impl, weld::Toggleable&, void); template< typename TabPage > bool FillItemSet_Impl( SfxItemSet* ); @@ -315,7 +315,7 @@ private: std::unique_ptr<weld::CustomWeld> m_xCtlPosition; std::unique_ptr<weld::CustomWeld> m_xCtlXRectPreview; - DECL_LINK(ClickShadowHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(ClickShadowHdl_Impl, weld::Toggleable&, void); DECL_LINK(ModifyShadowHdl_Impl, weld::MetricSpinButton&, void); DECL_LINK(SelectShadowHdl_Impl, ColorListBox&, void); @@ -387,7 +387,7 @@ private: DECL_LINK( ModifiedMetricHdl_Impl, weld::MetricSpinButton&, void ); DECL_LINK( ModifiedColorListBoxHdl_Impl, ColorListBox&, void ); DECL_LINK( ModifiedListBoxHdl_Impl, weld::ComboBox&, void ); - DECL_LINK( ChangeAutoStepHdl_Impl, weld::ToggleButton&, void ); + DECL_LINK( ChangeAutoStepHdl_Impl, weld::Toggleable&, void ); DECL_LINK( ModifiedSliderHdl_Impl, weld::Scale&, void ); void ModifiedHdl_Impl(void const *); @@ -451,7 +451,7 @@ private: DECL_LINK( ModifiedEditHdl_Impl, weld::MetricSpinButton&, void ); DECL_LINK( ModifiedListBoxHdl_Impl, weld::ComboBox&, void ); DECL_LINK( ModifiedColorListBoxHdl_Impl, ColorListBox&, void ); - DECL_LINK( ToggleHatchBackgroundColor_Impl, weld::ToggleButton&, void ); + DECL_LINK( ToggleHatchBackgroundColor_Impl, weld::Toggleable&, void ); DECL_LINK( ModifiedBackgroundHdl_Impl, ColorListBox&, void ); DECL_LINK( ModifiedSliderHdl_Impl, weld::Scale&, void ); void ModifiedHdl_Impl(void const *); @@ -527,7 +527,7 @@ private: std::unique_ptr<weld::CustomWeld> m_xBitmapLBWin; DECL_LINK( ModifyBitmapHdl, ValueSet*, void ); - DECL_LINK( ClickScaleHdl, weld::ToggleButton&, void ); + DECL_LINK( ClickScaleHdl, weld::Toggleable&, void ); DECL_LINK( ModifyBitmapStyleHdl, weld::ComboBox&, void ); DECL_LINK( ModifyBitmapSizeHdl, weld::MetricSpinButton&, void ); DECL_LINK( ModifyBitmapPositionHdl, weld::ComboBox&, void ); @@ -695,7 +695,7 @@ private: DECL_LINK(SelectPaletteLBHdl, weld::ComboBox&, void); DECL_LINK( SelectValSetHdl_Impl, ValueSet*, void ); - DECL_LINK( SelectColorModeHdl_Impl, weld::ToggleButton&, void ); + DECL_LINK( SelectColorModeHdl_Impl, weld::Toggleable&, void ); void ChangeColor(const Color &rNewColor, bool bUpdatePreset = true); void SetColorModel(ColorModel eModel); void ChangeColorModel(); diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 6e193acedc4a..1368425c87ff 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -171,17 +171,17 @@ private: // handler for gallery popup menu button + size DECL_LINK(GraphicHdl_Impl, const OString&, void); DECL_LINK(SizeHdl_Impl, weld::MetricSpinButton&, void); - DECL_LINK(MenuCreateHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(RatioHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(MenuCreateHdl_Impl, weld::Toggleable&, void); + DECL_LINK(RatioHdl_Impl, weld::Toggleable&, void); DECL_LINK(ClickInvisibleHdl_Impl, weld::ComboBox&, void); void ClickInvisibleHdl_Impl(); - DECL_LINK(ChangeStartClickHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(ChangeStartClickHdl_Impl, weld::Toggleable&, void); DECL_LINK(ChangeStartListBoxHdl_Impl, weld::ComboBox&, void); DECL_LINK(ChangeStartModifyHdl_Impl, weld::MetricSpinButton&, void); DECL_LINK(ChangeEndListBoxHdl_Impl, weld::ComboBox&, void); DECL_LINK(ChangeEndModifyHdl_Impl, weld::MetricSpinButton&, void); - DECL_LINK(ChangeEndClickHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(ChangeEndClickHdl_Impl, weld::Toggleable&, void); DECL_LINK(ChangePreviewListBoxHdl_Impl, ColorListBox&, void); DECL_LINK(ChangePreviewModifyHdl_Impl, weld::MetricSpinButton&, void); void ChangePreviewHdl_Impl(const weld::MetricSpinButton*); @@ -282,10 +282,10 @@ private: DECL_LINK(ChangeNumber2Hdl_Impl, weld::SpinButton&, void); DECL_LINK(ClickLoadHdl_Impl, weld::Button&, void); DECL_LINK(ClickSaveHdl_Impl, weld::Button&, void); - DECL_LINK(ChangeMetricHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(ChangeMetricHdl_Impl, weld::Toggleable&, void); DECL_LINK(SelectTypeListBoxHdl_Impl, weld::ComboBox&, void); void SelectTypeHdl_Impl(const weld::ComboBox*); - void ChangeMetricHdl_Impl(const weld::ToggleButton*); + void ChangeMetricHdl_Impl(const weld::Toggleable*); void CheckChanges_Impl(); diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index f1344c800157..57c3284d61b3 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -96,7 +96,7 @@ namespace svx bool m_bDocumentMode; Link<LinkParamNone*,void> m_aOptionsChangedLink; - Link<weld::ToggleButton&,void> m_aClickByCharacterLink; + Link<weld::Toggleable&,void> m_aClickByCharacterLink; std::unique_ptr<weld::Button> m_xFind; std::unique_ptr<weld::Button> m_xIgnore; @@ -128,8 +128,8 @@ namespace svx void SetChangeHdl( const Link<weld::Button&,void>& _rHdl ); void SetChangeAllHdl( const Link<weld::Button&,void>& _rHdl ); - void SetClickByCharacterHdl( const Link<weld::ToggleButton&,void>& _rHdl ); - void SetConversionFormatChangedHdl( const Link<weld::ToggleButton&,void>& _rHdl ); + void SetClickByCharacterHdl( const Link<weld::Toggleable&,void>& _rHdl ); + void SetConversionFormatChangedHdl( const Link<weld::Toggleable&,void>& _rHdl ); void SetFindHdl( const Link<weld::Button&,void>& _rHdl ); OUString GetCurrentString( ) const; @@ -164,8 +164,8 @@ namespace svx DECL_LINK( OnOption, weld::Button&, void ); DECL_LINK( OnSuggestionModified, weld::Entry&, void ); DECL_LINK( OnSuggestionSelected, SuggestionDisplay&, void ); - DECL_LINK( OnConversionDirectionClicked, weld::ToggleButton&, void ); - DECL_LINK( ClickByCharacterHdl, weld::ToggleButton&, void ); + DECL_LINK( OnConversionDirectionClicked, weld::Toggleable&, void ); + DECL_LINK( ClickByCharacterHdl, weld::Toggleable&, void ); /// fill the suggestion list box with suggestions for the actual input void FillSuggestions( const css::uno::Sequence< OUString >& _rSuggestions ); diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx index f930bc971411..e8eb96e6883d 100644 --- a/cui/source/inc/hlinettp.hxx +++ b/cui/source/inc/hlinettp.hxx @@ -45,8 +45,8 @@ private: std::unique_ptr<weld::Entry> m_xEdPassword; std::unique_ptr<weld::CheckButton> m_xCbAnonymous; - DECL_LINK( Click_SmartProtocol_Impl, weld::ToggleButton&, void ); ///< Radiobutton toggled: Type HTTP or FTP - DECL_LINK( ClickAnonymousHdl_Impl, weld::ToggleButton&, void ); ///< Checkbox : Anonymous User + DECL_LINK( Click_SmartProtocol_Impl, weld::Toggleable&, void ); ///< Radiobutton toggled: Type HTTP or FTP + DECL_LINK( ClickAnonymousHdl_Impl, weld::Toggleable&, void ); ///< Checkbox : Anonymous User DECL_LINK( ModifiedLoginHdl_Impl, weld::Entry&, void ); ///< Contents of editfield "Login" modified DECL_LINK( LostFocusTargetHdl_Impl, weld::Widget&, void ); ///< Combobox "Target" lost its focus DECL_LINK( ModifiedTargetHdl_Impl, weld::ComboBox&, void ); ///< Contents of editfield "Target" modified diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index 87d6395dfb91..c76658470450 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -64,7 +64,7 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl DECL_LINK(DoubleClickHdl, weld::TreeView&, bool); DECL_LINK(BrowseHdl, weld::Button&, void); - DECL_LINK(RadioHdl, weld::ToggleButton&, void); + DECL_LINK(RadioHdl, weld::Toggleable&, void); bool IsCreateNew() const override { return m_xRbNewObject->get_active(); } public: @@ -99,7 +99,7 @@ private: std::unique_ptr<weld::CheckButton> m_xCBMarginHeightDefault; DECL_LINK(OpenHdl, weld::Button&, void); - DECL_LINK(CheckHdl, weld::ToggleButton&, void); + DECL_LINK(CheckHdl, weld::Toggleable&, void); void Init(); diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx index d55c8b8d44ec..1a5d58a8357f 100644 --- a/cui/source/inc/labdlg.hxx +++ b/cui/source/inc/labdlg.hxx @@ -73,7 +73,7 @@ private: void SetupType_Impl( SdrCaptionType nType ); DECL_LINK(ExtensionSelectHdl_Impl, weld::ComboBox&, void); DECL_LINK(PositionSelectHdl_Impl, weld::ComboBox&, void); - DECL_LINK(LineOptHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(LineOptHdl_Impl, weld::Toggleable&, void); DECL_LINK(SelectCaptTypeHdl_Impl, ValueSet*, void); public: diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index 8a6453cbc71a..1e54954ec555 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -58,7 +58,7 @@ class SvBaseLinksDlg : public weld::GenericDialogController DECL_LINK(LinksSelectHdl, weld::TreeView&, void); DECL_LINK(LinksDoubleClickHdl, weld::TreeView&, bool); - DECL_LINK(ToggleHdl, weld::ToggleButton&, void); + DECL_LINK(ToggleHdl, weld::Toggleable&, void); DECL_LINK(UpdateNowClickHdl, weld::Button&, void); DECL_LINK(ChangeSourceClickHdl, weld::Button&, void); DECL_LINK(BreakLinkClickHdl, weld::Button&, void); diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx index 8f8836d0b8ed..6a41fb122854 100644 --- a/cui/source/inc/measure.hxx +++ b/cui/source/inc/measure.hxx @@ -57,11 +57,11 @@ private: void FillUnitLB(); - DECL_LINK(ClickAutoPosHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(ClickAutoPosHdl_Impl, weld::Toggleable&, void); DECL_LINK(ChangeAttrEditHdl_Impl, weld::MetricSpinButton&, void); DECL_LINK(ChangeAttrSpinHdl_Impl, weld::SpinButton&, void); DECL_LINK(ChangeAttrListBoxHdl_Impl, weld::ComboBox&, void); - DECL_LINK(ChangeAttrClickHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(ChangeAttrClickHdl_Impl, weld::Toggleable&, void); void ChangeAttrHdl_Impl(void const *); public: diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index dbbbfa1e4b24..7a4fd4605c6b 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -135,12 +135,12 @@ private: DECL_LINK(DoubleClickHdl_Impl, weld::TreeView&, bool); DECL_LINK(SelFormatListBoxHdl_Impl, weld::ComboBox&, void); DECL_LINK(SelFormatTreeListBoxHdl_Impl, weld::TreeView&, void); - DECL_LINK(SelFormatClickHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(SelFormatClickHdl_Impl, weld::Toggleable&, void); void SelFormatHdl_Impl(weld::Widget*); DECL_LINK(ClickHdl_Impl, weld::Button&, void); DECL_LINK(EditModifyHdl_Impl, weld::Entry&, void); DECL_LINK(OptEditHdl_Impl, weld::SpinButton&, void); - DECL_LINK(OptClickHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(OptClickHdl_Impl, weld::Toggleable&, void); void EditHdl_Impl(const weld::Entry*); void OptHdl_Impl(const weld::Widget*); diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 4a00f44e6f76..c4f6961f82b0 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -265,17 +265,17 @@ class SvxNumOptionsTabPage : public SfxTabPage DECL_LINK(NumberTypeSelectHdl_Impl, weld::ComboBox&, void); DECL_LINK(LevelHdl_Impl, weld::TreeView&, void); DECL_LINK(LevelHdl, void *, 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(CharFmtHdl_Impl, weld::ComboBox&, void); DECL_LINK(EditModifyHdl_Impl, weld::Entry&, void); DECL_LINK(SpinModifyHdl_Impl, weld::SpinButton&, void); DECL_LINK(AllLevelHdl_Impl, weld::SpinButton&, void); DECL_LINK(OrientHdl_Impl, weld::ComboBox&, void); - DECL_LINK(SameLevelHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(SameLevelHdl_Impl, weld::Toggleable&, void); DECL_LINK(BulColorHdl_Impl, ColorListBox&, void); DECL_LINK(BulRelSizeHdl_Impl, weld::MetricSpinButton&, void); DECL_LINK(PreviewInvalidateHdl_Impl, Timer*, void); @@ -354,7 +354,7 @@ class SvxNumPositionTabPage : public SfxTabPage DECL_LINK(LevelHdl, void *, void); DECL_LINK(EditModifyHdl_Impl, weld::ComboBox&, void); DECL_LINK(DistanceHdl_Impl, weld::MetricSpinButton&, void); - DECL_LINK(RelativeHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(RelativeHdl_Impl, weld::Toggleable&, void); DECL_LINK(StandardHdl_Impl, weld::Button&, void); void InitPosAndSpaceMode(); diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx index 8ecf942b9a13..6da4646ecc17 100644 --- a/cui/source/inc/optasian.hxx +++ b/cui/source/inc/optasian.hxx @@ -42,7 +42,7 @@ class SvxAsianLayoutPage : public SfxTabPage std::unique_ptr<weld::Label> m_xHintFT; DECL_LINK(LanguageHdl, weld::ComboBox&, void); - DECL_LINK(ChangeStandardHdl, weld::ToggleButton&, void); + DECL_LINK(ChangeStandardHdl, weld::Toggleable&, void); DECL_LINK(ModifyHdl, weld::Entry&, void); public: diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index fe43158e9424..f38283c1c61d 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -136,11 +136,11 @@ private: DECL_LINK(LayoutHdl_Impl, weld::ComboBox&, void); DECL_LINK(GutterPositionHdl_Impl, weld::ComboBox&, void); DECL_LINK(PaperBinHdl_Impl, weld::Widget&, void); - DECL_LINK(SwapOrientation_Impl, weld::ToggleButton&, void); + DECL_LINK(SwapOrientation_Impl, weld::Toggleable&, void); void SwapFirstValues_Impl( bool bSet ); DECL_LINK(BorderModify_Impl, weld::MetricSpinButton&, void); void InitHeadFoot_Impl( const SfxItemSet& rSet ); - DECL_LINK(CenterHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(CenterHdl_Impl, weld::Toggleable&, void); void UpdateExample_Impl( bool bResetbackground = false ); DECL_LINK(PaperSizeSelect_Impl, weld::ComboBox&, void ); @@ -153,7 +153,7 @@ private: void RangeHdl_Impl(); void CalcMargin_Impl(); - DECL_LINK(RegisterModify, weld::ToggleButton&, void); + DECL_LINK(RegisterModify, weld::Toggleable&, void); // page direction /** Disables vertical page direction entries in the text flow listbox. */ diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index cea797707a7e..a187bba92787 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -86,7 +86,7 @@ private: DECL_LINK(LineDistPopupHdl_Impl, weld::ComboBox&, void); DECL_LINK(LineDistHdl_Impl, weld::ComboBox&, void); DECL_LINK(ModifyHdl_Impl, weld::MetricSpinButton&, void); - DECL_LINK(AutoHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(AutoHdl_Impl, weld::Toggleable&, void); bool m_bLineDistToggled = false; @@ -148,7 +148,7 @@ class SvxParaAlignTabPage : public SfxTabPage std::unique_ptr<weld::Widget> m_xPropertiesFL; std::unique_ptr<svx::FrameDirectionListBox> m_xTextDirectionLB; - DECL_LINK(AlignHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(AlignHdl_Impl, weld::Toggleable&, void); DECL_LINK(LastLineHdl_Impl, weld::ComboBox&, void); DECL_LINK(TextDirectionHdl_Impl, weld::ComboBox&, void); @@ -264,16 +264,16 @@ private: void OrphanHdl(); void WidowHdl(); - DECL_LINK(PageBreakHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(KeepTogetherHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(WidowHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(OrphanHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(HyphenClickHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(ApplyCollClickHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(PageBreakHdl_Impl, weld::Toggleable&, void); + DECL_LINK(KeepTogetherHdl_Impl, weld::Toggleable&, void); + DECL_LINK(WidowHdl_Impl, weld::Toggleable&, void); + DECL_LINK(OrphanHdl_Impl, weld::Toggleable&, void); + DECL_LINK(HyphenClickHdl_Impl, weld::Toggleable&, void); + DECL_LINK(ApplyCollClickHdl_Impl, weld::Toggleable&, void); DECL_LINK(PageBreakPosHdl_Impl, weld::ComboBox&, void); DECL_LINK(PageBreakTypeHdl_Impl, weld::ComboBox&, void); - DECL_LINK(PageNumBoxClickHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(KeepParaBoxClickHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(PageNumBoxClickHdl_Impl, weld::Toggleable&, void); + DECL_LINK(KeepParaBoxClickHdl_Impl, weld::Toggleable&, void); virtual void PageCreated(const SfxAllItemSet& aSet) override; }; diff --git a/cui/source/inc/passwdomdlg.hxx b/cui/source/inc/passwdomdlg.hxx index 5f94d06c0d6d..2e13cc1b616c 100644 --- a/cui/source/inc/passwdomdlg.hxx +++ b/cui/source/inc/passwdomdlg.hxx @@ -47,7 +47,7 @@ class PasswordToOpenModifyDialog : public SfxDialogController DECL_LINK(OkBtnClickHdl, weld::Button&, void); - DECL_LINK(ReadonlyOnOffHdl, weld::ToggleButton&, void); + DECL_LINK(ReadonlyOnOffHdl, weld::Toggleable&, void); DECL_LINK(ChangeHdl, weld::Entry&, void); PasswordToOpenModifyDialog( const PasswordToOpenModifyDialog & ) = delete; diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx index 22e61e0ff7fc..ce14e0714a3e 100644 --- a/cui/source/inc/splitcelldlg.hxx +++ b/cui/source/inc/splitcelldlg.hxx @@ -35,7 +35,7 @@ private: public: SvxSplitTableDlg(weld::Window *pParent, bool bIsTableVertical, tools::Long nMaxVertical, tools::Long nMaxHorizontal); - DECL_LINK(ToggleHdl, weld::ToggleButton&, void); + DECL_LINK(ToggleHdl, weld::Toggleable&, void); bool IsHorizontal() const; bool IsProportional() const; diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index d9c72495acde..18e48481a3ce 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -84,13 +84,13 @@ class SvxSwPosSizeTabPage : public SfxTabPage std::unique_ptr<weld::CustomWeld> m_xExampleWN; DECL_LINK(RangeModifyHdl, weld::Widget&, void); - DECL_LINK(RangeModifyClickHdl, weld::ToggleButton&, void); - DECL_LINK(AnchorTypeHdl, weld::ToggleButton&, void); + DECL_LINK(RangeModifyClickHdl, weld::Toggleable&, void); + DECL_LINK(AnchorTypeHdl, weld::Toggleable&, void); DECL_LINK(PosHdl, weld::ComboBox&, void); DECL_LINK(RelHdl, weld::ComboBox&, void); - DECL_LINK(MirrorHdl, weld::ToggleButton&, void); + DECL_LINK(MirrorHdl, weld::Toggleable&, void); DECL_LINK(ModifyHdl, weld::MetricSpinButton&, void); - DECL_LINK(ProtectHdl, weld::ToggleButton&, void); + DECL_LINK(ProtectHdl, weld::Toggleable&, void); void InitPos(RndStdIds nAnchorType, sal_uInt16 nH, sal_uInt16 nHRel, sal_uInt16 nV, sal_uInt16 nVRel, diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index c6e7e70f748d..ddd7775b24da 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -129,8 +129,8 @@ private: DECL_LINK(DelHdl_Impl, weld::Button&, void); DECL_LINK(DelAllHdl_Impl, weld::Button&, void); - DECL_LINK(FillTypeCheckHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(TabTypeCheckHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(FillTypeCheckHdl_Impl, weld::Toggleable&, void); + DECL_LINK(TabTypeCheckHdl_Impl, weld::Toggleable&, void); DECL_LINK(SelectHdl_Impl, weld::TreeView&, bool); DECL_LINK(ModifyHdl_Impl, weld::ComboBox&, void); diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx index bef4a90e7f57..4f7785887a6c 100644 --- a/cui/source/inc/textanim.hxx +++ b/cui/source/inc/textanim.hxx @@ -67,9 +67,9 @@ private: std::unique_ptr<weld::MetricSpinButton> m_xMtrFldDelay; DECL_LINK( SelectEffectHdl_Impl, weld::ComboBox&, void ); - DECL_LINK( ClickEndlessHdl_Impl, weld::ToggleButton&, void ); - DECL_LINK( ClickAutoHdl_Impl, weld::ToggleButton&, void ); - DECL_LINK( ClickPixelHdl_Impl, weld::ToggleButton&, void ); + DECL_LINK( ClickEndlessHdl_Impl, weld::Toggleable&, void ); + DECL_LINK( ClickAutoHdl_Impl, weld::Toggleable&, void ); + DECL_LINK( ClickPixelHdl_Impl, weld::Toggleable&, void ); DECL_LINK( ClickDirectionHdl_Impl, weld::Button&, void ); void SelectDirection( SdrTextAniDirection nValue ); diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index 17a479af3e93..fe00b6302c3f 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -63,8 +63,8 @@ private: std::unique_ptr<weld::CustomWeld> m_xCtlPosition; std::unique_ptr<weld::CheckButton> m_xTsbFullWidth; - DECL_LINK(ClickFullWidthHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(ClickHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(ClickFullWidthHdl_Impl, weld::Toggleable&, void); + DECL_LINK(ClickHdl_Impl, weld::Toggleable&, void); /** Return whether the text direction is from left to right (</sal_True>) or top to bottom (</sal_False>). diff --git a/cui/source/inc/toolbarmodedlg.hxx b/cui/source/inc/toolbarmodedlg.hxx index 8d0216734a75..5965aa7598d6 100644 --- a/cui/source/inc/toolbarmodedlg.hxx +++ b/cui/source/inc/toolbarmodedlg.hxx @@ -30,7 +30,7 @@ private: void UpdateImage(std::u16string_view sFileName); int GetActiveRadioButton(); - DECL_LINK(SelectToolbarmode, weld::ToggleButton&, void); + DECL_LINK(SelectToolbarmode, weld::Toggleable&, void); DECL_LINK(OnApplyClick, weld::Button&, void); }; diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx index 33d984ff8b26..f3a6ba0a0e21 100644 --- a/cui/source/inc/transfrm.hxx +++ b/cui/source/inc/transfrm.hxx @@ -116,16 +116,16 @@ private: std::unique_ptr<weld::CheckButton> m_xTsbAutoGrowWidth; std::unique_ptr<weld::CheckButton> m_xTsbAutoGrowHeight; - DECL_LINK(ChangePosProtectHdl, weld::ToggleButton&, void); - DECL_LINK(ChangeSizeProtectHdl, weld::ToggleButton&, void); + DECL_LINK(ChangePosProtectHdl, weld::Toggleable&, void); + DECL_LINK(ChangeSizeProtectHdl, weld::Toggleable&, void); void SetMinMaxPosition(); void GetTopLeftPosition(double& rfX, double& rfY, const basegfx::B2DRange& rRange); DECL_LINK( ChangeWidthHdl, weld::MetricSpinButton&, void ); DECL_LINK( ChangeHeightHdl, weld::MetricSpinButton&, void ); - DECL_LINK( ClickSizeProtectHdl, weld::ToggleButton&, void ); - DECL_LINK( ClickAutoHdl, weld::ToggleButton&, void ); + DECL_LINK( ClickSizeProtectHdl, weld::Toggleable&, void ); + DECL_LINK( ClickAutoHdl, weld::Toggleable&, void ); public: SvxPositionSizeTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs); diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx index f338e313305d..f44998378d73 100644 --- a/cui/source/inc/zoom.hxx +++ b/cui/source/inc/zoom.hxx @@ -45,11 +45,11 @@ private: std::unique_ptr<weld::CheckButton> m_xBookModeChk; std::unique_ptr<weld::Button> m_xOKBtn; - DECL_LINK(UserHdl, weld::ToggleButton&, void); + DECL_LINK(UserHdl, weld::Toggleable&, void); DECL_LINK(SpinHdl, weld::MetricSpinButton&, void); - DECL_LINK(ViewLayoutUserHdl, weld::ToggleButton&, void); + DECL_LINK(ViewLayoutUserHdl, weld::Toggleable&, void); DECL_LINK(ViewLayoutSpinHdl, weld::SpinButton&, void); - DECL_LINK(ViewLayoutCheckHdl, weld::ToggleButton&, void); + DECL_LINK(ViewLayoutCheckHdl, weld::Toggleable&, void); DECL_LINK(OKHdl, weld::Button&, void); public: diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index a118b38a47cf..a478d9a652c3 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -221,7 +221,7 @@ namespace offapp updateCurrentRow(); } - IMPL_LINK( ConnectionPoolOptionsPage, OnEnabledDisabled, weld::ToggleButton&, rCheckBox, void ) + IMPL_LINK( ConnectionPoolOptionsPage, OnEnabledDisabled, weld::Toggleable&, rCheckBox, void ) { bool bGloballyEnabled = m_xEnablePooling->get_active(); bool bLocalDriverChanged = m_xDriverPoolingEnabled.get() == &rCheckBox; diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx index 39b5814cddda..549448e21ff6 100644 --- a/cui/source/options/connpooloptions.hxx +++ b/cui/source/options/connpooloptions.hxx @@ -57,7 +57,7 @@ namespace offapp bool isModifiedDriverList() const; void saveDriverList() { m_aSavedSettings = m_aSettings; } - DECL_LINK(OnEnabledDisabled, weld::ToggleButton&, void); + DECL_LINK(OnEnabledDisabled, weld::Toggleable&, void); DECL_LINK(OnSpinValueChanged, weld::SpinButton&, void); DECL_LINK(OnDriverRowChanged, weld::TreeView&, void); diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index fcf658a88b32..c438061bea90 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -249,7 +249,7 @@ void SvxFontSubstTabPage::Reset( const SfxItemSet* ) m_xFontHeightLB->save_value(); } -IMPL_LINK(SvxFontSubstTabPage, ToggleHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(SvxFontSubstTabPage, ToggleHdl, weld::Toggleable&, rButton, void) { SelectHdl(&rButton); } @@ -362,7 +362,7 @@ void SvxFontSubstTabPage::SelectHdl(const weld::Widget* pWin) CheckEnable(); } -IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, weld::Toggleable&, rBox, void) { OUString sFontName = m_xFontNameLB->get_active_text(); bool bNonPropOnly = rBox.get_active(); diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index e1b4269c012c..600af4cf4fa1 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -39,10 +39,10 @@ class SvxFontSubstTabPage : public SfxTabPage std::unique_ptr<weld::ComboBox> m_xFontHeightLB; DECL_LINK(SelectComboBoxHdl, weld::ComboBox&, void); - DECL_LINK(ToggleHdl, weld::ToggleButton&, void); + DECL_LINK(ToggleHdl, weld::Toggleable&, void); DECL_LINK(ClickHdl, weld::Button&, void); DECL_LINK(TreeListBoxSelectHdl, weld::TreeView&, void); - DECL_LINK(NonPropFontsHdl, weld::ToggleButton&, void); + DECL_LINK(NonPropFontsHdl, weld::Toggleable&, void); DECL_LINK(HeaderBarClick, int, void); DECL_LINK(ResizeHdl, const Size&, void); diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 962cf1fc2e0a..a5294c0b4b70 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -335,7 +335,7 @@ IMPL_LINK_NOARG(SvxAsianLayoutPage, LanguageHdl, weld::ComboBox&, void) m_xEndED->set_text(sEnd); } -IMPL_LINK(SvxAsianLayoutPage, ChangeStandardHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SvxAsianLayoutPage, ChangeStandardHdl, weld::Toggleable&, rBox, void) { bool bCheck = rBox.get_active(); m_xStartED->set_sensitive(!bCheck); diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 8567189e6cc4..0296e9a0d132 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -165,12 +165,12 @@ public: explicit ColorConfigWindow_Impl(weld::Window* pTopLevel, weld::Container* pParent); public: - void SetLinks(Link<weld::ToggleButton&,void> const&, + void SetLinks(Link<weld::Toggleable&,void> const&, Link<ColorListBox&,void> const&, Link<weld::Widget&,void> const&, weld::ScrolledWindow& rScroll); void Update(EditableColorConfig const*, EditableExtendedColorConfig const*); - void ClickHdl(EditableColorConfig*, weld::ToggleButton&); + void ClickHdl(EditableColorConfig*, weld::Toggleable&); void ColorHdl(EditableColorConfig*, EditableExtendedColorConfig*, const ColorListBox*); weld::Widget& GetWidget1() @@ -218,7 +218,7 @@ private: } void Hide (); public: - void SetLinks(Link<weld::ToggleButton&,void> const&, + void SetLinks(Link<weld::Toggleable&,void> const&, Link<ColorListBox&,void> const&, Link<weld::Widget&,void> const&); void Update (ColorConfigValue const&); @@ -226,7 +226,7 @@ private: void ColorChanged (ColorConfigValue&); void ColorChanged (ExtendedColorConfigValue&); public: - bool Is(const weld::ToggleButton* pBox) const { return m_xText.get() == pBox; } + bool Is(const weld::Toggleable* pBox) const { return m_xText.get() == pBox; } bool Is(const ColorListBox* pBox) const { return m_xColorList.get() == pBox; } private: // checkbox (CheckBox) or simple text (FixedText) @@ -310,13 +310,13 @@ void ColorConfigWindow_Impl::Entry::Hide() } // SetLinks() -void ColorConfigWindow_Impl::Entry::SetLinks(Link<weld::ToggleButton&,void> const& rCheckLink, +void ColorConfigWindow_Impl::Entry::SetLinks(Link<weld::Toggleable&,void> const& rCheckLink, Link<ColorListBox&,void> const& rColorLink, Link<weld::Widget&,void> const& rGetFocusLink) { m_xColorList->SetSelectHdl(rColorLink); m_xColorList->connect_focus_in(rGetFocusLink); - if (weld::ToggleButton* pCheckBox = dynamic_cast<weld::ToggleButton*>(m_xText.get())) + if (weld::Toggleable* pCheckBox = dynamic_cast<weld::Toggleable*>(m_xText.get())) { pCheckBox->connect_toggled(rCheckLink); pCheckBox->connect_focus_in(rGetFocusLink); @@ -328,7 +328,7 @@ void ColorConfigWindow_Impl::Entry::Update(ColorConfigValue const& rValue) { Color aColor(rValue.nColor); m_xColorList->SelectEntry(aColor); - if (weld::ToggleButton* pCheckBox = dynamic_cast<weld::ToggleButton*>(m_xText.get())) + if (weld::Toggleable* pCheckBox = dynamic_cast<weld::Toggleable*>(m_xText.get())) pCheckBox->set_active(rValue.bIsVisible); } @@ -461,7 +461,7 @@ void ColorConfigWindow_Impl::AdjustExtraWidths(int nTextWidth) } // SetLinks() -void ColorConfigWindow_Impl::SetLinks(Link<weld::ToggleButton&,void> const& aCheckLink, +void ColorConfigWindow_Impl::SetLinks(Link<weld::Toggleable&,void> const& aCheckLink, Link<ColorListBox&,void> const& aColorLink, Link<weld::Widget&,void> const& rGetFocusLink, weld::ScrolledWindow& rScroll) @@ -503,7 +503,7 @@ void ColorConfigWindow_Impl::Update ( } // ClickHdl() -void ColorConfigWindow_Impl::ClickHdl(EditableColorConfig* pConfig, weld::ToggleButton& rBox) +void ColorConfigWindow_Impl::ClickHdl(EditableColorConfig* pConfig, weld::Toggleable& rBox) { for (unsigned i = 0; i != ColorConfigEntryCount; ++i) { @@ -591,7 +591,7 @@ class ColorConfigCtrl_Impl EditableColorConfig* pColorConfig; EditableExtendedColorConfig* pExtColorConfig; - DECL_LINK(ClickHdl, weld::ToggleButton&, void); + DECL_LINK(ClickHdl, weld::Toggleable&, void); DECL_LINK(ColorHdl, ColorListBox&, void); DECL_LINK(ControlFocusHdl, weld::Widget&, void); @@ -629,7 +629,7 @@ ColorConfigCtrl_Impl::ColorConfigCtrl_Impl(weld::Window* pTopLevel, weld::Builde { m_xBody->set_stack_background(); - Link<weld::ToggleButton&,void> aCheckLink = LINK(this, ColorConfigCtrl_Impl, ClickHdl); + Link<weld::Toggleable&,void> aCheckLink = LINK(this, ColorConfigCtrl_Impl, ClickHdl); Link<ColorListBox&,void> aColorLink = LINK(this, ColorConfigCtrl_Impl, ColorHdl); Link<weld::Widget&,void> const& aGetFocusLink = LINK(this, ColorConfigCtrl_Impl, ControlFocusHdl); m_xScrollWindow->SetLinks(aCheckLink, aColorLink, aGetFocusLink, *m_xVScroll); @@ -641,7 +641,7 @@ void ColorConfigCtrl_Impl::Update () m_xScrollWindow->Update(pColorConfig, pExtColorConfig); } -IMPL_LINK(ColorConfigCtrl_Impl, ClickHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK(ColorConfigCtrl_Impl, ClickHdl, weld::Toggleable&, rBox, void) { DBG_ASSERT(pColorConfig, "Configuration not set"); m_xScrollWindow->ClickHdl(pColorConfig, rBox); diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx index ab5542c37566..52bd18fc8788 100644 --- a/cui/source/options/optctl.cxx +++ b/cui/source/options/optctl.cxx @@ -24,7 +24,7 @@ // class SvxCTLOptionsPage ----------------------------------------------------- -IMPL_LINK_NOARG(SvxCTLOptionsPage, SequenceCheckingCB_Hdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxCTLOptionsPage, SequenceCheckingCB_Hdl, weld::Toggleable&, void) { bool bIsSequenceChecking = m_xSequenceCheckingCB->get_active(); m_xRestrictedCB->set_sensitive( bIsSequenceChecking ); diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx index 40df4014c874..0cc24951b54b 100644 --- a/cui/source/options/optctl.hxx +++ b/cui/source/options/optctl.hxx @@ -32,7 +32,7 @@ private: std::unique_ptr<weld::RadioButton> m_xMovementVisualRB; std::unique_ptr<weld::ComboBox> m_xNumeralsLB; - DECL_LINK( SequenceCheckingCB_Hdl, weld::ToggleButton&, void ); + DECL_LINK( SequenceCheckingCB_Hdl, weld::Toggleable&, void ); public: SvxCTLOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 344f288f96d9..8624675f0b26 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -55,12 +55,12 @@ OfaMSFilterTabPage::~OfaMSFilterTabPage() { } -IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadWordBasicCheckHdl_Impl, weld::Toggleable&, void) { m_xWBasicWbctblCB->set_sensitive(m_xWBasicCodeCB->get_active()); } -IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, weld::Toggleable&, void) { m_xEBasicExectblCB->set_sensitive(m_xEBasicCodeCB->get_active()); } diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index 07c07680b957..f38a89366286 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -31,8 +31,8 @@ class OfaMSFilterTabPage : public SfxTabPage std::unique_ptr<weld::CheckButton> m_xPBasicCodeCB; std::unique_ptr<weld::CheckButton> m_xPBasicStgCB; - DECL_LINK(LoadWordBasicCheckHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(LoadExcelBasicCheckHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(LoadWordBasicCheckHdl_Impl, weld::Toggleable&, void); + DECL_LINK(LoadExcelBasicCheckHdl_Impl, weld::Toggleable&, void); public: OfaMSFilterTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet ); virtual ~OfaMSFilterTabPage() override; diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index b14b73daa1a5..a4cf97811e75 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -626,7 +626,7 @@ IMPL_STATIC_LINK_NOARG(OfaViewTabPage, OnMoreIconsClick, weld::Button&, void) comphelper::dispatchCommand(".uno:AdditionsDialog", aArgs); } -IMPL_LINK_NOARG( OfaViewTabPage, OnAntialiasingToggled, weld::ToggleButton&, void ) +IMPL_LINK_NOARG( OfaViewTabPage, OnAntialiasingToggled, weld::Toggleable&, void ) { bool bAAEnabled = m_xFontAntiAliasing->get_active(); @@ -634,7 +634,7 @@ IMPL_LINK_NOARG( OfaViewTabPage, OnAntialiasingToggled, weld::ToggleButton&, voi m_xAAPointLimit->set_sensitive(bAAEnabled); } -IMPL_LINK_NOARG(OfaViewTabPage, OnUseSkiaToggled, weld::ToggleButton&, void) +IMPL_LINK_NOARG(OfaViewTabPage, OnUseSkiaToggled, weld::Toggleable&, void) { UpdateSkiaStatus(); } @@ -1201,7 +1201,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(weld::Container* pPage, weld::DialogCon m_xLocaleSettingLB->connect_changed( LINK( this, OfaLanguagesTabPage, LocaleSettingHdl ) ); m_xDatePatternsED->connect_changed( LINK( this, OfaLanguagesTabPage, DatePatternsHdl ) ); - Link<weld::ToggleButton&,void> aLink( LINK( this, OfaLanguagesTabPage, SupportHdl ) ); + Link<weld::Toggleable&,void> aLink( LINK( this, OfaLanguagesTabPage, SupportHdl ) ); m_xAsianSupportCB->connect_toggled( aLink ); m_xCTLSupportCB->connect_toggled( aLink ); @@ -1638,7 +1638,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet* rSet ) } } -IMPL_LINK(OfaLanguagesTabPage, SupportHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK(OfaLanguagesTabPage, SupportHdl, weld::Toggleable&, rBox, void) { bool bCheck = rBox.get_active(); if ( m_xAsianSupportCB.get() == &rBox ) diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx index d9a55ced7fb1..183ef409e2ca 100644 --- a/cui/source/options/optgdlg.hxx +++ b/cui/source/options/optgdlg.hxx @@ -116,8 +116,8 @@ private: std::unique_ptr<weld::ComboBox> m_xMouseMiddleLB; std::unique_ptr<weld::Button> m_xMoreIcons; - DECL_LINK(OnAntialiasingToggled, weld::ToggleButton&, void); - DECL_LINK(OnUseSkiaToggled, weld::ToggleButton&, void); + DECL_LINK(OnAntialiasingToggled, weld::Toggleable&, void); + DECL_LINK(OnUseSkiaToggled, weld::Toggleable&, void); DECL_STATIC_LINK(OfaViewTabPage, OnMoreIconsClick, weld::Button&, void); void UpdateSkiaStatus(); void HideSkiaWidgets(); @@ -165,7 +165,7 @@ class OfaLanguagesTabPage : public SfxTabPage std::unique_ptr<weld::CheckButton> m_xCTLSupportCB; std::unique_ptr<weld::CheckButton> m_xIgnoreLanguageChangeCB; - DECL_LINK(SupportHdl, weld::ToggleButton&, void); + DECL_LINK(SupportHdl, weld::Toggleable&, void); DECL_LINK(LocaleSettingHdl, weld::ComboBox&, void); DECL_LINK(DatePatternsHdl, weld::Entry&, void); diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx index fca286ddbb7a..7c9e15aa8704 100644 --- a/cui/source/options/opthtml.cxx +++ b/cui/source/options/opthtml.cxx @@ -155,7 +155,7 @@ void OfaHtmlTabPage::Reset( const SfxItemSet* ) m_xCharSetLB->SelectTextEncoding( rHtmlOpt.GetTextEncoding() ); } -IMPL_LINK(OfaHtmlTabPage, CheckBoxHdl_Impl, weld::ToggleButton&, rBox, void) +IMPL_LINK(OfaHtmlTabPage, CheckBoxHdl_Impl, weld::Toggleable&, rBox, void) { m_xStarBasicWarningCB->set_sensitive(!rBox.get_active()); } diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx index 9915c3f0c2a9..4fdb9d754451 100644 --- a/cui/source/options/opthtml.hxx +++ b/cui/source/options/opthtml.hxx @@ -42,7 +42,7 @@ class OfaHtmlTabPage : public SfxTabPage std::unique_ptr<weld::CheckButton> m_xSaveGrfLocalCB; std::unique_ptr<SvxTextEncodingBox> m_xCharSetLB; - DECL_LINK(CheckBoxHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(CheckBoxHdl_Impl, weld::Toggleable&, void); public: OfaHtmlTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index a39a7f13a192..acb04b97d696 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -527,7 +527,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, SecurityOptionsHdl, weld::Button&, void) m_xSecOptDlg->run(); } -IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxSecurityTabPage, SavePasswordHdl, weld::Toggleable&, void) { try { @@ -606,7 +606,7 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordHdl, weld::Button&, void) {} } -IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordCBHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxSecurityTabPage, MasterPasswordCBHdl, weld::Toggleable&, void) { try { diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index f4dd0940eb59..6b4ca975199a 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -107,9 +107,9 @@ private: std::unique_ptr<weld::Label> m_xNoPasswordSaveFT; DECL_LINK(SecurityOptionsHdl, weld::Button&, void); - DECL_LINK(SavePasswordHdl, weld::ToggleButton&, void); + DECL_LINK(SavePasswordHdl, weld::Toggleable&, void); DECL_LINK(MasterPasswordHdl, weld::Button&, void); - DECL_LINK(MasterPasswordCBHdl, weld::ToggleButton&, void); + DECL_LINK(MasterPasswordCBHdl, weld::Toggleable&, void); DECL_LINK(ShowPasswordsHdl, weld::Button&, void); DECL_LINK(MacroSecPBHdl, weld::Button&, void ); DECL_LINK(CertPathPBHdl, weld::Button&, void ); diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 4994b4aef1ed..c074c9cf1ccb 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -132,7 +132,7 @@ SvxJavaOptionsPage::~SvxJavaOptionsPage() #endif } -IMPL_LINK_NOARG(SvxJavaOptionsPage, EnableHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxJavaOptionsPage, EnableHdl_Impl, weld::Toggleable&, void) { bool bEnable = m_xJavaFrame->get_sensitive() && m_xJavaEnableCB->get_active(); m_xJavaList->set_sensitive(bEnable); diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index 1d96450155bb..1cb7555d6531 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -81,7 +81,7 @@ private: std::unique_ptr<weld::Widget> m_xJavaFrame; - DECL_LINK(EnableHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(EnableHdl_Impl, weld::Toggleable&, void); DECL_LINK(CheckHdl_Impl, const weld::TreeView::iter_col&, void); DECL_LINK(SelectHdl_Impl, weld::TreeView&, void); DECL_LINK(AddHdl_Impl, weld::Button&, void); diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 9571e56d5697..3ee6a66c40d2 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -470,7 +470,7 @@ void SvxSaveTabPage::Reset( const SfxItemSet* ) m_xODFVersionLB->save_value(); } -IMPL_LINK(SvxSaveTabPage, AutoClickHdl_Impl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SvxSaveTabPage, AutoClickHdl_Impl, weld::Toggleable&, rBox, void) { if (&rBox != m_xAutoSaveCB.get()) return; diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index 75ba1149c764..4ec3b1ddada5 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -59,7 +59,7 @@ private: std::unique_ptr<weld::Widget> m_xODFWarningFI; std::unique_ptr<weld::Label> m_xODFWarningFT; - DECL_LINK( AutoClickHdl_Impl, weld::ToggleButton&, void ); + DECL_LINK( AutoClickHdl_Impl, weld::Toggleable&, void ); DECL_LINK( FilterHdl_Impl, weld::ComboBox&, void ); DECL_LINK(ODFVersionHdl_Impl, weld::ComboBox&, void ); diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index b89fbda027f4..db1402825f7c 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -310,7 +310,7 @@ void SvxOnlineUpdateTabPage::FillUserData() { } -IMPL_LINK(SvxOnlineUpdateTabPage, AutoCheckHdl_Impl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SvxOnlineUpdateTabPage, AutoCheckHdl_Impl, weld::Toggleable&, rBox, void) { bool bEnabled = rBox.get_active(); beans::Property aProperty = m_xReadWriteAccess->getPropertyByHierarchicalName("/org.openoffice.Office.Jobs/Jobs/org.openoffice.Office.Jobs:Job['UpdateCheck']/Arguments/CheckInterval"); @@ -320,7 +320,7 @@ IMPL_LINK(SvxOnlineUpdateTabPage, AutoCheckHdl_Impl, weld::ToggleButton&, rBox, m_xEveryMonthButton->set_sensitive(bEnabled && !bReadOnly); } -IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, ExtrasCheckHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxOnlineUpdateTabPage, ExtrasCheckHdl_Impl, weld::Toggleable&, void) { UpdateUserAgent(); } diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx index c5939429ea2c..f41fe2e2dd55 100644 --- a/cui/source/options/optupdt.hxx +++ b/cui/source/options/optupdt.hxx @@ -50,8 +50,8 @@ private: DECL_LINK(FileDialogHdl_Impl, weld::Button&, void); DECL_LINK(CheckNowHdl_Impl, weld::Button&, void); - DECL_LINK(AutoCheckHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(ExtrasCheckHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(AutoCheckHdl_Impl, weld::Toggleable&, void); + DECL_LINK(ExtrasCheckHdl_Impl, weld::Toggleable&, void); void UpdateLastCheckedText(); void UpdateUserAgent(); diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 30965cf9cb7f..142a229f92eb 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -737,29 +737,29 @@ bool AlignmentTabPage::HasAlignmentChanged( const SfxItemSet& rNew, sal_uInt16 n return eMethodOld != eMethodNew; } -IMPL_LINK(AlignmentTabPage, StackedClickHdl, weld::ToggleButton&, rToggle, void) +IMPL_LINK(AlignmentTabPage, StackedClickHdl, weld::Toggleable&, rToggle, void) { m_aStackedState.ButtonToggled(rToggle); UpdateEnableControls(); } -IMPL_LINK(AlignmentTabPage, AsianModeClickHdl, weld::ToggleButton&, rToggle, void) +IMPL_LINK(AlignmentTabPage, AsianModeClickHdl, weld::Toggleable&, rToggle, void) { m_aAsianModeState.ButtonToggled(rToggle); } -IMPL_LINK(AlignmentTabPage, WrapClickHdl, weld::ToggleButton&, rToggle, void) +IMPL_LINK(AlignmentTabPage, WrapClickHdl, weld::Toggleable&, rToggle, void) { m_aWrapState.ButtonToggled(rToggle); UpdateEnableControls(); } -IMPL_LINK(AlignmentTabPage, HyphenClickHdl, weld::ToggleButton&, rToggle, void) +IMPL_LINK(AlignmentTabPage, HyphenClickHdl, weld::Toggleable&, rToggle, void) { m_aHyphenState.ButtonToggled(rToggle); } -IMPL_LINK(AlignmentTabPage, ShrinkClickHdl, weld::ToggleButton&, rToggle, void) +IMPL_LINK(AlignmentTabPage, ShrinkClickHdl, weld::Toggleable&, rToggle, void) { m_aShrinkState.ButtonToggled(rToggle); } diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 8c21991be52b..42619a063d98 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -2079,7 +2079,7 @@ IMPL_LINK_NOARG(OfaAutoCompleteTabPage, DeleteHdl, weld::Button&, void) } } -IMPL_LINK(OfaAutoCompleteTabPage, CheckHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK(OfaAutoCompleteTabPage, CheckHdl, weld::Toggleable&, rBox, void) { bool bEnable = rBox.get_active(); if (&rBox == m_xCBActiv.get()) @@ -2256,7 +2256,7 @@ IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, ClickHdl, weld::Button&, void) /** Handler for the check box */ -IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, CheckHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(OfaSmartTagOptionsTabPage, CheckHdl, weld::Toggleable&, void) { const bool bEnable = m_xMainCB->get_active(); m_xSmartTagTypesLB->set_sensitive(bEnable); diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index 8e6a7fa8f3c2..cad792327f74 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -1517,12 +1517,12 @@ IMPL_LINK( SvxBorderTabPage, ModifyDistanceHdl_Impl, weld::MetricSpinButton&, rF } } -IMPL_LINK( SvxBorderTabPage, SyncHdl_Impl, weld::ToggleButton&, rBox, void) +IMPL_LINK( SvxBorderTabPage, SyncHdl_Impl, weld::Toggleable&, rBox, void) { mbSync = rBox.get_active(); } -IMPL_LINK( SvxBorderTabPage, RemoveAdjacentCellBorderHdl_Impl, weld::ToggleButton&, rBox, void) +IMPL_LINK( SvxBorderTabPage, RemoveAdjacentCellBorderHdl_Impl, weld::Toggleable&, rBox, void) { mbRemoveAdjacentCellBorders = rBox.get_active(); } diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 925427d7b93e..5a40fed3fc00 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -1642,7 +1642,7 @@ void SvxCharEffectsPage::SelectHdl_Impl(const weld::ComboBox* pBox) UpdatePreview_Impl(); } -IMPL_LINK(SvxCharEffectsPage, CbClickHdl_Impl, weld::ToggleButton&, rToggle, void) +IMPL_LINK(SvxCharEffectsPage, CbClickHdl_Impl, weld::Toggleable&, rToggle, void) { m_aIndividualWordsState.ButtonToggled(rToggle); UpdatePreview_Impl(); @@ -2038,18 +2038,18 @@ void SvxCharEffectsPage::Reset( const SfxItemSet* rSet ) ChangesApplied(); } -IMPL_LINK(SvxCharEffectsPage, HiddenBtnClickHdl, weld::ToggleButton&, rToggle, void) +IMPL_LINK(SvxCharEffectsPage, HiddenBtnClickHdl, weld::Toggleable&, rToggle, void) { m_aHiddenState.ButtonToggled(rToggle); } -IMPL_LINK(SvxCharEffectsPage, OutlineBtnClickHdl, weld::ToggleButton&, rToggle, void) +IMPL_LINK(SvxCharEffectsPage, OutlineBtnClickHdl, weld::Toggleable&, rToggle, void) { m_aOutlineState.ButtonToggled(rToggle); UpdatePreview_Impl(); } -IMPL_LINK(SvxCharEffectsPage, ShadowBtnClickHdl, weld::ToggleButton&, rToggle, void) +IMPL_LINK(SvxCharEffectsPage, ShadowBtnClickHdl, weld::Toggleable&, rToggle, void) { m_aShadowState.ButtonToggled(rToggle); UpdatePreview_Impl(); @@ -2455,7 +2455,7 @@ void SvxCharPositionPage::Initialize() m_xNormalPosBtn->set_active(true); PositionHdl_Impl(*m_xNormalPosBtn); - Link<weld::ToggleButton&,void> aLink2 = LINK(this, SvxCharPositionPage, PositionHdl_Impl); + Link<weld::Toggleable&,void> aLink2 = LINK(this, SvxCharPositionPage, PositionHdl_Impl); m_xHighPosBtn->connect_toggled(aLink2); m_xNormalPosBtn->connect_toggled(aLink2); m_xLowPosBtn->connect_toggled(aLink2); @@ -2528,7 +2528,7 @@ void SvxCharPositionPage::SetEscapement_Impl( SvxEscapement nEsc ) } -IMPL_LINK_NOARG(SvxCharPositionPage, PositionHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxCharPositionPage, PositionHdl_Impl, weld::Toggleable&, void) { SvxEscapement nEsc = SvxEscapement::Off; // also when pBtn == NULL @@ -2540,7 +2540,7 @@ IMPL_LINK_NOARG(SvxCharPositionPage, PositionHdl_Impl, weld::ToggleButton&, void SetEscapement_Impl( nEsc ); } -IMPL_LINK_NOARG(SvxCharPositionPage, RotationHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxCharPositionPage, RotationHdl_Impl, weld::Toggleable&, void) { bool bEnable = false; if (m_x90degRB->get_active() || m_x270degRB->get_active()) @@ -2558,7 +2558,7 @@ void SvxCharPositionPage::FontModifyHdl_Impl() UpdatePreview_Impl( 100, nEscProp, nEsc ); } -IMPL_LINK(SvxCharPositionPage, AutoPositionHdl_Impl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SvxCharPositionPage, AutoPositionHdl_Impl, weld::Toggleable&, rBox, void) { if (rBox.get_active()) { @@ -2571,7 +2571,7 @@ IMPL_LINK(SvxCharPositionPage, AutoPositionHdl_Impl, weld::ToggleButton&, rBox, : *m_xNormalPosBtn); } -IMPL_LINK_NOARG(SvxCharPositionPage, FitToLineHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxCharPositionPage, FitToLineHdl_Impl, weld::Toggleable&, void) { sal_uInt16 nVal = m_nScaleWidthInitialVal; if (m_xFitToLineCB->get_active()) @@ -3115,7 +3115,7 @@ void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, bool bStart ) m_nEndBracketPosition = nEntryPos; } -IMPL_LINK_NOARG(SvxCharTwoLinesPage, TwoLinesHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxCharTwoLinesPage, TwoLinesHdl_Impl, weld::Toggleable&, void) { bool bChecked = m_xTwoLinesBtn->get_active(); m_xEnclosingFrame->set_sensitive(bChecked); diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index c12ebc53601e..c230797d9c4a 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -408,7 +408,7 @@ IMPL_LINK(SvxCaptionTabPage, PositionSelectHdl_Impl, weld::ComboBox&, rListBox, } } -IMPL_LINK( SvxCaptionTabPage, LineOptHdl_Impl, weld::ToggleButton&, rButton, void ) +IMPL_LINK( SvxCaptionTabPage, LineOptHdl_Impl, weld::Toggleable&, rButton, void ) { if (&rButton != m_xCB_OPTIMAL.get()) return; diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx index 14c9fef1e09b..a543ebc07b01 100644 --- a/cui/source/tabpages/measure.cxx +++ b/cui/source/tabpages/measure.cxx @@ -530,7 +530,7 @@ void SvxMeasurePage::PointChanged(weld::DrawingArea* pDrawingArea, RectPoint /*e ChangeAttrHdl_Impl(pDrawingArea); } -IMPL_LINK( SvxMeasurePage, ClickAutoPosHdl_Impl, weld::ToggleButton&, rBox, void ) +IMPL_LINK( SvxMeasurePage, ClickAutoPosHdl_Impl, weld::Toggleable&, rBox, void ) { if (m_xTsbAutoPosH->get_state() == TRISTATE_TRUE) { @@ -577,7 +577,7 @@ IMPL_LINK( SvxMeasurePage, ClickAutoPosHdl_Impl, weld::ToggleButton&, rBox, void ChangeAttrHdl_Impl(&rBox); } -IMPL_LINK(SvxMeasurePage, ChangeAttrClickHdl_Impl, weld::ToggleButton&, r, void) +IMPL_LINK(SvxMeasurePage, ChangeAttrClickHdl_Impl, weld::Toggleable&, r, void) { ChangeAttrHdl_Impl(&r); } diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index ec43ed08aca3..de987adb754d 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -1148,7 +1148,7 @@ IMPL_LINK(SvxNumberFormatTabPage, DoubleClickHdl_Impl, weld::TreeView&, rLb, boo #* #************************************************************************/ -IMPL_LINK(SvxNumberFormatTabPage, SelFormatClickHdl_Impl, weld::ToggleButton&, rLb, void) +IMPL_LINK(SvxNumberFormatTabPage, SelFormatClickHdl_Impl, weld::Toggleable&, rLb, void) { SelFormatHdl_Impl(&rLb); } @@ -1540,7 +1540,7 @@ void SvxNumberFormatTabPage::EditHdl_Impl(const weld::Entry* pEdFormat) #* #************************************************************************/ -IMPL_LINK(SvxNumberFormatTabPage, OptClickHdl_Impl, weld::ToggleButton&, rOptCtrl, void) +IMPL_LINK(SvxNumberFormatTabPage, OptClickHdl_Impl, weld::Toggleable&, rOptCtrl, void) { OptHdl_Impl(&rOptCtrl); } diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index e03ec1451daa..df227f53346d 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -1742,7 +1742,7 @@ IMPL_LINK(SvxNumOptionsTabPage, OrientHdl_Impl, weld::ComboBox&, rBox, void) SetModified(false); } -IMPL_LINK(SvxNumOptionsTabPage, SameLevelHdl_Impl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SvxNumOptionsTabPage, SameLevelHdl_Impl, weld::Toggleable&, rBox, void) { bool bSet = rBox.get_active(); pActNum->SetContinuousNumbering(bSet); @@ -1874,7 +1874,7 @@ IMPL_LINK(SvxNumOptionsTabPage, GraphicHdl_Impl, const OString&, rIdent, void) aInvalidateTimer.Start(); } -IMPL_LINK_NOARG(SvxNumOptionsTabPage, PopupActivateHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxNumOptionsTabPage, PopupActivateHdl_Impl, weld::Toggleable&, void) { if (m_xGalleryMenu) return; @@ -2050,7 +2050,7 @@ IMPL_LINK( SvxNumOptionsTabPage, SizeHdl_Impl, weld::MetricSpinButton&, rField, SetModified(bRepaint); } -IMPL_LINK(SvxNumOptionsTabPage, RatioHdl_Impl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SvxNumOptionsTabPage, RatioHdl_Impl, weld::Toggleable&, rBox, void) { if (rBox.get_active()) { @@ -3100,7 +3100,7 @@ IMPL_LINK(SvxNumPositionTabPage, DistanceHdl_Impl, weld::MetricSpinButton&, rFld } } -IMPL_LINK(SvxNumPositionTabPage, RelativeHdl_Impl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SvxNumPositionTabPage, 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/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 8562257a70db..71df320eb902 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -465,8 +465,8 @@ void SvxPageDescPage::Reset( const SfxItemSet* rSet ) // tdf#130548 disable callbacks on the other of a pair of the radiogroup // when toggling its partner - m_xLandscapeBtn->connect_toggled(Link<weld::ToggleButton&, void>()); - m_xPortraitBtn->connect_toggled(Link<weld::ToggleButton&, void>()); + m_xLandscapeBtn->connect_toggled(Link<weld::Toggleable&, void>()); + m_xPortraitBtn->connect_toggled(Link<weld::Toggleable&, void>()); m_xLandscapeBtn->set_active(bLandscape); m_xPortraitBtn->set_active(!bLandscape); @@ -1010,7 +1010,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, PaperSizeModify_Impl, weld::MetricSpinButton&, RangeHdl_Impl(); } -IMPL_LINK(SvxPageDescPage, SwapOrientation_Impl, weld::ToggleButton&, rBtn, void) +IMPL_LINK(SvxPageDescPage, SwapOrientation_Impl, weld::Toggleable&, rBtn, void) { if (!rBtn.get_active()) return; @@ -1522,7 +1522,7 @@ void SvxPageDescPage::CalcMargin_Impl() } } -IMPL_LINK_NOARG(SvxPageDescPage, CenterHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxPageDescPage, CenterHdl_Impl, weld::Toggleable&, void) { m_aBspWin.SetHorz(m_xHorzBox->get_active()); m_aBspWin.SetVert(m_xVertBox->get_active()); @@ -1545,7 +1545,7 @@ void SvxPageDescPage::SetCollectionList(const std::vector<OUString> &aList) m_xRegisterCB->connect_toggled(LINK(this, SvxPageDescPage, RegisterModify)); } -IMPL_LINK(SvxPageDescPage, RegisterModify, weld::ToggleButton&, rBox, void) +IMPL_LINK(SvxPageDescPage, RegisterModify, weld::Toggleable&, rBox, void) { bool bEnable = false; if (rBox.get_active()) diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index eaa0daf23cfe..cb59cc8c8010 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -924,7 +924,7 @@ void SvxStdParagraphTabPage::EnableContextualMode() m_xContextualCB->show(); } -IMPL_LINK(SvxStdParagraphTabPage, AutoHdl_Impl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SvxStdParagraphTabPage, AutoHdl_Impl, weld::Toggleable&, rBox, void) { bool bEnable = !rBox.get_active(); m_xFLineLabel->set_sensitive(bEnable); @@ -1034,7 +1034,7 @@ SvxParaAlignTabPage::SvxParaAlignTabPage(weld::Container* pPage, weld::DialogCon if (m_xLastLineLB->get_count() == LASTLINECOUNT_NEW) m_xLastLineLB->remove(nLastLinePos); - Link<weld::ToggleButton&, void> aLink = LINK( this, SvxParaAlignTabPage, AlignHdl_Impl ); + Link<weld::Toggleable&, void> aLink = LINK( this, SvxParaAlignTabPage, AlignHdl_Impl ); m_xLeft->connect_toggled(aLink); m_xRight->connect_toggled(aLink); m_xCenter->connect_toggled(aLink); @@ -1254,7 +1254,7 @@ void SvxParaAlignTabPage::ChangesApplied() m_xExpandCB->save_state(); } -IMPL_LINK_NOARG(SvxParaAlignTabPage, AlignHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxParaAlignTabPage, AlignHdl_Impl, weld::Toggleable&, void) { bool bJustify = m_xJustify->get_active(); m_xLastLineFT->set_sensitive(bJustify); @@ -2033,7 +2033,7 @@ void SvxExtParagraphTabPage::PageBreakHdl() } } -IMPL_LINK(SvxExtParagraphTabPage, PageBreakHdl_Impl, weld::ToggleButton&, rToggle, void) +IMPL_LINK(SvxExtParagraphTabPage, PageBreakHdl_Impl, weld::Toggleable&, rToggle, void) { aPageBreakState.ButtonToggled(rToggle); PageBreakHdl(); @@ -2046,7 +2046,7 @@ void SvxExtParagraphTabPage::KeepTogetherHdl() m_xOrphanBox->set_sensitive(bEnable); } -IMPL_LINK(SvxExtParagraphTabPage, KeepTogetherHdl_Impl, weld::ToggleButton&, rToggle, void) +IMPL_LINK(SvxExtParagraphTabPage, KeepTogetherHdl_Impl, weld::Toggleable&, rToggle, void) { aKeepTogetherState.ButtonToggled(rToggle); KeepTogetherHdl(); @@ -2072,13 +2072,13 @@ void SvxExtParagraphTabPage::WidowHdl() } } -IMPL_LINK(SvxExtParagraphTabPage, WidowHdl_Impl, weld::ToggleButton&, rToggle, void) +IMPL_LINK(SvxExtParagraphTabPage, WidowHdl_Impl, weld::Toggleable&, rToggle, void) { aWidowState.ButtonToggled(rToggle); WidowHdl(); } -IMPL_LINK(SvxExtParagraphTabPage, OrphanHdl_Impl, weld::ToggleButton&, rToggle, void) +IMPL_LINK(SvxExtParagraphTabPage, OrphanHdl_Impl, weld::Toggleable&, rToggle, void) { aOrphanState.ButtonToggled(rToggle); OrphanHdl(); @@ -2118,7 +2118,7 @@ void SvxExtParagraphTabPage::HyphenClickHdl() m_xHyphenBox->set_state(bEnable ? TRISTATE_TRUE : TRISTATE_FALSE); } -IMPL_LINK(SvxExtParagraphTabPage, HyphenClickHdl_Impl, weld::ToggleButton&, rToggle, void) +IMPL_LINK(SvxExtParagraphTabPage, HyphenClickHdl_Impl, weld::Toggleable&, rToggle, void) { aHyphenState.ButtonToggled(rToggle); HyphenClickHdl(); @@ -2144,7 +2144,7 @@ void SvxExtParagraphTabPage::ApplyCollClickHdl() } } -IMPL_LINK(SvxExtParagraphTabPage, ApplyCollClickHdl_Impl, weld::ToggleButton&, rToggle, void) +IMPL_LINK(SvxExtParagraphTabPage, ApplyCollClickHdl_Impl, weld::Toggleable&, rToggle, void) { aApplyCollState.ButtonToggled(rToggle); ApplyCollClickHdl(); @@ -2196,13 +2196,13 @@ void SvxExtParagraphTabPage::PageNumBoxClickHdl() m_xPagenumEdit->set_sensitive(m_xPageNumBox->get_state() == TRISTATE_TRUE); } -IMPL_LINK(SvxExtParagraphTabPage, PageNumBoxClickHdl_Impl, weld::ToggleButton&, rToggle, void) +IMPL_LINK(SvxExtParagraphTabPage, PageNumBoxClickHdl_Impl, weld::Toggleable&, rToggle, void) { aPageNumState.ButtonToggled(rToggle); PageNumBoxClickHdl(); } -IMPL_LINK(SvxExtParagraphTabPage, KeepParaBoxClickHdl_Impl, weld::ToggleButton&, rToggle, void) +IMPL_LINK(SvxExtParagraphTabPage, KeepParaBoxClickHdl_Impl, weld::Toggleable&, rToggle, void) { aKeepParaState.ButtonToggled(rToggle); } diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index e3154fa62339..564976c7fb8b 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -590,7 +590,7 @@ SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(weld::Container* pPage, weld::DialogCon m_xHoriByMF->connect_value_changed( aLk ); m_xVertByMF->connect_value_changed( aLk ); - Link<weld::ToggleButton&,void> aLk2 = LINK(this, SvxSwPosSizeTabPage, AnchorTypeHdl); + Link<weld::Toggleable&,void> aLk2 = LINK(this, SvxSwPosSizeTabPage, AnchorTypeHdl); m_xToPageRB->connect_toggled( aLk2 ); m_xToParaRB->connect_toggled( aLk2 ); m_xToCharRB->connect_toggled( aLk2 ); @@ -1124,7 +1124,7 @@ RndStdIds SvxSwPosSizeTabPage::GetAnchorType(bool* pbHasChanged) return nRet; } -IMPL_LINK_NOARG(SvxSwPosSizeTabPage, RangeModifyClickHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxSwPosSizeTabPage, RangeModifyClickHdl, weld::Toggleable&, void) { RangeModifyHdl(m_xWidthMF->get_widget()); } @@ -1204,7 +1204,7 @@ IMPL_LINK_NOARG(SvxSwPosSizeTabPage, RangeModifyHdl, weld::Widget&, void) m_xVertByMF->set_value(m_xVertByMF->normalize(aVal.nVPos), FieldUnit::TWIP); } -IMPL_LINK_NOARG(SvxSwPosSizeTabPage, AnchorTypeHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxSwPosSizeTabPage, AnchorTypeHdl, weld::Toggleable&, void) { m_xHoriMirrorCB->set_sensitive(!m_xAsCharRB->get_active() && !m_bIsMultiSelection); @@ -1224,7 +1224,7 @@ IMPL_LINK_NOARG(SvxSwPosSizeTabPage, AnchorTypeHdl, weld::ToggleButton&, void) } } -IMPL_LINK_NOARG(SvxSwPosSizeTabPage, MirrorHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxSwPosSizeTabPage, MirrorHdl, weld::Toggleable&, void) { RndStdIds nId = GetAnchorType(); InitPos( nId, USHRT_MAX, 0, USHRT_MAX, 0, LONG_MAX, LONG_MAX); @@ -1370,7 +1370,7 @@ IMPL_LINK( SvxSwPosSizeTabPage, ModifyHdl, weld::MetricSpinButton&, rEdit, void UpdateExample(); } -IMPL_LINK_NOARG(SvxSwPosSizeTabPage, ProtectHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxSwPosSizeTabPage, ProtectHdl, weld::Toggleable&, void) { if (m_xSizeCB->get_sensitive()) { diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 202576bff30d..712a88e86a7e 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -112,7 +112,7 @@ SvxTabulatorTabPage::SvxTabulatorTabPage(weld::Container* pPage, weld::DialogCon m_xDelBtn->connect_clicked(LINK(this,SvxTabulatorTabPage, DelHdl_Impl)); m_xDelAllBtn->connect_clicked(LINK(this,SvxTabulatorTabPage, DelAllHdl_Impl)); - Link<weld::ToggleButton&,void> aLink = LINK(this, SvxTabulatorTabPage, TabTypeCheckHdl_Impl); + Link<weld::Toggleable&,void> aLink = LINK(this, SvxTabulatorTabPage, TabTypeCheckHdl_Impl); m_xLeftTab->connect_toggled(aLink); m_xRightTab->connect_toggled(aLink); m_xDezTab->connect_toggled(aLink); @@ -525,7 +525,7 @@ IMPL_LINK_NOARG(SvxTabulatorTabPage, DelAllHdl_Impl, weld::Button&, void) } } -IMPL_LINK(SvxTabulatorTabPage, TabTypeCheckHdl_Impl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SvxTabulatorTabPage, TabTypeCheckHdl_Impl, weld::Toggleable&, rBox, void) { if (!rBox.get_active()) return; @@ -558,7 +558,7 @@ IMPL_LINK(SvxTabulatorTabPage, TabTypeCheckHdl_Impl, weld::ToggleButton&, rBox, } } -IMPL_LINK(SvxTabulatorTabPage, FillTypeCheckHdl_Impl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SvxTabulatorTabPage, FillTypeCheckHdl_Impl, weld::Toggleable&, rBox, void) { if (!rBox.get_active()) return; diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index 04f930b88f8a..71a5d185a3dc 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -438,7 +438,7 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl, weld::ComboBox&, voi } } -IMPL_LINK_NOARG(SvxTextAnimationPage, ClickEndlessHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxTextAnimationPage, ClickEndlessHdl_Impl, weld::Toggleable&, void) { if( eAniKind == SdrTextAniKind::Slide ) return; @@ -456,7 +456,7 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, ClickEndlessHdl_Impl, weld::ToggleButton&, } } -IMPL_LINK_NOARG(SvxTextAnimationPage, ClickAutoHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxTextAnimationPage, ClickAutoHdl_Impl, weld::Toggleable&, void) { TriState eState = m_xTsbAuto->get_state(); if( eState != TRISTATE_FALSE ) @@ -471,7 +471,7 @@ IMPL_LINK_NOARG(SvxTextAnimationPage, ClickAutoHdl_Impl, weld::ToggleButton&, vo } } -IMPL_LINK_NOARG(SvxTextAnimationPage, ClickPixelHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxTextAnimationPage, ClickPixelHdl_Impl, weld::Toggleable&, void) { TriState eState = m_xTsbPixel->get_state(); if (eState == TRISTATE_TRUE) diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 4f935f252172..679bb8dce740 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -85,7 +85,7 @@ SvxTextAttrPage::SvxTextAttrPage(weld::Container* pPage, weld::DialogController* SetFieldUnit( *m_xMtrFldTop, eFUnit ); SetFieldUnit( *m_xMtrFldBottom, eFUnit ); - Link<weld::ToggleButton&,void> aLink( LINK( this, SvxTextAttrPage, ClickHdl_Impl ) ); + Link<weld::Toggleable&,void> aLink( LINK( this, SvxTextAttrPage, ClickHdl_Impl ) ); m_xTsbAutoGrowWidth->connect_toggled( aLink ); m_xTsbAutoGrowHeight->connect_toggled( aLink ); m_xTsbAutoGrowSize->connect_toggled( aLink ); @@ -528,7 +528,7 @@ void SvxTextAttrPage::PointChanged(weld::DrawingArea*, RectPoint eRP) to be moved to a valid and adjacent position. This position depends on the current anchor position and the text writing direction. */ -IMPL_LINK_NOARG(SvxTextAttrPage, ClickFullWidthHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxTextAttrPage, ClickFullWidthHdl_Impl, weld::Toggleable&, void) { if( m_xTsbFullWidth->get_state() != TRISTATE_TRUE ) return; @@ -585,7 +585,7 @@ IMPL_LINK_NOARG(SvxTextAttrPage, ClickFullWidthHdl_Impl, weld::ToggleButton&, vo |* \************************************************************************/ -IMPL_LINK(SvxTextAttrPage, ClickHdl_Impl, weld::ToggleButton&, rButton, void) +IMPL_LINK(SvxTextAttrPage, ClickHdl_Impl, weld::Toggleable&, rButton, void) { if (&rButton == m_xTsbAutoGrowSize.get()) { diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 079b717c3efe..fe751bc37436 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -100,7 +100,7 @@ SvxAreaTabPage::SvxAreaTabPage(weld::Container* pPage, weld::DialogController* p maBox.AddButton(m_xBtnHatch.get()); maBox.AddButton(m_xBtnBitmap.get()); maBox.AddButton(m_xBtnPattern.get()); - Link<weld::ToggleButton&, void> aLink = LINK(this, SvxAreaTabPage, SelectFillTypeHdl_Impl); + Link<weld::Toggleable&, void> aLink = LINK(this, SvxAreaTabPage, SelectFillTypeHdl_Impl); m_xBtnNone->connect_toggled(aLink); m_xBtnColor->connect_toggled(aLink); m_xBtnGradient->connect_toggled(aLink); @@ -355,7 +355,7 @@ std::unique_ptr<SfxTabPage> lcl_CreateFillStyleTabPage(sal_uInt16 nId, weld::Con } -IMPL_LINK(SvxAreaTabPage, SelectFillTypeHdl_Impl, weld::ToggleButton&, rButton, void) +IMPL_LINK(SvxAreaTabPage, SelectFillTypeHdl_Impl, weld::Toggleable&, rButton, void) { //tdf#124549 - If the button is already active do not toggle it back. if(!rButton.get_active()) @@ -365,7 +365,7 @@ IMPL_LINK(SvxAreaTabPage, SelectFillTypeHdl_Impl, weld::ToggleButton&, rButton, m_bBtnClicked = true; } -void SvxAreaTabPage::SelectFillType(weld::ToggleButton& rButton, const SfxItemSet* _pSet) +void SvxAreaTabPage::SelectFillType(weld::Toggleable& rButton, const SfxItemSet* _pSet) { if (_pSet) m_rXFSet.Set(*_pSet); diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 73dc80cb975d..39e1a18dda4d 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -596,7 +596,7 @@ IMPL_LINK_NOARG( SvxBitmapTabPage, ModifyBitmapSizeHdl, weld::MetricSpinButton&, m_aCtlBitmapPreview.Invalidate(); } -IMPL_LINK_NOARG( SvxBitmapTabPage, ClickScaleHdl, weld::ToggleButton&, void ) +IMPL_LINK_NOARG( SvxBitmapTabPage, ClickScaleHdl, weld::Toggleable&, void ) { if (m_xTsbScale->get_state() == TRISTATE_TRUE) { diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index d1241b0e7db5..619fc4ad76dc 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -114,7 +114,7 @@ SvxColorTabPage::SvxColorTabPage(weld::Container* pPage, weld::DialogController* m_xMcustom->connect_value_changed(aMetricSpinLink); m_xKcustom->connect_value_changed(aMetricSpinLink); - Link<weld::ToggleButton&,void> aLink2 = LINK( this, SvxColorTabPage, SelectColorModeHdl_Impl ); + Link<weld::Toggleable&,void> aLink2 = LINK( this, SvxColorTabPage, SelectColorModeHdl_Impl ); m_xRbRGB->connect_toggled(aLink2); m_xRbCMYK->connect_toggled(aLink2); SetColorModel( eCM ); @@ -524,7 +524,7 @@ void SvxColorTabPage::ConvertColorValues (Color& rColor, ColorModel eModell) } } -IMPL_LINK_NOARG(SvxColorTabPage, SelectColorModeHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxColorTabPage, SelectColorModeHdl_Impl, weld::Toggleable&, void) { if (m_xRbRGB->get_active()) eCM = ColorModel::RGB; diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 51f6ecca35db..56814081b20b 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -264,7 +264,7 @@ IMPL_LINK( SvxGradientTabPage, ModifiedSliderHdl_Impl, weld::Scale&, rSlider, vo m_xGradientLB->SetNoSelection(); } -IMPL_LINK_NOARG( SvxGradientTabPage, ChangeAutoStepHdl_Impl, weld::ToggleButton&, void ) +IMPL_LINK_NOARG( SvxGradientTabPage, ChangeAutoStepHdl_Impl, weld::Toggleable&, void ) { if (m_xCbIncrement->get_active()) { diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 57d34031fe00..bcf2588675b5 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -286,7 +286,7 @@ IMPL_LINK( SvxHatchTabPage, ModifiedColorListBoxHdl_Impl, ColorListBox&, rListBo m_xHatchLB->SetNoSelection(); } -IMPL_LINK_NOARG( SvxHatchTabPage, ToggleHatchBackgroundColor_Impl, weld::ToggleButton&, void ) +IMPL_LINK_NOARG( SvxHatchTabPage, ToggleHatchBackgroundColor_Impl, weld::Toggleable&, void ) { if (m_xCbBackgroundColor->get_active()) m_xLbBackgroundColor->set_sensitive(true); diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 9b0e90886ca5..ceab29aed666 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -1255,7 +1255,7 @@ void SvxLineTabPage::ChangePreviewHdl_Impl(const weld::MetricSpinButton* pCntrl) m_xBoxEnd->set_sensitive(bHasLineEnd && bHasLineStyle); } -IMPL_LINK_NOARG(SvxLineTabPage, ChangeStartClickHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxLineTabPage, ChangeStartClickHdl_Impl, weld::Toggleable&, void) { if (m_xCbxSynchronize->get_active()) m_xTsbCenterEnd->set_state(m_xTsbCenterStart->get_state()); @@ -1336,7 +1336,7 @@ void SvxLineTabPage::ClickInvisibleHdl_Impl() ChangePreviewHdl_Impl( nullptr ); } -IMPL_LINK_NOARG(SvxLineTabPage, ChangeEndClickHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxLineTabPage, ChangeEndClickHdl_Impl, weld::Toggleable&, void) { if (m_xCbxSynchronize->get_active()) m_xTsbCenterStart->set_state(m_xTsbCenterEnd->get_state()); @@ -1381,7 +1381,7 @@ void SvxLineTabPage::FillUserData() // #58425# Symbols on a list (e.g. StarChart) // Handler for the symbol selection's popup menu (NumMenueButton) // The following link originates from SvxNumOptionsTabPage -IMPL_LINK_NOARG(SvxLineTabPage, MenuCreateHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxLineTabPage, MenuCreateHdl_Impl, weld::Toggleable&, void) { ScopedVclPtrInstance< VirtualDevice > pVD; @@ -1656,7 +1656,7 @@ IMPL_LINK( SvxLineTabPage, SizeHdl_Impl, weld::MetricSpinButton&, rField, void) m_aSymbolLastSize=m_aSymbolSize; } -IMPL_LINK(SvxLineTabPage, RatioHdl_Impl, weld::ToggleButton&, rBox, void) +IMPL_LINK(SvxLineTabPage, RatioHdl_Impl, weld::Toggleable&, rBox, void) { if (rBox.get_active()) { diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 2d4b04fb79cd..c895a6969c9b 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -369,12 +369,12 @@ IMPL_LINK_NOARG(SvxLineDefTabPage, ChangeNumber2Hdl_Impl, weld::SpinButton&, voi ChangePreviewHdl_Impl(*m_xMtrLength1); } -IMPL_LINK( SvxLineDefTabPage, ChangeMetricHdl_Impl, weld::ToggleButton&, r, void) +IMPL_LINK( SvxLineDefTabPage, ChangeMetricHdl_Impl, weld::Toggleable&, r, void) { ChangeMetricHdl_Impl(&r); } -void SvxLineDefTabPage::ChangeMetricHdl_Impl(const weld::ToggleButton* p) +void SvxLineDefTabPage::ChangeMetricHdl_Impl(const weld::Toggleable* p) { if( !m_xCbxSynchronize->get_active() && m_xMtrLength1->get_unit() != eFUnit ) { diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 64da825d685f..cca27ae0edb1 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -444,7 +444,7 @@ std::unique_ptr<SfxTabPage> SvxShadowTabPage::Create( weld::Container* pPage, we return std::make_unique<SvxShadowTabPage>(pPage, pController, *rAttrs); } -IMPL_LINK_NOARG(SvxShadowTabPage, ClickShadowHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxShadowTabPage, ClickShadowHdl_Impl, weld::Toggleable&, void) { if (m_xTsbShowShadow->get_state() == TRISTATE_FALSE) { diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx index 6aa38b8df941..3f7d9f6a76bd 100644 --- a/cui/source/tabpages/tptrans.cxx +++ b/cui/source/tabpages/tptrans.cxx @@ -50,7 +50,7 @@ const sal_uInt16 SvxTransparenceTabPage::pTransparenceRanges[] = |* \************************************************************************/ -IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransOffHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransOffHdl_Impl, weld::Toggleable&, void) { // disable all other controls ActivateLinear(false); @@ -65,7 +65,7 @@ IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransOffHdl_Impl, weld::ToggleButto InvalidatePreview(false); } -IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransLinearHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransLinearHdl_Impl, weld::Toggleable&, void) { // enable linear, disable other ActivateLinear(true); @@ -76,7 +76,7 @@ IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransLinearHdl_Impl, weld::ToggleBu ModifyTransparentHdl_Impl(*m_xMtrTransparent); } -IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransGradientHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxTransparenceTabPage, ClickTransGradientHdl_Impl, weld::Toggleable&, void) { // enable gradient, disable other ActivateLinear(false); diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index fe684f446e44..94ff0ef49d20 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -1160,7 +1160,7 @@ DeactivateRC SvxPositionSizeTabPage::DeactivatePage( SfxItemSet* _pSet ) } -IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangePosProtectHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangePosProtectHdl, weld::Toggleable&, void) { // #106572# Remember user's last choice m_xTsbSizeProtect->set_state(m_xTsbPosProtect->get_state() == TRISTATE_TRUE ? TRISTATE_TRUE : mnProtectSizeState); @@ -1199,7 +1199,7 @@ void SvxPositionSizeTabPage::UpdateControlStates() m_aCtlPos.Invalidate(); } -IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeSizeProtectHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeSizeProtectHdl, weld::Toggleable&, void) { if (m_xTsbSizeProtect->get_sensitive()) { @@ -1561,12 +1561,12 @@ IMPL_LINK_NOARG(SvxPositionSizeTabPage, ChangeHeightHdl, weld::MetricSpinButton& } } -IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickSizeProtectHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickSizeProtectHdl, weld::Toggleable&, void) { UpdateControlStates(); } -IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickAutoHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvxPositionSizeTabPage, ClickAutoHdl, weld::Toggleable&, void) { if (m_xCbxScale->get_active()) { diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 6855edff1644..cf4d16204bba 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -1088,7 +1088,7 @@ namespace }; }; -IMPL_LINK_NOARG(OAppDetailPageHelper, OnDropdownClickHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(OAppDetailPageHelper, OnDropdownClickHdl, weld::Toggleable&, void) { if (!m_xMBPreview->get_active()) return; diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index 44d40273115c..4428bcfc9f2a 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -155,7 +155,7 @@ namespace dbaui DECL_LINK( OnPasteEntry, LinkParamNone*, void ); DECL_LINK( OnDeleteEntry, LinkParamNone*, void ); - DECL_LINK(OnDropdownClickHdl, weld::ToggleButton&, void); + DECL_LINK(OnDropdownClickHdl, weld::Toggleable&, void); DECL_LINK(MenuSelectHdl, const OString&, void); OAppBorderWindow& getBorderWin() const { return m_rBorderWin; } diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index 9c8d0fdd8e91..a15c011f3734 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -167,7 +167,7 @@ using namespace ::com::sun::star; _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Entry>(m_xETHostServer.get())); _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Entry>(m_xETBaseDN.get())); _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::SpinButton>(m_xNFPortNumber.get())); - _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ToggleButton>(m_xCBUseSSL.get())); + _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Toggleable>(m_xCBUseSSL.get())); } void OLDAPConnectionPageSetup::fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) { @@ -223,7 +223,7 @@ using namespace ::com::sun::star; { } - IMPL_LINK_NOARG(OMySQLIntroPageSetup, OnSetupModeSelected, weld::ToggleButton&, void) + IMPL_LINK_NOARG(OMySQLIntroPageSetup, OnSetupModeSelected, weld::Toggleable&, void) { maClickHdl.Call( this ); } @@ -630,7 +630,7 @@ using namespace ::com::sun::star; void OSpreadSheetConnectionPageSetup::fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) { OConnectionTabPageSetup::fillControls(_rControlList); - _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ToggleButton>(m_xPasswordrequired.get())); + _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Toggleable>(m_xPasswordrequired.get())); } @@ -673,7 +673,7 @@ using namespace ::com::sun::star; void OAuthentificationPageSetup::fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) { _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Entry>(m_xETUserName.get())); - _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ToggleButton>(m_xCBPasswordRequired.get())); + _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Toggleable>(m_xCBPasswordRequired.get())); } void OAuthentificationPageSetup::implInitControls(const SfxItemSet& _rSet, bool /*_bSaveValue*/) @@ -754,10 +754,10 @@ using namespace ::com::sun::star; void OFinalDBPageSetup::fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) { - _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ToggleButton>(m_xCBOpenAfterwards.get())); - _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ToggleButton>(m_xCBStartTableWizard.get())); - _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ToggleButton>(m_xRBRegisterDataSource.get())); - _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ToggleButton>(m_xRBDontregisterDataSource.get())); + _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Toggleable>(m_xCBOpenAfterwards.get())); + _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Toggleable>(m_xCBStartTableWizard.get())); + _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Toggleable>(m_xRBRegisterDataSource.get())); + _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Toggleable>(m_xRBDontregisterDataSource.get())); } void OFinalDBPageSetup::implInitControls(const SfxItemSet& /*_rSet*/, bool /*_bSaveValue*/) @@ -775,7 +775,7 @@ using namespace ::com::sun::star; return true; } - IMPL_LINK(OFinalDBPageSetup, OnOpenSelected, weld::ToggleButton&, rBox, void) + IMPL_LINK(OFinalDBPageSetup, OnOpenSelected, weld::Toggleable&, rBox, void) { m_xCBStartTableWizard->set_sensitive(rBox.get_sensitive() && rBox.get_active()); } diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx index d1974fa731b5..64fa848c855f 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx @@ -211,7 +211,7 @@ namespace dbaui std::unique_ptr<weld::RadioButton> m_xNATIVEDatabase; Link<OMySQLIntroPageSetup *, void> maClickHdl; - DECL_LINK(OnSetupModeSelected, weld::ToggleButton&, void); + DECL_LINK(OnSetupModeSelected, weld::Toggleable&, void); }; // OAuthentificationPageSetup @@ -249,7 +249,7 @@ namespace dbaui bool IsTableWizardToBeStarted() const; void enableTableWizardCheckBox( bool _bSupportsTableCreation); - DECL_LINK(OnOpenSelected, weld::ToggleButton&, void); + DECL_LINK(OnOpenSelected, weld::Toggleable&, void); protected: virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; virtual void fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) override; diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index a494bda4c4ad..432f8b6cc150 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -121,7 +121,7 @@ namespace dbaui m_aGetExtensionHandler.Call(this); } - IMPL_LINK_NOARG(OTextConnectionHelper, OnSetExtensionHdl, weld::ToggleButton&, void) + IMPL_LINK_NOARG(OTextConnectionHelper, OnSetExtensionHdl, weld::Toggleable&, void) { bool bDoEnable = m_xAccessOtherFiles->get_active(); m_xOwnExtension->set_sensitive(bDoEnable); @@ -135,7 +135,7 @@ namespace dbaui _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ComboBox>(m_xTextSeparator.get())); _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ComboBox>(m_xDecimalSeparator.get())); _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ComboBox>(m_xThousandsSeparator.get())); - _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ToggleButton>(m_xRowHeader.get())); + _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Toggleable>(m_xRowHeader.get())); _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ComboBox>(m_xCharSet->get_widget())); } diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx index 459260960e40..41921f092f82 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.hxx @@ -68,7 +68,7 @@ namespace dbaui std::unique_ptr<weld::Label> m_xCharSetLabel; std::unique_ptr<CharSetListBox> m_xCharSet; - DECL_LINK(OnSetExtensionHdl, weld::ToggleButton&, void); + DECL_LINK(OnSetExtensionHdl, weld::Toggleable&, void); DECL_LINK(OnEditModified, weld::Entry&, void); OUString GetSeparator(const weld::ComboBox& rBox, const OUString& rList); diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index 88a3bdc1465f..de515f9e3777 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -66,7 +66,7 @@ namespace dbaui m_xContainer->show(); } - IMPL_LINK(MySQLNativeSettings, RadioToggleHdl, weld::ToggleButton&, rRadioButton, void) + IMPL_LINK(MySQLNativeSettings, RadioToggleHdl, weld::Toggleable&, rRadioButton, void) { m_aControlModificationLink.Call(&rRadioButton); diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx index 0f691cc51460..7bd1e5edfc97 100644 --- a/dbaccess/source/ui/dlg/admincontrols.hxx +++ b/dbaccess/source/ui/dlg/admincontrols.hxx @@ -45,7 +45,7 @@ namespace dbaui std::unique_ptr<weld::Entry> m_xSocket; std::unique_ptr<weld::Entry> m_xNamedPipe; Link<weld::Widget*,void> m_aControlModificationLink; - DECL_LINK(RadioToggleHdl, weld::ToggleButton&, void); + DECL_LINK(RadioToggleHdl, weld::Toggleable&, void); DECL_LINK(SpinModifyHdl, weld::SpinButton&, void); DECL_LINK(EditModifyHdl, weld::Entry&, void); diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 4dbdb3d6afad..9806c3d7199a 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -103,7 +103,7 @@ namespace dbaui callModifiedHdl(pCtrl); } - IMPL_LINK(OGenericAdministrationPage, OnControlModifiedButtonClick, weld::ToggleButton&, rCtrl, void) + IMPL_LINK(OGenericAdministrationPage, OnControlModifiedButtonClick, weld::Toggleable&, rCtrl, void) { callModifiedHdl(&rCtrl); } diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index e42ef6359525..de8265751992 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -45,11 +45,11 @@ namespace dbaui virtual void Disable() override { m_pSaveValue->set_sensitive(false); } }; - template <> class OSaveValueWidgetWrapper<weld::ToggleButton> : public ISaveValueWrapper + template <> class OSaveValueWidgetWrapper<weld::Toggleable> : public ISaveValueWrapper { - weld::ToggleButton* m_pSaveValue; + weld::Toggleable* m_pSaveValue; public: - explicit OSaveValueWidgetWrapper(weld::ToggleButton* _pSaveValue) : m_pSaveValue(_pSaveValue) + explicit OSaveValueWidgetWrapper(weld::Toggleable* _pSaveValue) : m_pSaveValue(_pSaveValue) { OSL_ENSURE(m_pSaveValue,"Illegal argument!"); } virtual void SaveValue() override { m_pSaveValue->save_state(); } @@ -225,7 +225,7 @@ namespace dbaui DECL_LINK(OnControlModified, weld::Widget*, void); DECL_LINK(OnControlEntryModifyHdl, weld::Entry&, void); DECL_LINK(OnControlSpinButtonModifyHdl, weld::SpinButton&, void); - DECL_LINK(OnControlModifiedButtonClick, weld::ToggleButton&, void); + DECL_LINK(OnControlModifiedButtonClick, weld::Toggleable&, void); DECL_LINK(OnTestConnectionButtonClickHdl, weld::Button&, void); }; } // namespace dbaui diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 335a346e2e28..809b483cd19a 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -434,7 +434,7 @@ IMPL_LINK_NOARG( OAddTableDlg, CloseClickHdl, weld::Button&, void ) m_xDialog->response(RET_CLOSE); } -IMPL_LINK_NOARG(OAddTableDlg, OnTypeSelected, weld::ToggleButton&, void) +IMPL_LINK_NOARG(OAddTableDlg, OnTypeSelected, weld::Toggleable&, void) { if ( m_xCaseTables->get_active() ) impl_switchTo( Tables ); diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx index 6ec06a9dbeb7..40964305a9f3 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.cxx +++ b/dbaccess/source/ui/dlg/advancedsettings.cxx @@ -114,7 +114,7 @@ namespace dbaui } } - IMPL_LINK(SpecialSettingsPage, OnTriStateToggleHdl, weld::ToggleButton&, rToggle, void) + IMPL_LINK(SpecialSettingsPage, OnTriStateToggleHdl, weld::Toggleable&, rToggle, void) { auto eOldState = m_aTriStates[&rToggle]; switch (eOldState) @@ -133,7 +133,7 @@ namespace dbaui OnToggleHdl(rToggle); } - IMPL_LINK(SpecialSettingsPage, OnToggleHdl, weld::ToggleButton&, rBtn, void) + IMPL_LINK(SpecialSettingsPage, OnToggleHdl, weld::Toggleable&, rBtn, void) { if (&rBtn == m_xAppendTableAlias.get() && m_xAsBeforeCorrelationName) { @@ -170,7 +170,7 @@ namespace dbaui { if (booleanSetting.xControl) { - _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ToggleButton>(booleanSetting.xControl.get())); + _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Toggleable>(booleanSetting.xControl.get())); } } @@ -297,7 +297,7 @@ namespace dbaui m_xAutoRetrieving->connect_changed(LINK(this, OGenericAdministrationPage, OnControlEntryModifyHdl)); } - IMPL_LINK(GeneratedValuesPage, OnAutoToggleHdl, weld::ToggleButton&, rBtn, void) + IMPL_LINK(GeneratedValuesPage, OnAutoToggleHdl, weld::Toggleable&, rBtn, void) { m_xGrid->set_sensitive(rBtn.get_active()); OnControlModifiedButtonClick(rBtn); @@ -314,7 +314,7 @@ namespace dbaui void GeneratedValuesPage::fillControls( std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList ) { - _rControlList.emplace_back( new OSaveValueWidgetWrapper<weld::ToggleButton>( m_xAutoRetrievingEnabled.get() ) ); + _rControlList.emplace_back( new OSaveValueWidgetWrapper<weld::Toggleable>( m_xAutoRetrievingEnabled.get() ) ); _rControlList.emplace_back( new OSaveValueWidgetWrapper<weld::Entry>( m_xAutoIncrement.get() ) ); _rControlList.emplace_back( new OSaveValueWidgetWrapper<weld::Entry>( m_xAutoRetrieving.get() ) ); } diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx index 181ccbb84faf..38f100612b43 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.hxx +++ b/dbaccess/source/ui/dlg/advancedsettings.hxx @@ -54,7 +54,7 @@ namespace dbaui std::unique_ptr<weld::Label> m_xMaxRowScanLabel; std::unique_ptr<weld::SpinButton> m_xMaxRowScan; - std::map<weld::ToggleButton*, TriState> m_aTriStates; + std::map<weld::Toggleable*, TriState> m_aTriStates; std::vector< BooleanSettingDesc > m_aBooleanSettings; @@ -62,8 +62,8 @@ namespace dbaui bool m_bHasMaxRowScan; public: - DECL_LINK(OnToggleHdl, weld::ToggleButton&, void); - DECL_LINK(OnTriStateToggleHdl, weld::ToggleButton&, void); + DECL_LINK(OnToggleHdl, weld::Toggleable&, void); + DECL_LINK(OnTriStateToggleHdl, weld::Toggleable&, void); virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override; @@ -100,7 +100,7 @@ namespace dbaui virtual ~GeneratedValuesPage() override; private: - DECL_LINK(OnAutoToggleHdl, weld::ToggleButton&, void); + DECL_LINK(OnAutoToggleHdl, weld::Toggleable&, void); // subclasses must override this, but it isn't pure virtual virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index 6f7e51e186d7..8b74872d904f 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -215,7 +215,7 @@ namespace dbaui aIndexDialog.run(); } - IMPL_LINK_NOARG(ODbaseDetailsPage, OnButtonToggled, weld::ToggleButton&, void) + IMPL_LINK_NOARG(ODbaseDetailsPage, OnButtonToggled, weld::Toggleable&, void) { m_xFT_Message->set_visible(m_xShowDeleted->get_active()); // it was the checkbox -> we count as modified from now on @@ -309,7 +309,7 @@ namespace dbaui { OCommonBehaviourTabPage::fillControls(_rControlList); _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Entry>(m_xEDHostname.get())); - _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ToggleButton>(m_xUseCatalog.get())); + _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Toggleable>(m_xUseCatalog.get())); _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::SpinButton>(m_xNFPortNumber.get())); } void OUserDriverDetailsPage::fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) @@ -509,7 +509,7 @@ namespace dbaui m_xMySQLSettings->fillControls( _rControlList ); _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Entry>(m_xUserName.get())); - _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::ToggleButton>(m_xPasswordRequired.get())); + _rControlList.emplace_back(new OSaveValueWidgetWrapper<weld::Toggleable>(m_xPasswordRequired.get())); } void MySQLNativePage::fillWindows(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList) @@ -612,7 +612,7 @@ namespace dbaui return bChangedSomething; } - IMPL_LINK(OLDAPDetailsPage, OnCheckBoxClick, weld::ToggleButton&, rCheckBox, void) + IMPL_LINK(OLDAPDetailsPage, OnCheckBoxClick, weld::Toggleable&, rCheckBox, void) { OnControlModifiedButtonClick(rCheckBox); callModifiedHdl(); diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx index d93d8dffa88e..2952f42e6155 100644 --- a/dbaccess/source/ui/dlg/detailpages.hxx +++ b/dbaccess/source/ui/dlg/detailpages.hxx @@ -101,7 +101,7 @@ namespace dbaui private: DECL_LINK(OnButtonClicked, weld::Button&, void); - DECL_LINK(OnButtonToggled, weld::ToggleButton&, void); + DECL_LINK(OnButtonToggled, weld::Toggleable&, void); }; // OAdoDetailsPage @@ -225,7 +225,7 @@ namespace dbaui std::unique_ptr<weld::SpinButton> m_xNFPortNumber; std::unique_ptr<weld::SpinButton> m_xNFRowCount; - DECL_LINK(OnCheckBoxClick, weld::ToggleButton&, void); + DECL_LINK(OnCheckBoxClick, weld::Toggleable&, void); }; // OTextDetailsPage diff --git a/dbaccess/source/ui/dlg/dlgsize.cxx b/dbaccess/source/ui/dlg/dlgsize.cxx index 5b9f3a1ae839..544d9577fdd9 100644 --- a/dbaccess/source/ui/dlg/dlgsize.cxx +++ b/dbaccess/source/ui/dlg/dlgsize.cxx @@ -63,7 +63,7 @@ sal_Int32 DlgSize::GetValue() const return static_cast<sal_Int32>(m_xMF_VALUE->get_value( FieldUnit::CM )); } -IMPL_LINK_NOARG(DlgSize, CbClickHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(DlgSize, CbClickHdl, weld::Toggleable&, void) { m_xMF_VALUE->set_sensitive(!m_xCB_STANDARD->get_active()); if (m_xCB_STANDARD->get_active()) diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index f9a8ebb4902c..da41b8984d6f 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -647,7 +647,7 @@ namespace dbaui EnableControls(); } - IMPL_LINK(OGeneralPageWizard, OnSetupModeSelected, weld::ToggleButton&, rButton, void) + IMPL_LINK(OGeneralPageWizard, OnSetupModeSelected, weld::Toggleable&, rButton, void) { if (!rButton.get_active()) return; diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx index 461161195eef..1abda980ec54 100644 --- a/dbaccess/source/ui/dlg/generalpage.hxx +++ b/dbaccess/source/ui/dlg/generalpage.hxx @@ -179,7 +179,7 @@ namespace dbaui void SetupModeSelected(); DECL_LINK( OnEmbeddedDBTypeSelected, weld::ComboBox&, void ); - DECL_LINK( OnSetupModeSelected, weld::ToggleButton&, void ); + DECL_LINK( OnSetupModeSelected, weld::Toggleable&, void ); DECL_LINK( OnDocumentSelected, weld::ComboBox&, void ); DECL_LINK( OnOpenDocument, weld::Button&, void ); }; diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx index 89aabbc0d27f..dfa9bf355187 100644 --- a/dbaccess/source/ui/dlg/indexdialog.cxx +++ b/dbaccess/source/ui/dlg/indexdialog.cxx @@ -615,7 +615,7 @@ namespace dbaui return true; } - IMPL_LINK_NOARG(DbaIndexDialog, OnModifiedClick, weld::ToggleButton&, void) + IMPL_LINK_NOARG(DbaIndexDialog, OnModifiedClick, weld::Toggleable&, void) { OnModified(*m_xFields); } diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx index f340d0c4757e..69dc96f144e2 100644 --- a/dbaccess/source/ui/inc/WCPage.hxx +++ b/dbaccess/source/ui/inc/WCPage.hxx @@ -40,8 +40,8 @@ namespace dbaui std::unique_ptr<weld::Label> m_xFT_KeyName; std::unique_ptr<weld::Entry> m_xEdKeyName; - DECL_LINK( RadioChangeHdl, weld::ToggleButton&, void ); - DECL_LINK( KeyClickHdl, weld::ToggleButton&, void ); + DECL_LINK( RadioChangeHdl, weld::Toggleable&, void ); + DECL_LINK( KeyClickHdl, weld::Toggleable&, void ); bool checkAppendData(); void SetAppendDataRadio(); diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx index c79eec0467e0..5fe1d7c1da42 100644 --- a/dbaccess/source/ui/inc/adtabdlg.hxx +++ b/dbaccess/source/ui/inc/adtabdlg.hxx @@ -70,7 +70,7 @@ namespace dbaui DECL_LINK( CloseClickHdl, weld::Button&, void); DECL_LINK( TableListDoubleClickHdl, weld::TreeView&, bool ); DECL_LINK( TableListSelectHdl, weld::TreeView&, void ); - DECL_LINK( OnTypeSelected, weld::ToggleButton&, void ); + DECL_LINK( OnTypeSelected, weld::Toggleable&, void ); public: OAddTableDlg(weld::Window* _pParent, diff --git a/dbaccess/source/ui/inc/dlgsize.hxx b/dbaccess/source/ui/inc/dlgsize.hxx index 3d530c193bc8..5a673d7122b3 100644 --- a/dbaccess/source/ui/inc/dlgsize.hxx +++ b/dbaccess/source/ui/inc/dlgsize.hxx @@ -29,7 +29,7 @@ namespace dbaui sal_Int32 m_nPrevValue; void SetValue( sal_Int32 nVal ); - DECL_LINK(CbClickHdl, weld::ToggleButton&, void); + DECL_LINK(CbClickHdl, weld::Toggleable&, void); std::unique_ptr<weld::MetricSpinButton> m_xMF_VALUE; std::unique_ptr<weld::CheckButton> m_xCB_STANDARD; diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index aa817171a184..f03b04f6f0b8 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -77,7 +77,7 @@ namespace dbaui DECL_LINK( OnIndexAction, const OString&, void ); DECL_LINK( OnEntryEditing, const weld::TreeIter&, bool ); DECL_LINK( OnEntryEdited, const IterString&, bool ); - DECL_LINK( OnModifiedClick, weld::ToggleButton&, void ); + DECL_LINK( OnModifiedClick, weld::Toggleable&, void ); DECL_LINK( OnModified, IndexFieldsControl&, void ); DECL_LINK( OnCloseDialog, weld::Button&, void ); diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx index 64abfd101dfd..738c85124708 100644 --- a/dbaccess/source/ui/misc/WCPage.cxx +++ b/dbaccess/source/ui/misc/WCPage.cxx @@ -97,7 +97,7 @@ void OCopyTable::SetAppendDataRadio() m_pParent->setOperation(CopyTableOperation::AppendData); } -IMPL_LINK(OCopyTable, RadioChangeHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(OCopyTable, RadioChangeHdl, weld::Toggleable&, rButton, void) { if (!rButton.get_active()) return; @@ -122,7 +122,7 @@ IMPL_LINK(OCopyTable, RadioChangeHdl, weld::ToggleButton&, rButton, void) m_pParent->setOperation( CopyTableOperation::CreateAsView ); } -IMPL_LINK_NOARG( OCopyTable, KeyClickHdl, weld::ToggleButton&, void ) +IMPL_LINK_NOARG( OCopyTable, KeyClickHdl, weld::Toggleable&, void ) { m_xEdKeyName->set_sensitive(m_xCB_PrimaryColumn->get_active()); m_xFT_KeyName->set_sensitive(m_xCB_PrimaryColumn->get_active()); diff --git a/dbaccess/source/ui/querydesign/querydlg.cxx b/dbaccess/source/ui/querydesign/querydlg.cxx index 422eeb9354fc..91631f9f3b93 100644 --- a/dbaccess/source/ui/querydesign/querydlg.cxx +++ b/dbaccess/source/ui/querydesign/querydlg.cxx @@ -230,7 +230,7 @@ IMPL_LINK_NOARG(DlgQryJoin, OKClickHdl, weld::Button&, void) m_xDialog->response(RET_OK); } -IMPL_LINK_NOARG(DlgQryJoin, NaturalToggleHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(DlgQryJoin, NaturalToggleHdl, weld::Toggleable&, void) { bool bChecked = m_xCBNatural->get_active(); static_cast<OQueryTableConnectionData*>(m_pConnData.get())->setNatural(bChecked); diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx index fbc58904a160..3da416c6e927 100644 --- a/dbaccess/source/ui/querydesign/querydlg.hxx +++ b/dbaccess/source/ui/querydesign/querydlg.hxx @@ -46,7 +46,7 @@ namespace dbaui DECL_LINK(OKClickHdl, weld::Button&, void); DECL_LINK(LBChangeHdl, weld::ComboBox&, void); - DECL_LINK(NaturalToggleHdl, weld::ToggleButton&, void); + DECL_LINK(NaturalToggleHdl, weld::Toggleable&, void); /** setJoinType enables and set the new join type @param _eNewJoinType the new jointype diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 00d2603e529d..8b3f5099a083 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -905,7 +905,7 @@ IMPL_LINK_NOARG(ExtMgrDialog, HandleEnableBtn, weld::Button&, void) } } -IMPL_LINK_NOARG(ExtMgrDialog, HandleExtTypeCbx, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ExtMgrDialog, HandleExtTypeCbx, weld::Toggleable&, void) { // re-creates the list of packages with addEntry selecting the packages prepareChecking(); diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 424ad607f7fa..70e7626435a4 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -132,7 +132,7 @@ class ExtMgrDialog : public weld::GenericDialogController DECL_LINK( HandleUpdateBtn, weld::Button&, void ); DECL_LINK( HandleCancelBtn, weld::Button&, void ); DECL_LINK( HandleCloseBtn, weld::Button&, void ); - DECL_LINK( HandleExtTypeCbx, weld::ToggleButton&, void ); + DECL_LINK( HandleExtTypeCbx, weld::Toggleable&, void ); DECL_LINK( TimeOutHdl, Timer *, void ); DECL_LINK( startProgress, void *, void ); diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index f24335b6357f..1e48fa7182f8 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -928,7 +928,7 @@ IMPL_LINK_NOARG(UpdateDialog, selectionHandler, weld::TreeView&, void) showDescription( b.makeStringAndClear() ); } -IMPL_LINK_NOARG(UpdateDialog, allHandler, weld::ToggleButton&, void) +IMPL_LINK_NOARG(UpdateDialog, allHandler, weld::Toggleable&, void) { if (m_xAll->get_active()) { diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx index 056b2803261f..323e4d58ba53 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx @@ -123,7 +123,7 @@ private: bool showDescription( const OUString& rDescription); DECL_LINK(selectionHandler, weld::TreeView&, void); - DECL_LINK(allHandler, weld::ToggleButton&, void); + DECL_LINK(allHandler, weld::Toggleable&, void); DECL_LINK(okHandler, weld::Button&, void); DECL_LINK(closeHandler, weld::Button&, void); DECL_LINK(entryToggled, const weld::TreeView::iter_col&, void); diff --git a/editeng/source/misc/hangulhanja.cxx b/editeng/source/misc/hangulhanja.cxx index 839943e86e72..1908586240e8 100644 --- a/editeng/source/misc/hangulhanja.cxx +++ b/editeng/source/misc/hangulhanja.cxx @@ -153,8 +153,8 @@ namespace editeng DECL_LINK( OnIgnoreAll, weld::Button&, void ); DECL_LINK( OnChange, weld::Button&, void ); DECL_LINK( OnChangeAll, weld::Button&, void ); - DECL_LINK( OnByCharClicked, weld::ToggleButton&, void ); - DECL_LINK( OnConversionTypeChanged, weld::ToggleButton&, void ); + DECL_LINK( OnByCharClicked, weld::Toggleable&, void ); + DECL_LINK( OnConversionTypeChanged, weld::Toggleable&, void ); DECL_LINK( OnFind, weld::Button&, void ); /** proceed, after the current convertible has been handled @@ -860,7 +860,7 @@ namespace editeng implProceed( false ); } - IMPL_LINK(HangulHanjaConversion_Impl, OnByCharClicked, weld::ToggleButton&, rBox, void) + IMPL_LINK(HangulHanjaConversion_Impl, OnByCharClicked, weld::Toggleable&, rBox, void) { m_bByCharacter = rBox.get_active(); @@ -868,7 +868,7 @@ namespace editeng implProceed( true ); } - IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnConversionTypeChanged, weld::ToggleButton&, void) + IMPL_LINK_NOARG(HangulHanjaConversion_Impl, OnConversionTypeChanged, weld::Toggleable&, void) { DBG_ASSERT( m_pConversionDialog, "we should always have a dialog here!" ); if( m_pConversionDialog ) diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx index 609918899e0b..028a08413bb0 100644 --- a/extensions/source/abpilot/abpfinalpage.cxx +++ b/extensions/source/abpilot/abpfinalpage.cxx @@ -204,7 +204,7 @@ namespace abp implCheckName(); } - IMPL_LINK_NOARG(FinalPage, OnRegister, weld::ToggleButton&, void) + IMPL_LINK_NOARG(FinalPage, OnRegister, weld::Toggleable&, void) { bool bEnable = m_xRegisterName->get_active(); m_xNameLabel->set_sensitive(bEnable); @@ -212,7 +212,7 @@ namespace abp implCheckName(); } - IMPL_LINK_NOARG(FinalPage, OnEmbed, weld::ToggleButton&, void) + IMPL_LINK_NOARG(FinalPage, OnEmbed, weld::Toggleable&, void) { bool bEmbed = m_xEmbed->get_active(); m_xLocationLabel->set_sensitive(!bEmbed); diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx index 229509cb97fb..6c6c5d69d989 100644 --- a/extensions/source/abpilot/abpfinalpage.hxx +++ b/extensions/source/abpilot/abpfinalpage.hxx @@ -62,8 +62,8 @@ namespace abp DECL_LINK(OnEntryNameModified, weld::Entry&, void); DECL_LINK(OnComboNameModified, weld::ComboBox&, void); - DECL_LINK(OnRegister, weld::ToggleButton&, void); - DECL_LINK(OnEmbed, weld::ToggleButton&, void); + DECL_LINK(OnRegister, weld::Toggleable&, void); + DECL_LINK(OnEmbed, weld::Toggleable&, void); bool isValidName() const; void implCheckName(); diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx index 29efaf4f4fe7..79cfd5d6b035 100644 --- a/extensions/source/abpilot/typeselectionpage.cxx +++ b/extensions/source/abpilot/typeselectionpage.cxx @@ -115,7 +115,7 @@ namespace abp m_aAllTypes.push_back( ButtonItem( m_xMacab.get(), AST_MACAB, bHaveMacab ) ); m_aAllTypes.push_back( ButtonItem( m_xOther.get(), AST_OTHER, true ) ); - Link<weld::ToggleButton&,void> aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected ); + Link<weld::Toggleable&,void> aTypeSelectionHandler = LINK(this, TypeSelectionPage, OnTypeSelected ); for (auto const& elem : m_aAllTypes) { if (!elem.m_bVisible) @@ -211,7 +211,7 @@ namespace abp && (AST_INVALID != getSelectedType()); } - IMPL_LINK(TypeSelectionPage, OnTypeSelected, weld::ToggleButton&, rButton, void) + IMPL_LINK(TypeSelectionPage, OnTypeSelected, weld::Toggleable&, rButton, void) { if (!rButton.get_active()) return; diff --git a/extensions/source/abpilot/typeselectionpage.hxx b/extensions/source/abpilot/typeselectionpage.hxx index b3878a6bf711..7c908057d642 100644 --- a/extensions/source/abpilot/typeselectionpage.hxx +++ b/extensions/source/abpilot/typeselectionpage.hxx @@ -71,7 +71,7 @@ namespace abp // OImportPage overridables virtual bool canAdvance() const override; - DECL_LINK( OnTypeSelected, weld::ToggleButton&, void ); + DECL_LINK( OnTypeSelected, weld::Toggleable&, void ); void selectType( AddressSourceType _eType ); }; diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index 3aede04224e4..3566e91c5c61 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -367,7 +367,7 @@ namespace dbp implEnableWindows(); } - IMPL_LINK(OMaybeListSelectionPage, OnRadioSelected, weld::ToggleButton&, rButton, void) + IMPL_LINK(OMaybeListSelectionPage, OnRadioSelected, weld::Toggleable&, rButton, void) { if (!rButton.get_active()) return; diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx index 6aaac6854eab..1ae74215009a 100644 --- a/extensions/source/dbpilots/commonpagesdbp.hxx +++ b/extensions/source/dbpilots/commonpagesdbp.hxx @@ -70,7 +70,7 @@ namespace dbp virtual ~OMaybeListSelectionPage() override; protected: - DECL_LINK( OnRadioSelected, weld::ToggleButton&, void ); + DECL_LINK( OnRadioSelected, weld::Toggleable&, void ); // BuilderPage overridables void Activate() override; diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index 1987de8d85c5..7cf09af05dd2 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -239,7 +239,7 @@ namespace pcr m_xNoAssignment->set_active(sData.isEmpty()); } - IMPL_LINK(OSelectLabelDialog, OnNoAssignmentClicked, weld::ToggleButton&, rButton, void) + IMPL_LINK(OSelectLabelDialog, OnNoAssignmentClicked, weld::Toggleable&, rButton, void) { DBG_ASSERT(&rButton == m_xNoAssignment.get(), "OSelectLabelDialog::OnNoAssignmentClicked : where did this come from ?"); diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx index cb45fe05abcc..bf55725382f6 100644 --- a/extensions/source/propctrlr/selectlabeldialog.hxx +++ b/extensions/source/propctrlr/selectlabeldialog.hxx @@ -55,7 +55,7 @@ namespace pcr sal_Int32 InsertEntries(const css::uno::Reference< css::uno::XInterface >& _xContainer, weld::TreeIter& rContainerEntry); DECL_LINK(OnEntrySelected, weld::TreeView&, void); - DECL_LINK(OnNoAssignmentClicked, weld::ToggleButton&, void); + DECL_LINK(OnNoAssignmentClicked, weld::Toggleable&, void); }; } // namespace pcr diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index 06a508d6f860..7dc78017ced8 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -617,7 +617,7 @@ IMPL_LINK( SaneDlg, ClickBtnHdl, weld::Button&, rButton, void ) } } -IMPL_LINK( SaneDlg, ToggleBtnHdl, weld::ToggleButton&, rButton, void ) +IMPL_LINK( SaneDlg, ToggleBtnHdl, weld::Toggleable&, rButton, void ) { if( mrSane.IsOpen() ) { diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx index f467cdd1f6f8..e9ba1540dab5 100644 --- a/extensions/source/scanner/sanedlg.hxx +++ b/extensions/source/scanner/sanedlg.hxx @@ -75,7 +75,7 @@ private: std::unique_ptr<weld::CustomWeld> mxPreviewWnd; DECL_LINK( ClickBtnHdl, weld::Button&, void ); - DECL_LINK( ToggleBtnHdl, weld::ToggleButton&, void ); + DECL_LINK( ToggleBtnHdl, weld::Toggleable&, void ); DECL_LINK( SelectHdl, weld::ComboBox&, void ); DECL_LINK( ModifyHdl, weld::Entry&, void ); DECL_LINK( MetricValueModifyHdl, weld::MetricSpinButton&, void ); diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 050c1aa4d5cc..7162cd2de2b2 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -741,18 +741,18 @@ std::unique_ptr<SfxTabPage> ImpPDFTabGeneralPage::Create( weld::Container* pPage return std::make_unique<ImpPDFTabGeneralPage>(pPage, pController, *rAttrSet); } -IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleAllHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleAllHdl, weld::Toggleable&, void) { EnableExportNotesPages(); } -IMPL_LINK_NOARG(ImpPDFTabGeneralPage, TogglePagesHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ImpPDFTabGeneralPage, TogglePagesHdl, weld::Toggleable&, void) { TogglePagesHdl(); EnableExportNotesPages(); } -IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleSelectionHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleSelectionHdl, weld::Toggleable&, void) { EnableExportNotesPages(); } @@ -773,27 +773,27 @@ void ImpPDFTabGeneralPage::EnableExportNotesPages() } } -IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportFormFieldsHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportFormFieldsHdl, weld::Toggleable&, void) { mxFormsFrame->set_sensitive(mxCbExportFormFields->get_active()); } -IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportNotesPagesHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportNotesPagesHdl, weld::Toggleable&, void) { mxCbExportOnlyNotesPages->set_sensitive(mxCbExportNotesPages->get_active()); } -IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleCompressionHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleCompressionHdl, weld::Toggleable&, void) { mxQualityFrame->set_sensitive(mxRbJPEGCompression->get_active()); } -IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleReduceImageResolutionHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleReduceImageResolutionHdl, weld::Toggleable&, void) { mxCoReduceImageResolution->set_sensitive(mxCbReduceImageResolution->get_active()); } -IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleWatermarkHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleWatermarkHdl, weld::Toggleable&, void) { mxEdWatermark->set_sensitive(mxCbWatermark->get_active()); mxFtWatermark->set_sensitive(mxCbWatermark->get_active()); @@ -801,7 +801,7 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleWatermarkHdl, weld::ToggleButton&, v mxEdWatermark->grab_focus(); } -IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleAddStreamHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleAddStreamHdl, weld::Toggleable&, void) { if (!mxCbAddStream->get_visible()) return; @@ -822,7 +822,7 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleAddStreamHdl, weld::ToggleButton&, v } } -IMPL_LINK_NOARG(ImpPDFTabGeneralPage, TogglePDFVersionOrUniversalAccessibilityHandle, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ImpPDFTabGeneralPage, TogglePDFVersionOrUniversalAccessibilityHandle, weld::Toggleable&, void) { const bool bIsPDFA = mxCbPDFA->get_active(); const bool bIsPDFUA = mxCbPDFUA->get_active(); @@ -1004,7 +1004,7 @@ void ImpPDFTabOpnFtrPage::SetFilterConfigItem( const ImpPDFTabDialog* pParent ) } } -IMPL_LINK_NOARG(ImpPDFTabOpnFtrPage, ToggleRbPgLyContinueFacingHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ImpPDFTabOpnFtrPage, ToggleRbPgLyContinueFacingHdl, weld::Toggleable&, void) { ToggleRbPgLyContinueFacingHdl(); } @@ -1014,7 +1014,7 @@ void ImpPDFTabOpnFtrPage::ToggleRbPgLyContinueFacingHdl() mxCbPgLyFirstOnLeft->set_sensitive(mxRbPgLyContinueFacing->get_active()); } -IMPL_LINK_NOARG( ImpPDFTabOpnFtrPage, ToggleRbMagnHdl, weld::ToggleButton&, void ) +IMPL_LINK_NOARG( ImpPDFTabOpnFtrPage, ToggleRbMagnHdl, weld::Toggleable&, void ) { mxNumZoom->set_sensitive(mxRbMagnZoom->get_active()); } @@ -1043,7 +1043,7 @@ ImpPDFTabViewerPage::~ImpPDFTabViewerPage() { } -IMPL_LINK_NOARG( ImpPDFTabViewerPage, ToggleRbBookmarksHdl, weld::ToggleButton&, void ) +IMPL_LINK_NOARG( ImpPDFTabViewerPage, ToggleRbBookmarksHdl, weld::Toggleable&, void ) { m_xNumBookmarkLevels->set_sensitive(m_xRbVisibleBookmarkLevels->get_active()); } @@ -1438,7 +1438,7 @@ void ImpPDFTabLinksPage::ImplPDFALinkControl( bool bEnableLaunch ) } /// Reset the memory of Launch action present when PDF/A-1 was requested -IMPL_LINK_NOARG(ImpPDFTabLinksPage, ClickRbOpnLnksDefaultHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ImpPDFTabLinksPage, ClickRbOpnLnksDefaultHdl, weld::Toggleable&, void) { mbOpnLnksDefaultUserState = m_xRbOpnLnksDefault->get_active(); mbOpnLnksLaunchUserState = m_xRbOpnLnksLaunch->get_active(); @@ -1446,7 +1446,7 @@ IMPL_LINK_NOARG(ImpPDFTabLinksPage, ClickRbOpnLnksDefaultHdl, weld::ToggleButton } /// Reset the memory of a launch action present when PDF/A-1 was requested -IMPL_LINK_NOARG(ImpPDFTabLinksPage, ClickRbOpnLnksBrowserHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ImpPDFTabLinksPage, ClickRbOpnLnksBrowserHdl, weld::Toggleable&, void) { mbOpnLnksDefaultUserState = m_xRbOpnLnksDefault->get_active(); mbOpnLnksLaunchUserState = m_xRbOpnLnksLaunch->get_active(); diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index b11ee000a970..d527c3797edb 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -214,20 +214,20 @@ class ImpPDFTabGeneralPage : public SfxTabPage std::unique_ptr<weld::Label> mxSlidesFt; std::unique_ptr<weld::Label> mxSheetsFt; - DECL_LINK(ToggleAllHdl, weld::ToggleButton&, void); - DECL_LINK(TogglePagesHdl, weld::ToggleButton&, void); - DECL_LINK(ToggleSelectionHdl, weld::ToggleButton&, void); - DECL_LINK(ToggleCompressionHdl, weld::ToggleButton&, void); - DECL_LINK(ToggleReduceImageResolutionHdl, weld::ToggleButton&, void); - DECL_LINK(ToggleWatermarkHdl, weld::ToggleButton&, void); - DECL_LINK(ToggleAddStreamHdl, weld::ToggleButton&, void); - DECL_LINK(ToggleExportFormFieldsHdl, weld::ToggleButton&, void); - DECL_LINK(ToggleExportNotesPagesHdl, weld::ToggleButton&, void); + DECL_LINK(ToggleAllHdl, weld::Toggleable&, void); + DECL_LINK(TogglePagesHdl, weld::Toggleable&, void); + DECL_LINK(ToggleSelectionHdl, weld::Toggleable&, void); + DECL_LINK(ToggleCompressionHdl, weld::Toggleable&, void); + DECL_LINK(ToggleReduceImageResolutionHdl, weld::Toggleable&, void); + DECL_LINK(ToggleWatermarkHdl, weld::Toggleable&, void); + DECL_LINK(ToggleAddStreamHdl, weld::Toggleable&, void); + DECL_LINK(ToggleExportFormFieldsHdl, weld::Toggleable&, void); + DECL_LINK(ToggleExportNotesPagesHdl, weld::Toggleable&, void); void TogglePagesHdl(); void EnableExportNotesPages(); - DECL_LINK(TogglePDFVersionOrUniversalAccessibilityHandle, weld::ToggleButton&, void); + DECL_LINK(TogglePDFVersionOrUniversalAccessibilityHandle, weld::Toggleable&, void); public: @@ -263,8 +263,8 @@ class ImpPDFTabOpnFtrPage : public SfxTabPage std::unique_ptr<weld::RadioButton> mxRbPgLyContinueFacing; std::unique_ptr<weld::CheckButton> mxCbPgLyFirstOnLeft; - DECL_LINK(ToggleRbPgLyContinueFacingHdl, weld::ToggleButton&, void); - DECL_LINK(ToggleRbMagnHdl, weld::ToggleButton&, void); + DECL_LINK(ToggleRbPgLyContinueFacingHdl, weld::Toggleable&, void); + DECL_LINK(ToggleRbMagnHdl, weld::Toggleable&, void); void ToggleRbPgLyContinueFacingHdl(); @@ -295,7 +295,7 @@ class ImpPDFTabViewerPage : public SfxTabPage std::unique_ptr<weld::RadioButton> m_xRbVisibleBookmarkLevels; std::unique_ptr<weld::SpinButton>m_xNumBookmarkLevels; - DECL_LINK(ToggleRbBookmarksHdl, weld::ToggleButton&, void); + DECL_LINK(ToggleRbBookmarksHdl, weld::Toggleable&, void); public: ImpPDFTabViewerPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); @@ -371,8 +371,8 @@ class ImpPDFTabLinksPage : public SfxTabPage std::unique_ptr<weld::RadioButton> m_xRbOpnLnksLaunch; std::unique_ptr<weld::RadioButton> m_xRbOpnLnksBrowser; - DECL_LINK(ClickRbOpnLnksDefaultHdl, weld::ToggleButton&, void); - DECL_LINK(ClickRbOpnLnksBrowserHdl, weld::ToggleButton&, void); + DECL_LINK(ClickRbOpnLnksDefaultHdl, weld::Toggleable&, void); + DECL_LINK(ClickRbOpnLnksBrowserHdl, weld::Toggleable&, void); public: ImpPDFTabLinksPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 06044e8a875f..22b79396d3d3 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -114,7 +114,7 @@ public: DECL_LINK( ModifyHdl, ParaWin&, void ); DECL_LINK( FxHdl, ParaWin&, void ); - DECL_LINK( MatrixHdl, weld::ToggleButton&, void ); + DECL_LINK( MatrixHdl, weld::Toggleable&, void ); DECL_LINK( FormulaHdl, weld::TextView&, void); DECL_LINK( FormulaCursorHdl, weld::TextView&, void ); DECL_LINK( BtnHdl, weld::Button&, void ); @@ -1655,7 +1655,7 @@ IMPL_LINK_NOARG( FormulaDlg_Impl, StructSelHdl, StructPage&, void) m_bStructUpdate = true; } -IMPL_LINK_NOARG( FormulaDlg_Impl, MatrixHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG( FormulaDlg_Impl, MatrixHdl, weld::Toggleable&, void) { m_bUserMatrixFlag = true; UpdateValues(true); diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx index 9095c12ee873..2096ccc0f178 100644 --- a/fpicker/source/office/OfficeControlAccess.cxx +++ b/fpicker/source/office/OfficeControlAccess.cxx @@ -664,7 +664,7 @@ namespace svt case PropFlags::Checked: { - weld::ToggleButton* pToggleButton = dynamic_cast<weld::ToggleButton*>(pControl); + weld::Toggleable* pToggleButton = dynamic_cast<weld::Toggleable*>(pControl); assert(pToggleButton && "OControlAccess::implSetControlProperty: invalid control/property combination!"); bool bChecked = false; @@ -752,7 +752,7 @@ namespace svt case PropFlags::Checked: { - const weld::ToggleButton* pToggleButton = dynamic_cast<const weld::ToggleButton*>(pControl); + const weld::Toggleable* pToggleButton = dynamic_cast<const weld::Toggleable*>(pControl); assert(pToggleButton && "OControlAccess::implGetControlProperty: invalid control/property combination!"); aReturn <<= pToggleButton->get_active(); diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index a861716559ef..acbe04e43d54 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -1213,7 +1213,7 @@ IMPL_LINK( SvtFileDialog, OpenDoneHdl_Impl, SvtFileView*, pView, void ) EnableControl( m_xImpl->m_xBtnUp->getWidget(), bCanTravelUp ); } -IMPL_LINK_NOARG(SvtFileDialog, AutoExtensionHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvtFileDialog, AutoExtensionHdl_Impl, weld::Toggleable&, void) { if (m_pFileNotifier) m_pFileNotifier->notify(CTRL_STATE_CHANGED, CHECKBOX_AUTOEXTENSION); @@ -1222,7 +1222,7 @@ IMPL_LINK_NOARG(SvtFileDialog, AutoExtensionHdl_Impl, weld::ToggleButton&, void) lcl_autoUpdateFileExtension( this, m_xImpl->GetCurFilter()->GetExtension() ); } -IMPL_LINK( SvtFileDialog, ClickHdl_Impl, weld::ToggleButton&, rCheckBox, void ) +IMPL_LINK( SvtFileDialog, ClickHdl_Impl, weld::Toggleable&, rCheckBox, void ) { if (!m_pFileNotifier) return; diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index 4eec689116fa..3578ae883de6 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -120,8 +120,8 @@ private: DECL_LINK(DblClickHdl_Impl, SvtFileView*, bool); DECL_LINK(EntrySelectHdl_Impl, weld::ComboBox&, void); DECL_LINK(OpenDoneHdl_Impl, SvtFileView*, void); - DECL_LINK(AutoExtensionHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(ClickHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(AutoExtensionHdl_Impl, weld::Toggleable&, void); + DECL_LINK(ClickHdl_Impl, weld::Toggleable&, void); DECL_LINK(PlayButtonHdl_Impl, weld::Button&, void); DECL_LINK(SizeAllocHdl, const Size&, void); diff --git a/include/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx index 84e5b6edc03d..3ef3220faa31 100644 --- a/include/editeng/edtdlg.hxx +++ b/include/editeng/edtdlg.hxx @@ -38,11 +38,10 @@ class SvxSpellWrapper; class LinkParamNone; namespace weld { class Button; } -namespace weld { class ToggleButton; } +namespace weld { class Toggleable; } namespace weld { class Window; } - class AbstractThesaurusDialog : public VclAbstractDialog { protected: @@ -71,8 +70,8 @@ public: virtual void SetIgnoreAllHdl( const Link<weld::Button&,void>& _rHdl ) = 0; virtual void SetChangeHdl( const Link<weld::Button&,void>& _rHdl ) = 0; virtual void SetChangeAllHdl( const Link<weld::Button&,void>& _rHdl ) = 0; - virtual void SetClickByCharacterHdl( const Link<weld::ToggleButton&,void>& _rHdl ) = 0; - virtual void SetConversionFormatChangedHdl( const Link<weld::ToggleButton&,void>& _rHdl ) = 0; + virtual void SetClickByCharacterHdl( const Link<weld::Toggleable&,void>& _rHdl ) = 0; + virtual void SetConversionFormatChangedHdl( const Link<weld::Toggleable&,void>& _rHdl ) = 0; virtual void SetFindHdl( const Link<weld::Button&,void>& _rHdl ) = 0; virtual bool GetUseBothDirections() const= 0; virtual editeng::HangulHanjaConversion::ConversionDirection diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx index 2a9992d26daf..e68286c1a2e1 100644 --- a/include/sfx2/printopt.hxx +++ b/include/sfx2/printopt.hxx @@ -57,15 +57,15 @@ private: PrinterOptions maPrinterOptions; PrinterOptions maPrintFileOptions; - DECL_DLLPRIVATE_LINK( ToggleOutputPrinterRBHdl, weld::ToggleButton&, void ); - DECL_DLLPRIVATE_LINK( ToggleOutputPrintFileRBHdl, weld::ToggleButton&, void); + DECL_DLLPRIVATE_LINK( ToggleOutputPrinterRBHdl, weld::Toggleable&, void ); + DECL_DLLPRIVATE_LINK( ToggleOutputPrintFileRBHdl, weld::Toggleable&, void); - DECL_DLLPRIVATE_LINK( ClickReduceTransparencyCBHdl, weld::ToggleButton&, void ); - DECL_DLLPRIVATE_LINK( ClickReduceGradientsCBHdl, weld::ToggleButton&, void ); - DECL_DLLPRIVATE_LINK( ClickReduceBitmapsCBHdl, weld::ToggleButton&, void ); + DECL_DLLPRIVATE_LINK( ClickReduceTransparencyCBHdl, weld::Toggleable&, void ); + DECL_DLLPRIVATE_LINK( ClickReduceGradientsCBHdl, weld::Toggleable&, void ); + DECL_DLLPRIVATE_LINK( ClickReduceBitmapsCBHdl, weld::Toggleable&, void ); - DECL_DLLPRIVATE_LINK( ToggleReduceGradientsStripesRBHdl, weld::ToggleButton&, void ); - DECL_DLLPRIVATE_LINK( ToggleReduceBitmapsResolutionRBHdl, weld::ToggleButton&, void ); + DECL_DLLPRIVATE_LINK( ToggleReduceGradientsStripesRBHdl, weld::Toggleable&, void ); + DECL_DLLPRIVATE_LINK( ToggleReduceBitmapsResolutionRBHdl, weld::Toggleable&, void ); SAL_DLLPRIVATE void ImplUpdateControls( const PrinterOptions* pCurrentOptions ); SAL_DLLPRIVATE void ImplSaveControls( PrinterOptions* pCurrentOptions ); diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx index f4faad6ba7cf..4c9b30e3f6e8 100644 --- a/include/sfx2/sidebar/TabBar.hxx +++ b/include/sfx2/sidebar/TabBar.hxx @@ -123,7 +123,7 @@ private: css::uno::Reference<css::graphic::XGraphic> GetItemImage(const DeckDescriptor& rDeskDescriptor) const; void UpdateButtonIcons(); - DECL_LINK(OnToolboxClicked, weld::ToggleButton&, void); + DECL_LINK(OnToolboxClicked, weld::Toggleable&, void); SidebarController* pParentSidebarController; std::unique_ptr<svt::AcceleratorExecute> mpAccel; diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index c83b2ab05880..89d0b6d3d61e 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -86,8 +86,8 @@ protected: DECL_LINK(ImplUpdateDataHdl, Timer*, void); DECL_LINK(KeyInputHdl, const KeyEvent&, bool); - DECL_LINK(ListViewHdl, weld::ToggleButton&, void); - DECL_LINK(ThumbnailViewHdl, weld::ToggleButton&, void); + DECL_LINK(ListViewHdl, weld::Toggleable&, void); + DECL_LINK(ThumbnailViewHdl, weld::Toggleable&, void); DECL_LINK(FocusRectLocalHdl, weld::Widget&, tools::Rectangle); DECL_LINK(FocusRectSearchHdl, weld::Widget&, tools::Rectangle); @@ -146,8 +146,8 @@ protected: std::unique_ptr<weld::Menu> mxTemplateDefaultMenu; std::unique_ptr<weld::CustomWeld> mxSearchViewWeld; std::unique_ptr<weld::CustomWeld> mxLocalViewWeld; - std::unique_ptr<weld::ToggleButton> mxListViewButton; - std::unique_ptr<weld::ToggleButton> mxThumbnailViewButton; + std::unique_ptr<weld::Toggleable> mxListViewButton; + std::unique_ptr<weld::Toggleable> mxThumbnailViewButton; TemplateViewMode mViewMode; bool bMakeSelItemVisible; }; diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index 0aff598ff705..eda2f1cd08dc 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -253,7 +253,7 @@ private: void UpdatePaintLineColor(); // returns sal_True if maPaintCol has changed DECL_LINK(ValueSelectHdl, ValueSet*, void); DECL_LINK(FocusHdl, weld::Widget&, void); - DECL_LINK(ToggleHdl, weld::ToggleButton&, void); + DECL_LINK(ToggleHdl, weld::Toggleable&, void); DECL_LINK(NoneHdl, weld::Button&, void); void UpdateEntries(); diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 4e0fd518efaa..0a9067d73733 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -551,7 +551,7 @@ namespace svt void Clicked(); private: - DECL_LINK(OnToggle, weld::ToggleButton&, void); + DECL_LINK(OnToggle, weld::Toggleable&, void); void CallModifyHdls() { @@ -766,7 +766,7 @@ namespace svt std::unique_ptr<weld::Button> m_xTodayBtn; std::unique_ptr<weld::Button> m_xNoneBtn; - DECL_LINK(ToggleHdl, weld::ToggleButton&, void); + DECL_LINK(ToggleHdl, weld::Toggleable&, void); DECL_LINK(ActivateHdl, weld::Calendar&, void); DECL_LINK(ImplClickHdl, weld::Button&, void); }; diff --git a/include/svx/ClassificationDialog.hxx b/include/svx/ClassificationDialog.hxx index 8259b64617fd..b83068ba1c1e 100644 --- a/include/svx/ClassificationDialog.hxx +++ b/include/svx/ClassificationDialog.hxx @@ -61,7 +61,7 @@ private: DECL_LINK(ButtonClicked, weld::Button&, void); DECL_LINK(OkHdl, weld::Button&, void); - DECL_LINK(SelectToolboxHdl, weld::ToggleButton&, void); + DECL_LINK(SelectToolboxHdl, weld::Toggleable&, void); DECL_LINK(SelectClassificationHdl, weld::ComboBox&, void); DECL_LINK(SelectMarkingHdl, weld::TreeView&, bool); DECL_LINK(SelectIPPartNumbersHdl, weld::TreeView&, bool); diff --git a/include/svx/colorbox.hxx b/include/svx/colorbox.hxx index c303a312820d..ff01b2941b78 100644 --- a/include/svx/colorbox.hxx +++ b/include/svx/colorbox.hxx @@ -48,7 +48,7 @@ private: void LockWidthRequest(); ColorWindow* getColorWindow() const; - DECL_LINK(ToggleHdl, weld::ToggleButton&, void); + DECL_LINK(ToggleHdl, weld::Toggleable&, void); public: // rTopLevelParentFunction will be used to get parent for any color picker dialog created diff --git a/include/svx/compressgraphicdialog.hxx b/include/svx/compressgraphicdialog.hxx index 9c11b8dc765f..2ee351075562 100644 --- a/include/svx/compressgraphicdialog.hxx +++ b/include/svx/compressgraphicdialog.hxx @@ -70,8 +70,8 @@ private: DECL_LINK( NewWidthModifiedHdl, weld::Entry&, void ); DECL_LINK( NewHeightModifiedHdl, weld::Entry&, void ); DECL_LINK( ResolutionModifiedHdl, weld::ComboBox&, void ); - DECL_LINK( ToggleCompressionRB, weld::ToggleButton&, void ); - DECL_LINK( ToggleReduceResolutionRB, weld::ToggleButton&, void ); + DECL_LINK( ToggleCompressionRB, weld::Toggleable&, void ); + DECL_LINK( ToggleReduceResolutionRB, weld::Toggleable&, void ); DECL_LINK( CalculateClickHdl, weld::Button&, void ); diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index c3e887ba1302..0b046f415f60 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -182,7 +182,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxTPFilter final : public SvxTPage std::unique_ptr<weld::Entry> m_xEdComment; DECL_LINK( SelDateHdl, weld::ComboBox&, void ); - DECL_LINK( RowEnableHdl, weld::ToggleButton&, void ); + DECL_LINK( RowEnableHdl, weld::Toggleable&, void ); DECL_LINK( TimeHdl, weld::Button&, void ); DECL_LINK( ModifyHdl, weld::Entry&, void ); DECL_LINK( ModifyListBoxHdl, weld::ComboBox&, void ); diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx index a48181d487fe..50e1a26aaddf 100644 --- a/include/svx/float3d.hxx +++ b/include/svx/float3d.hxx @@ -212,7 +212,7 @@ private: std::unique_ptr<SfxItemSet> mpRemember2DAttributes; DECL_LINK( ClickViewTypeHdl, weld::Button&, void ); - DECL_LINK( ClickUpdateHdl, weld::ToggleButton&, void ); + DECL_LINK( ClickUpdateHdl, weld::Toggleable&, void ); DECL_LINK( ClickAssignHdl, weld::Button&, void ); DECL_LINK( ClickHdl, weld::Button&, void ); DECL_LINK( ClickColorHdl, weld::Button&, void ); diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx index 01ddead29db4..c7d929f8ed66 100644 --- a/include/svx/hdft.hxx +++ b/include/svx/hdft.hxx @@ -81,8 +81,8 @@ protected: std::unique_ptr<weld::CustomWeld> m_xBspWin; void InitHandler(); - void TurnOn(const weld::ToggleButton* pButton); - DECL_LINK(TurnOnHdl, weld::ToggleButton&, void); + void TurnOn(const weld::Toggleable* pButton); + DECL_LINK(TurnOnHdl, weld::Toggleable&, void); DECL_LINK(BackgroundHdl, weld::Button&, void); DECL_LINK(ValueChangeHdl, weld::MetricSpinButton&, void); void RangeHdl(); diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx index 33be89ecb89a..2154844f1b50 100644 --- a/include/svx/optgrid.hxx +++ b/include/svx/optgrid.hxx @@ -124,10 +124,10 @@ protected: std::unique_ptr<weld::MetricSpinButton> m_xMtrFldAngle; std::unique_ptr<weld::MetricSpinButton> m_xMtrFldBezAngle; - DECL_LINK(ClickRotateHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(ClickRotateHdl_Impl, weld::Toggleable&, void); private: DECL_LINK(ChangeDrawHdl_Impl, weld::MetricSpinButton&, void); - DECL_LINK(ChangeGridsnapHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(ChangeGridsnapHdl_Impl, weld::Toggleable&, void); DECL_LINK(ChangeDivisionHdl_Impl, weld::SpinButton&, void); }; diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index 973671355cbf..cdbefe91ae58 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -226,9 +226,9 @@ private: std::unique_ptr<weld::Label> m_xCalcStrFT; DECL_DLLPRIVATE_LINK( ModifyHdl_Impl, weld::ComboBox&, void ); - DECL_DLLPRIVATE_LINK( FlagHdl_Impl, weld::ToggleButton&, void ); + DECL_DLLPRIVATE_LINK( FlagHdl_Impl, weld::Toggleable&, void ); DECL_DLLPRIVATE_LINK( CommandHdl_Impl, weld::Button&, void ); - DECL_DLLPRIVATE_LINK(TemplateHdl_Impl, weld::ToggleButton&, void); + DECL_DLLPRIVATE_LINK(TemplateHdl_Impl, weld::Toggleable&, void); DECL_DLLPRIVATE_LINK( FocusHdl_Impl, weld::Widget&, void ); DECL_DLLPRIVATE_LINK( LBSelectHdl_Impl, weld::ComboBox&, void ); DECL_DLLPRIVATE_LINK(LoseFocusHdl_Impl, weld::Widget&, void); diff --git a/include/vcl/jsdialog/executor.hxx b/include/vcl/jsdialog/executor.hxx index 713afaff9082..c6d7dceb60c7 100644 --- a/include/vcl/jsdialog/executor.hxx +++ b/include/vcl/jsdialog/executor.hxx @@ -26,7 +26,7 @@ public: static void trigger_changed(weld::IconView& rIconView) { rIconView.signal_selection_changed(); } - static void trigger_toggled(weld::ToggleButton& rButton) { rButton.signal_toggled(); } + static void trigger_toggled(weld::Toggleable& rButton) { rButton.signal_toggled(); } static void trigger_row_activated(weld::TreeView& rTreeView) { diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx index cd8958dd602b..680b1db92c69 100644 --- a/include/vcl/weld.hxx +++ b/include/vcl/weld.hxx @@ -1381,7 +1381,6 @@ public: virtual void set_image(const css::uno::Reference<css::graphic::XGraphic>& rImage) = 0; virtual void set_from_icon_name(const OUString& rIconName) = 0; virtual OUString get_label() const = 0; - virtual void set_label_wrap(bool wrap) = 0; void clicked() { signal_clicked(); } // font size is in points, not pixels, e.g. see Window::[G]etPointFont @@ -1399,12 +1398,12 @@ public: void connect_clicked(const Link<Button&, void>& rLink) { m_aClickHdl = rLink; } }; -class VCL_DLLPUBLIC ToggleButton : virtual public Button +class VCL_DLLPUBLIC Toggleable : virtual public Widget { friend class ::LOKTrigger; protected: - Link<ToggleButton&, void> m_aToggleHdl; + Link<Toggleable&, void> m_aToggleHdl; TriState m_eSavedValue = TRISTATE_FALSE; void signal_toggled() { m_aToggleHdl.Call(*this); } @@ -1447,7 +1446,12 @@ public: TriState get_saved_state() const { return m_eSavedValue; } bool get_state_changed_from_saved() const { return m_eSavedValue != get_state(); } - virtual void connect_toggled(const Link<ToggleButton&, void>& rLink) { m_aToggleHdl = rLink; } + virtual void connect_toggled(const Link<Toggleable&, void>& rLink) { m_aToggleHdl = rLink; } +}; + +class VCL_DLLPUBLIC ToggleButton : virtual public Button, virtual public Toggleable +{ + friend class ::LOKTrigger; }; struct VCL_DLLPUBLIC TriStateEnabled @@ -1459,7 +1463,7 @@ struct VCL_DLLPUBLIC TriStateEnabled , bTriStateEnabled(true) { } - void ButtonToggled(ToggleButton& rToggle); + void ButtonToggled(Toggleable& rToggle); }; class VCL_DLLPUBLIC MenuButton : virtual public ToggleButton @@ -1517,11 +1521,15 @@ class VCL_DLLPUBLIC MenuToggleButton : virtual public MenuButton { }; -class VCL_DLLPUBLIC CheckButton : virtual public ToggleButton +class VCL_DLLPUBLIC CheckButton : virtual public Toggleable { +public: + virtual void set_label(const OUString& rText) = 0; + virtual OUString get_label() const = 0; + virtual void set_label_wrap(bool wrap) = 0; }; -class VCL_DLLPUBLIC RadioButton : virtual public ToggleButton +class VCL_DLLPUBLIC RadioButton : virtual public CheckButton { }; diff --git a/reportdesign/source/ui/dlg/DateTime.cxx b/reportdesign/source/ui/dlg/DateTime.cxx index 9e5a91bbea64..fb3c93ef7467 100644 --- a/reportdesign/source/ui/dlg/DateTime.cxx +++ b/reportdesign/source/ui/dlg/DateTime.cxx @@ -167,7 +167,7 @@ OUString ODateTimeDialog::getFormatStringByKey(::sal_Int32 _nNumberFormatKey,con return xPreviewer->convertNumberToPreviewString(sFormat,nValue,m_nLocale,true); } -IMPL_LINK_NOARG(ODateTimeDialog, CBClickHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ODateTimeDialog, CBClickHdl, weld::Toggleable&, void) { const bool bDate = m_xDate->get_active(); m_xFTDateFormat->set_sensitive(bDate); diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx index 0906c7906e57..df9fbfe87c4a 100644 --- a/reportdesign/source/ui/inc/DateTime.hxx +++ b/reportdesign/source/ui/inc/DateTime.hxx @@ -61,7 +61,7 @@ class ODateTimeDialog : public weld::GenericDialogController */ sal_Int32 getFormatKey(bool _bDate) const; - DECL_LINK(CBClickHdl, weld::ToggleButton&, void); + DECL_LINK(CBClickHdl, weld::Toggleable&, void); ODateTimeDialog(const ODateTimeDialog&) = delete; void operator =(const ODateTimeDialog&) = delete; diff --git a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx index f2e0155b578b..9c59007314af 100644 --- a/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/AnalysisOfVarianceDialog.cxx @@ -121,7 +121,7 @@ const char* ScAnalysisOfVarianceDialog::GetUndoNameId() return STR_ANALYSIS_OF_VARIANCE_UNDO_NAME; } -IMPL_LINK_NOARG( ScAnalysisOfVarianceDialog, FactorChanged, weld::ToggleButton&, void ) +IMPL_LINK_NOARG( ScAnalysisOfVarianceDialog, FactorChanged, weld::Toggleable&, void ) { FactorChanged(); } diff --git a/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx b/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx index 9688e17ac68f..69da12adc126 100644 --- a/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/FourierAnalysisDialog.cxx @@ -223,7 +223,7 @@ void ScFourierAnalysisDialog::genFormula(OUString& rFormula) + OUString::boolean(mbInverse) + ";true;" + OUString::number(mfMinMag) + ")"; } -IMPL_LINK_NOARG(ScFourierAnalysisDialog, CheckBoxHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ScFourierAnalysisDialog, CheckBoxHdl, weld::Toggleable&, void) { ValidateDialogInput(); } diff --git a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx index 68f04630de29..3aa6b93626ee 100644 --- a/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/RandomNumberGeneratorDialog.cxx @@ -382,7 +382,7 @@ IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, Parameter2ValueModified, weld::Sp } } -IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, CheckChanged, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ScRandomNumberGeneratorDialog, CheckChanged, weld::Toggleable&, void) { mxSeed->set_sensitive(mxEnableSeed->get_active()); mxDecimalPlaces->set_sensitive(mxEnableRounding->get_active()); diff --git a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx index 7f0dd05cee94..5a4002f97d62 100644 --- a/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/RegressionDialog.cxx @@ -678,7 +678,7 @@ void ScRegressionDialog::WriteTable(const std::function<CellValueGetter>& rCellG } } -IMPL_LINK_NOARG(ScRegressionDialog, CheckBoxHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ScRegressionDialog, CheckBoxHdl, weld::Toggleable&, void) { ValidateDialogInput(); } diff --git a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx index 9963baa7c799..608ba1a30fa1 100644 --- a/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/SamplingDialog.cxx @@ -440,7 +440,7 @@ IMPL_LINK_NOARG(ScSamplingDialog, LoseButtonFocusHandler, formula::RefButton&, v mDialogLostFocus = !m_xDialog->has_toplevel_focus(); } -IMPL_LINK_NOARG(ScSamplingDialog, ToggleSamplingMethod, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ScSamplingDialog, ToggleSamplingMethod, weld::Toggleable&, void) { ToggleSamplingMethod(); } @@ -466,7 +466,7 @@ void ScSamplingDialog::ToggleSamplingMethod() } } -IMPL_LINK(ScSamplingDialog, CheckHdl, weld::ToggleButton&, rBtn, void) +IMPL_LINK(ScSamplingDialog, CheckHdl, weld::Toggleable&, rBtn, void) { // Keep both checkboxes enabled so user can easily switch between the three // possible combinations (one or the other or none), just uncheck the other diff --git a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx index d275d79c6524..7447ebf9a35a 100644 --- a/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/StatisticsInputOutputDialog.cxx @@ -216,7 +216,7 @@ IMPL_LINK_NOARG(ScStatisticsInputOutputDialog, LoseButtonFocusHandler, formula:: mDialogLostFocus = !m_xDialog->has_toplevel_focus(); } -IMPL_LINK_NOARG( ScStatisticsInputOutputDialog, GroupByChanged, weld::ToggleButton&, void ) +IMPL_LINK_NOARG( ScStatisticsInputOutputDialog, GroupByChanged, weld::Toggleable&, void ) { if (mxGroupByColumnsRadio->get_active()) mGroupedBy = BY_COLUMN; diff --git a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx index df93a0533b1d..3c0f7ce98b56 100644 --- a/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx +++ b/sc/source/ui/StatisticsDialogs/StatisticsTwoVariableDialog.cxx @@ -242,7 +242,7 @@ IMPL_LINK_NOARG( ScStatisticsTwoVariableDialog, LoseButtonFocusHandler, formula: mDialogLostFocus = !m_xDialog->has_toplevel_focus(); } -IMPL_LINK_NOARG(ScStatisticsTwoVariableDialog, GroupByChanged, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ScStatisticsTwoVariableDialog, GroupByChanged, weld::Toggleable&, void) { if (mxGroupByColumnsRadio->get_active()) mGroupedBy = BY_COLUMN; diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index 572e1dc362f6..5957de8d1c2d 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -141,31 +141,31 @@ DeactivateRC ScTabPageProtection::DeactivatePage( SfxItemSet* pSetP ) return DeactivateRC::LeavePage; } -IMPL_LINK(ScTabPageProtection, ProtectClickHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK(ScTabPageProtection, ProtectClickHdl, weld::Toggleable&, rBox, void) { aProtectState.ButtonToggled(rBox); ButtonClick(rBox); } -IMPL_LINK(ScTabPageProtection, HideCellClickHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK(ScTabPageProtection, HideCellClickHdl, weld::Toggleable&, rBox, void) { aHideCellState.ButtonToggled(rBox); ButtonClick(rBox); } -IMPL_LINK(ScTabPageProtection, HideFormulaClickHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK(ScTabPageProtection, HideFormulaClickHdl, weld::Toggleable&, rBox, void) { aHideFormulaState.ButtonToggled(rBox); ButtonClick(rBox); } -IMPL_LINK(ScTabPageProtection, HidePrintClickHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK(ScTabPageProtection, HidePrintClickHdl, weld::Toggleable&, rBox, void) { aHidePrintState.ButtonToggled(rBox); ButtonClick(rBox); } -void ScTabPageProtection::ButtonClick(weld::ToggleButton& rBox) +void ScTabPageProtection::ButtonClick(weld::Toggleable& rBox) { TriState eState = rBox.get_state(); if (eState == TRISTATE_INDET) diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 1e8cb5662d82..c8df91c57872 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -662,7 +662,7 @@ IMPL_LINK(ScCheckListMenuControl, ButtonHdl, weld::Button&, rBtn, void) } } -IMPL_LINK_NOARG(ScCheckListMenuControl, TriStateHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ScCheckListMenuControl, TriStateHdl, weld::Toggleable&, void) { switch (mePrevToggleAllState) { diff --git a/sc/source/ui/dbgui/PivotLayoutDialog.cxx b/sc/source/ui/dbgui/PivotLayoutDialog.cxx index 700f189e19ef..39357771105d 100644 --- a/sc/source/ui/dbgui/PivotLayoutDialog.cxx +++ b/sc/source/ui/dbgui/PivotLayoutDialog.cxx @@ -112,7 +112,7 @@ ScPivotLayoutDialog::ScPivotLayoutDialog( , mxMore(m_xBuilder->weld_expander("more")) { // Source UI - Link<weld::ToggleButton&,void> aLink2 = LINK(this, ScPivotLayoutDialog, ToggleSource); + Link<weld::Toggleable&,void> aLink2 = LINK(this, ScPivotLayoutDialog, ToggleSource); mxSourceRadioNamedRange->connect_toggled(aLink2); mxSourceRadioSelection->connect_toggled(aLink2); @@ -686,7 +686,7 @@ IMPL_LINK_NOARG(ScPivotLayoutDialog, SourceEditModified, formula::RefEdit&, void UpdateSourceRange(); } -IMPL_LINK_NOARG(ScPivotLayoutDialog, ToggleSource, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ScPivotLayoutDialog, ToggleSource, weld::Toggleable&, void) { ToggleSource(); } @@ -701,7 +701,7 @@ void ScPivotLayoutDialog::ToggleSource() UpdateSourceRange(); } -IMPL_LINK_NOARG(ScPivotLayoutDialog, ToggleDestination, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ScPivotLayoutDialog, ToggleDestination, weld::Toggleable&, void) { ToggleDestination(); } diff --git a/sc/source/ui/dbgui/dapitype.cxx b/sc/source/ui/dbgui/dapitype.cxx index 15acb8c65553..9843a2bb975b 100644 --- a/sc/source/ui/dbgui/dapitype.cxx +++ b/sc/source/ui/dbgui/dapitype.cxx @@ -101,7 +101,7 @@ void ScDataPilotSourceTypeDlg::AppendNamedRange(const OUString& rName) } } -IMPL_LINK_NOARG(ScDataPilotSourceTypeDlg, RadioClickHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ScDataPilotSourceTypeDlg, RadioClickHdl, weld::Toggleable&, void) { m_xLbNamedRange->set_sensitive(m_xBtnNamedRange->get_active()); } diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index d260b4337680..4846a9c48aed 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.cxx @@ -93,7 +93,7 @@ void ScDPGroupEditHelper::SetValue( bool bAuto, double fValue ) ImplSetValue( fValue ); } -IMPL_LINK(ScDPGroupEditHelper, ToggleHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(ScDPGroupEditHelper, ToggleHdl, weld::Toggleable&, rButton, void) { if (!rButton.get_active()) return; @@ -302,7 +302,7 @@ sal_Int32 ScDPDateGroupDlg::GetDatePart() const return nDatePart; } -IMPL_LINK(ScDPDateGroupDlg, ToggleHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(ScDPDateGroupDlg, ToggleHdl, weld::Toggleable&, rButton, void) { if (!rButton.get_active()) return; diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 1b417eb4d326..7e6808f655d7 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -1003,7 +1003,7 @@ IMPL_LINK(ScFilterDlg, LbSelectHdl, weld::ComboBox&, rLb, void) } } -IMPL_LINK( ScFilterDlg, CheckBoxHdl, weld::ToggleButton&, rBox, void ) +IMPL_LINK( ScFilterDlg, CheckBoxHdl, weld::Toggleable&, rBox, void ) { // Column headers: // Field list: Columnxx <-> column header string diff --git a/sc/source/ui/dbgui/foptmgr.cxx b/sc/source/ui/dbgui/foptmgr.cxx index da323ed2f8bb..ac06054ac9be 100644 --- a/sc/source/ui/dbgui/foptmgr.cxx +++ b/sc/source/ui/dbgui/foptmgr.cxx @@ -239,7 +239,7 @@ IMPL_LINK( ScFilterOptionsMgr, EdAreaModifyHdl, formula::RefEdit&, rEd, void ) pLbCopyArea->set_active( 0 ); } -IMPL_LINK( ScFilterOptionsMgr, BtnCopyResultHdl, weld::ToggleButton&, rBox, void ) +IMPL_LINK( ScFilterOptionsMgr, BtnCopyResultHdl, weld::Toggleable&, rBox, void ) { if ( &rBox != pBtnCopyResult ) return; diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx index 1fe50d32a204..04abc907e7c4 100644 --- a/sc/source/ui/dbgui/pfiltdlg.cxx +++ b/sc/source/ui/dbgui/pfiltdlg.cxx @@ -463,7 +463,7 @@ IMPL_LINK( ScPivotFilterDlg, LbSelectHdl, weld::ComboBox&, rLb, void ) } } -IMPL_LINK(ScPivotFilterDlg, CheckBoxHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK(ScPivotFilterDlg, CheckBoxHdl, weld::Toggleable&, rBox, void) { // update the value lists when dealing with uppercase/lowercase diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index 6c1e006ecbc5..90a13e920352 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -562,7 +562,7 @@ IMPL_LINK(ScDPSubtotalDlg, ButtonClicked, weld::Button&, rButton, void) response(RET_CANCEL); } -IMPL_LINK(ScDPSubtotalDlg, RadioClickHdl, weld::ToggleButton&, rBtn, void) +IMPL_LINK(ScDPSubtotalDlg, RadioClickHdl, weld::Toggleable&, rBtn, void) { if (!rBtn.get_active()) return; @@ -876,7 +876,7 @@ IMPL_LINK(ScDPSubtotalOptDlg, ButtonClicked, weld::Button&, rButton, void) response(RET_CANCEL); } -IMPL_LINK(ScDPSubtotalOptDlg, RadioClickHdl, weld::ToggleButton&, rBtn, void) +IMPL_LINK(ScDPSubtotalOptDlg, RadioClickHdl, weld::Toggleable&, rBtn, void) { if (!rBtn.get_active()) return; @@ -884,7 +884,7 @@ IMPL_LINK(ScDPSubtotalOptDlg, RadioClickHdl, weld::ToggleButton&, rBtn, void) m_xLbSortBy->set_sensitive(m_xRbSortMan->get_active()); } -IMPL_LINK(ScDPSubtotalOptDlg, CheckHdl, weld::ToggleButton&, rCBox, void) +IMPL_LINK(ScDPSubtotalOptDlg, CheckHdl, weld::Toggleable&, rCBox, void) { if (&rCBox == m_xCbShow.get()) { diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index a1bc89825196..f287bf1c440c 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -154,7 +154,7 @@ IMPL_LINK_NOARG(ScNewScenarioDlg, OkHdl, weld::Button&, void) //! when editing, test whether another table has the name! } -IMPL_LINK(ScNewScenarioDlg, EnableHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK(ScNewScenarioDlg, EnableHdl, weld::Toggleable&, rBox, void) { if (&rBox == m_xCbShowFrame.get()) m_xLbColor->set_sensitive(m_xCbShowFrame->get_active()); diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 1347bf645112..395d2595937b 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -431,7 +431,7 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, const OUString& aDatNa lcl_FillCombo( *mxCbTextSep, gaTextSepList, mcTextSep ); mxCbTextSep->set_entry_text(sTextSeparators); - Link<weld::ToggleButton&,void> aSeparatorClickHdl =LINK( this, ScImportAsciiDlg, SeparatorClickHdl ); + Link<weld::Toggleable&,void> aSeparatorClickHdl =LINK( this, ScImportAsciiDlg, SeparatorClickHdl ); mxCbTextSep->connect_changed( LINK( this, ScImportAsciiDlg, SeparatorComboBoxHdl ) ); mxCkbTab->connect_toggled( aSeparatorClickHdl ); mxCkbSemicolon->connect_toggled( aSeparatorClickHdl ); @@ -706,14 +706,14 @@ void ScImportAsciiDlg::RbSepFix() SetupSeparatorCtrls(); } -IMPL_LINK(ScImportAsciiDlg, RbSepFixHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(ScImportAsciiDlg, RbSepFixHdl, weld::Toggleable&, rButton, void) { if (!rButton.get_active()) return; RbSepFix(); } -IMPL_LINK(ScImportAsciiDlg, SeparatorClickHdl, weld::ToggleButton&, rCtrl, void) +IMPL_LINK(ScImportAsciiDlg, SeparatorClickHdl, weld::Toggleable&, rCtrl, void) { SeparatorHdl(&rCtrl); } diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx index 9969251729e8..30bd89823f89 100644 --- a/sc/source/ui/dbgui/scuiimoptdlg.cxx +++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx @@ -305,7 +305,7 @@ sal_uInt16 ScImportOptionsDlg::GetCodeFromCombo(const weld::ComboBox& rEd) const return nCode; } -IMPL_LINK_NOARG(ScImportOptionsDlg, FixedWidthHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ScImportOptionsDlg, FixedWidthHdl, weld::Toggleable&, void) { bool bEnable = !m_xCbFixed->get_active(); m_xFtFieldSep->set_sensitive( bEnable ); diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx index b8e99ca2e6df..99ddc425da37 100644 --- a/sc/source/ui/dbgui/textimportoptions.cxx +++ b/sc/source/ui/dbgui/textimportoptions.cxx @@ -62,7 +62,7 @@ bool ScTextImportOptionsDlg::isKeepAskingSet() const void ScTextImportOptionsDlg::init() { m_xBtnOk->connect_clicked(LINK(this, ScTextImportOptionsDlg, OKHdl)); - Link<weld::ToggleButton&,void> aLink = LINK(this, ScTextImportOptionsDlg, RadioHdl); + Link<weld::Toggleable&,void> aLink = LINK(this, ScTextImportOptionsDlg, RadioHdl); m_xRbAutomatic->connect_toggled(aLink); m_xRbCustom->connect_toggled(aLink); @@ -81,7 +81,7 @@ IMPL_LINK_NOARG(ScTextImportOptionsDlg, OKHdl, weld::Button&, void) m_xDialog->response(RET_OK); } -IMPL_LINK(ScTextImportOptionsDlg, RadioHdl, weld::ToggleButton&, rBtn, void) +IMPL_LINK(ScTextImportOptionsDlg, RadioHdl, weld::Toggleable&, rBtn, void) { if (&rBtn == m_xRbAutomatic.get()) { diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index c0b84d022274..87989f0069d7 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -796,7 +796,7 @@ void ScTabPageSortOptions::FillUserSortListBox() // Handler: -IMPL_LINK( ScTabPageSortOptions, EnableHdl, weld::ToggleButton&, rButton, void ) +IMPL_LINK( ScTabPageSortOptions, EnableHdl, weld::Toggleable&, rButton, void ) { if (&rButton == m_xBtnCopyResult.get()) { @@ -838,7 +838,7 @@ IMPL_LINK(ScTabPageSortOptions, SelOutPosHdl, weld::ComboBox&, rLb, void) } } -IMPL_LINK_NOARG(ScTabPageSortOptions, SortDirHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ScTabPageSortOptions, SortDirHdl, weld::Toggleable&, void) { if (m_xBtnTopDown->get_active()) m_xBtnHeader->set_label(aStrColLabel); diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index 57b34a9b09f9..b9496fdef35e 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -551,7 +551,7 @@ void ScTpSubTotalOptions::FillUserSortListBox() // Handler: -IMPL_LINK(ScTpSubTotalOptions, CheckHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK(ScTpSubTotalOptions, CheckHdl, weld::Toggleable&, rBox, void) { if (&rBox == m_xBtnSort.get()) { @@ -588,7 +588,7 @@ IMPL_LINK(ScTpSubTotalOptions, CheckHdl, weld::ToggleButton&, rBox, void) } } -IMPL_LINK(ScTpSubTotalGroup, CheckBoxHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK(ScTpSubTotalGroup, CheckBoxHdl, weld::Toggleable&, rBox, void) { if (&rBox != mxLbSelectAllColumns.get()) return; diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index ca74136968d6..b3d471d886a5 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -688,7 +688,7 @@ IMPL_LINK_NOARG(ScTPValidationValue, SelectHdl, weld::ComboBox&, void) m_xBtnRef->GetWidget()->set_visible( bRange ); // cell range picker } -IMPL_LINK_NOARG(ScTPValidationValue, CheckHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ScTPValidationValue, CheckHdl, weld::Toggleable&, void) { m_xCbSort->set_sensitive( m_xCbShow->get_active() ); } diff --git a/sc/source/ui/dialogs/searchresults.cxx b/sc/source/ui/dialogs/searchresults.cxx index 2ad53cfde7e8..c9558c5376f3 100644 --- a/sc/source/ui/dialogs/searchresults.cxx +++ b/sc/source/ui/dialogs/searchresults.cxx @@ -236,7 +236,7 @@ IMPL_LINK_NOARG( SearchResultsDlg, ListSelectHdl, weld::TreeView&, void ) pScViewShell->AlignToCursor(aPos.Col(), aPos.Row(), SC_FOLLOW_JUMP); } -IMPL_STATIC_LINK( SearchResultsDlg, OnShowToggled, weld::ToggleButton&, rButton, void ) +IMPL_STATIC_LINK( SearchResultsDlg, OnShowToggled, weld::Toggleable&, rButton, void ) { ScTabViewShell* pScViewShell = ScTabViewShell::GetActiveViewShell(); ScViewOptions aViewOpt( pScViewShell->GetViewData().GetOptions() ); diff --git a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx index 78506127a32e..675cc422e1e6 100644 --- a/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx +++ b/sc/source/ui/inc/AnalysisOfVarianceDialog.hxx @@ -27,7 +27,7 @@ private: TWO_FACTOR }; - DECL_LINK(FactorChanged, weld::ToggleButton&, void); + DECL_LINK(FactorChanged, weld::Toggleable&, void); void FactorChanged(); AnovaFactor meFactor; diff --git a/sc/source/ui/inc/FourierAnalysisDialog.hxx b/sc/source/ui/inc/FourierAnalysisDialog.hxx index 3814c6e7487d..ab9507e31c49 100644 --- a/sc/source/ui/inc/FourierAnalysisDialog.hxx +++ b/sc/source/ui/inc/FourierAnalysisDialog.hxx @@ -50,7 +50,7 @@ private: void getDataLabel(OUString& rLabel); void genFormula(OUString& rFormula); - DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void); + DECL_LINK(CheckBoxHdl, weld::Toggleable&, void); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/PivotLayoutDialog.hxx b/sc/source/ui/inc/PivotLayoutDialog.hxx index fe5d0bf40a8d..0ce026bf4047 100644 --- a/sc/source/ui/inc/PivotLayoutDialog.hxx +++ b/sc/source/ui/inc/PivotLayoutDialog.hxx @@ -93,8 +93,8 @@ private: DECL_LINK(GetButtonFocusHandler, formula::RefButton&, void); DECL_LINK(LoseEditFocusHandler, formula::RefEdit&, void); DECL_LINK(LoseButtonFocusHandler, formula::RefButton&, void); - DECL_LINK(ToggleSource, weld::ToggleButton&, void); - DECL_LINK(ToggleDestination, weld::ToggleButton&, void); + DECL_LINK(ToggleSource, weld::Toggleable&, void); + DECL_LINK(ToggleDestination, weld::Toggleable&, void); DECL_LINK(SourceListSelected, weld::ComboBox&, void); DECL_LINK(SourceEditModified, formula::RefEdit&, void); void ToggleSource(); diff --git a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx index 4fb20954fd09..40a457732909 100644 --- a/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx +++ b/sc/source/ui/inc/RandomNumberGeneratorDialog.hxx @@ -78,7 +78,7 @@ private: DECL_LINK( Parameter1ValueModified, weld::SpinButton&, void ); DECL_LINK( Parameter2ValueModified, weld::SpinButton&, void ); DECL_LINK( DistributionChanged, weld::ComboBox&, void ); - DECL_LINK( CheckChanged, weld::ToggleButton&, void ); + DECL_LINK( CheckChanged, weld::Toggleable&, void ); }; diff --git a/sc/source/ui/inc/RegressionDialog.hxx b/sc/source/ui/inc/RegressionDialog.hxx index 7872b2660fc0..cab704d96384 100644 --- a/sc/source/ui/inc/RegressionDialog.hxx +++ b/sc/source/ui/inc/RegressionDialog.hxx @@ -74,7 +74,7 @@ private: size_t nColsInTable, AddressWalkerWriter& rOutput, const std::function<CellWriter>& rFunc); - DECL_LINK( CheckBoxHdl, weld::ToggleButton&, void ); + DECL_LINK( CheckBoxHdl, weld::Toggleable&, void ); DECL_LINK( NumericFieldHdl, weld::SpinButton&, void ); }; diff --git a/sc/source/ui/inc/SamplingDialog.hxx b/sc/source/ui/inc/SamplingDialog.hxx index 23b727d40083..e561092a80f1 100644 --- a/sc/source/ui/inc/SamplingDialog.hxx +++ b/sc/source/ui/inc/SamplingDialog.hxx @@ -82,9 +82,9 @@ private: DECL_LINK( LoseButtonFocusHandler, formula::RefButton&, void ); DECL_LINK( SamplingSizeValueModified, weld::SpinButton&, void ); DECL_LINK( PeriodValueModified, weld::SpinButton&, void ); - DECL_LINK( ToggleSamplingMethod, weld::ToggleButton&, void ); + DECL_LINK( ToggleSamplingMethod, weld::Toggleable&, void ); DECL_LINK( RefInputModifyHandler, formula::RefEdit&, void ); - DECL_LINK( CheckHdl, weld::ToggleButton&, void ); + DECL_LINK( CheckHdl, weld::Toggleable&, void ); void ToggleSamplingMethod(); }; diff --git a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx index 6e3a082d84a4..6f35e75472ea 100644 --- a/sc/source/ui/inc/StatisticsInputOutputDialog.hxx +++ b/sc/source/ui/inc/StatisticsInputOutputDialog.hxx @@ -77,7 +77,7 @@ private: void Init(); void GetRangeFromSelection(); - DECL_LINK( GroupByChanged, weld::ToggleButton&, void ); + DECL_LINK( GroupByChanged, weld::Toggleable&, void ); DECL_LINK( ButtonClicked, weld::Button&, void ); DECL_LINK( GetEditFocusHandler, formula::RefEdit&, void ); DECL_LINK( GetButtonFocusHandler, formula::RefButton&, void ); diff --git a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx index 875e9a4f29d7..8ac10b3c42df 100644 --- a/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx +++ b/sc/source/ui/inc/StatisticsTwoVariableDialog.hxx @@ -79,7 +79,7 @@ private: void Init(); void GetRangeFromSelection(); - DECL_LINK( GroupByChanged, weld::ToggleButton&, void ); + DECL_LINK( GroupByChanged, weld::Toggleable&, void ); DECL_LINK( ButtonClicked, weld::Button&, void ); DECL_LINK( GetEditFocusHandler, formula::RefEdit&, void ); DECL_LINK( GetButtonFocusHandler, formula::RefButton&, void ); diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 363de1b51a78..6c3dbfd53d46 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -219,7 +219,7 @@ private: void NotifyCloseLOK(); DECL_LINK(ButtonHdl, weld::Button&, void); - DECL_LINK(TriStateHdl, weld::ToggleButton&, void); + DECL_LINK(TriStateHdl, weld::Toggleable&, void); void Check(const weld::TreeIter* pIter); diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx index 6162eb3f76ca..5bff6d2e8c13 100644 --- a/sc/source/ui/inc/crnrdlg.hxx +++ b/sc/source/ui/inc/crnrdlg.hxx @@ -83,7 +83,7 @@ private: DECL_LINK( RemoveBtnHdl, weld::Button&, void ); DECL_LINK( Range1SelectHdl, weld::TreeView&, void ); DECL_LINK( Range1DataModifyHdl, formula::RefEdit&, void ); - DECL_LINK( ColRowToggleHdl, weld::ToggleButton&, void ); + DECL_LINK( ColRowToggleHdl, weld::Toggleable&, void ); DECL_LINK( Range2DataModifyHdl, formula::RefEdit&, void ); DECL_LINK( GetEditFocusHdl, formula::RefEdit&, void ); DECL_LINK( LoseEditFocusHdl, formula::RefEdit&, void ); diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx index bd807a5e01a5..e45400cdf6b2 100644 --- a/sc/source/ui/inc/dapitype.hxx +++ b/sc/source/ui/inc/dapitype.hxx @@ -42,7 +42,7 @@ public: void AppendNamedRange(const OUString& rNames); private: - DECL_LINK(RadioClickHdl, weld::ToggleButton&, void); + DECL_LINK(RadioClickHdl, weld::Toggleable&, void); DECL_LINK(ResponseHdl, weld::Button&, void); }; diff --git a/sc/source/ui/inc/datastreamdlg.hxx b/sc/source/ui/inc/datastreamdlg.hxx index b2e5a6fbb299..5f1f7eec49e8 100644 --- a/sc/source/ui/inc/datastreamdlg.hxx +++ b/sc/source/ui/inc/datastreamdlg.hxx @@ -41,7 +41,7 @@ class DataStreamDlg : public weld::GenericDialogController std::unique_ptr<weld::Frame> m_xVclFrameLimit; std::unique_ptr<weld::Frame> m_xVclFrameMove; - DECL_LINK(UpdateClickHdl, weld::ToggleButton&, void); + DECL_LINK(UpdateClickHdl, weld::Toggleable&, void); DECL_LINK(UpdateHdl, weld::Entry&, void); DECL_LINK(UpdateComboBoxHdl, weld::ComboBox&, void); DECL_LINK(BrowseHdl, weld::Button&, void); diff --git a/sc/source/ui/inc/delcodlg.hxx b/sc/source/ui/inc/delcodlg.hxx index db3f6bd5cccb..c23deed4fcc6 100644 --- a/sc/source/ui/inc/delcodlg.hxx +++ b/sc/source/ui/inc/delcodlg.hxx @@ -41,7 +41,7 @@ private: static InsertDeleteFlags nPreviousChecks; void DisableChecks(bool bDelAllChecked); - DECL_LINK(DelAllHdl, weld::ToggleButton&, void); + DECL_LINK(DelAllHdl, weld::Toggleable&, void); public: ScDeleteContentsDlg(weld::Window* pParent); diff --git a/sc/source/ui/inc/dpgroupdlg.hxx b/sc/source/ui/inc/dpgroupdlg.hxx index 0682282b1c3a..d3c390f46087 100644 --- a/sc/source/ui/inc/dpgroupdlg.hxx +++ b/sc/source/ui/inc/dpgroupdlg.hxx @@ -43,7 +43,7 @@ private: virtual bool ImplGetValue( double& rfValue ) const = 0; virtual void ImplSetValue( double fValue ) = 0; - DECL_LINK(ToggleHdl, weld::ToggleButton&, void); + DECL_LINK(ToggleHdl, weld::Toggleable&, void); private: weld::RadioButton& mrRbAuto; @@ -115,7 +115,7 @@ public: sal_Int32 GetDatePart() const; private: - DECL_LINK(ToggleHdl, weld::ToggleButton&, void); + DECL_LINK(ToggleHdl, weld::Toggleable&, void); DECL_LINK(CheckHdl, const weld::TreeView::iter_col&, void); void Check(); diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx index d794ec5b7d53..c52452841b6c 100644 --- a/sc/source/ui/inc/filldlg.hxx +++ b/sc/source/ui/inc/filldlg.hxx @@ -95,7 +95,7 @@ private: weld::Entry* CheckValues(); DECL_LINK(OKHdl, weld::Button&, void); - DECL_LINK(DisableHdl, weld::ToggleButton&, void); + DECL_LINK(DisableHdl, weld::Toggleable&, void); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index f65195bc566a..ca11a0eb675d 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -154,7 +154,7 @@ private: // Handler: DECL_LINK( LbSelectHdl, weld::ComboBox&, void ); DECL_LINK( ValModifyHdl, weld::ComboBox&, void ); - DECL_LINK( CheckBoxHdl, weld::ToggleButton&, void ); + DECL_LINK( CheckBoxHdl, weld::Toggleable&, void ); DECL_LINK( BtnClearHdl, weld::Button&, void ); DECL_LINK( BtnRemoveHdl, weld::Button&, void ); DECL_LINK( EndDlgHdl, weld::Button&, void ); diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx index c21c766630d6..2a4fcd145623 100644 --- a/sc/source/ui/inc/foptmgr.hxx +++ b/sc/source/ui/inc/foptmgr.hxx @@ -77,7 +77,7 @@ private: // Handler: DECL_LINK( EdAreaModifyHdl, formula::RefEdit&, void ); DECL_LINK( LbAreaSelHdl, weld::ComboBox&, void ); - DECL_LINK( BtnCopyResultHdl, weld::ToggleButton&, void ); + DECL_LINK( BtnCopyResultHdl, weld::Toggleable&, void ); }; diff --git a/sc/source/ui/inc/highred.hxx b/sc/source/ui/inc/highred.hxx index 4fcc0e5320bf..cfb706a8ec1d 100644 --- a/sc/source/ui/inc/highred.hxx +++ b/sc/source/ui/inc/highred.hxx @@ -50,7 +50,7 @@ private: void Init(); DECL_LINK( RefHandle, SvxTPFilter*, void ); - DECL_LINK( HighlightHandle, weld::ToggleButton&, void ); + DECL_LINK( HighlightHandle, weld::Toggleable&, void ); DECL_LINK( OKBtnHdl, weld::Button&, void ); protected: diff --git a/sc/source/ui/inc/inscodlg.hxx b/sc/source/ui/inc/inscodlg.hxx index b480eb6b4196..a30cffe0b355 100644 --- a/sc/source/ui/inc/inscodlg.hxx +++ b/sc/source/ui/inc/inscodlg.hxx @@ -94,8 +94,8 @@ private: void TestModes(); // Handler - DECL_LINK( InsAllHdl, weld::ToggleButton&, void ); - DECL_LINK( LinkBtnHdl, weld::ToggleButton&, void ); + DECL_LINK( InsAllHdl, weld::Toggleable&, void ); + DECL_LINK( LinkBtnHdl, weld::Toggleable&, void ); DECL_LINK( ShortCutHdl, weld::Button&, void ); }; diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx index 6e97085b416d..618177fe0a6c 100644 --- a/sc/source/ui/inc/instbdlg.hxx +++ b/sc/source/ui/inc/instbdlg.hxx @@ -83,7 +83,7 @@ private: void DoEnable_Impl(); DECL_LINK( BrowseHdl_Impl, weld::Button&, void ); - DECL_LINK( ChoiceHdl_Impl, weld::ToggleButton&, void ); + DECL_LINK( ChoiceHdl_Impl, weld::Toggleable&, void ); DECL_LINK( SelectHdl_Impl, weld::TreeView&, void ); DECL_LINK( CountHdl_Impl, weld::SpinButton&, void ); DECL_LINK( DoEnterHdl, weld::Button&, void ); diff --git a/sc/source/ui/inc/linkarea.hxx b/sc/source/ui/inc/linkarea.hxx index 02e022196d2e..b3ead95ddd65 100644 --- a/sc/source/ui/inc/linkarea.hxx +++ b/sc/source/ui/inc/linkarea.hxx @@ -47,7 +47,7 @@ private: DECL_LINK(FileHdl, weld::ComboBox&, bool); DECL_LINK(BrowseHdl, weld::Button&, void); DECL_LINK(RangeHdl, weld::TreeView&, void); - DECL_LINK(ReloadHdl, weld::ToggleButton&, void); + DECL_LINK(ReloadHdl, weld::Toggleable&, void); DECL_LINK(DialogClosedHdl, sfx2::FileDialogHelper*, void); void UpdateSourceRanges(); diff --git a/sc/source/ui/inc/mtrindlg.hxx b/sc/source/ui/inc/mtrindlg.hxx index 823aa3cd77bd..fc4163a55e1d 100644 --- a/sc/source/ui/inc/mtrindlg.hxx +++ b/sc/source/ui/inc/mtrindlg.hxx @@ -42,7 +42,7 @@ private: int nDefaultValue; int nCurrentValue; - DECL_LINK(SetDefValHdl, weld::ToggleButton&, void); + DECL_LINK(SetDefValHdl, weld::Toggleable&, void); DECL_LINK(ModifyHdl, weld::MetricSpinButton&, void); }; diff --git a/sc/source/ui/inc/mvtabdlg.hxx b/sc/source/ui/inc/mvtabdlg.hxx index 00ed09204487..2f11fd3868b4 100644 --- a/sc/source/ui/inc/mvtabdlg.hxx +++ b/sc/source/ui/inc/mvtabdlg.hxx @@ -76,7 +76,7 @@ private: void InitDocListBox (); DECL_LINK(OkHdl, weld::Button&, void); DECL_LINK(SelHdl, weld::ComboBox&, void); - DECL_LINK(CheckBtnHdl, weld::ToggleButton&, void); + DECL_LINK(CheckBtnHdl, weld::Toggleable&, void); DECL_LINK(CheckNameHdl, weld::Entry&, void); }; diff --git a/sc/source/ui/inc/namedlg.hxx b/sc/source/ui/inc/namedlg.hxx index 484500dcef4f..73b8dbcd756a 100644 --- a/sc/source/ui/inc/namedlg.hxx +++ b/sc/source/ui/inc/namedlg.hxx @@ -97,7 +97,7 @@ private: DECL_LINK(RemoveBtnHdl, weld::Button&, void); DECL_LINK(EdModifyHdl, weld::Entry&, void); DECL_LINK(RefEdModifyHdl, formula::RefEdit&, void); - DECL_LINK(EdModifyCheckBoxHdl, weld::ToggleButton&, void); + DECL_LINK(EdModifyCheckBoxHdl, weld::Toggleable&, void); DECL_LINK(AssignGetFocusHdl, formula::RefEdit&, void); DECL_LINK(SelectionChangedHdl_Impl, weld::TreeView&, void); DECL_LINK(ScopeChangedHdl, weld::ComboBox&, void); diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index 630515519f5c..892d8655255f 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -87,7 +87,7 @@ private: // Handler: DECL_LINK( LbSelectHdl, weld::ComboBox&, void ); DECL_LINK( ValModifyHdl, weld::ComboBox&, void ); - DECL_LINK( CheckBoxHdl, weld::ToggleButton&, void ); + DECL_LINK( CheckBoxHdl, weld::Toggleable&, void ); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/protectiondlg.hxx b/sc/source/ui/inc/protectiondlg.hxx index 08902610ec37..d36c8a820fad 100644 --- a/sc/source/ui/inc/protectiondlg.hxx +++ b/sc/source/ui/inc/protectiondlg.hxx @@ -63,7 +63,7 @@ private: void InsertEntry(const OUString& rTxt); DECL_LINK(OKHdl, weld::Button&, void); - DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void); + DECL_LINK(CheckBoxHdl, weld::Toggleable&, void); DECL_LINK(PasswordModifyHdl, weld::Entry&, void); }; diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index e0fc34011173..17a20526be02 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -109,7 +109,7 @@ private: void CloseSubdialog(); DECL_LINK( DblClickHdl, weld::TreeView&, bool ); - DECL_LINK( RadioClickHdl, weld::ToggleButton&, void ); + DECL_LINK( RadioClickHdl, weld::Toggleable&, void ); DECL_LINK( ClickHdl, weld::Button&, void ); DECL_LINK( ButtonClicked, weld::Button&, void ); @@ -151,8 +151,8 @@ private: /** Searches for a listbox entry, starts search at specified position. */ sal_Int32 FindListBoxEntry( const weld::ComboBox& rLBox, std::u16string_view rEntry, sal_Int32 nStartPos ) const; - DECL_LINK( RadioClickHdl, weld::ToggleButton&, void ); - DECL_LINK( CheckHdl, weld::ToggleButton&, void ); + DECL_LINK( RadioClickHdl, weld::Toggleable&, void ); + DECL_LINK( CheckHdl, weld::Toggleable&, void ); DECL_LINK( SelectHdl, weld::ComboBox&, void ); DECL_LINK( ButtonClicked, weld::Button&, void ); diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index aa06167be2f7..cf4598c3f287 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -120,8 +120,8 @@ private: std::unique_ptr<weld::RadioButton> m_xBtnRemovePassword; DECL_LINK(OKHdl, weld::Button&, void); - DECL_LINK(RadioBtnHdl, weld::ToggleButton&, void); - DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void); + DECL_LINK(RadioBtnHdl, weld::Toggleable&, void); + DECL_LINK(CheckBoxHdl, weld::Toggleable&, void); DECL_LINK(PasswordModifyHdl, weld::Entry&, void); }; diff --git a/sc/source/ui/inc/scendlg.hxx b/sc/source/ui/inc/scendlg.hxx index d094474c926f..07ee1f3ef19c 100644 --- a/sc/source/ui/inc/scendlg.hxx +++ b/sc/source/ui/inc/scendlg.hxx @@ -52,7 +52,7 @@ private: std::unique_ptr<weld::Label> m_xOnFt; DECL_LINK(OkHdl, weld::Button&, void); - DECL_LINK(EnableHdl, weld::ToggleButton&, void); + DECL_LINK(EnableHdl, weld::Toggleable&, void); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index 184e37dc9bf3..5064243ae58e 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -106,9 +106,9 @@ private: DECL_LINK( CharSetHdl, weld::ComboBox&, void ); DECL_LINK( FirstRowHdl, weld::SpinButton&, void ); - DECL_LINK( RbSepFixHdl, weld::ToggleButton&, void ); + DECL_LINK( RbSepFixHdl, weld::Toggleable&, void ); DECL_LINK( SeparatorEditHdl, weld::Entry&, void ); - DECL_LINK( SeparatorClickHdl, weld::ToggleButton&, void ); + DECL_LINK( SeparatorClickHdl, weld::Toggleable&, void ); DECL_LINK( SeparatorComboBoxHdl, weld::ComboBox&, void ); void SeparatorHdl(const weld::Widget*); DECL_LINK( LbColTypeHdl, weld::ComboBox&, void ); diff --git a/sc/source/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx index 2ccbffc851ea..a89d508a20e5 100644 --- a/sc/source/ui/inc/scuiautofmt.hxx +++ b/sc/source/ui/inc/scuiautofmt.hxx @@ -65,7 +65,7 @@ private: void Init (); void UpdateChecks (); - DECL_LINK( CheckHdl, weld::ToggleButton&, void ); + DECL_LINK( CheckHdl, weld::Toggleable&, void ); DECL_LINK( AddHdl, weld::Button&, void ); DECL_LINK( RemoveHdl, weld::Button&, void ); DECL_LINK( SelFmtHdl, weld::TreeView&, void ); diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx index b7e4f8e86baa..03d488524955 100644 --- a/sc/source/ui/inc/scuiimoptdlg.hxx +++ b/sc/source/ui/inc/scuiimoptdlg.hxx @@ -68,7 +68,7 @@ private: void FillFromTextEncodingTable(bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags = 0); void FillFromDbTextEncodingMap(bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags = 0); - DECL_LINK(FixedWidthHdl, weld::ToggleButton&, void); + DECL_LINK(FixedWidthHdl, weld::Toggleable&, void); DECL_LINK(DoubleClickHdl, weld::TreeView&, bool); }; diff --git a/sc/source/ui/inc/searchresults.hxx b/sc/source/ui/inc/searchresults.hxx index a6992c025fc0..54d40a39de1e 100644 --- a/sc/source/ui/inc/searchresults.hxx +++ b/sc/source/ui/inc/searchresults.hxx @@ -30,7 +30,7 @@ class SearchResultsDlg : public SfxDialogController DECL_LINK(ListSelectHdl, weld::TreeView&, void); DECL_LINK(HeaderBarClick, int, void); - DECL_STATIC_LINK(SearchResultsDlg, OnShowToggled, weld::ToggleButton&, void); + DECL_STATIC_LINK(SearchResultsDlg, OnShowToggled, weld::Toggleable&, void); public: SearchResultsDlg(SfxBindings* _pBindings, weld::Window* pParent); virtual ~SearchResultsDlg() override; diff --git a/sc/source/ui/inc/sharedocdlg.hxx b/sc/source/ui/inc/sharedocdlg.hxx index fb4258a7a150..d6dcc4810d86 100644 --- a/sc/source/ui/inc/sharedocdlg.hxx +++ b/sc/source/ui/inc/sharedocdlg.hxx @@ -38,7 +38,7 @@ private: std::unique_ptr<weld::Label> m_xFtWarning; std::unique_ptr<weld::TreeView> m_xLbUsers; - DECL_LINK(ToggleHandle, weld::ToggleButton&, void); + DECL_LINK(ToggleHandle, weld::Toggleable&, void); DECL_LINK(SizeAllocated, const Size&, void); public: diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index b7ca470b6e92..cd7c9f10bb7e 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -57,11 +57,11 @@ private: std::unique_ptr<weld::CheckButton> m_xBtnHidePrint; // Handler: - DECL_LINK(ProtectClickHdl, weld::ToggleButton&, void); - DECL_LINK(HideCellClickHdl, weld::ToggleButton&, void); - DECL_LINK(HideFormulaClickHdl, weld::ToggleButton&, void); - DECL_LINK(HidePrintClickHdl, weld::ToggleButton&, void); - void ButtonClick(weld::ToggleButton& rBox); + DECL_LINK(ProtectClickHdl, weld::Toggleable&, void); + DECL_LINK(HideCellClickHdl, weld::Toggleable&, void); + DECL_LINK(HideFormulaClickHdl, weld::Toggleable&, void); + DECL_LINK(HidePrintClickHdl, weld::Toggleable&, void); + void ButtonClick(weld::Toggleable& rBox); void UpdateButtons(); }; diff --git a/sc/source/ui/inc/textimportoptions.hxx b/sc/source/ui/inc/textimportoptions.hxx index 71e092cb0667..35e2fffa1308 100644 --- a/sc/source/ui/inc/textimportoptions.hxx +++ b/sc/source/ui/inc/textimportoptions.hxx @@ -46,7 +46,7 @@ private: std::unique_ptr<SvxLanguageBox> m_xLbCustomLang; DECL_LINK(OKHdl, weld::Button&, void); - DECL_LINK(RadioHdl, weld::ToggleButton&, void); + DECL_LINK(RadioHdl, weld::Toggleable&, void); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index 4ecdec717a19..b7c4989a0c20 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -67,8 +67,8 @@ private: void Init(); // Handler: - DECL_LINK( RadioClickHdl, weld::ToggleButton&, void ); - DECL_LINK( CheckClickHdl, weld::ToggleButton&, void ); + DECL_LINK( RadioClickHdl, weld::Toggleable&, void ); + DECL_LINK( CheckClickHdl, weld::Toggleable&, void ); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index 77d6567694c7..6f8a4c601cdf 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -46,7 +46,7 @@ private: bool IsValidSeparator(const OUString& rSep) const; DECL_LINK(ButtonHdl, weld::Button&, void); - DECL_LINK(ToggleHdl, weld::ToggleButton&, void); + DECL_LINK(ToggleHdl, weld::Toggleable&, void); DECL_LINK(SepInsertTextHdl, OUString&, bool); DECL_LINK(ColSepInsertTextHdl, OUString&, bool); DECL_LINK(RowSepInsertTextHdl, OUString&, bool); diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index 36df5352a59f..911d8bccd1ce 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -48,7 +48,7 @@ private: std::unique_ptr<weld::Button> m_xBtnEdit; DECL_LINK(BtnHdl, weld::Button&, void); - DECL_LINK(TurnOnHdl, weld::ToggleButton&, void); + DECL_LINK(TurnOnHdl, weld::Toggleable&, void); }; class ScHeaderPage : public ScHFPage diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 3332263bf121..9f04aeafc23f 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -141,10 +141,10 @@ private: void FillUserSortListBox (); // Handler ------------------------ - DECL_LINK( EnableHdl, weld::ToggleButton&, void ); + DECL_LINK( EnableHdl, weld::Toggleable&, void ); DECL_LINK( SelOutPosHdl, weld::ComboBox&, void ); void EdOutPosModHdl(); - DECL_LINK( SortDirHdl, weld::ToggleButton&, void ); + DECL_LINK( SortDirHdl, weld::Toggleable&, void ); void FillAlgor(); DECL_LINK( FillAlgorHdl, weld::ComboBox&, void ); }; diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index 4edaddc24f61..faa252c3a9c0 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -67,7 +67,7 @@ private: DECL_LINK( SelectListBoxHdl, weld::ComboBox&, void ); DECL_LINK( SelectTreeListBoxHdl, weld::TreeView&, void ); DECL_LINK(CheckHdl, const weld::TreeView::iter_col&, void); - DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void); + DECL_LINK(CheckBoxHdl, weld::Toggleable&, void); void SelectHdl(const weld::Widget*); }; @@ -126,7 +126,7 @@ private: void FillUserSortListBox (); // Handler ------------------------ - DECL_LINK(CheckHdl, weld::ToggleButton&, void); + DECL_LINK(CheckHdl, weld::Toggleable&, void); ScViewData* pViewData; ScDocument* pDoc; diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index 3f22ebce103a..6cc5888a4d9b 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -70,11 +70,11 @@ private: private: // Handler: - DECL_LINK(PageDirHdl, weld::ToggleButton&, void); - DECL_LINK(PageNoHdl, weld::ToggleButton&, void); - void PageNoHdl(const weld::ToggleButton* pBtn); + DECL_LINK(PageDirHdl, weld::Toggleable&, void); + DECL_LINK(PageNoHdl, weld::Toggleable&, void); + void PageNoHdl(const weld::Toggleable* pBtn); DECL_LINK(ScaleHdl, weld::ComboBox&, void); - DECL_LINK(ToggleHdl, weld::ToggleButton&, void); + DECL_LINK(ToggleHdl, weld::Toggleable&, void); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 59acf3a4a547..0306044d4f9f 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -58,7 +58,7 @@ class ScTpContentOptions : public SfxTabPage void InitGridOpt(); DECL_LINK( GridHdl, weld::ComboBox&, void ); DECL_LINK( SelLbObjHdl, weld::ComboBox&, void ); - DECL_LINK( CBHdl, weld::ToggleButton&, void ); + DECL_LINK( CBHdl, weld::Toggleable&, void ); public: ScTpContentOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet); @@ -96,7 +96,7 @@ class ScTpLayoutOptions : public SfxTabPage std::unique_ptr<weld::CheckButton> m_xEnterPasteModeCB; DECL_LINK(MetricHdl, weld::ComboBox&, void ); - DECL_LINK( AlignHdl, weld::ToggleButton&, void ); + DECL_LINK( AlignHdl, weld::Toggleable&, void ); public: diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 9216c8b75766..495a6ea5ad72 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -96,7 +96,7 @@ private: void SetSecondFormula( const OUString& rFmlaStr ); DECL_LINK(SelectHdl, weld::ComboBox&, void); - DECL_LINK(CheckHdl, weld::ToggleButton&, void); + DECL_LINK(CheckHdl, weld::Toggleable&, void); OUString maStrMin; OUString maStrMax; diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 09ca326e6d9a..15d12d42b69a 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -728,7 +728,7 @@ IMPL_LINK_NOARG(ScColRowNameRangesDlg, Range2DataModifyHdl, formula::RefEdit&, v } } -IMPL_LINK_NOARG(ScColRowNameRangesDlg, ColRowToggleHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ScColRowNameRangesDlg, ColRowToggleHdl, weld::Toggleable&, void) { if (m_xBtnColHead->get_active()) { diff --git a/sc/source/ui/miscdlgs/datastreamdlg.cxx b/sc/source/ui/miscdlgs/datastreamdlg.cxx index efbf6ab28cad..a713b9723a3e 100644 --- a/sc/source/ui/miscdlgs/datastreamdlg.cxx +++ b/sc/source/ui/miscdlgs/datastreamdlg.cxx @@ -58,7 +58,7 @@ IMPL_LINK_NOARG(DataStreamDlg, BrowseHdl, weld::Button&, void) UpdateEnable(); } -IMPL_LINK_NOARG(DataStreamDlg, UpdateClickHdl, weld::ToggleButton&, void) { UpdateEnable(); } +IMPL_LINK_NOARG(DataStreamDlg, UpdateClickHdl, weld::Toggleable&, void) { UpdateEnable(); } IMPL_LINK_NOARG(DataStreamDlg, UpdateComboBoxHdl, weld::ComboBox&, void) { UpdateEnable(); } diff --git a/sc/source/ui/miscdlgs/delcodlg.cxx b/sc/source/ui/miscdlgs/delcodlg.cxx index 0caa9075c9f6..9d804c252419 100644 --- a/sc/source/ui/miscdlgs/delcodlg.cxx +++ b/sc/source/ui/miscdlgs/delcodlg.cxx @@ -117,7 +117,7 @@ void ScDeleteContentsDlg::DisableObjects() m_xBtnDelObjects->set_sensitive(false); } -IMPL_LINK_NOARG(ScDeleteContentsDlg, DelAllHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ScDeleteContentsDlg, DelAllHdl, weld::Toggleable&, void) { DisableChecks( m_xBtnDelAll->get_active() ); } diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index f47ee81942c7..8fd45f501b1f 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -221,7 +221,7 @@ weld::Entry* ScFillSeriesDlg::CheckValues() } // Handler: -IMPL_LINK(ScFillSeriesDlg, DisableHdl, weld::ToggleButton&, rBtn, void) +IMPL_LINK(ScFillSeriesDlg, DisableHdl, weld::Toggleable&, rBtn, void) { if (&rBtn == m_xBtnDate.get()) { diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index c75220824fe7..fa655f80e405 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -161,7 +161,7 @@ bool ScHighlightChgDlg::IsRefInputMode() const return m_xEdAssign->GetWidget()->get_visible(); } -IMPL_LINK_NOARG(ScHighlightChgDlg, HighlightHandle, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ScHighlightChgDlg, HighlightHandle, weld::Toggleable&, void) { if (m_xHighlightBox->get_active()) { diff --git a/sc/source/ui/miscdlgs/inscodlg.cxx b/sc/source/ui/miscdlgs/inscodlg.cxx index 12b95d95fd3f..879ed28354f3 100644 --- a/sc/source/ui/miscdlgs/inscodlg.cxx +++ b/sc/source/ui/miscdlgs/inscodlg.cxx @@ -319,12 +319,12 @@ IMPL_LINK(ScInsertContentsDlg, ShortCutHdl, weld::Button&, rBtn, void) if (mxImmediately->get_active()) m_xDialog->response(RET_OK); } -IMPL_LINK_NOARG(ScInsertContentsDlg, InsAllHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ScInsertContentsDlg, InsAllHdl, weld::Toggleable&, void) { DisableChecks( mxBtnInsAll->get_active() ); } -IMPL_LINK_NOARG(ScInsertContentsDlg, LinkBtnHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ScInsertContentsDlg, LinkBtnHdl, weld::Toggleable&, void) { TestModes(); } diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index 6ccdc01991be..748318997fb6 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -249,7 +249,7 @@ IMPL_LINK_NOARG(ScInsertTableDlg, CountHdl_Impl, weld::SpinButton&, void) DoEnable_Impl(); } -IMPL_LINK(ScInsertTableDlg, ChoiceHdl_Impl, weld::ToggleButton&, rButton, void) +IMPL_LINK(ScInsertTableDlg, ChoiceHdl_Impl, weld::Toggleable&, rButton, void) { if (!rButton.get_active()) return; diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index a8887a301855..480347e159a7 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -173,7 +173,7 @@ IMPL_LINK_NOARG(ScLinkedAreaDlg, RangeHdl, weld::TreeView&, void) UpdateEnable(); } -IMPL_LINK_NOARG(ScLinkedAreaDlg, ReloadHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ScLinkedAreaDlg, ReloadHdl, weld::Toggleable&, void) { UpdateEnable(); } diff --git a/sc/source/ui/miscdlgs/mtrindlg.cxx b/sc/source/ui/miscdlgs/mtrindlg.cxx index 69a728068916..80c98537d463 100644 --- a/sc/source/ui/miscdlgs/mtrindlg.cxx +++ b/sc/source/ui/miscdlgs/mtrindlg.cxx @@ -85,7 +85,7 @@ int ScMetricInputDlg::GetInputValue() const // Handler: -IMPL_LINK_NOARG(ScMetricInputDlg, SetDefValHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ScMetricInputDlg, SetDefValHdl, weld::Toggleable&, void) { if (m_xBtnDefVal->get_active()) { diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index ff8657fb96a3..b753b678b631 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -238,7 +238,7 @@ void ScMoveTableDlg::InitDocListBox() // Handler: -IMPL_LINK(ScMoveTableDlg, CheckBtnHdl, weld::ToggleButton&, rBtn, void) +IMPL_LINK(ScMoveTableDlg, CheckBtnHdl, weld::Toggleable&, rBtn, void) { if (&rBtn == m_xBtnCopy.get()) ResetRenameInput(); diff --git a/sc/source/ui/miscdlgs/protectiondlg.cxx b/sc/source/ui/miscdlgs/protectiondlg.cxx index a1718ac985ed..920e7bfc4888 100644 --- a/sc/source/ui/miscdlgs/protectiondlg.cxx +++ b/sc/source/ui/miscdlgs/protectiondlg.cxx @@ -127,10 +127,9 @@ void ScTableProtectionDlg::EnableOptionalWidgets(bool bEnable) { m_xPasswords->set_sensitive(bEnable); m_xOptions->set_sensitive(bEnable); -//TODO m_xOptionsListBox->Invalidate(); } -IMPL_LINK(ScTableProtectionDlg, CheckBoxHdl, weld::ToggleButton&, rBtn, void) +IMPL_LINK(ScTableProtectionDlg, CheckBoxHdl, weld::Toggleable&, rBtn, void) { if (&rBtn == m_xBtnProtect.get()) { diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx index 9af22432648d..c7b9084a82d9 100644 --- a/sc/source/ui/miscdlgs/retypepassdlg.cxx +++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx @@ -339,7 +339,7 @@ void ScRetypePassInputDlg::CheckPasswordInput() IMPL_LINK_NOARG(ScRetypePassInputDlg, OKHdl, weld::Button&, void) { m_xDialog->response(RET_OK); } -IMPL_LINK_NOARG(ScRetypePassInputDlg, RadioBtnHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ScRetypePassInputDlg, RadioBtnHdl, weld::Toggleable&, void) { if (m_xBtnRetypePassword->get_active()) { @@ -353,7 +353,7 @@ IMPL_LINK_NOARG(ScRetypePassInputDlg, RadioBtnHdl, weld::ToggleButton&, void) } } -IMPL_LINK_NOARG(ScRetypePassInputDlg, CheckBoxHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ScRetypePassInputDlg, CheckBoxHdl, weld::Toggleable&, void) { CheckPasswordInput(); } diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index 53cb8b7094ff..d08c93b3e5dc 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -151,7 +151,7 @@ IMPL_LINK_NOARG(ScAutoFormatDlg, DblClkHdl, weld::TreeView&, bool) return true; } -IMPL_LINK(ScAutoFormatDlg, CheckHdl, weld::ToggleButton&, rBtn, void) +IMPL_LINK(ScAutoFormatDlg, CheckHdl, weld::Toggleable&, rBtn, void) { ScAutoFormatData* pData = pFormat->findByIndex(nIndex); bool bCheck = rBtn.get_active(); diff --git a/sc/source/ui/miscdlgs/sharedocdlg.cxx b/sc/source/ui/miscdlgs/sharedocdlg.cxx index 9f1a6e16185b..eb7c1f5c6e57 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.cxx +++ b/sc/source/ui/miscdlgs/sharedocdlg.cxx @@ -83,7 +83,7 @@ ScShareDocumentDlg::~ScShareDocumentDlg() { } -IMPL_LINK_NOARG(ScShareDocumentDlg, ToggleHandle, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ScShareDocumentDlg, ToggleHandle, weld::Toggleable&, void) { m_xFtWarning->set_sensitive(m_xCbShare->get_active()); } diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index b3ee50eac252..5be421e44607 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -218,10 +218,10 @@ void ScNameDlg::UpdateChecks(const ScRangeData* pData) // handlers, triggering handlers while already processing a handler can // ( and does in this case ) corrupt the internal data - m_xBtnCriteria->connect_toggled( Link<weld::ToggleButton&,void>() ); - m_xBtnPrintArea->connect_toggled( Link<weld::ToggleButton&,void>() ); - m_xBtnColHeader->connect_toggled( Link<weld::ToggleButton&,void>() ); - m_xBtnRowHeader->connect_toggled( Link<weld::ToggleButton&,void>() ); + m_xBtnCriteria->connect_toggled( Link<weld::Toggleable&,void>() ); + m_xBtnPrintArea->connect_toggled( Link<weld::Toggleable&,void>() ); + m_xBtnColHeader->connect_toggled( Link<weld::Toggleable&,void>() ); + m_xBtnRowHeader->connect_toggled( Link<weld::Toggleable&,void>() ); m_xBtnCriteria->set_active( pData->HasType( ScRangeData::Type::Criteria ) ); m_xBtnPrintArea->set_active( pData->HasType( ScRangeData::Type::PrintArea ) ); @@ -229,7 +229,7 @@ void ScNameDlg::UpdateChecks(const ScRangeData* pData) m_xBtnRowHeader->set_active( pData->HasType( ScRangeData::Type::RowHeader ) ); // Restore handlers so user input is processed again - Link<weld::ToggleButton&,void> aToggleHandler = LINK( this, ScNameDlg, EdModifyCheckBoxHdl ); + Link<weld::Toggleable&,void> aToggleHandler = LINK( this, ScNameDlg, EdModifyCheckBoxHdl ); m_xBtnCriteria->connect_toggled( aToggleHandler ); m_xBtnPrintArea->connect_toggled( aToggleHandler ); m_xBtnColHeader->connect_toggled( aToggleHandler ); @@ -472,7 +472,7 @@ IMPL_LINK_NOARG(ScNameDlg, RemoveBtnHdl, weld::Button&, void) RemovePushed(); } -IMPL_LINK_NOARG(ScNameDlg, EdModifyCheckBoxHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ScNameDlg, EdModifyCheckBoxHdl, weld::Toggleable&, void) { NameModified(); } diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx index a3e9d73935d1..ec65fb9d8014 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.cxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx @@ -111,7 +111,7 @@ void ScCalcOptionsDialog::CoupleEmptyAsZeroToStringConversion() } } -IMPL_LINK(ScCalcOptionsDialog, AsZeroModifiedHdl, weld::ToggleButton&, rCheckBox, void ) +IMPL_LINK(ScCalcOptionsDialog, AsZeroModifiedHdl, weld::Toggleable&, rCheckBox, void ) { maConfig.mbEmptyStringAsZero = mbSelectedEmptyStringAsZero = rCheckBox.get_active(); } @@ -127,7 +127,7 @@ IMPL_LINK(ScCalcOptionsDialog, SyntaxModifiedHdl, weld::ComboBox&, rSyntax, void maConfig.SetStringRefSyntax(toAddressConvention(rSyntax.get_active())); } -IMPL_LINK(ScCalcOptionsDialog, CurrentDocOnlyHdl, weld::ToggleButton&, rCheckBox, void) +IMPL_LINK(ScCalcOptionsDialog, CurrentDocOnlyHdl, weld::Toggleable&, rCheckBox, void) { mbWriteConfig = !rCheckBox.get_active(); } diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx index 003f58ff11ac..97d7bb21c48e 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx @@ -18,10 +18,10 @@ public: ScCalcOptionsDialog(weld::Window* pParent, const ScCalcConfig& rConfig, bool bWriteConfig); virtual ~ScCalcOptionsDialog() override; - DECL_LINK(AsZeroModifiedHdl, weld::ToggleButton&, void); + DECL_LINK(AsZeroModifiedHdl, weld::Toggleable&, void); DECL_LINK(ConversionModifiedHdl, weld::ComboBox&, void); DECL_LINK(SyntaxModifiedHdl, weld::ComboBox&, void); - DECL_LINK(CurrentDocOnlyHdl, weld::ToggleButton&, void); + DECL_LINK(CurrentDocOnlyHdl, weld::Toggleable&, void); const ScCalcConfig& GetConfig() const { return maConfig; } bool GetWriteCalcConfig() const { return mbWriteConfig; } diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index 57a78e15e382..92570ea9653f 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -222,7 +222,7 @@ DeactivateRC ScTpCalcOptions::DeactivatePage( SfxItemSet* pSetP ) // Handler: -IMPL_LINK( ScTpCalcOptions, RadioClickHdl, weld::ToggleButton&, rBtn, void ) +IMPL_LINK( ScTpCalcOptions, RadioClickHdl, weld::Toggleable&, rBtn, void ) { if (!rBtn.get_active()) return; @@ -240,7 +240,7 @@ IMPL_LINK( ScTpCalcOptions, RadioClickHdl, weld::ToggleButton&, rBtn, void ) } } -IMPL_LINK(ScTpCalcOptions, CheckClickHdl, weld::ToggleButton&, rBtn, void) +IMPL_LINK(ScTpCalcOptions, CheckClickHdl, weld::Toggleable&, rBtn, void) { if (&rBtn == m_xBtnGeneralPrec.get()) { diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index ba3663d95b8d..24d91000867f 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -54,7 +54,7 @@ ScTpFormulaOptions::ScTpFormulaOptions(weld::Container* pPage, weld::DialogContr mxBtnSepReset->connect_clicked(aLink2); mxBtnCustomCalcDetails->connect_clicked(aLink2); - Link<weld::ToggleButton&,void> aToggleLink = LINK( this, ScTpFormulaOptions, ToggleHdl ); + Link<weld::Toggleable&,void> aToggleLink = LINK( this, ScTpFormulaOptions, ToggleHdl ); mxBtnCustomCalcDefault->connect_toggled(aToggleLink); mxBtnCustomCalcCustom->connect_toggled(aToggleLink); @@ -177,7 +177,7 @@ IMPL_LINK( ScTpFormulaOptions, ButtonHdl, weld::Button&, rBtn, void ) LaunchCustomCalcSettings(); } -IMPL_LINK( ScTpFormulaOptions, ToggleHdl, weld::ToggleButton&, rBtn, void ) +IMPL_LINK( ScTpFormulaOptions, ToggleHdl, weld::Toggleable&, rBtn, void ) { if (!rBtn.get_active()) return; diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index a5f56979e3cd..994e74822a8e 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -65,7 +65,7 @@ ScTpContentOptions::ScTpContentOptions(weld::Container* pPage, weld::DialogContr m_xDrawLB->connect_changed(aSelObjHdl); m_xGridLB->connect_changed( LINK( this, ScTpContentOptions, GridHdl ) ); - Link<weld::ToggleButton&, void> aCBHdl(LINK( this, ScTpContentOptions, CBHdl ) ); + Link<weld::Toggleable&, void> aCBHdl(LINK( this, ScTpContentOptions, CBHdl ) ); m_xFormulaCB->connect_toggled(aCBHdl); m_xNilCB->connect_toggled(aCBHdl); m_xAnnotCB->connect_toggled(aCBHdl); @@ -232,7 +232,7 @@ IMPL_LINK( ScTpContentOptions, SelLbObjHdl, weld::ComboBox&, rLb, void ) m_xLocalOptions->SetObjMode( eType, eMode ); } -IMPL_LINK( ScTpContentOptions, CBHdl, weld::ToggleButton&, rBtn, void ) +IMPL_LINK( ScTpContentOptions, CBHdl, weld::Toggleable&, rBtn, void ) { ScViewOption eOption = VOPT_FORMULAS; bool bChecked = rBtn.get_active(); @@ -603,7 +603,7 @@ IMPL_LINK_NOARG(ScTpLayoutOptions, MetricHdl, weld::ComboBox&, void) } } -IMPL_LINK(ScTpLayoutOptions, AlignHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK(ScTpLayoutOptions, AlignHdl, weld::Toggleable&, rBox, void) { m_xAlignLB->set_sensitive(rBox.get_active()); } diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index e04f2694507c..3fb27a9cf43f 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -128,7 +128,7 @@ DeactivateRC ScHFPage::DeactivatePage( SfxItemSet* pSetP ) // Handler: -IMPL_LINK_NOARG(ScHFPage, TurnOnHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ScHFPage, TurnOnHdl, weld::Toggleable&, void) { SvxHFPage::TurnOnHdl(*m_xTurnOnBox); diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index 76ecb43fb8ad..3b987debda35 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -39,7 +39,7 @@ const sal_uInt16 ScTablePage::pPageTableRanges[] = static bool lcl_PutVObjModeItem(sal_uInt16 nWhich, SfxItemSet& rCoreSet, const SfxItemSet& rOldSet, - const weld::ToggleButton& rBtn); + const weld::Toggleable& rBtn); static bool lcl_PutScaleItem( sal_uInt16 nWhich, SfxItemSet& rCoreSet, @@ -351,17 +351,17 @@ DeactivateRC ScTablePage::DeactivatePage( SfxItemSet* pSetP ) // Handler: -IMPL_LINK_NOARG(ScTablePage, PageDirHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ScTablePage, PageDirHdl, weld::Toggleable&, void) { ShowImage(); } -IMPL_LINK(ScTablePage, PageNoHdl, weld::ToggleButton&, rBtn, void) +IMPL_LINK(ScTablePage, PageNoHdl, weld::Toggleable&, rBtn, void) { PageNoHdl(&rBtn); } -void ScTablePage::PageNoHdl(const weld::ToggleButton* pBtn) +void ScTablePage::PageNoHdl(const weld::Toggleable* pBtn) { if (m_xBtnPageNo->get_active()) { @@ -385,7 +385,7 @@ IMPL_LINK_NOARG(ScTablePage, ScaleHdl, weld::ComboBox&, void) m_xBxScalePageNum->set_visible(m_xLbScaleMode->get_active() == SC_TPTABLE_SCALE_TO_PAGES); } -IMPL_LINK(ScTablePage, ToggleHdl, weld::ToggleButton&, rBox, void) +IMPL_LINK(ScTablePage, ToggleHdl, weld::Toggleable&, rBox, void) { if (&rBox == m_xCbScalePageWidth.get()) { @@ -437,7 +437,7 @@ static bool lcl_PutBoolItem( sal_uInt16 nWhich, static bool lcl_PutVObjModeItem( sal_uInt16 nWhich, SfxItemSet& rCoreSet, const SfxItemSet& rOldSet, - const weld::ToggleButton& rBtn ) + const weld::Toggleable& rBtn ) { bool bIsChecked = rBtn.get_active(); bool bDataChanged = rBtn.get_saved_state() == (bIsChecked ? 1 : 0) diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index ff91ad41c0b0..eb4dfd98ebd4 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -122,13 +122,13 @@ void AlignmentPropertyPanel::Initialize() mxMtrAngle->connect_value_changed(LINK( this, AlignmentPropertyPanel, AngleModifiedHdl)); mxCBStacked->connect_toggled(LINK(this, AlignmentPropertyPanel, ClickStackHdl)); - Link<weld::ToggleButton&,void> aLink2 = LINK(this, AlignmentPropertyPanel, ReferenceEdgeHdl); + Link<weld::Toggleable&,void> aLink2 = LINK(this, AlignmentPropertyPanel, ReferenceEdgeHdl); mxRefEdgeBottom->connect_toggled(aLink2); mxRefEdgeTop->connect_toggled(aLink2); mxRefEdgeStd->connect_toggled(aLink2); } -IMPL_LINK(AlignmentPropertyPanel, ReferenceEdgeHdl, weld::ToggleButton&, rToggle, void) +IMPL_LINK(AlignmentPropertyPanel, ReferenceEdgeHdl, weld::Toggleable&, rToggle, void) { if (mbSettingToggles) return; @@ -155,7 +155,7 @@ IMPL_LINK_NOARG( AlignmentPropertyPanel, AngleModifiedHdl, weld::MetricSpinButto SID_ATTR_ALIGN_DEGREES, SfxCallMode::RECORD, { &aAngleItem }); } -IMPL_LINK_NOARG( AlignmentPropertyPanel, ClickStackHdl, weld::ToggleButton&, void ) +IMPL_LINK_NOARG( AlignmentPropertyPanel, ClickStackHdl, weld::Toggleable&, void ) { bool bVertical = mxCBStacked->get_active(); ScVerticalStackCell aStackItem(bVertical); @@ -172,7 +172,7 @@ IMPL_LINK_NOARG(AlignmentPropertyPanel, MFLeftIndentMdyHdl, weld::MetricSpinButt SfxCallMode::RECORD, { &aItem }); } -IMPL_LINK_NOARG(AlignmentPropertyPanel, CBOXMergnCellClkHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(AlignmentPropertyPanel, CBOXMergnCellClkHdl, weld::Toggleable&, void) { bool bState = mxCBXMergeCell->get_active(); @@ -183,7 +183,7 @@ IMPL_LINK_NOARG(AlignmentPropertyPanel, CBOXMergnCellClkHdl, weld::ToggleButton& GetBindings()->Invalidate(FID_MERGE_TOGGLE,true); } -IMPL_LINK_NOARG(AlignmentPropertyPanel, CBOXWrapTextClkHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(AlignmentPropertyPanel, CBOXWrapTextClkHdl, weld::Toggleable&, void) { bool bState = mxCBXWrapText->get_active(); ScLineBreakCell aItem(bState); diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx index 37073c3cf2ea..77c3a3162a4e 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx @@ -99,11 +99,11 @@ private: SfxBindings* mpBindings; DECL_LINK( MFLeftIndentMdyHdl, weld::MetricSpinButton&, void ); - DECL_LINK( CBOXMergnCellClkHdl, weld::ToggleButton&, void ); - DECL_LINK( CBOXWrapTextClkHdl, weld::ToggleButton&, void ); + DECL_LINK( CBOXMergnCellClkHdl, weld::Toggleable&, void ); + DECL_LINK( CBOXWrapTextClkHdl, weld::Toggleable&, void ); DECL_LINK( AngleModifiedHdl, weld::MetricSpinButton&, void ); - DECL_LINK( ClickStackHdl, weld::ToggleButton&, void ); - DECL_LINK( ReferenceEdgeHdl, weld::ToggleButton&, void ); + DECL_LINK( ClickStackHdl, weld::Toggleable&, void ); + DECL_LINK( ReferenceEdgeHdl, weld::Toggleable&, void ); void Initialize(); }; diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx index 93dd19da0c98..9057f9bf3923 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx @@ -103,7 +103,7 @@ IMPL_LINK( NumberFormatPropertyPanel, NumFormatSelectHdl, weld::ComboBox&, rBox, } } -IMPL_LINK_NOARG( NumberFormatPropertyPanel, NumFormatValueClickHdl, weld::ToggleButton&, void ) +IMPL_LINK_NOARG( NumberFormatPropertyPanel, NumFormatValueClickHdl, weld::Toggleable&, void ) { NumFormatValueHdl(*mxEdDecimals); } diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx index 7c540beef5ee..7f16dffb92f4 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx @@ -83,7 +83,7 @@ private: DECL_LINK(NumFormatSelectHdl, weld::ComboBox&, void); DECL_LINK(NumFormatValueHdl, weld::SpinButton&, void); - DECL_LINK(NumFormatValueClickHdl, weld::ToggleButton&, void); + DECL_LINK(NumFormatValueClickHdl, weld::Toggleable&, void); void Initialize(); void DisableControls(); 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(); diff --git a/sfx2/inc/emojicontrol.hxx b/sfx2/inc/emojicontrol.hxx index 787405d101fb..b4267fbaf8f6 100644 --- a/sfx2/inc/emojicontrol.hxx +++ b/sfx2/inc/emojicontrol.hxx @@ -36,9 +36,9 @@ public: private: static void ConvertLabelToUnicode(weld::ToggleButton& rBtn); - FILTER_CATEGORY getFilter(const weld::ToggleButton& rBtn) const; + FILTER_CATEGORY getFilter(const weld::Toggleable& rBtn) const; - DECL_LINK(ActivatePageHdl, weld::ToggleButton&, void); + DECL_LINK(ActivatePageHdl, weld::Toggleable&, void); DECL_STATIC_LINK(SfxEmojiControl, InsertHdl, ThumbnailViewItem*, void); std::unique_ptr<weld::ToggleButton> mxPeopleBtn; diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 94f014fe073c..fb0516fedfd4 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -1951,7 +1951,7 @@ IMPL_LINK_NOARG(SfxHelpTextWindow_Impl, CloseHdl, LinkParamNone*, void) m_xSrchDlg.reset(); } -IMPL_LINK_NOARG(SfxHelpTextWindow_Impl, CheckHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SfxHelpTextWindow_Impl, CheckHdl, weld::Toggleable&, void) { if ( !xConfiguration.is() ) return; diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 47654dc7f994..7d22336ecf83 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -381,7 +381,7 @@ private: DECL_LINK( NotifyHdl, LinkParamNone*, void ); DECL_LINK( FindHdl, sfx2::SearchDialog&, void ); DECL_LINK( CloseHdl, LinkParamNone*, void ); - DECL_LINK( CheckHdl, weld::ToggleButton&, void ); + DECL_LINK( CheckHdl, weld::Toggleable&, void ); void FindHdl(sfx2::SearchDialog*); public: diff --git a/sfx2/source/control/emojicontrol.cxx b/sfx2/source/control/emojicontrol.cxx index 8ace6e79c5a9..63093efc3601 100644 --- a/sfx2/source/control/emojicontrol.cxx +++ b/sfx2/source/control/emojicontrol.cxx @@ -99,7 +99,7 @@ void SfxEmojiControl::ConvertLabelToUnicode(weld::ToggleButton& rBtn) rBtn.set_label(sHexText.toString()); } -FILTER_CATEGORY SfxEmojiControl::getFilter(const weld::ToggleButton& rCurPageId) const +FILTER_CATEGORY SfxEmojiControl::getFilter(const weld::Toggleable& rCurPageId) const { if (&rCurPageId == mxPeopleBtn.get()) return FILTER_CATEGORY::PEOPLE; @@ -123,7 +123,7 @@ FILTER_CATEGORY SfxEmojiControl::getFilter(const weld::ToggleButton& rCurPageId) return FILTER_CATEGORY::PEOPLE; } -IMPL_LINK(SfxEmojiControl, ActivatePageHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(SfxEmojiControl, ActivatePageHdl, weld::Toggleable&, rButton, void) { mxPeopleBtn->set_active(&rButton == mxPeopleBtn.get()); mxNatureBtn->set_active(&rButton == mxNatureBtn.get()); diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index 2b106f9c5081..d6fe953c785b 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -216,7 +216,7 @@ void SfxCommonPrintOptionsTabPage::ImplSaveControls( PrinterOptions* pCurrentOpt } } -IMPL_LINK_NOARG( SfxCommonPrintOptionsTabPage, ClickReduceTransparencyCBHdl, weld::ToggleButton&, void ) +IMPL_LINK_NOARG( SfxCommonPrintOptionsTabPage, ClickReduceTransparencyCBHdl, weld::Toggleable&, void ) { const bool bReduceTransparency = m_xReduceTransparencyCB->get_active(); @@ -226,7 +226,7 @@ IMPL_LINK_NOARG( SfxCommonPrintOptionsTabPage, ClickReduceTransparencyCBHdl, wel m_xTransparencyCB->set_sensitive( !bReduceTransparency ); } -IMPL_LINK_NOARG( SfxCommonPrintOptionsTabPage, ClickReduceGradientsCBHdl, weld::ToggleButton&, void ) +IMPL_LINK_NOARG( SfxCommonPrintOptionsTabPage, ClickReduceGradientsCBHdl, weld::Toggleable&, void ) { const bool bEnable = m_xReduceGradientsCB->get_active(); @@ -237,7 +237,7 @@ IMPL_LINK_NOARG( SfxCommonPrintOptionsTabPage, ClickReduceGradientsCBHdl, weld:: ToggleReduceGradientsStripesRBHdl(*m_xReduceGradientsStripesRB); } -IMPL_LINK_NOARG( SfxCommonPrintOptionsTabPage, ClickReduceBitmapsCBHdl, weld::ToggleButton&, void ) +IMPL_LINK_NOARG( SfxCommonPrintOptionsTabPage, ClickReduceBitmapsCBHdl, weld::Toggleable&, void ) { const bool bEnable = m_xReduceBitmapsCB->get_active(); @@ -250,21 +250,21 @@ IMPL_LINK_NOARG( SfxCommonPrintOptionsTabPage, ClickReduceBitmapsCBHdl, weld::To ToggleReduceBitmapsResolutionRBHdl(*m_xReduceBitmapsResolutionRB); } -IMPL_LINK_NOARG( SfxCommonPrintOptionsTabPage, ToggleReduceGradientsStripesRBHdl, weld::ToggleButton&, void ) +IMPL_LINK_NOARG( SfxCommonPrintOptionsTabPage, ToggleReduceGradientsStripesRBHdl, weld::Toggleable&, void ) { const bool bEnable = m_xReduceGradientsCB->get_active() && m_xReduceGradientsStripesRB->get_active(); m_xReduceGradientsStepCountNF->set_sensitive(bEnable); } -IMPL_LINK_NOARG( SfxCommonPrintOptionsTabPage, ToggleReduceBitmapsResolutionRBHdl, weld::ToggleButton&, void ) +IMPL_LINK_NOARG( SfxCommonPrintOptionsTabPage, ToggleReduceBitmapsResolutionRBHdl, weld::Toggleable&, void ) { const bool bEnable = m_xReduceBitmapsCB->get_active() && m_xReduceBitmapsResolutionRB->get_active(); m_xReduceBitmapsResolutionLB->set_sensitive(bEnable); } -IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrinterRBHdl, weld::ToggleButton&, rButton, void ) +IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrinterRBHdl, weld::Toggleable&, rButton, void ) { if (rButton.get_active()) { @@ -275,7 +275,7 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrinterRBHdl, weld::ToggleB ImplSaveControls( &maPrinterOptions ); } -IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrintFileRBHdl, weld::ToggleButton&, rButton, void ) +IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrintFileRBHdl, weld::Toggleable&, rButton, void ) { if (rButton.get_active()) { diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index ad4c30b4e6c1..7441e47c1746 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -147,7 +147,7 @@ struct SfxSecurityPage_Impl std::unique_ptr<weld::Button> m_xProtectPB; // for record changes std::unique_ptr<weld::Button> m_xUnProtectPB; // for record changes - DECL_LINK(RecordChangesCBToggleHdl, weld::ToggleButton&, void); + DECL_LINK(RecordChangesCBToggleHdl, weld::Toggleable&, void); DECL_LINK(ChangeProtectionPBHdl, weld::Button&, void); SfxSecurityPage_Impl( SfxSecurityPage &rDlg ); @@ -312,7 +312,7 @@ void SfxSecurityPage_Impl::Reset_Impl() } } -IMPL_LINK_NOARG(SfxSecurityPage_Impl, RecordChangesCBToggleHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SfxSecurityPage_Impl, RecordChangesCBToggleHdl, weld::Toggleable&, void) { // when change recording gets disabled protection must be disabled as well if (m_xRecordChangesCB->get_active()) // the new check state is already present, thus the '!' diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index ed55c859fb2e..5ed2e844c38c 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -1935,7 +1935,7 @@ IMPL_LINK_NOARG(SfxCommonTemplateDialog_Impl, TreeListApplyHdl, weld::TreeView&, return true; } -IMPL_LINK_NOARG(SfxCommonTemplateDialog_Impl, PreviewHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SfxCommonTemplateDialog_Impl, PreviewHdl, weld::Toggleable&, void) { std::shared_ptr<comphelper::ConfigurationChanges> batch( comphelper::ConfigurationChanges::create() ); bool bCustomPreview = mxPreviewCheckbox->get_active(); diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 2501df8ed480..1c11e5fd422f 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -376,7 +376,7 @@ IMPL_LINK(SfxVersionDialog, ButtonHdl_Impl, weld::Button&, rButton, void) } } -IMPL_LINK(SfxVersionDialog, ToggleHdl_Impl, weld::ToggleButton&, rButton, void) +IMPL_LINK(SfxVersionDialog, ToggleHdl_Impl, weld::Toggleable&, rButton, void) { if (&rButton == m_xSaveCheckBox.get()) { diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index 47348dfe15f1..033f3d24df4a 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -819,7 +819,7 @@ IMPL_LINK_NOARG(SfxTemplateManagerDlg, LoseFocusHdl, weld::Widget&, void) } } -IMPL_LINK_NOARG ( SfxTemplateManagerDlg, ListViewHdl, weld::ToggleButton&, void ) +IMPL_LINK_NOARG ( SfxTemplateManagerDlg, ListViewHdl, weld::Toggleable&, void ) { setTemplateViewMode(TemplateViewMode::eListView); @@ -829,7 +829,7 @@ IMPL_LINK_NOARG ( SfxTemplateManagerDlg, ListViewHdl, weld::ToggleButton&, void mxSearchView->ListView::grab_focus(); } -IMPL_LINK_NOARG ( SfxTemplateManagerDlg, ThumbnailViewHdl, weld::ToggleButton&, void ) +IMPL_LINK_NOARG ( SfxTemplateManagerDlg, ThumbnailViewHdl, weld::Toggleable&, void ) { setTemplateViewMode(TemplateViewMode::eThumbnailView); bMakeSelItemVisible = true; diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 909425a5539e..357db1b24b32 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -132,7 +132,7 @@ protected: DECL_LINK(TreeListApplyHdl, weld::TreeView&, bool); DECL_LINK(MousePressHdl, const MouseEvent&, bool); DECL_LINK(TimeOut, Timer*, void ); - DECL_LINK(PreviewHdl, weld::ToggleButton&, void); + DECL_LINK(PreviewHdl, weld::Toggleable&, void); DECL_LINK(PopupFlatMenuHdl, const CommandEvent&, bool); DECL_LINK(PopupTreeMenuHdl, const CommandEvent&, bool); DECL_LINK(KeyInputHdl, const KeyEvent&, bool); diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx index c94da8af0405..e8830b5f1237 100644 --- a/sfx2/source/inc/versdlg.hxx +++ b/sfx2/source/inc/versdlg.hxx @@ -44,7 +44,7 @@ class SfxVersionDialog : public SfxDialogController DECL_LINK(DClickHdl_Impl, weld::TreeView&, bool); DECL_LINK(SelectHdl_Impl, weld::TreeView&, void); DECL_LINK(ButtonHdl_Impl, weld::Button&, void); - DECL_LINK(ToggleHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(ToggleHdl_Impl, weld::Toggleable&, void); void Init_Impl(); void Open_Impl(); diff --git a/sfx2/source/sidebar/TabBar.cxx b/sfx2/source/sidebar/TabBar.cxx index f77cd0e60b5c..eda97378bcae 100644 --- a/sfx2/source/sidebar/TabBar.cxx +++ b/sfx2/source/sidebar/TabBar.cxx @@ -319,7 +319,7 @@ void TabBar::UpdateFocusManager(FocusManager& rFocusManager) rFocusManager.SetButtons(aButtons); } -IMPL_LINK_NOARG(TabBar, OnToolboxClicked, weld::ToggleButton&, void) +IMPL_LINK_NOARG(TabBar, OnToolboxClicked, weld::Toggleable&, void) { if (!mxMenuButton->get_active()) return; diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index fc303ba29fc3..ac1f65ac9913 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -50,7 +50,7 @@ class SmPrintOptionsTabPage final : public SfxTabPage std::unique_ptr<weld::CheckButton> m_xSaveOnlyUsedSymbols; std::unique_ptr<weld::CheckButton> m_xAutoCloseBrackets; - DECL_LINK(SizeButtonClickHdl, weld::ToggleButton&, void); + DECL_LINK(SizeButtonClickHdl, weld::Toggleable&, void); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; @@ -89,7 +89,7 @@ class SmFontDialog : public weld::GenericDialogController std::unique_ptr<weld::CustomWeld> m_xShowFont; DECL_LINK(FontSelectHdl, weld::ComboBox&, void); - DECL_LINK(AttrChangeHdl, weld::ToggleButton&, void); + DECL_LINK(AttrChangeHdl, weld::Toggleable&, void); public: SmFontDialog(weld::Window* pParent, OutputDevice *pFntListDevice, bool bHideCheckboxes); @@ -206,7 +206,7 @@ class SmDistanceDialog final : public weld::GenericDialogController DECL_LINK(GetFocusHdl, weld::Widget&, void); DECL_LINK(MenuSelectHdl, const OString&, void); DECL_LINK(DefaultButtonClickHdl, weld::Button&, void); - DECL_LINK(CheckBoxClickHdl, weld::ToggleButton&, void); + DECL_LINK(CheckBoxClickHdl, weld::Toggleable&, void); void SetCategory(sal_uInt16 Category); diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 523f2fa89d7f..802588f9c38c 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -153,7 +153,7 @@ void SetFontStyle(std::u16string_view rStyleName, vcl::Font &rFont) rFont.SetWeight((nIndex & 0x2) ? WEIGHT_BOLD : WEIGHT_NORMAL); } -IMPL_LINK_NOARG(SmPrintOptionsTabPage, SizeButtonClickHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SmPrintOptionsTabPage, SizeButtonClickHdl, weld::Toggleable&, void) { m_xZoom->set_sensitive(m_xSizeZoomed->get_active()); } @@ -267,7 +267,7 @@ IMPL_LINK( SmFontDialog, FontSelectHdl, weld::ComboBox&, rComboBox, void ) m_aShowFont.SetFont(maFont); } -IMPL_LINK_NOARG(SmFontDialog, AttrChangeHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SmFontDialog, AttrChangeHdl, weld::Toggleable&, void) { if (m_xBoldCheckBox->get_active()) maFont.SetWeight(WEIGHT_BOLD); @@ -644,7 +644,7 @@ IMPL_LINK_NOARG( SmDistanceDialog, DefaultButtonClickHdl, weld::Button&, void ) } } -IMPL_LINK( SmDistanceDialog, CheckBoxClickHdl, weld::ToggleButton&, rCheckBox, void ) +IMPL_LINK( SmDistanceDialog, CheckBoxClickHdl, weld::Toggleable&, rCheckBox, void ) { if (&rCheckBox == m_xCheckBox1.get()) { diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx index 5af701fba0fb..3b1819e94923 100644 --- a/svtools/source/brwbox/ebbcontrols.cxx +++ b/svtools/source/brwbox/ebbcontrols.cxx @@ -231,7 +231,7 @@ namespace svt OnToggle(*m_xBox); } - IMPL_LINK_NOARG(CheckBoxControl, OnToggle, weld::ToggleButton&, void) + IMPL_LINK_NOARG(CheckBoxControl, OnToggle, weld::Toggleable&, void) { m_aModeState.ButtonToggled(*m_xBox); m_aToggleLink.Call(*m_xBox); @@ -501,7 +501,7 @@ namespace svt } } - IMPL_LINK(DateControl, ToggleHdl, weld::ToggleButton&, rButton, void) + IMPL_LINK(DateControl, ToggleHdl, weld::Toggleable&, rButton, void) { if (rButton.get_active()) m_xCalendar->set_date(static_cast<weld::DateFormatter&>(get_formatter()).GetDate()); diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 8d5f8836a0c3..655eb430db60 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -1453,7 +1453,7 @@ IMPL_LINK_NOARG(SvtLineListBox, FocusHdl, weld::Widget&, void) m_xLineSet->GrabFocus(); } -IMPL_LINK(SvtLineListBox, ToggleHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(SvtLineListBox, ToggleHdl, weld::Toggleable&, rButton, void) { if (rButton.get_active()) FocusHdl(*m_xTopLevel); diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index 8a3b481b50f3..08a81cdc36a6 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -182,7 +182,7 @@ bool DavDetailsContainer::verifyScheme( const OUString& rScheme ) return bValid; } -IMPL_LINK( DavDetailsContainer, ToggledDavsHdl, weld::ToggleButton&, rCheckBox, void ) +IMPL_LINK( DavDetailsContainer, ToggledDavsHdl, weld::Toggleable&, rCheckBox, void ) { // Change default port if needed bool bCheckedDavs = rCheckBox.get_active(); diff --git a/svtools/source/dialogs/ServerDetailsControls.hxx b/svtools/source/dialogs/ServerDetailsControls.hxx index d5041ddefff5..71f920a998bc 100644 --- a/svtools/source/dialogs/ServerDetailsControls.hxx +++ b/svtools/source/dialogs/ServerDetailsControls.hxx @@ -96,7 +96,7 @@ class DavDetailsContainer final : public HostDetailsContainer private: virtual bool verifyScheme( const OUString& rScheme ) override; - DECL_LINK(ToggledDavsHdl, weld::ToggleButton&, void); + DECL_LINK(ToggledDavsHdl, weld::Toggleable&, void); }; class SmbDetailsContainer final : public DetailsContainer diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx index f611e291ec5b..5accd1482cd1 100644 --- a/svtools/source/filter/exportdialog.cxx +++ b/svtools/source/filter/exportdialog.cxx @@ -992,12 +992,12 @@ IMPL_LINK_NOARG(ExportDialog, SelectListBoxHdl, weld::ComboBox&, void) updateControls(); } -IMPL_LINK_NOARG(ExportDialog, UpdateHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ExportDialog, UpdateHdl, weld::Toggleable&, void) { updateControls(); } -IMPL_LINK_NOARG(ExportDialog, UpdateLock, weld::ToggleButton&, void) +IMPL_LINK_NOARG(ExportDialog, UpdateLock, weld::Toggleable&, void) { if (mxModifyResolution->get_active()) { diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx index 787329d16703..28953ee0224c 100644 --- a/svtools/source/filter/exportdialog.hxx +++ b/svtools/source/filter/exportdialog.hxx @@ -144,8 +144,8 @@ private: std::unique_ptr<weld::Button> mxBtnOK; - DECL_LINK(UpdateHdl, weld::ToggleButton&, void); - DECL_LINK(UpdateLock, weld::ToggleButton&, void); + DECL_LINK(UpdateHdl, weld::Toggleable&, void); + DECL_LINK(UpdateLock, weld::Toggleable&, void); DECL_LINK(SelectListBoxHdl, weld::ComboBox&, void); DECL_LINK(SelectHdl, weld::SpinButton&, void); DECL_LINK(UpdateHdlMtfSizeX, weld::SpinButton&, void); 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 ); diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx index 6cf6760aeb2b..862a7b53347c 100644 --- a/sw/inc/AnnotationWin.hxx +++ b/sw/inc/AnnotationWin.hxx @@ -213,7 +213,7 @@ class SAL_DLLPUBLIC_RTTI SwAnnotationWin : public InterimItemWindow DECL_LINK(ModifyHdl, LinkParamNone*, void); DECL_LINK(ScrollHdl, weld::ScrolledWindow&, void); DECL_LINK(DeleteHdl, void*, void); - DECL_LINK(ToggleHdl, weld::ToggleButton&, void); + DECL_LINK(ToggleHdl, weld::Toggleable&, void); DECL_LINK(SelectHdl, const OString&, void); DECL_LINK(KeyInputHdl, const KeyEvent&, bool); DECL_LINK(MouseMoveHdl, const MouseEvent&, bool); 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; diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx index 482b1216f753..3f3ace7d801a 100644 --- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx +++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx @@ -191,7 +191,7 @@ public: m_xWidget->set_active(bActive); } - void connect_toggled(const Link<weld::ToggleButton&, void>& rLink) + void connect_toggled(const Link<weld::Toggleable&, void>& rLink) { m_xWidget->connect_toggled(rLink); } @@ -212,7 +212,7 @@ class MMExcludeEntryController : public svt::ToolboxController, public lang::XSe { VclPtr<ExcludeCheckBox> m_xExcludeCheckbox; - DECL_STATIC_LINK(MMExcludeEntryController, ExcludeHdl, weld::ToggleButton&, void); + DECL_STATIC_LINK(MMExcludeEntryController, ExcludeHdl, weld::Toggleable&, void); public: explicit MMExcludeEntryController(const uno::Reference<uno::XComponentContext>& rContext) @@ -358,7 +358,7 @@ uno::Reference<awt::XWindow> MMExcludeEntryController::createItemWindow(const un return VCLUnoHelper::GetInterface(m_xExcludeCheckbox); } -IMPL_STATIC_LINK(MMExcludeEntryController, ExcludeHdl, weld::ToggleButton&, rCheckbox, void) +IMPL_STATIC_LINK(MMExcludeEntryController, ExcludeHdl, weld::Toggleable&, rCheckbox, void) { SwView* pView = ::GetActiveView(); std::shared_ptr<SwMailMergeConfigItem> xConfigItem; diff --git a/sw/source/uibase/docvw/AnnotationMenuButton.cxx b/sw/source/uibase/docvw/AnnotationMenuButton.cxx index 48f848416ec6..1696f7e6d338 100644 --- a/sw/source/uibase/docvw/AnnotationMenuButton.cxx +++ b/sw/source/uibase/docvw/AnnotationMenuButton.cxx @@ -61,7 +61,7 @@ IMPL_LINK(SwAnnotationWin, SelectHdl, const OString&, rIdent, void) GrabFocusToDocument(); } -IMPL_LINK_NOARG(SwAnnotationWin, ToggleHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SwAnnotationWin, ToggleHdl, weld::Toggleable&, void) { if (!mxMenuButton->get_active()) return; diff --git a/sw/source/uibase/docvw/PageBreakWin.cxx b/sw/source/uibase/docvw/PageBreakWin.cxx index 582ff2701933..6223d56057ae 100644 --- a/sw/source/uibase/docvw/PageBreakWin.cxx +++ b/sw/source/uibase/docvw/PageBreakWin.cxx @@ -450,7 +450,7 @@ void SwPageBreakWin::Fade( bool bFadeIn ) m_aFadeTimer.Start( ); } -IMPL_LINK(SwPageBreakWin, ToggleHdl, weld::ToggleButton&, rMenuButton, void) +IMPL_LINK(SwPageBreakWin, ToggleHdl, weld::Toggleable&, rMenuButton, void) { // hide on dropdown, draw fully unfaded if dropdown before fully faded in Fade(rMenuButton.get_active()); diff --git a/sw/source/uibase/inc/PageBreakWin.hxx b/sw/source/uibase/inc/PageBreakWin.hxx index c5cc9cd7774e..761a983eeb8b 100644 --- a/sw/source/uibase/inc/PageBreakWin.hxx +++ b/sw/source/uibase/inc/PageBreakWin.hxx @@ -54,7 +54,7 @@ public: private: DECL_LINK( FadeHandler, Timer *, void ); /// Hide the button when the menu is toggled closed, e.g by clicking outside - DECL_LINK(ToggleHdl, weld::ToggleButton&, void); + DECL_LINK(ToggleHdl, weld::Toggleable&, void); DECL_LINK(SelectHdl, const OString&, void); void PaintButton(); }; diff --git a/sw/source/uibase/inc/ascfldlg.hxx b/sw/source/uibase/inc/ascfldlg.hxx index c50d51956cd7..fc652fab3da3 100644 --- a/sw/source/uibase/inc/ascfldlg.hxx +++ b/sw/source/uibase/inc/ascfldlg.hxx @@ -44,7 +44,7 @@ class SwAsciiFilterDlg : public SfxDialogController std::unique_ptr<weld::CheckButton> m_xIncludeBOM_CB; DECL_LINK(CharSetSelHdl, weld::ComboBox&, void); - DECL_LINK(LineEndHdl, weld::ToggleButton&, void); + DECL_LINK(LineEndHdl, weld::Toggleable&, void); void SetCRLF(LineEnd eEnd); LineEnd GetCRLF() const; void SetIncludeBOM(bool bIncludeBOM); diff --git a/sw/source/uibase/inc/bookmark.hxx b/sw/source/uibase/inc/bookmark.hxx index 85f67e9c2981..2c3b81ffe69e 100644 --- a/sw/source/uibase/inc/bookmark.hxx +++ b/sw/source/uibase/inc/bookmark.hxx @@ -87,7 +87,7 @@ class SwInsertBookmarkDlg : public SfxDialogController DECL_LINK(SelectionChangedHdl, weld::TreeView&, void); DECL_LINK(DoubleClickHdl, weld::TreeView&, bool); DECL_LINK(HeaderBarClick, int, void); - DECL_LINK(ChangeHideHdl, weld::ToggleButton&, void); + DECL_LINK(ChangeHideHdl, weld::Toggleable&, void); // Fill table with bookmarks void PopulateTable(); diff --git a/sw/source/uibase/inc/break.hxx b/sw/source/uibase/inc/break.hxx index 9de8a9f4a366..8b021d0d6d1a 100644 --- a/sw/source/uibase/inc/break.hxx +++ b/sw/source/uibase/inc/break.hxx @@ -43,9 +43,9 @@ class SwBreakDlg : public weld::GenericDialogController bool bHtmlMode; - DECL_LINK(ToggleHdl, weld::ToggleButton&, void); + DECL_LINK(ToggleHdl, weld::Toggleable&, void); DECL_LINK(ChangeHdl, weld::ComboBox&, void); - DECL_LINK(PageNumHdl, weld::ToggleButton&, void); + DECL_LINK(PageNumHdl, weld::Toggleable&, void); DECL_LINK(PageNumModifyHdl, weld::SpinButton&, void); DECL_LINK(OkHdl, weld::Button&, void); diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index 2d883c2b4d17..e7c39cb7db90 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -140,7 +140,7 @@ class SwColumnPage : public SfxTabPage void ColModify(bool bForceColReset); DECL_LINK(GapModify, weld::MetricSpinButton&, void); DECL_LINK(EdModify, weld::MetricSpinButton&, void); - DECL_LINK(AutoWidthHdl, weld::ToggleButton&, void ); + DECL_LINK(AutoWidthHdl, weld::Toggleable&, void ); DECL_LINK(SetDefaultsHdl, ValueSet *, void); DECL_LINK(Up, weld::Button&, void); diff --git a/sw/source/uibase/inc/convert.hxx b/sw/source/uibase/inc/convert.hxx index 19080ac7581e..867ae46ce21a 100644 --- a/sw/source/uibase/inc/convert.hxx +++ b/sw/source/uibase/inc/convert.hxx @@ -52,9 +52,9 @@ class SwConvertTableDlg : public SfxDialogController SwWrtShell* pShell; DECL_LINK(AutoFormatHdl, weld::Button&, void); - DECL_LINK(BtnHdl, weld::ToggleButton&, void); - DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void); - DECL_LINK(RepeatHeaderCheckBoxHdl, weld::ToggleButton&, void); + DECL_LINK(BtnHdl, weld::Toggleable&, void); + DECL_LINK(CheckBoxHdl, weld::Toggleable&, void); + DECL_LINK(RepeatHeaderCheckBoxHdl, weld::Toggleable&, void); public: SwConvertTableDlg(SwView& rView, bool bToTable); diff --git a/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx index 49d6fd9e39ea..3cd7a76a6b26 100644 --- a/sw/source/uibase/inc/dbinsdlg.hxx +++ b/sw/source/uibase/inc/dbinsdlg.hxx @@ -123,15 +123,15 @@ class SwInsertDBColAutoPilot : public SfxDialogController, public utl::ConfigIte std::unique_ptr<weld::Button> m_xPbTableFormat; std::unique_ptr<weld::Button> m_xPbTableAutofmt; - DECL_LINK( PageHdl, weld::ToggleButton&, void ); + DECL_LINK( PageHdl, weld::Toggleable&, void ); DECL_LINK( AutoFormatHdl, weld::Button&, void ); DECL_LINK( TableFormatHdl, weld::Button&, void ); - DECL_LINK( DBFormatHdl, weld::ToggleButton&, void ); + DECL_LINK( DBFormatHdl, weld::Toggleable&, void ); DECL_LINK( TableToFromHdl, weld::Button&, void ); DECL_LINK( TVSelectHdl, weld::TreeView&, void ); DECL_LINK( CBSelectHdl, weld::ComboBox&, void ); DECL_LINK( DblClickHdl, weld::TreeView&, bool ); - DECL_LINK( HeaderHdl, weld::ToggleButton&, void ); + DECL_LINK( HeaderHdl, weld::Toggleable&, void ); bool SplitTextToColArr( const OUString& rText, DB_Columns& rColArr, bool bInsField ); virtual void Notify( const css::uno::Sequence< OUString >& aPropertyNames ) override; diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx index 39479738cde8..bf02a7284b09 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -137,12 +137,12 @@ friend class SwDropCapsPict; void ModifyEntry(weld::Entry& rEdit); - DECL_LINK(ClickHdl, weld::ToggleButton&, void); + DECL_LINK(ClickHdl, weld::Toggleable&, void); DECL_LINK(MetricValueChangedHdl, weld::MetricSpinButton&, void); DECL_LINK(ValueChangedHdl, weld::SpinButton&, void); DECL_LINK(ModifyHdl, weld::Entry&, void); DECL_LINK(SelectHdl, weld::ComboBox&, void); - DECL_LINK(WholeWordHdl, weld::ToggleButton&, void); + DECL_LINK(WholeWordHdl, weld::Toggleable&, void); static const sal_uInt16 aPageRg[]; diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index ed23fb6b0f6a..00abb7ab2889 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -98,7 +98,7 @@ class SwEnvPage : public SfxTabPage DECL_LINK(DatabaseHdl, weld::ComboBox&, void); DECL_LINK(FieldHdl, weld::Button&, void); - DECL_LINK(SenderHdl, weld::ToggleButton&, void); + DECL_LINK(SenderHdl, weld::Toggleable&, void); void InitDatabaseBox(); diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index 63d6e5bf1e78..831ce60933d1 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -126,9 +126,9 @@ class SwFramePage: public SfxTabPage virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; - DECL_LINK(RangeModifyClickHdl, weld::ToggleButton&, void); + DECL_LINK(RangeModifyClickHdl, weld::Toggleable&, void); void RangeModifyHdl(); - DECL_LINK(AnchorTypeHdl, weld::ToggleButton&, void); + DECL_LINK(AnchorTypeHdl, weld::Toggleable&, void); DECL_LINK(PosHdl, weld::ComboBox&, void); DECL_LINK(RelHdl, weld::ComboBox&, void); void InitPos(RndStdIds eId, sal_Int16 nH, sal_Int16 nHRel, @@ -136,11 +136,11 @@ class SwFramePage: public SfxTabPage tools::Long nX, tools::Long nY); DECL_LINK(RealSizeHdl, weld::Button&, void); - DECL_LINK(RelSizeClickHdl, weld::ToggleButton&, void); - DECL_LINK(MirrorHdl, weld::ToggleButton&, void); + DECL_LINK(RelSizeClickHdl, weld::Toggleable&, void); + DECL_LINK(MirrorHdl, weld::Toggleable&, void); - DECL_LINK(AutoWidthClickHdl, weld::ToggleButton&, void); - DECL_LINK(AutoHeightClickHdl, weld::ToggleButton&, void); + DECL_LINK(AutoWidthClickHdl, weld::Toggleable&, void); + DECL_LINK(AutoHeightClickHdl, weld::Toggleable&, void); // update example void UpdateExample(); @@ -225,7 +225,7 @@ class SwGrfExtPage : public SfxTabPage std::unique_ptr<weld::Label> m_xLabelGraphicType; // handler for mirroring - DECL_LINK(MirrorHdl, weld::ToggleButton&, void); + DECL_LINK(MirrorHdl, weld::Toggleable&, void); DECL_LINK(BrowseHdl, weld::Button&, void); virtual void ActivatePage(const SfxItemSet& rSet) override; diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx index 4ac5b6c8e4ec..6427f04a5c34 100644 --- a/sw/source/uibase/inc/glossary.hxx +++ b/sw/source/uibase/inc/glossary.hxx @@ -84,11 +84,11 @@ class SwGlossaryDlg : public SfxDialogController DECL_LINK( NameDoubleClick, weld::TreeView&, bool ); DECL_LINK( GrpSelect, weld::TreeView&, void ); DECL_LINK( MenuHdl, const OString&, void ); - DECL_LINK( EnableHdl, weld::ToggleButton&, void ); + DECL_LINK( EnableHdl, weld::Toggleable&, void ); DECL_LINK( BibHdl, weld::Button&, void ); DECL_LINK( InsertHdl, weld::Button&, void ); DECL_LINK( PathHdl, weld::Button&, void ); - DECL_LINK( CheckBoxHdl, weld::ToggleButton&, void ); + DECL_LINK( CheckBoxHdl, weld::Toggleable&, void ); DECL_LINK( PreviewLoadedHdl, SwOneExampleFrame&, void ); DECL_LINK( KeyInputHdl, const KeyEvent&, bool ); DECL_LINK( TextFilterHdl, OUString&, bool ); diff --git a/sw/source/uibase/inc/insfnote.hxx b/sw/source/uibase/inc/insfnote.hxx index ac523457e343..bf0600bb73aa 100644 --- a/sw/source/uibase/inc/insfnote.hxx +++ b/sw/source/uibase/inc/insfnote.hxx @@ -49,7 +49,7 @@ class SwInsFootNoteDlg: public weld::GenericDialogController std::unique_ptr<weld::Button> m_xPrevBT; std::unique_ptr<weld::Button> m_xNextBT; - DECL_LINK(NumberToggleHdl, weld::ToggleButton&, void); + DECL_LINK(NumberToggleHdl, weld::Toggleable&, void); DECL_LINK(NumberEditHdl, weld::Entry&, void); DECL_LINK(NumberExtCharHdl, weld::Button&, void); DECL_LINK(NextPrevHdl, weld::Button&, void); diff --git a/sw/source/uibase/inc/instable.hxx b/sw/source/uibase/inc/instable.hxx index 3070dcccbd54..e802503c3fb2 100644 --- a/sw/source/uibase/inc/instable.hxx +++ b/sw/source/uibase/inc/instable.hxx @@ -71,8 +71,8 @@ class SwInsTableDlg : public SfxDialogController DECL_LINK(ModifyName, weld::Entry&, void); DECL_LINK(ModifyRowCol, weld::Entry&, void); DECL_LINK(OKHdl, weld::Button&, void); - DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void); - DECL_LINK(RepeatHeaderCheckBoxHdl, weld::ToggleButton&, void); + DECL_LINK(CheckBoxHdl, weld::Toggleable&, void); + DECL_LINK(RepeatHeaderCheckBoxHdl, weld::Toggleable&, void); DECL_LINK(ModifyRepeatHeaderNF_Hdl, weld::SpinButton&, void); public: diff --git a/sw/source/uibase/inc/javaedit.hxx b/sw/source/uibase/inc/javaedit.hxx index 74130d40284f..b71adfc18348 100644 --- a/sw/source/uibase/inc/javaedit.hxx +++ b/sw/source/uibase/inc/javaedit.hxx @@ -53,7 +53,7 @@ private: DECL_LINK(OKHdl, weld::Button&, void); DECL_LINK(PrevHdl, weld::Button&, void); DECL_LINK(NextHdl, weld::Button&, void); - DECL_LINK(RadioButtonHdl, weld::ToggleButton&, void); + DECL_LINK(RadioButtonHdl, weld::Toggleable&, void); DECL_LINK(InsertFileHdl, weld::Button&, void); DECL_LINK(DlgClosedHdl, sfx2::FileDialogHelper *, void); diff --git a/sw/source/uibase/inc/linenum.hxx b/sw/source/uibase/inc/linenum.hxx index c05a8fe7d61c..d239e631992f 100644 --- a/sw/source/uibase/inc/linenum.hxx +++ b/sw/source/uibase/inc/linenum.hxx @@ -48,7 +48,7 @@ private: std::unique_ptr<weld::Widget> m_xNumIntervalFT; std::unique_ptr<weld::Widget> m_xNumRowsFT; DECL_LINK(OKHdl, weld::Button&, void); - DECL_LINK(LineOnOffHdl, weld::ToggleButton&, void); + DECL_LINK(LineOnOffHdl, weld::Toggleable&, void); DECL_LINK(ModifyHdl, weld::Entry&, void); public: diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx index be6dfe137c15..e008a702ab46 100644 --- a/sw/source/uibase/inc/mailconfigpage.hxx +++ b/sw/source/uibase/inc/mailconfigpage.hxx @@ -42,10 +42,10 @@ class SwMailConfigPage : public SfxTabPage std::unique_ptr<weld::Button> m_xServerAuthenticationPB; std::unique_ptr<weld::Button> m_xTestPB; - DECL_LINK(ReplyToHdl, weld::ToggleButton&, void); + DECL_LINK(ReplyToHdl, weld::Toggleable&, void); DECL_LINK(AuthenticationHdl, weld::Button&, void); DECL_LINK(TestHdl, weld::Button&, void); - DECL_LINK(SecureHdl, weld::ToggleButton&, void); + DECL_LINK(SecureHdl, weld::Toggleable&, void); public: SwMailConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx index f409c664ffe9..0eebc628618b 100644 --- a/sw/source/uibase/inc/mailmrge.hxx +++ b/sw/source/uibase/inc/mailmrge.hxx @@ -103,10 +103,10 @@ class SwMailMergeDlg : public SfxDialogController DECL_LINK( ButtonHdl, weld::Button&, void ); DECL_LINK( InsertPathHdl, weld::Button&, void ); - DECL_LINK( OutputTypeHdl, weld::ToggleButton&, void ); - DECL_LINK( FilenameHdl, weld::ToggleButton&, void ); + DECL_LINK( OutputTypeHdl, weld::Toggleable&, void ); + DECL_LINK( FilenameHdl, weld::Toggleable&, void ); DECL_LINK( ModifyHdl, weld::SpinButton&, void ); - DECL_LINK( SaveTypeHdl, weld::ToggleButton&, void ); + DECL_LINK( SaveTypeHdl, weld::Toggleable&, void ); DECL_LINK( FileFormatHdl, weld::ComboBox&, void ); bool ExecQryShell(); diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index 9d536066915c..ff4d1e7671b7 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -79,7 +79,7 @@ class SwNumPositionTabPage : public SfxTabPage DECL_LINK(LevelHdl, weld::TreeView&, void); DECL_LINK(EditModifyHdl, weld::ComboBox&, void); DECL_LINK(DistanceHdl, weld::MetricSpinButton&, void); - DECL_LINK(RelativeHdl, weld::ToggleButton&, void); + DECL_LINK(RelativeHdl, weld::Toggleable&, void); DECL_LINK(StandardHdl, weld::Button&, void); void InitPosAndSpaceMode(); diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx index 1589220e6b8b..db67c1358ab2 100644 --- a/sw/source/uibase/inc/numpara.hxx +++ b/sw/source/uibase/inc/numpara.hxx @@ -50,9 +50,9 @@ class SwParagraphNumTabPage final : public SfxTabPage std::unique_ptr<weld::Widget> m_xRestartBX; std::unique_ptr<weld::SpinButton> m_xRestartNF; - DECL_LINK(NewStartHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(NewStartHdl_Impl, weld::Toggleable&, void); DECL_LINK(StyleHdl_Impl, weld::ComboBox&,void); - DECL_LINK(LineCountHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(LineCountHdl_Impl, weld::Toggleable&, void); DECL_LINK(EditNumStyleHdl_Impl, weld::Button&, void); DECL_LINK(EditNumStyleSelectHdl_Impl, weld::ComboBox&, void); diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index 4f8b8c23ca2b..931156795eb8 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -77,7 +77,7 @@ private: std::unique_ptr<weld::SpinButton> m_xStandardizedPageSizeNF; DECL_LINK(MetricHdl, weld::ComboBox&, void); - DECL_LINK(StandardizedPageCountCheckHdl, weld::ToggleButton&, void); + DECL_LINK(StandardizedPageCountCheckHdl, weld::Toggleable&, void); public: SwLoadOptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index 8ca8bf3fc55b..dfd0e4d4bf85 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -61,8 +61,8 @@ class SwContentOptPage : public SfxTabPage std::unique_ptr<weld::CheckButton> m_xFieldHiddenCB; std::unique_ptr<weld::CheckButton> m_xFieldHiddenParaCB; - DECL_LINK(VertRulerHdl, weld::ToggleButton&, void); - DECL_LINK(ShowOutlineContentVisibilityButtonHdl, weld::ToggleButton&, void); + DECL_LINK(VertRulerHdl, weld::Toggleable&, void); + DECL_LINK(ShowOutlineContentVisibilityButtonHdl, weld::Toggleable&, void); public: SwContentOptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); virtual ~SwContentOptPage() override; @@ -104,7 +104,7 @@ class SwAddPrinterTabPage : public SfxTabPage std::unique_ptr<weld::CheckButton> m_xPaperFromSetupCB; std::unique_ptr<weld::ComboBox> m_xFaxLB; - DECL_LINK(AutoClickHdl, weld::ToggleButton&, void); + DECL_LINK(AutoClickHdl, weld::Toggleable&, void); DECL_LINK(SelectHdl, weld::ComboBox&, void); public: @@ -205,7 +205,7 @@ class SwTableOptionsTabPage : public SfxTabPage std::unique_ptr<weld::RadioButton> m_xFixPropRB; std::unique_ptr<weld::RadioButton> m_xVarRB; - DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void); + DECL_LINK(CheckBoxHdl, weld::Toggleable&, void); public: SwTableOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); @@ -362,7 +362,7 @@ private: std::unique_ptr<weld::CheckButton> m_xTest10CBox; void Init(); - DECL_LINK(AutoClickHdl, weld::ToggleButton&, void); + DECL_LINK(AutoClickHdl, weld::Toggleable&, void); }; #endif // DBG_UTIL @@ -376,8 +376,8 @@ class SwCompareOptionsTabPage : public SfxTabPage std::unique_ptr<weld::SpinButton> m_xLenNF; std::unique_ptr<weld::CheckButton> m_xStoreRsidCB; - DECL_LINK(ComparisonHdl, weld::ToggleButton&, void); - DECL_LINK(IgnoreHdl, weld::ToggleButton&, void); + DECL_LINK(ComparisonHdl, weld::Toggleable&, void); + DECL_LINK(IgnoreHdl, weld::Toggleable&, void); public: SwCompareOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index d1e1b2915b7d..17b9568bac23 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -45,7 +45,7 @@ class SwOutlineTabDialog final : public SfxTabDialogController std::unique_ptr<weld::MenuButton> m_xMenuButton; DECL_LINK(CancelHdl, weld::Button&, void); - DECL_LINK(FormHdl, weld::ToggleButton&, void); + DECL_LINK(FormHdl, weld::Toggleable&, void); DECL_LINK(MenuSelectHdl, const OString&, void); virtual void PageCreated(const OString& rPageId, SfxTabPage& rPage) override; diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx index c67c2f6a5b62..1bf5bd63fa81 100644 --- a/sw/source/uibase/inc/pgfnote.hxx +++ b/sw/source/uibase/inc/pgfnote.hxx @@ -52,8 +52,8 @@ private: std::unique_ptr<weld::MetricSpinButton> m_xLineLengthEdit; std::unique_ptr<weld::MetricSpinButton> m_xLineDistEdit; - DECL_LINK(HeightPage, weld::ToggleButton&, void); - DECL_LINK(HeightMetric, weld::ToggleButton&, void); + DECL_LINK(HeightPage, weld::Toggleable&, void); + DECL_LINK(HeightMetric, weld::Toggleable&, void); DECL_LINK(HeightModify, weld::MetricSpinButton&, void); DECL_LINK(LineWidthChanged_Impl, weld::MetricSpinButton&, void); DECL_LINK(LineColorSelected_Impl, ColorListBox&, void); diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx index a43aee7b4686..a714abff7fd4 100644 --- a/sw/source/uibase/inc/pggrid.hxx +++ b/sw/source/uibase/inc/pggrid.hxx @@ -65,12 +65,12 @@ class SwTextGridPage: public SfxTabPage void GridModifyHdl(); - DECL_LINK(GridTypeHdl, weld::ToggleButton&, void); + DECL_LINK(GridTypeHdl, weld::Toggleable&, void); DECL_LINK(CharorLineChangedHdl, weld::SpinButton&, void); DECL_LINK(TextSizeChangedHdl, weld::MetricSpinButton&, void); DECL_LINK(ColorModifyHdl, ColorListBox&, void); - DECL_LINK(GridModifyClickHdl, weld::ToggleButton&, void); - DECL_LINK(DisplayGridHdl, weld::ToggleButton&, void); + DECL_LINK(GridModifyClickHdl, weld::Toggleable&, void); + DECL_LINK(DisplayGridHdl, weld::Toggleable&, void); public: SwTextGridPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet); diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index a16fc1b93f5e..fb959c521d1e 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -88,23 +88,23 @@ class SwEditRegionDlg : public SfxDialogController DECL_LINK( ConditionEditHdl, weld::Entry&, void ); void ChangePasswd(bool bChange); - DECL_LINK( TogglePasswdHdl, weld::ToggleButton&, void ); + DECL_LINK( TogglePasswdHdl, weld::Toggleable&, void ); DECL_LINK( ChangePasswdHdl, weld::Button&, void ); - DECL_LINK( ChangeProtectHdl, weld::ToggleButton&, void ); - DECL_LINK( ChangeHideHdl, weld::ToggleButton&, void ); + DECL_LINK( ChangeProtectHdl, weld::Toggleable&, void ); + DECL_LINK( ChangeHideHdl, weld::Toggleable&, void ); // #114856# edit in readonly sections - DECL_LINK( ChangeEditInReadonlyHdl, weld::ToggleButton&, void ); + DECL_LINK( ChangeEditInReadonlyHdl, weld::Toggleable&, void ); DECL_LINK( ChangeDismissHdl, weld::Button&, void); - DECL_LINK( UseFileHdl, weld::ToggleButton&, void ); + DECL_LINK( UseFileHdl, weld::Toggleable&, void ); DECL_LINK( FileSearchHdl, weld::Button&, void ); DECL_LINK( OptionsHdl, weld::Button&, void ); DECL_LINK( FileNameComboBoxHdl, weld::ComboBox&, void ); DECL_LINK( FileNameEntryHdl, weld::Entry&, void ); - DECL_LINK( DDEHdl, weld::ToggleButton&, void ); + DECL_LINK( DDEHdl, weld::Toggleable&, void ); DECL_LINK( DlgClosedHdl, sfx2::FileDialogHelper*, void ); DECL_LINK( SubRegionEventHdl, weld::ComboBox&, void ); - bool CheckPasswd(weld::ToggleButton* pBox = nullptr); + bool CheckPasswd(weld::Toggleable* pBox = nullptr); public: SwEditRegionDlg(weld::Window* pParent, SwWrtShell& rWrtSh); @@ -145,14 +145,14 @@ class SwInsertSectionTabPage : public SfxTabPage void ChangePasswd(bool bChange); - DECL_LINK( ChangeHideHdl, weld::ToggleButton&, void ); - DECL_LINK( ChangeProtectHdl, weld::ToggleButton&, void ); + DECL_LINK( ChangeHideHdl, weld::Toggleable&, void ); + DECL_LINK( ChangeProtectHdl, weld::Toggleable&, void ); DECL_LINK( ChangePasswdHdl, weld::Button&, void ); - DECL_LINK( TogglePasswdHdl, weld::ToggleButton&, void ); + DECL_LINK( TogglePasswdHdl, weld::Toggleable&, void ); DECL_LINK( NameEditHdl, weld::ComboBox&, void ); - DECL_LINK( UseFileHdl, weld::ToggleButton&, void ); + DECL_LINK( UseFileHdl, weld::Toggleable&, void ); DECL_LINK( FileSearchHdl, weld::Button&, void ); - DECL_LINK( DDEHdl, weld::ToggleButton&, void ); + DECL_LINK( DDEHdl, weld::Toggleable&, void ); DECL_LINK( DlgClosedHdl, sfx2::FileDialogHelper*, void ); public: @@ -191,7 +191,7 @@ class SwSectionFootnoteEndTabPage : public SfxTabPage std::unique_ptr<weld::Label> m_xEndSuffixFT; std::unique_ptr<weld::Entry> m_xEndSuffixED; - DECL_LINK(FootEndHdl, weld::ToggleButton&, void); + DECL_LINK(FootEndHdl, weld::Toggleable&, void); void ResetState( bool bFootnote, const SwFormatFootnoteEndAtTextEnd& ); public: diff --git a/sw/source/uibase/inc/srtdlg.hxx b/sw/source/uibase/inc/srtdlg.hxx index e47a974e40ee..2e3a6a137088 100644 --- a/sw/source/uibase/inc/srtdlg.hxx +++ b/sw/source/uibase/inc/srtdlg.hxx @@ -73,8 +73,8 @@ class SwSortDlg : public weld::GenericDialogController void Apply(); sal_Unicode GetDelimChar() const; - DECL_LINK(CheckHdl, weld::ToggleButton&, void); - DECL_LINK(DelimHdl, weld::ToggleButton&, void); + DECL_LINK(CheckHdl, weld::Toggleable&, void); + DECL_LINK(DelimHdl, weld::Toggleable&, void); DECL_LINK(LanguageListBoxHdl, weld::ComboBox&, void); void LanguageHdl(weld::ComboBox const*); DECL_LINK(DelimCharHdl, weld::Button&, void); diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index 16756594f82b..5afa438eb5a1 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -84,7 +84,7 @@ class SwMultiTOXTabDialog : public SfxTabDialogController std::unique_ptr<SwTOXDescription> CreateTOXDescFromTOXBase(const SwTOXBase*pCurTOX); DECL_LINK(CreateExample_Hdl, SwOneExampleFrame&, void); - DECL_LINK(ShowPreviewHdl, weld::ToggleButton&, void); + DECL_LINK(ShowPreviewHdl, weld::Toggleable&, void); public: SwMultiTOXTabDialog(weld::Widget* pParent, const SfxItemSet& rSet, @@ -190,12 +190,12 @@ class SwTOXSelectTabPage : public SfxTabPage DECL_LINK(TOXTypeHdl, weld::ComboBox&, void ); DECL_LINK(AddStylesHdl, weld::Button&, void ); - DECL_LINK(MenuEnableHdl, weld::ToggleButton&, void); + DECL_LINK(MenuEnableHdl, weld::Toggleable&, void); DECL_LINK(MenuExecuteHdl, const OString&, void); DECL_LINK(LanguageListBoxHdl, weld::ComboBox&, void); void LanguageHdl(const weld::ComboBox*); - DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void ); - DECL_LINK(RadioButtonHdl, weld::ToggleButton&, void); + DECL_LINK(CheckBoxHdl, weld::Toggleable&, void ); + DECL_LINK(RadioButtonHdl, weld::Toggleable&, void); DECL_LINK(ModifyEntryHdl, weld::Entry&, void); DECL_LINK(ModifySpinHdl, weld::SpinButton&, void); DECL_LINK(ModifyListBoxHdl, weld::ComboBox&, void); @@ -364,12 +364,12 @@ class SwTOXEntryTabPage : public SfxTabPage DECL_LINK(EditStyleHdl, weld::Button&, void); DECL_LINK(InsertTokenHdl, weld::Button&, void); DECL_LINK(LevelHdl, weld::TreeView&, void); - DECL_LINK(AutoRightHdl, weld::ToggleButton&, void); + DECL_LINK(AutoRightHdl, weld::Toggleable&, void); DECL_LINK(TokenSelectedHdl, SwFormToken&, void); DECL_LINK(TabPosHdl, weld::MetricSpinButton&, void); DECL_LINK(FillCharHdl, weld::ComboBox&, void); DECL_LINK(RemoveInsertAuthHdl, weld::Button&, void); - DECL_LINK(SortKeyHdl, weld::ToggleButton&, void); + DECL_LINK(SortKeyHdl, weld::Toggleable&, void); DECL_LINK(ChapterInfoHdl, weld::ComboBox&, void); DECL_LINK(ChapterInfoOutlineHdl, weld::SpinButton&, void); DECL_LINK(NumberFormatHdl, weld::ComboBox&, void); @@ -380,7 +380,7 @@ class SwTOXEntryTabPage : public SfxTabPage void UpdateDescriptor(); DECL_LINK(ModifyHdl, LinkParamNone*, void); void OnModify(bool bAllLevels); - DECL_LINK(ModifyClickHdl, weld::ToggleButton&, void); + DECL_LINK(ModifyClickHdl, weld::Toggleable&, void); public: SwTOXEntryTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet); diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx index ee738021fc13..617425c6def8 100644 --- a/sw/source/uibase/inc/swuiidxmrk.hxx +++ b/sw/source/uibase/inc/swuiidxmrk.hxx @@ -106,7 +106,7 @@ class SwIndexMarkPane void ModifyHdl(const weld::Widget& rWidget); DECL_LINK( KeyDCBModifyHdl, weld::ComboBox&, void ); DECL_LINK( NewUserIdxHdl, weld::Button&, void ); - DECL_LINK( SearchTypeHdl, weld::ToggleButton&, void ); + DECL_LINK( SearchTypeHdl, weld::Toggleable&, void ); DECL_LINK( PhoneticEDModifyHdl, weld::Entry&, void ); //this method updates the values from 'nLangForPhoneticReading' and 'bIsPhoneticReadingEnabled' @@ -194,7 +194,7 @@ class SwAuthorMarkPane DECL_LINK(CloseHdl, weld::Button&, void); DECL_LINK(CreateEntryHdl, weld::Button&, void); DECL_LINK(CompEntryHdl, weld::ComboBox&, void); - DECL_LINK(ChangeSourceHdl, weld::ToggleButton&, void); + DECL_LINK(ChangeSourceHdl, weld::Toggleable&, void); DECL_LINK(IsEditAllowedHdl, weld::Entry&, bool); DECL_LINK(IsEntryAllowedHdl, weld::Entry&, bool); DECL_LINK(EditModifyHdl, weld::Entry&, void); diff --git a/sw/source/uibase/inc/tautofmt.hxx b/sw/source/uibase/inc/tautofmt.hxx index 8438e5701049..f5ea72206dad 100644 --- a/sw/source/uibase/inc/tautofmt.hxx +++ b/sw/source/uibase/inc/tautofmt.hxx @@ -67,7 +67,7 @@ class SwAutoFormatDlg : public SfxDialogController void Init( const SwTableAutoFormat* pSelFormat ); void UpdateChecks( const SwTableAutoFormat&, bool bEnableBtn ); - DECL_LINK(CheckHdl, weld::ToggleButton&, void); + DECL_LINK(CheckHdl, weld::Toggleable&, void); DECL_LINK(AddHdl, weld::Button&, void); DECL_LINK(RemoveHdl, weld::Button&, void); DECL_LINK(RenameHdl, weld::Button&, void); diff --git a/sw/source/uibase/inc/titlepage.hxx b/sw/source/uibase/inc/titlepage.hxx index f6b1456a01a0..c37def2e3e41 100644 --- a/sw/source/uibase/inc/titlepage.hxx +++ b/sw/source/uibase/inc/titlepage.hxx @@ -51,10 +51,10 @@ private: DECL_LINK(OKHdl, weld::Button&, void); DECL_LINK(EditHdl, weld::Button&, void); - DECL_LINK(RestartNumberingHdl, weld::ToggleButton&, void); - DECL_LINK(SetPageNumberHdl, weld::ToggleButton&, void); + DECL_LINK(RestartNumberingHdl, weld::Toggleable&, void); + DECL_LINK(SetPageNumberHdl, weld::Toggleable&, void); DECL_LINK(ValueChangeHdl, weld::SpinButton&, void); - DECL_LINK(StartPageHdl, weld::ToggleButton&, void); + DECL_LINK(StartPageHdl, weld::Toggleable&, void); public: SwTitlePageDlg(weld::Window* pParent); diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index 6ea3e192e6f3..6588bd359953 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -79,8 +79,8 @@ class SwWrapTabPage: public SfxTabPage virtual DeactivateRC DeactivatePage(SfxItemSet *pSet) override; DECL_LINK(RangeModifyHdl, weld::MetricSpinButton&, void); - DECL_LINK(WrapTypeHdl, weld::ToggleButton&, void); - DECL_LINK(ContourHdl, weld::ToggleButton&, void); + DECL_LINK(WrapTypeHdl, weld::Toggleable&, void); + DECL_LINK(ContourHdl, weld::Toggleable&, void); static const sal_uInt16 m_aWrapPageRg[]; diff --git a/sw/source/uibase/sidebar/PageFooterPanel.cxx b/sw/source/uibase/sidebar/PageFooterPanel.cxx index c85969e29168..fe039942d5b9 100644 --- a/sw/source/uibase/sidebar/PageFooterPanel.cxx +++ b/sw/source/uibase/sidebar/PageFooterPanel.cxx @@ -246,7 +246,7 @@ void PageFooterPanel::NotifyItemUpdate( } } -IMPL_LINK_NOARG( PageFooterPanel, FooterToggleHdl, weld::ToggleButton&, void ) +IMPL_LINK_NOARG( PageFooterPanel, FooterToggleHdl, weld::Toggleable&, void ) { bool IsChecked = mxFooterToggle->get_active(); mpFooterItem->SetValue(IsChecked); diff --git a/sw/source/uibase/sidebar/PageFooterPanel.hxx b/sw/source/uibase/sidebar/PageFooterPanel.hxx index aa67de6e760d..33294bf5fbb5 100644 --- a/sw/source/uibase/sidebar/PageFooterPanel.hxx +++ b/sw/source/uibase/sidebar/PageFooterPanel.hxx @@ -88,7 +88,7 @@ private: static FieldUnit GetCurrentUnit(SfxItemState eState, const SfxPoolItem* pState); - DECL_LINK( FooterToggleHdl, weld::ToggleButton&, void ); + DECL_LINK( FooterToggleHdl, weld::Toggleable&, void ); DECL_LINK( FooterLRMarginHdl, weld::ComboBox&, void); DECL_LINK( FooterSpacingHdl, weld::ComboBox&, void); DECL_LINK( FooterLayoutHdl, weld::ComboBox&, void); diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.cxx b/sw/source/uibase/sidebar/PageHeaderPanel.cxx index 9f7cd0b795d6..339d9c2ccc9f 100644 --- a/sw/source/uibase/sidebar/PageHeaderPanel.cxx +++ b/sw/source/uibase/sidebar/PageHeaderPanel.cxx @@ -249,7 +249,7 @@ void PageHeaderPanel::NotifyItemUpdate( } } -IMPL_LINK_NOARG( PageHeaderPanel, HeaderToggleHdl, weld::ToggleButton&, void ) +IMPL_LINK_NOARG( PageHeaderPanel, HeaderToggleHdl, weld::Toggleable&, void ) { bool IsChecked = mxHeaderToggle->get_active(); mpHeaderItem->SetValue(IsChecked); diff --git a/sw/source/uibase/sidebar/PageHeaderPanel.hxx b/sw/source/uibase/sidebar/PageHeaderPanel.hxx index bffc5d992b75..589c959eaafc 100644 --- a/sw/source/uibase/sidebar/PageHeaderPanel.hxx +++ b/sw/source/uibase/sidebar/PageHeaderPanel.hxx @@ -87,7 +87,7 @@ private: static FieldUnit GetCurrentUnit(SfxItemState eState, const SfxPoolItem* pState); - DECL_LINK( HeaderToggleHdl, weld::ToggleButton&, void ); + DECL_LINK( HeaderToggleHdl, weld::Toggleable&, void ); DECL_LINK( HeaderLRMarginHdl, weld::ComboBox&, void); DECL_LINK( HeaderSpacingHdl, weld::ComboBox&, void); DECL_LINK( HeaderLayoutHdl, weld::ComboBox&, void); diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx index 4c1171dd72eb..7c3a4ceea816 100644 --- a/sw/source/uibase/table/tablepg.hxx +++ b/sw/source/uibase/table/tablepg.hxx @@ -71,8 +71,8 @@ class SwFormatTablePage : public SfxTabPage void Init(); void ModifyHdl(const weld::MetricSpinButton& rEdit, bool bAllowInconsistencies = false); - DECL_LINK(AutoClickHdl, weld::ToggleButton&, void); - DECL_LINK(RelWidthClickHdl, weld::ToggleButton&, void); + DECL_LINK(AutoClickHdl, weld::Toggleable&, void); + DECL_LINK(RelWidthClickHdl, weld::Toggleable&, void); void RightModify(); DECL_LINK(ValueChangedHdl, weld::MetricSpinButton&, void); @@ -120,7 +120,7 @@ class SwTableColumnPage : public SfxTabPage DECL_LINK(AutoClickHdl, weld::Button&, void); void ModifyHdl(const weld::MetricSpinButton* pEdit); DECL_LINK(ValueChangedHdl, weld::MetricSpinButton&, void); - DECL_LINK(ModeHdl, weld::ToggleButton&, void); + DECL_LINK(ModeHdl, weld::Toggleable&, void); void UpdateCols( sal_uInt16 nCurrentPos ); SwTwips GetVisibleWidth(sal_uInt16 nPos); void SetVisibleWidth(sal_uInt16 nPos, SwTwips nNewWidth); @@ -162,13 +162,13 @@ class SwTextFlowPage : public SfxTabPage std::unique_ptr<weld::ComboBox> m_xTextDirectionLB; std::unique_ptr<weld::ComboBox> m_xVertOrientLB; - DECL_LINK(PageBreakHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(ApplyCollClickHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(PageBreakPosHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(PageBreakTypeHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(PageNoClickHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(SplitHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(HeadLineCBClickHdl, weld::ToggleButton&, void); + DECL_LINK(PageBreakHdl_Impl, weld::Toggleable&, void); + DECL_LINK(ApplyCollClickHdl_Impl, weld::Toggleable&, void); + DECL_LINK(PageBreakPosHdl_Impl, weld::Toggleable&, void); + DECL_LINK(PageBreakTypeHdl_Impl, weld::Toggleable&, void); + DECL_LINK(PageNoClickHdl_Impl, weld::Toggleable&, void); + DECL_LINK(SplitHdl_Impl, weld::Toggleable&, void); + DECL_LINK(HeadLineCBClickHdl, weld::Toggleable&, void); public: SwTextFlowPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx index 262da5d7f74c..11c6b20394bd 100644 --- a/uui/source/logindlg.cxx +++ b/uui/source/logindlg.cxx @@ -105,7 +105,7 @@ IMPL_LINK_NOARG(LoginDialog, OKHdl_Impl, weld::Button&, void) m_xDialog->response(RET_OK); } -IMPL_LINK_NOARG(LoginDialog, UseSysCredsHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(LoginDialog, UseSysCredsHdl_Impl, weld::Toggleable&, void) { EnableUseSysCredsControls_Impl( m_xUseSysCredsCB->get_active() ); } diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx index 6f2e2de2de98..82bc18544842 100644 --- a/uui/source/logindlg.hxx +++ b/uui/source/logindlg.hxx @@ -58,7 +58,7 @@ class LoginDialog : public weld::GenericDialogController void SetRequest(); DECL_LINK(OKHdl_Impl, weld::Button&, void); - DECL_LINK(UseSysCredsHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(UseSysCredsHdl_Impl, weld::Toggleable&, void); public: LoginDialog(weld::Window* pParent, LoginFlags nFlags, diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx index 10bd36a17a94..81351e957c17 100644 --- a/uui/source/secmacrowarnings.cxx +++ b/uui/source/secmacrowarnings.cxx @@ -137,7 +137,7 @@ IMPL_LINK_NOARG(MacroWarning, DisableBtnHdl, weld::Button&, void) m_xDialog->response(RET_CANCEL); } -IMPL_LINK_NOARG(MacroWarning, AlwaysTrustCheckHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(MacroWarning, AlwaysTrustCheckHdl, weld::Toggleable&, void) { const bool bEnable = (mnActSecLevel < 2 || mxAlwaysTrustCB->get_active()); mxEnableBtn->set_sensitive(bEnable); diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx index 1c0776e4bc52..300a5477bea5 100644 --- a/uui/source/secmacrowarnings.hxx +++ b/uui/source/secmacrowarnings.hxx @@ -48,7 +48,7 @@ private: DECL_LINK(ViewSignsBtnHdl, weld::Button&, void); DECL_LINK(EnableBtnHdl, weld::Button&, void); DECL_LINK(DisableBtnHdl, weld::Button&, void); - DECL_LINK(AlwaysTrustCheckHdl, weld::ToggleButton&, void); + DECL_LINK(AlwaysTrustCheckHdl, weld::Toggleable&, void); DECL_STATIC_LINK(MacroWarning, InstallLOKNotifierHdl, void*, vcl::ILibreOfficeKitNotifier*); void InitControls(); diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index 847ac8b62164..e4d42f4bb7c7 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -217,10 +217,10 @@ namespace vcl DECL_LINK( FocusOutHdl, weld::Widget&, void ); DECL_LINK( SpinModifyHdl, weld::SpinButton&, void ); DECL_LINK( MetricSpinModifyHdl, weld::MetricSpinButton&, void ); - DECL_LINK( ToggleHdl, weld::ToggleButton&, void ); + DECL_LINK( ToggleHdl, weld::Toggleable&, void ); - DECL_LINK( UIOption_CheckHdl, weld::ToggleButton&, void ); - DECL_LINK( UIOption_RadioHdl, weld::ToggleButton&, void ); + DECL_LINK( UIOption_CheckHdl, weld::Toggleable&, void ); + DECL_LINK( UIOption_RadioHdl, weld::Toggleable&, void ); DECL_LINK( UIOption_SelectHdl, weld::ComboBox&, void ); DECL_LINK( UIOption_SpinModifyHdl, weld::SpinButton&, void ); DECL_LINK( UIOption_EntryModifyHdl, weld::Entry&, void ); diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index 207e326e43f5..12a716edcd1c 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -1010,6 +1010,9 @@ private: DECL_LINK(ClickHdl, ::Button*, void); +protected: + void set_label_wrap(bool bWrap); + public: SalInstanceButton(::Button* pButton, SalInstanceBuilder* pBuilder, bool bTakeOwnership); @@ -1021,8 +1024,6 @@ public: virtual void set_from_icon_name(const OUString& rIconName) override; - virtual void set_label_wrap(bool wrap) override; - virtual OUString get_label() const override; virtual void set_font(const vcl::Font& rFont) override; @@ -1110,6 +1111,12 @@ public: virtual bool get_inconsistent() const override; + virtual void set_label(const OUString& rText) override { SalInstanceButton::set_label(rText); } + + virtual OUString get_label() const override { return SalInstanceButton::get_label(); } + + virtual void set_label_wrap(bool wrap) override { SalInstanceButton::set_label_wrap(wrap); } + virtual ~SalInstanceCheckButton() override; }; @@ -1810,6 +1817,12 @@ public: virtual bool get_inconsistent() const override; + virtual void set_label(const OUString& rText) override { SalInstanceButton::set_label(rText); } + + virtual OUString get_label() const override { return SalInstanceButton::get_label(); } + + virtual void set_label_wrap(bool wrap) override { SalInstanceButton::set_label_wrap(wrap); } + virtual ~SalInstanceRadioButton() override; }; diff --git a/vcl/jsdialog/executor.cxx b/vcl/jsdialog/executor.cxx index 72faac5c639c..c8659b22158e 100644 --- a/vcl/jsdialog/executor.cxx +++ b/vcl/jsdialog/executor.cxx @@ -129,8 +129,7 @@ bool ExecuteAction(sal_uInt64 nWindowId, const OString& rWidget, StringMap& rDat { bool bChecked = rData["data"] == "true"; pCheckButton->set_state(bChecked ? TRISTATE_TRUE : TRISTATE_FALSE); - LOKTrigger::trigger_clicked(*static_cast<weld::Button*>(pCheckButton)); - LOKTrigger::trigger_toggled(*static_cast<weld::ToggleButton*>(pCheckButton)); + LOKTrigger::trigger_toggled(*static_cast<weld::Toggleable*>(pCheckButton)); return true; } } @@ -360,8 +359,7 @@ bool ExecuteAction(sal_uInt64 nWindowId, const OString& rWidget, StringMap& rDat { bool bChecked = rData["data"] == "true"; pRadioButton->set_state(bChecked ? TRISTATE_TRUE : TRISTATE_FALSE); - LOKTrigger::trigger_clicked(*static_cast<weld::Button*>(pRadioButton)); - LOKTrigger::trigger_toggled(*static_cast<weld::ToggleButton*>(pRadioButton)); + LOKTrigger::trigger_toggled(*static_cast<weld::Toggleable*>(pRadioButton)); return true; } } diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index d3b60a55c38f..dcf21400eec9 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -2944,7 +2944,7 @@ public: { } - virtual void connect_toggled(const Link<ToggleButton&, void>& rLink) override + virtual void connect_toggled(const Link<Toggleable&, void>& rLink) override { assert(!m_aToggleHdl.IsSet()); m_xToggleButton->AddEventListener(LINK(this, SalInstanceToggleButton, ToggleListener)); diff --git a/vcl/source/app/weldutils.cxx b/vcl/source/app/weldutils.cxx index e9d557430b42..6927297ad9da 100644 --- a/vcl/source/app/weldutils.cxx +++ b/vcl/source/app/weldutils.cxx @@ -94,7 +94,7 @@ Dialog* AssistantController::getDialog() { return m_xAssistant.get(); } AssistantController::~AssistantController() {} -void TriStateEnabled::ButtonToggled(weld::ToggleButton& rToggle) +void TriStateEnabled::ButtonToggled(weld::Toggleable& rToggle) { if (bTriStateEnabled) { diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 4418a543c919..c69799ed1c4e 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -1820,7 +1820,7 @@ PropertyValue* PrintDialog::getValueForWindow( weld::Widget* i_pWindow ) const return pVal; } -IMPL_LINK(PrintDialog, ToggleHdl, weld::ToggleButton&, rButton, void) +IMPL_LINK(PrintDialog, ToggleHdl, weld::Toggleable&, rButton, void) { if (&rButton == mxPreviewBox.get()) { @@ -2076,7 +2076,7 @@ IMPL_LINK( PrintDialog, SpinModifyHdl, weld::SpinButton&, rEdit, void ) } } -IMPL_LINK( PrintDialog, UIOption_CheckHdl, weld::ToggleButton&, i_rBox, void ) +IMPL_LINK( PrintDialog, UIOption_CheckHdl, weld::Toggleable&, i_rBox, void ) { PropertyValue* pVal = getValueForWindow( &i_rBox ); if( pVal ) @@ -2093,7 +2093,7 @@ IMPL_LINK( PrintDialog, UIOption_CheckHdl, weld::ToggleButton&, i_rBox, void ) } } -IMPL_LINK( PrintDialog, UIOption_RadioHdl, weld::ToggleButton&, i_rBtn, void ) +IMPL_LINK( PrintDialog, UIOption_RadioHdl, weld::Toggleable&, i_rBtn, void ) { // this handler gets called for all radiobuttons that get unchecked, too // however we only want one notification for the new value (that is for diff --git a/vcl/unx/generic/print/prtsetup.cxx b/vcl/unx/generic/print/prtsetup.cxx index 33cfc7a1fabe..04493761a259 100644 --- a/vcl/unx/generic/print/prtsetup.cxx +++ b/vcl/unx/generic/print/prtsetup.cxx @@ -249,7 +249,7 @@ IMPL_LINK( RTSPaperPage, SelectHdl, weld::ComboBox&, rBox, void ) m_pParent->SetDataModified( true ); } -IMPL_LINK( RTSPaperPage, CheckBoxHdl, weld::ToggleButton&, /*cBox*/, void ) +IMPL_LINK_NOARG(RTSPaperPage, CheckBoxHdl, weld::Toggleable&, void) { bool bFromSetup = m_xCbFromSetup->get_active(); m_pParent->m_aJobData.m_bPapersizeFromSetup = bFromSetup; @@ -259,10 +259,10 @@ IMPL_LINK( RTSPaperPage, CheckBoxHdl, weld::ToggleButton&, /*cBox*/, void ) m_xOrientBox->set_sensitive(bFromSetup); m_pParent->SetDataModified(true); } + /* * RTSDevicePage */ - RTSDevicePage::RTSDevicePage(weld::Widget* pPage, RTSDialog* pParent) : m_xBuilder(Application::CreateBuilder(pPage, "vcl/ui/printerdevicepage.ui")) , m_pCustomValue(nullptr) diff --git a/vcl/unx/generic/print/prtsetup.hxx b/vcl/unx/generic/print/prtsetup.hxx index 262ba903b79a..bcf86670d0b6 100644 --- a/vcl/unx/generic/print/prtsetup.hxx +++ b/vcl/unx/generic/print/prtsetup.hxx @@ -85,7 +85,7 @@ private: std::unique_ptr<weld::ComboBox> m_xSlotBox; DECL_LINK(SelectHdl, weld::ComboBox&, void); - DECL_LINK(CheckBoxHdl, weld::ToggleButton&, void); + DECL_LINK(CheckBoxHdl, weld::Toggleable&, void); public: RTSPaperPage(weld::Widget* pPage, RTSDialog* pDialog); diff --git a/vcl/unx/gtk3/gtkinst.cxx b/vcl/unx/gtk3/gtkinst.cxx index 8a4ca74f266f..278e21f66a71 100644 --- a/vcl/unx/gtk3/gtkinst.cxx +++ b/vcl/unx/gtk3/gtkinst.cxx @@ -5588,6 +5588,78 @@ public: } }; +#if GTK_CHECK_VERSION(4, 0, 0) +GtkWidget* find_label_widget(GtkWidget* pContainer) +{ + GtkWidget* pLabel = nullptr; + for (GtkWidget* pChild = gtk_widget_get_first_child(pContainer); + pChild; pChild = gtk_widget_get_next_sibling(pChild)) + { + if (GTK_IS_LABEL(pChild)) + { + pLabel = pChild; + break; + } + else + { + pLabel = find_label_widget(pChild); + if (pLabel) + break; + } + } + return pLabel; +} +#else +GtkWidget* find_label_widget(GtkContainer* pContainer) +{ + GList* pChildren = gtk_container_get_children(pContainer); + + GtkWidget* pChild = nullptr; + for (GList* pCandidate = pChildren; pCandidate; pCandidate = pCandidate->next) + { + if (GTK_IS_LABEL(pCandidate->data)) + { + pChild = GTK_WIDGET(pCandidate->data); + break; + } + else if (GTK_IS_CONTAINER(pCandidate->data)) + { + pChild = find_label_widget(GTK_CONTAINER(pCandidate->data)); + if (pChild) + break; + } + } + g_list_free(pChildren); + + return pChild; +} +#endif + +GtkWidget* get_label_widget(GtkWidget* pButton) +{ +#if !GTK_CHECK_VERSION(4, 0, 0) + GtkWidget* pChild = gtk_bin_get_child(GTK_BIN(pButton)); + + if (GTK_IS_CONTAINER(pChild)) + pChild = find_label_widget(GTK_CONTAINER(pChild)); + else if (!GTK_IS_LABEL(pChild)) + pChild = nullptr; + + return pChild; +#else + return find_label_widget(pButton); +#endif +} + +void set_label_wrap(GtkLabel* pLabel, bool bWrap) +{ +#if GTK_CHECK_VERSION(4, 0, 0) + gtk_label_set_wrap(pLabel, bWrap); +#else + gtk_label_set_line_wrap(pLabel, bWrap); +#endif +} + class GtkInstanceAssistant : public GtkInstanceDialog, public virtual weld::Assistant { private: @@ -5629,11 +5701,7 @@ private: { if (GTK_IS_LABEL(pWidget)) { -#if GTK_CHECK_VERSION(4, 0, 0) - gtk_label_set_wrap(GTK_LABEL(pWidget), true); -#else - gtk_label_set_line_wrap(GTK_LABEL(pWidget), true); -#endif + ::set_label_wrap(GTK_LABEL(pWidget), true); gtk_label_set_width_chars(GTK_LABEL(pWidget), 22); gtk_label_set_max_width_chars(GTK_LABEL(pWidget), 22); } @@ -7716,32 +7784,6 @@ private: m_pMouseEventBox = m_pWidget; } -#if !GTK_CHECK_VERSION(4, 0, 0) - static GtkWidget* find_label_widget(GtkContainer* pContainer) - { - GList* pChildren = gtk_container_get_children(pContainer); - - GtkWidget* pChild = nullptr; - for (GList* pCandidate = pChildren; pCandidate; pCandidate = pCandidate->next) - { - if (GTK_IS_LABEL(pCandidate->data)) - { - pChild = GTK_WIDGET(pCandidate->data); - break; - } - else if (GTK_IS_CONTAINER(pCandidate->data)) - { - pChild = find_label_widget(GTK_CONTAINER(pCandidate->data)); - if (pChild) - break; - } - } - g_list_free(pChildren); - - return pChild; - } -#endif - // See: https://developer.gnome.org/Buttons/ void use_custom_content(VirtualDevice* pDevice) { @@ -7775,23 +7817,6 @@ private: GTK_STYLE_PROVIDER_PRIORITY_APPLICATION); } -protected: - GtkWidget* get_label_widget() - { -#if !GTK_CHECK_VERSION(4, 0, 0) - GtkWidget* pChild = gtk_bin_get_child(GTK_BIN(m_pButton)); - - if (GTK_IS_CONTAINER(pChild)) - pChild = find_label_widget(GTK_CONTAINER(pChild)); - else if (!GTK_IS_LABEL(pChild)) - pChild = nullptr; - - return pChild; -#else - return nullptr; -#endif - } - public: GtkInstanceButton(GtkButton* pButton, GtkInstanceBuilder* pBuilder, bool bTakeOwnership) : GtkInstanceWidget(GTK_WIDGET(pButton), pBuilder, bTakeOwnership) @@ -7867,20 +7892,10 @@ public: return ::get_label(m_pButton); } - virtual void set_label_wrap(bool wrap) override - { - GtkWidget* pChild = get_label_widget(); -#if GTK_CHECK_VERSION(4, 0, 0) - gtk_label_set_wrap(GTK_LABEL(pChild), wrap); -#else - gtk_label_set_line_wrap(GTK_LABEL(pChild), wrap); -#endif - } - virtual void set_font(const vcl::Font& rFont) override { m_xFont.reset(new vcl::Font(rFont)); - GtkWidget* pChild = get_label_widget(); + GtkWidget* pChild = ::get_label_widget(GTK_WIDGET(m_pButton)); ::set_font(GTK_LABEL(pChild), rFont); } @@ -9880,6 +9895,31 @@ public: #endif } + virtual void set_label(const OUString& rText) override + { +#if GTK_CHECK_VERSION(4, 0, 0) + gtk_check_button_set_label(m_pCheckButton, MapToGtkAccelerator(rText).getStr()); +#else + ::set_label(GTK_BUTTON(m_pCheckButton), rText); +#endif + } + + virtual OUString get_label() const override + { +#if GTK_CHECK_VERSION(4, 0, 0) + const gchar* pStr = gtk_check_button_get_label(m_pCheckButton); + return OUString(pStr, pStr ? strlen(pStr) : 0, RTL_TEXTENCODING_UTF8); +#else + return ::get_label(GTK_BUTTON(m_pCheckButton)); +#endif + } + + virtual void set_label_wrap(bool bWrap) override + { + GtkWidget* pChild = ::get_label_widget(GTK_WIDGET(m_pCheckButton)); + ::set_label_wrap(GTK_LABEL(pChild), bWrap); + } + virtual void disable_notify_events() override { g_signal_handler_block(m_pCheckButton, m_nSignalId); diff --git a/xmlsecurity/inc/digitalsignaturesdialog.hxx b/xmlsecurity/inc/digitalsignaturesdialog.hxx index f062c7da9d8e..4c668c9399f2 100644 --- a/xmlsecurity/inc/digitalsignaturesdialog.hxx +++ b/xmlsecurity/inc/digitalsignaturesdialog.hxx @@ -72,7 +72,7 @@ private: std::unique_ptr<weld::Button> m_xStartCertMgrBtn; std::unique_ptr<weld::Button> m_xCloseBtn; - DECL_LINK(AdESCompliantCheckBoxHdl, weld::ToggleButton&, void); + DECL_LINK(AdESCompliantCheckBoxHdl, weld::Toggleable&, void); DECL_LINK(ViewButtonHdl, weld::Button&, void); DECL_LINK(AddButtonHdl, weld::Button&, void); DECL_LINK(RemoveButtonHdl, weld::Button&, void); diff --git a/xmlsecurity/inc/macrosecurity.hxx b/xmlsecurity/inc/macrosecurity.hxx index 4461188cfc82..690c5b05fcaf 100644 --- a/xmlsecurity/inc/macrosecurity.hxx +++ b/xmlsecurity/inc/macrosecurity.hxx @@ -83,7 +83,7 @@ private: std::unique_ptr<weld::Widget> m_xMedImg; std::unique_ptr<weld::Widget> m_xLowImg; - DECL_LINK(RadioButtonHdl, weld::ToggleButton&, void); + DECL_LINK(RadioButtonHdl, weld::Toggleable&, void); public: MacroSecurityLevelTP(weld::Container* pParent, MacroSecurity* pDlg); virtual void ClosePage() override; diff --git a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 265db493f882..4e561963425f 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -363,7 +363,7 @@ IMPL_LINK_NOARG(DigitalSignaturesDialog, SignatureSelectHdl, weld::TreeView&, bo return true; } -IMPL_LINK_NOARG(DigitalSignaturesDialog, AdESCompliantCheckBoxHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(DigitalSignaturesDialog, AdESCompliantCheckBoxHdl, weld::Toggleable&, void) { m_bAdESCompliant = m_xAdESCompliantCB->get_active(); } diff --git a/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index b7a5112b5401..7cae32bf3905 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -165,7 +165,7 @@ MacroSecurityLevelTP::MacroSecurityLevelTP(weld::Container* pParent, MacroSecuri } } -IMPL_LINK_NOARG(MacroSecurityLevelTP, RadioButtonHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(MacroSecurityLevelTP, RadioButtonHdl, weld::Toggleable&, void) { sal_uInt16 nNewLevel = 0; if( m_xVeryHighRB->get_active() ) |