diff options
| author | Henry Castro <hcastro@collabora.com> | 2020-12-29 16:40:14 -0400 |
|---|---|---|
| committer | Henry Castro <hcastro@collabora.com> | 2021-01-19 03:40:23 +0100 |
| commit | 68016cd0d8f21c2e9760ad1f3400d2e1df7c4d4c (patch) | |
| tree | d9afc3fb73ca1411f9c1a0ecb83ce02f11911f9a /uui | |
| parent | 2ce61a9b9becc5d730de1fd18460585f4cc8d558 (diff) | |
lok: fix the "disable button" of the "Macro Security Warning"...
Dialog.
The client side cannot disable macros and close the message dialog
Change-Id: Id78060d3c2b3c9c8ac010d8b951e7640b02ca715
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108489
Tested-by: Jenkins
Reviewed-by: Henry Castro <hcastro@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109146
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'uui')
| -rw-r--r-- | uui/source/secmacrowarnings.cxx | 6 | ||||
| -rw-r--r-- | uui/source/secmacrowarnings.hxx | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/uui/source/secmacrowarnings.cxx b/uui/source/secmacrowarnings.cxx index 0bc2e1d04d72..e02c6946f393 100644 --- a/uui/source/secmacrowarnings.cxx +++ b/uui/source/secmacrowarnings.cxx @@ -76,6 +76,7 @@ MacroWarning::MacroWarning(weld::Window* pParent, bool _bWithSignatures) InitControls(); mxEnableBtn->connect_clicked(LINK(this, MacroWarning, EnableBtnHdl)); + mxDisableBtn->connect_clicked(LINK(this, MacroWarning, DisableBtnHdl)); mxDisableBtn->grab_focus(); // Default button, but focus is on view button } @@ -123,6 +124,11 @@ IMPL_LINK_NOARG(MacroWarning, EnableBtnHdl, weld::Button&, void) m_xDialog->response(RET_OK); } +IMPL_LINK_NOARG(MacroWarning, DisableBtnHdl, weld::Button&, void) +{ + m_xDialog->response(RET_CANCEL); +} + IMPL_LINK_NOARG(MacroWarning, AlwaysTrustCheckHdl, weld::Button&, void) { const bool bEnable = (mnActSecLevel < 2 || mxAlwaysTrustCB->get_active()); diff --git a/uui/source/secmacrowarnings.hxx b/uui/source/secmacrowarnings.hxx index b5e3c9a450b9..6e4b433a2a55 100644 --- a/uui/source/secmacrowarnings.hxx +++ b/uui/source/secmacrowarnings.hxx @@ -51,6 +51,7 @@ private: DECL_LINK(ViewSignsBtnHdl, weld::Button&, void); DECL_LINK(EnableBtnHdl, weld::Button&, void); + DECL_LINK(DisableBtnHdl, weld::Button&, void); DECL_LINK(AlwaysTrustCheckHdl, weld::Button&, void); void InitControls(); |