commit 47a3a8042d79a8b287b9efec532f5d14049553d0
author Gabor Kelemen <kelemen.gabor2@nisz.hu> Mon Oct 21 22:34:40 2019 +0200
committer Caolán McNamara <caolanm@redhat.com> Tue Oct 22 13:10:44 2019 +0200
tree 48709487bbf13d49c1a07a929382af58a622c67e
parent 237347dc530800bd83cc01bb8b675c01b351b5c8

tdf#128230 Require password if the Unprotect button is visible

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/81310
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Tested-by: Jenkins

sfx2/source/dialog/securitypage.cxx

diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index fcafc16..8dcc830 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;