add Toggleable as a separate thing to a Button

and inherit ToggleButton from both it and Button

Change-Id: If0e500aca8d0ffa087cb5e2bfc1786372fbff4eb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115921
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

26 files changed, 52 insertions, 52 deletions

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