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 /sw/source/ui/dialog | |
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 'sw/source/ui/dialog')
-rw-r--r-- | sw/source/ui/dialog/uiregionsw.cxx | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 1096103092da..b513bbcffa2b 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -407,11 +407,11 @@ bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox) if (!pRepr->GetTempPasswd().getLength() && pRepr->GetSectionData().GetPassword().getLength()) { - ScopedVclPtrInstance< SfxPasswordDialog > aPasswdDlg(this); + SfxPasswordDialog aPasswdDlg(GetFrameWeld()); bRet = false; - if (aPasswdDlg->Execute()) + if (aPasswdDlg.run()) { - const OUString sNewPasswd( aPasswdDlg->GetPassword() ); + const OUString sNewPasswd(aPasswdDlg.GetPassword()); css::uno::Sequence <sal_Int8 > aNewPasswd; SvPasswordHelper::GetHashPassword( aNewPasswd, sNewPasswd ); if (SvPasswordHelper::CompareHashPassword( @@ -1260,12 +1260,12 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox, void ) { if(!pRepr->GetTempPasswd().getLength() || bChange) { - ScopedVclPtrInstance< SfxPasswordDialog > aPasswdDlg(this); - aPasswdDlg->ShowExtras(SfxShowExtras::CONFIRM); - if(RET_OK == aPasswdDlg->Execute()) + SfxPasswordDialog aPasswdDlg(GetFrameWeld()); + aPasswdDlg.ShowExtras(SfxShowExtras::CONFIRM); + if (RET_OK == aPasswdDlg.run()) { - const OUString sNewPasswd( aPasswdDlg->GetPassword() ); - if( aPasswdDlg->GetConfirm() == sNewPasswd ) + const OUString sNewPasswd(aPasswdDlg.GetPassword()); + if (aPasswdDlg.GetConfirm() == sNewPasswd) { SvPasswordHelper::GetHashPassword( pRepr->GetTempPasswd(), sNewPasswd ); } @@ -1700,12 +1700,12 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl, Button *, pButton, void ) { if(!m_aNewPasswd.getLength() || bChange) { - ScopedVclPtrInstance< SfxPasswordDialog > aPasswdDlg(this); - aPasswdDlg->ShowExtras(SfxShowExtras::CONFIRM); - if(RET_OK == aPasswdDlg->Execute()) + SfxPasswordDialog aPasswdDlg(GetFrameWeld()); + aPasswdDlg.ShowExtras(SfxShowExtras::CONFIRM); + if(RET_OK == aPasswdDlg.run()) { - const OUString sNewPasswd( aPasswdDlg->GetPassword() ); - if( aPasswdDlg->GetConfirm() == sNewPasswd ) + const OUString sNewPasswd(aPasswdDlg.GetPassword()); + if (aPasswdDlg.GetConfirm() == sNewPasswd) { SvPasswordHelper::GetHashPassword( m_aNewPasswd, sNewPasswd ); } |