From d6f1c3dece1ab321230cbaf6b5a11318ba04b216 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 4 Mar 2018 17:05:19 +0000 Subject: weld SfxPasswordDialog Dialog MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If8c9757986f4af7b7927717221860e65c8c7285e Reviewed-on: https://gerrit.libreoffice.org/50755 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- basctl/source/basicide/bastypes.cxx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'basctl') diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index a770bd986213..d645a74fc272 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -755,19 +755,20 @@ bool QueryPassword( const Reference< script::XLibraryContainer >& xLibContainer, do { // password dialog - ScopedVclPtrInstance< SfxPasswordDialog > aDlg(Application::GetDefDialogParent()); - aDlg->SetMinLen( 1 ); + vcl::Window* pWin = Application::GetDefDialogParent(); + SfxPasswordDialog aDlg(pWin ? pWin->GetFrameWeld() : nullptr); + aDlg.SetMinLen(1); // set new title if ( bNewTitle ) { OUString aTitle(IDEResId(RID_STR_ENTERPASSWORD)); aTitle = aTitle.replaceAll("XX", rLibName); - aDlg->SetText( aTitle ); + aDlg.set_title(aTitle); } // execute dialog - nRet = aDlg->Execute(); + nRet = aDlg.run(); // verify password if ( nRet == RET_OK ) @@ -777,7 +778,7 @@ bool QueryPassword( const Reference< script::XLibraryContainer >& xLibContainer, Reference< script::XLibraryContainerPassword > xPasswd( xLibContainer, UNO_QUERY ); if ( xPasswd.is() && xPasswd->isLibraryPasswordProtected( rLibName ) && !xPasswd->isLibraryPasswordVerified( rLibName ) ) { - rPassword = aDlg->GetPassword(); + rPassword = aDlg.GetPassword(); // OUString aOUPassword( rPassword ); bOK = xPasswd->verifyLibraryPassword( rLibName, rPassword ); -- cgit