diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-03-04 17:05:19 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-03-05 00:32:13 +0100 |
| commit | d6f1c3dece1ab321230cbaf6b5a11318ba04b216 (patch) | |
| tree | 9a09218d3fb27dfef8939c8924dd100378196f78 /basctl | |
| parent | 77db2da61658906c354084b13a95f1102949fbd0 (diff) | |
weld SfxPasswordDialog Dialog
Change-Id: If8c9757986f4af7b7927717221860e65c8c7285e
Reviewed-on: https://gerrit.libreoffice.org/50755
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 'basctl')
| -rw-r--r-- | basctl/source/basicide/bastypes.cxx | 11 |
1 files changed, 6 insertions, 5 deletions
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 ); |