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>

39 files changed, 100 insertions, 100 deletions

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);