|
 |
2654e0 |
From 81618bd69088436eb60fd07b944effb178d788ae Mon Sep 17 00:00:00 2001
|
|
|
2654e0 |
From: Justin Luth <justin.luth@collabora.com>
|
|
|
2654e0 |
Date: Sat, 31 Oct 2020 15:36:44 +0300
|
|
|
2654e0 |
Subject: [PATCH 6/8] tdf#137897 scRetypePassInputDlg: re-allow password
|
|
|
2654e0 |
removal
|
|
|
2654e0 |
MIME-Version: 1.0
|
|
|
2654e0 |
Content-Type: text/plain; charset=UTF-8
|
|
|
2654e0 |
Content-Transfer-Encoding: 8bit
|
|
|
2654e0 |
|
|
|
2654e0 |
This weld-conversion logic error caused a LO 6.1 regression
|
|
|
2654e0 |
in commit 0e4f93e88bfae3489d2de84fc2febed100880628.
|
|
|
2654e0 |
|
|
|
2654e0 |
- m_pPasswordGrid->Disable();
|
|
|
2654e0 |
+ m_xPasswordGrid->set_sensitive(false); //disable == false
|
|
|
2654e0 |
- m_pBtnOk->Enable();
|
|
|
2654e0 |
+ m_xBtnOk->set_sensitive(false); //enable == true
|
|
|
2654e0 |
|
|
|
2654e0 |
The result is that attempting to remove the password did not
|
|
|
2654e0 |
enable the OK button, so it was impossible.
|
|
|
2654e0 |
|
|
|
2654e0 |
Change-Id: I4067b2ec6b89e86b21968d33c8850cca6d067e71
|
|
|
2654e0 |
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105049
|
|
|
2654e0 |
Tested-by: Jenkins
|
|
|
2654e0 |
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
|
|
|
2654e0 |
(cherry picked from commit 9eeaff5fa9070bea685db8b6bbd2dfc1565756ac)
|
|
|
2654e0 |
---
|
|
|
2654e0 |
sc/source/ui/miscdlgs/retypepassdlg.cxx | 2 +-
|
|
|
2654e0 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
2654e0 |
|
|
|
2654e0 |
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx
|
|
|
2654e0 |
index 84f8ef182b54..fa31ea77e392 100644
|
|
|
2654e0 |
--- a/sc/source/ui/miscdlgs/retypepassdlg.cxx
|
|
|
2654e0 |
+++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx
|
|
|
2654e0 |
@@ -372,7 +372,7 @@ IMPL_LINK_NOARG(ScRetypePassInputDlg, RadioBtnHdl, weld::ToggleButton&, void)
|
|
|
2654e0 |
else
|
|
|
2654e0 |
{
|
|
|
2654e0 |
m_xPasswordGrid->set_sensitive(false);
|
|
|
2654e0 |
- m_xBtnOk->set_sensitive(false);
|
|
|
2654e0 |
+ m_xBtnOk->set_sensitive(true);
|
|
|
2654e0 |
}
|
|
|
2654e0 |
}
|
|
|
2654e0 |
|
|
|
2654e0 |
--
|
|
|
2654e0 |
2.28.0
|
|
|
2654e0 |
|