diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-03-22 09:32:51 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-03-22 18:27:55 +0100 |
| commit | da9aa49f360c1351f5b5ce8bcf4a9df2db8c4f15 (patch) | |
| tree | 9d586ba59dcbe6b1951e5ec614e2d024812bba5a /uui/source | |
| parent | 4829542997ddd3f32a834b460a077bbe2ffbdf95 (diff) | |
weld PasswordToOpenModifyDialog
Change-Id: I42ebbd1c94a54fb1d4c755fbcc6758c93614bc33
Reviewed-on: https://gerrit.libreoffice.org/51729
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')
| -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 2351cdbc395d..2e88d43191db 100644 --- a/uui/source/iahndl-authentication.cxx +++ b/uui/source/iahndl-authentication.cxx @@ -500,7 +500,7 @@ handleMasterPasswordRequest_( void executePasswordDialog( - vcl::Window * pParent, + weld::Window * pParent, LoginErrorInfo & rInfo, task::PasswordRequestMode nMode, const OUString& aDocName, @@ -517,7 +517,7 @@ executePasswordDialog( { if (bIsSimplePasswordRequest) { - std::unique_ptr<PasswordDialog> xDialog(new PasswordDialog(pParent ? pParent->GetFrameWeld() : nullptr, nMode, + std::unique_ptr<PasswordDialog> xDialog(new PasswordDialog(pParent, nMode, aResLocale, aDocName, bIsPasswordToModify, bIsSimplePasswordRequest)); xDialog->SetMinLen(0); @@ -540,7 +540,7 @@ executePasswordDialog( } else // enter password or reenter password { - std::unique_ptr<PasswordDialog> xDialog(new PasswordDialog(pParent ? pParent->GetFrameWeld() : nullptr, nMode, + std::unique_ptr<PasswordDialog> xDialog(new PasswordDialog(pParent, nMode, aResLocale, aDocName, bIsPasswordToModify, bIsSimplePasswordRequest)); xDialog->SetMinLen(0); @@ -558,7 +558,7 @@ executePasswordDialog( void handlePasswordRequest_( - vcl::Window * pParent, + weld::Window * pParent, task::PasswordRequestMode nMode, uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations, @@ -723,7 +723,7 @@ UUIInteractionHelper::handlePasswordRequest( if (bDoHandleRequest) { - handlePasswordRequest_( pParent, nMode, rContinuations, + handlePasswordRequest_( pParent ? pParent->GetFrameWeld() : nullptr, nMode, rContinuations, aDocumentName, bMSCryptoMode, bIsPasswordToModify ); return true; } @@ -731,7 +731,7 @@ UUIInteractionHelper::handlePasswordRequest( task::PasswordRequest aPasswordRequest; if( aAnyRequest >>= aPasswordRequest ) { - handlePasswordRequest_(getParentProperty(), + handlePasswordRequest_(pParent ? pParent->GetFrameWeld() : nullptr, aPasswordRequest.Mode, rRequest->getContinuations(), OUString(), |