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>

32 files changed, 109 insertions, 109 deletions

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: