diff options
author | Caolán McNamara <caolanm@redhat.com> | 2018-03-16 16:07:22 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2018-03-16 21:31:59 +0100 |
commit | d2f95590f478a68a4de6ef05018785523e46506b (patch) | |
tree | 97bdacb7ee8c28ee5f9981733c9740be6b07cb96 /uui/source/iahndl-authentication.cxx | |
parent | 975a8164e05a437ec8b51a506989b0bd617854b8 (diff) |
Related: tdf#115964 convert the problematic dialog to a native gtk3 one
Change-Id: I84e10f1c45dfbe267f9b350d74271ac149bdaf43
Reviewed-on: https://gerrit.libreoffice.org/51432
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'uui/source/iahndl-authentication.cxx')
-rw-r--r-- | uui/source/iahndl-authentication.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx index 12ed4ed7aff9..2d4d5362f169 100644 --- a/uui/source/iahndl-authentication.cxx +++ b/uui/source/iahndl-authentication.cxx @@ -518,11 +518,11 @@ executePasswordDialog( { if (bIsSimplePasswordRequest) { - ScopedVclPtrInstance<PasswordDialog> xDialog(pParent, nMode, aResLocale, aDocName, - bIsPasswordToModify, bIsSimplePasswordRequest); + std::unique_ptr<PasswordDialog> xDialog(new PasswordDialog(pParent ? pParent->GetFrameWeld() : nullptr, nMode, + aResLocale, aDocName, bIsPasswordToModify, bIsSimplePasswordRequest)); xDialog->SetMinLen(0); - rInfo.SetResult(xDialog->Execute() == RET_OK ? DialogMask::ButtonsOk : DialogMask::ButtonsCancel); + rInfo.SetResult(xDialog->run() == RET_OK ? DialogMask::ButtonsOk : DialogMask::ButtonsCancel); rInfo.SetPassword(xDialog->GetPassword()); } else @@ -541,11 +541,11 @@ executePasswordDialog( } else // enter password or reenter password { - ScopedVclPtrInstance<PasswordDialog> xDialog(pParent, nMode, aResLocale, aDocName, - bIsPasswordToModify, bIsSimplePasswordRequest); + std::unique_ptr<PasswordDialog> xDialog(new PasswordDialog(pParent ? pParent->GetFrameWeld() : nullptr, nMode, + aResLocale, aDocName, bIsPasswordToModify, bIsSimplePasswordRequest)); xDialog->SetMinLen(0); - rInfo.SetResult(xDialog->Execute() == RET_OK ? DialogMask::ButtonsOk : DialogMask::ButtonsCancel); + rInfo.SetResult(xDialog->run() == RET_OK ? DialogMask::ButtonsOk : DialogMask::ButtonsCancel); rInfo.SetPassword(bIsPasswordToModify ? OUString() : xDialog->GetPassword()); rInfo.SetPasswordToModify(bIsPasswordToModify ? xDialog->GetPassword() : OUString()); } |