diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-05-20 17:27:49 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-05-21 18:19:58 +0200 |
| commit | 9940f077fdfc0c271aa66ad64578ae2236a2ca81 (patch) | |
| tree | a52b00f3ba98d78f88a0d2aa5a02605746f8e6c7 /fpicker | |
| parent | f19a599f6911f5ccd1049228454b6c6c8fd6d5cb (diff) | |
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>
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/office/OfficeControlAccess.cxx | 4 | ||||
| -rw-r--r-- | fpicker/source/office/iodlg.cxx | 4 | ||||
| -rw-r--r-- | fpicker/source/office/iodlg.hxx | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx index 9095c12ee873..2096ccc0f178 100644 --- a/fpicker/source/office/OfficeControlAccess.cxx +++ b/fpicker/source/office/OfficeControlAccess.cxx @@ -664,7 +664,7 @@ namespace svt case PropFlags::Checked: { - weld::ToggleButton* pToggleButton = dynamic_cast<weld::ToggleButton*>(pControl); + weld::Toggleable* pToggleButton = dynamic_cast<weld::Toggleable*>(pControl); assert(pToggleButton && "OControlAccess::implSetControlProperty: invalid control/property combination!"); bool bChecked = false; @@ -752,7 +752,7 @@ namespace svt case PropFlags::Checked: { - const weld::ToggleButton* pToggleButton = dynamic_cast<const weld::ToggleButton*>(pControl); + const weld::Toggleable* pToggleButton = dynamic_cast<const weld::Toggleable*>(pControl); assert(pToggleButton && "OControlAccess::implGetControlProperty: invalid control/property combination!"); aReturn <<= pToggleButton->get_active(); diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index a861716559ef..acbe04e43d54 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -1213,7 +1213,7 @@ IMPL_LINK( SvtFileDialog, OpenDoneHdl_Impl, SvtFileView*, pView, void ) EnableControl( m_xImpl->m_xBtnUp->getWidget(), bCanTravelUp ); } -IMPL_LINK_NOARG(SvtFileDialog, AutoExtensionHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(SvtFileDialog, AutoExtensionHdl_Impl, weld::Toggleable&, void) { if (m_pFileNotifier) m_pFileNotifier->notify(CTRL_STATE_CHANGED, CHECKBOX_AUTOEXTENSION); @@ -1222,7 +1222,7 @@ IMPL_LINK_NOARG(SvtFileDialog, AutoExtensionHdl_Impl, weld::ToggleButton&, void) lcl_autoUpdateFileExtension( this, m_xImpl->GetCurFilter()->GetExtension() ); } -IMPL_LINK( SvtFileDialog, ClickHdl_Impl, weld::ToggleButton&, rCheckBox, void ) +IMPL_LINK( SvtFileDialog, ClickHdl_Impl, weld::Toggleable&, rCheckBox, void ) { if (!m_pFileNotifier) return; diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index 4eec689116fa..3578ae883de6 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -120,8 +120,8 @@ private: DECL_LINK(DblClickHdl_Impl, SvtFileView*, bool); DECL_LINK(EntrySelectHdl_Impl, weld::ComboBox&, void); DECL_LINK(OpenDoneHdl_Impl, SvtFileView*, void); - DECL_LINK(AutoExtensionHdl_Impl, weld::ToggleButton&, void); - DECL_LINK(ClickHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(AutoExtensionHdl_Impl, weld::Toggleable&, void); + DECL_LINK(ClickHdl_Impl, weld::Toggleable&, void); DECL_LINK(PlayButtonHdl_Impl, weld::Button&, void); DECL_LINK(SizeAllocHdl, const Size&, void); |