From 6c5aa32a3ca51f9feecf2ed59944080e766b9ac2 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 5 Apr 2018 12:40:52 +0100 Subject: enable mapping direct from awt::XWindow and weld::Window MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I33b1309a4b81bfd84449213099c4f3f781413e00 Reviewed-on: https://gerrit.libreoffice.org/52456 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- uui/source/iahndl-authentication.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'uui/source') 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 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(), -- cgit