diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-05 12:40:52 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-05 15:29:16 +0200 |
| commit | 6c5aa32a3ca51f9feecf2ed59944080e766b9ac2 (patch) | |
| tree | 87e8081be5696b7f08013e3b3d07d448ca46b517 /uui | |
| parent | d9d6f805fdda16a1a51d50deaba8c3a08b606234 (diff) | |
enable mapping direct from awt::XWindow and weld::Window
Change-Id: I33b1309a4b81bfd84449213099c4f3f781413e00
Reviewed-on: https://gerrit.libreoffice.org/52456
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')
| -rw-r--r-- | uui/source/iahndl-authentication.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/uui/source/iahndl-authentication.cxx b/uui/source/iahndl-authentication.cxx index 3897469c87ec..1852e67b6a6d 100644 --- a/uui/source/iahndl-authentication.cxx +++ b/uui/source/iahndl-authentication.cxx @@ -664,7 +664,7 @@ UUIInteractionHelper::handlePasswordRequest( uno::Reference< task::XInteractionRequest > const & rRequest) { // parameters to be filled for the call to handlePasswordRequest_ - vcl::Window * pParent = getParentProperty(); + uno::Reference<awt::XWindow> xParent = getParentXWindow(); task::PasswordRequestMode nMode = task::PasswordRequestMode_PASSWORD_ENTER; uno::Sequence< uno::Reference< task::XInteractionContinuation > > const & rContinuations = rRequest->getContinuations(); OUString aDocumentName; @@ -721,7 +721,7 @@ UUIInteractionHelper::handlePasswordRequest( if (bDoHandleRequest) { - handlePasswordRequest_( pParent ? pParent->GetFrameWeld() : nullptr, nMode, rContinuations, + handlePasswordRequest_( Application::GetFrameWeld(xParent), nMode, rContinuations, aDocumentName, bMSCryptoMode, bIsPasswordToModify ); return true; } @@ -729,7 +729,7 @@ UUIInteractionHelper::handlePasswordRequest( task::PasswordRequest aPasswordRequest; if( aAnyRequest >>= aPasswordRequest ) { - handlePasswordRequest_(pParent ? pParent->GetFrameWeld() : nullptr, + handlePasswordRequest_(Application::GetFrameWeld(xParent), aPasswordRequest.Mode, rRequest->getContinuations(), OUString(), |