From 9940f077fdfc0c271aa66ad64578ae2236a2ca81 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 20 May 2021 17:27:49 +0100
Subject: add Toggleable as a separate thing to a Button
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 svtools/source/brwbox/ebbcontrols.cxx            | 4 ++--
 svtools/source/control/ctrlbox.cxx               | 2 +-
 svtools/source/dialogs/ServerDetailsControls.cxx | 2 +-
 svtools/source/dialogs/ServerDetailsControls.hxx | 2 +-
 svtools/source/filter/exportdialog.cxx           | 4 ++--
 svtools/source/filter/exportdialog.hxx           | 4 ++--
 6 files changed, 9 insertions(+), 9 deletions(-)

(limited to 'svtools/source')

diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index 5af701fba0fb..3b1819e94923 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -231,7 +231,7 @@ namespace svt
         OnToggle(*m_xBox);
     }
 
-    IMPL_LINK_NOARG(CheckBoxControl, OnToggle, weld::ToggleButton&, void)
+    IMPL_LINK_NOARG(CheckBoxControl, OnToggle, weld::Toggleable&, void)
     {
         m_aModeState.ButtonToggled(*m_xBox);
         m_aToggleLink.Call(*m_xBox);
@@ -501,7 +501,7 @@ namespace svt
         }
     }
 
-    IMPL_LINK(DateControl, ToggleHdl, weld::ToggleButton&, rButton, void)
+    IMPL_LINK(DateControl, ToggleHdl, weld::Toggleable&, rButton, void)
     {
         if (rButton.get_active())
             m_xCalendar->set_date(static_cast<weld::DateFormatter&>(get_formatter()).GetDate());
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 8d5f8836a0c3..655eb430db60 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -1453,7 +1453,7 @@ IMPL_LINK_NOARG(SvtLineListBox, FocusHdl, weld::Widget&, void)
         m_xLineSet->GrabFocus();
 }
 
-IMPL_LINK(SvtLineListBox, ToggleHdl, weld::ToggleButton&, rButton, void)
+IMPL_LINK(SvtLineListBox, ToggleHdl, weld::Toggleable&, rButton, void)
 {
     if (rButton.get_active())
         FocusHdl(*m_xTopLevel);
diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx
index 8a3b481b50f3..08a81cdc36a6 100644
--- a/svtools/source/dialogs/ServerDetailsControls.cxx
+++ b/svtools/source/dialogs/ServerDetailsControls.cxx
@@ -182,7 +182,7 @@ bool DavDetailsContainer::verifyScheme( const OUString& rScheme )
     return bValid;
 }
 
-IMPL_LINK( DavDetailsContainer, ToggledDavsHdl, weld::ToggleButton&, rCheckBox, void )
+IMPL_LINK( DavDetailsContainer, ToggledDavsHdl, weld::Toggleable&, rCheckBox, void )
 {
     // Change default port if needed
     bool bCheckedDavs = rCheckBox.get_active();
diff --git a/svtools/source/dialogs/ServerDetailsControls.hxx b/svtools/source/dialogs/ServerDetailsControls.hxx
index d5041ddefff5..71f920a998bc 100644
--- a/svtools/source/dialogs/ServerDetailsControls.hxx
+++ b/svtools/source/dialogs/ServerDetailsControls.hxx
@@ -96,7 +96,7 @@ class DavDetailsContainer final : public HostDetailsContainer
     private:
         virtual bool verifyScheme( const OUString& rScheme ) override;
 
-        DECL_LINK(ToggledDavsHdl, weld::ToggleButton&, void);
+        DECL_LINK(ToggledDavsHdl, weld::Toggleable&, void);
 };
 
 class SmbDetailsContainer final : public DetailsContainer
diff --git a/svtools/source/filter/exportdialog.cxx b/svtools/source/filter/exportdialog.cxx
index f611e291ec5b..5accd1482cd1 100644
--- a/svtools/source/filter/exportdialog.cxx
+++ b/svtools/source/filter/exportdialog.cxx
@@ -992,12 +992,12 @@ IMPL_LINK_NOARG(ExportDialog, SelectListBoxHdl, weld::ComboBox&, void)
     updateControls();
 }
 
-IMPL_LINK_NOARG(ExportDialog, UpdateHdl, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ExportDialog, UpdateHdl, weld::Toggleable&, void)
 {
     updateControls();
 }
 
-IMPL_LINK_NOARG(ExportDialog, UpdateLock, weld::ToggleButton&, void)
+IMPL_LINK_NOARG(ExportDialog, UpdateLock, weld::Toggleable&, void)
 {
     if (mxModifyResolution->get_active())
     {
diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx
index 787329d16703..28953ee0224c 100644
--- a/svtools/source/filter/exportdialog.hxx
+++ b/svtools/source/filter/exportdialog.hxx
@@ -144,8 +144,8 @@ private:
 
     std::unique_ptr<weld::Button> mxBtnOK;
 
-    DECL_LINK(UpdateHdl, weld::ToggleButton&, void);
-    DECL_LINK(UpdateLock, weld::ToggleButton&, void);
+    DECL_LINK(UpdateHdl, weld::Toggleable&, void);
+    DECL_LINK(UpdateLock, weld::Toggleable&, void);
     DECL_LINK(SelectListBoxHdl, weld::ComboBox&, void);
     DECL_LINK(SelectHdl, weld::SpinButton&, void);
     DECL_LINK(UpdateHdlMtfSizeX, weld::SpinButton&, void);
-- 
cgit