From 9940f077fdfc0c271aa66ad64578ae2236a2ca81 Mon Sep 17 00:00:00 2001 From: Caolán McNamara 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 --- uui/source/logindlg.cxx | 2 +- uui/source/logindlg.hxx | 2 +- uui/source/secmacrowarnings.cxx | 2 +- uui/source/secmacrowarnings.hxx | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'uui') diff --git a/uui/source/logindlg.cxx b/uui/source/logindlg.cxx index 262da5d7f74c..11c6b20394bd 100644 --- a/uui/source/logindlg.cxx +++ b/uui/source/logindlg.cxx @@ -105,7 +105,7 @@ IMPL_LINK_NOARG(LoginDialog, OKHdl_Impl, weld::Button&, void) m_xDialog->response(RET_OK); } -IMPL_LINK_NOARG(LoginDialog, UseSysCredsHdl_Impl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(LoginDialog, UseSysCredsHdl_Impl, weld::Toggleable&, void) { EnableUseSysCredsControls_Impl( m_xUseSysCredsCB->get_active() ); } diff --git a/uui/source/logindlg.hxx b/uui/source/logindlg.hxx index 6f2e2de2de98..82bc18544842 100644 --- a/uui/source/logindlg.hxx +++ b/uui/source/logindlg.hxx @@ -58,7 +58,7 @@ class LoginDialog : public weld::GenericDialogController void SetRequest(); DECL_LINK(OKHdl_Impl, weld::Button&, void); - DECL_LINK(UseSysCredsHdl_Impl, weld::ToggleButton&, void); + DECL_LINK(UseSysCredsHdl_Impl, weld::Toggleable&, void); public: LoginDialog(weld::Window* pParent, LoginFlags nFlags, diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx index 10bd36a17a94..81351e957c17 100644 --- a/uui/source/secmacrowarnings.cxx +++ b/uui/source/secmacrowarnings.cxx @@ -137,7 +137,7 @@ IMPL_LINK_NOARG(MacroWarning, DisableBtnHdl, weld::Button&, void) m_xDialog->response(RET_CANCEL); } -IMPL_LINK_NOARG(MacroWarning, AlwaysTrustCheckHdl, weld::ToggleButton&, void) +IMPL_LINK_NOARG(MacroWarning, AlwaysTrustCheckHdl, weld::Toggleable&, void) { const bool bEnable = (mnActSecLevel < 2 || mxAlwaysTrustCB->get_active()); mxEnableBtn->set_sensitive(bEnable); diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx index 1c0776e4bc52..300a5477bea5 100644 --- a/uui/source/secmacrowarnings.hxx +++ b/uui/source/secmacrowarnings.hxx @@ -48,7 +48,7 @@ private: DECL_LINK(ViewSignsBtnHdl, weld::Button&, void); DECL_LINK(EnableBtnHdl, weld::Button&, void); DECL_LINK(DisableBtnHdl, weld::Button&, void); - DECL_LINK(AlwaysTrustCheckHdl, weld::ToggleButton&, void); + DECL_LINK(AlwaysTrustCheckHdl, weld::Toggleable&, void); DECL_STATIC_LINK(MacroWarning, InstallLOKNotifierHdl, void*, vcl::ILibreOfficeKitNotifier*); void InitControls(); -- cgit