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 /writerperfect | |
| 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 'writerperfect')
3 files changed, 12 insertions, 12 deletions
diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx index 2cef6152f4a8..f3a365dd1bd6 100644 --- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx +++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx @@ -241,11 +241,11 @@ bool MSWorksCalcImportFilter::doImportDocument(librevenge::RVNGInputStream &rInp // try to ask for a password try { - ScopedVclPtrInstance< SfxPasswordDialog > aPasswdDlg(nullptr); - aPasswdDlg->SetMinLen(1); - if (!aPasswdDlg->Execute()) + SfxPasswordDialog aPasswdDlg(nullptr); + aPasswdDlg.SetMinLen(1); + if (!aPasswdDlg.run()) return false; - OUString aPasswd = aPasswdDlg->GetPassword(); + OUString aPasswd = aPasswdDlg.GetPassword(); aUtf8Passwd = OUStringToOString(aPasswd, RTL_TEXTENCODING_UTF8); } catch (...) diff --git a/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx b/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx index 5d083131b6f6..6c0ac8ecf13c 100644 --- a/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx +++ b/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx @@ -45,11 +45,11 @@ bool StarOfficeWriterImportFilter::doImportDocument(librevenge::RVNGInputStream // try to ask for a password try { - ScopedVclPtrInstance< SfxPasswordDialog > aPasswdDlg(nullptr); - aPasswdDlg->SetMinLen(0); - if (!aPasswdDlg->Execute()) + SfxPasswordDialog aPasswdDlg(nullptr); + aPasswdDlg.SetMinLen(0); + if (!aPasswdDlg.run()) return false; - OUString aPasswd = aPasswdDlg->GetPassword(); + OUString aPasswd = aPasswdDlg.GetPassword(); aUtf8Passwd = OUStringToOString(aPasswd, RTL_TEXTENCODING_UTF8); } catch (...) diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx index 6a32a7d37c36..1975a7084b1c 100644 --- a/writerperfect/source/writer/WordPerfectImportFilter.cxx +++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx @@ -112,11 +112,11 @@ bool WordPerfectImportFilter::importImpl(const Sequence< css::beans::PropertyVal int unsuccessfulAttempts = 0; while (true) { - ScopedVclPtrInstance< SfxPasswordDialog > aPasswdDlg(nullptr); - aPasswdDlg->SetMinLen(0); - if (!aPasswdDlg->Execute()) + SfxPasswordDialog aPasswdDlg(nullptr); + aPasswdDlg.SetMinLen(0); + if (!aPasswdDlg.run()) return false; - OUString aPasswd = aPasswdDlg->GetPassword(); + OUString aPasswd = aPasswdDlg.GetPassword(); aUtf8Passwd = OUStringToOString(aPasswd, RTL_TEXTENCODING_UTF8); if (libwpd::WPD_PASSWORD_MATCH_OK == libwpd::WPDocument::verifyPassword(&input, aUtf8Passwd.getStr())) break; |