From e7bb875b3e9b5d35e8077484b4b43fcca79d30b7 Mon Sep 17 00:00:00 2001 From: Gabor Kelemen Date: Mon, 21 Oct 2019 22:34:40 +0200 Subject: tdf#128230 Require password if the Unprotect button is visible MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Regression from commit a2279bb2f52ee5bbe8d38433aac55aa1a16661fb Before that requiring password depended on the current text of the Protect/Unprotect button, which was changed dynamically. This commit changed that logic and introduced two buttons in the new .ui file that are hidden/shown dynamically. The password condition however was changed to check the visibility of the new Protect button instead of the Unprotect button. Change-Id: Ie24e1b2d45fa92a375a29b7bc71689f9b83ae9dc Reviewed-on: https://gerrit.libreoffice.org/81283 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sfx2/source/dialog/securitypage.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sfx2/source/dialog') diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index 53197688fa68..2e673538d913 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -331,7 +331,7 @@ IMPL_LINK_NOARG(SfxSecurityPage_Impl, RecordChangesCBToggleHdl, weld::ToggleButt } const bool bNeedPasssword = !m_bOrigPasswordIsConfirmed - && m_xProtectPB->get_visible(); + && m_xUnProtectPB->get_visible(); // tdf#128230 Require password if the Unprotect button is visible if (!bAlreadyDone && bNeedPasssword) { OUString aPasswordText; -- cgit