diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-02-05 12:38:02 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-02-05 17:43:46 +0100 |
| commit | db9e1ef04d13ecc1b8f8f156b059173143ea03ea (patch) | |
| tree | 731b7d5dc796c027f288bfca423e5b22a1e1f830 /cui/source/options/optinet2.cxx | |
| parent | b030e83fccbff8d82a4c84462075baa8442cde54 (diff) | |
weld CertPathDialog
Change-Id: I73c5aa3694d2580b707c2ce769e3e9ffbc076ec8
Reviewed-on: https://gerrit.libreoffice.org/67406
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui/source/options/optinet2.cxx')
| -rw-r--r-- | cui/source/options/optinet2.cxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx index f4fa1ffb3594..c269d87fdda5 100644 --- a/cui/source/options/optinet2.cxx +++ b/cui/source/options/optinet2.cxx @@ -575,7 +575,6 @@ IMPL_STATIC_LINK( SvxProxyTabPage, LoseFocusHdl_Impl, Control&, rControl, void ) SvxSecurityTabPage::SvxSecurityTabPage(vcl::Window* pParent, const SfxItemSet& rSet) : SfxTabPage(pParent, "OptSecurityPage", "cui/ui/optsecuritypage.ui", &rSet) , mpSecOptions(new SvtSecurityOptions) - , mpCertPathDlg(nullptr) { get(m_pSecurityOptionsPB, "options"); get(m_pSavePasswordsCB, "savepassword"); @@ -624,7 +623,7 @@ SvxSecurityTabPage::~SvxSecurityTabPage() void SvxSecurityTabPage::dispose() { mpSecOptions.reset(); - mpCertPathDlg.disposeAndClear(); + mpCertPathDlg.reset(); m_xSecOptDlg.reset(); m_pSecurityOptionsPB.clear(); m_pSavePasswordsCB.clear(); @@ -796,10 +795,10 @@ IMPL_LINK_NOARG(SvxSecurityTabPage, ShowPasswordsHdl, Button*, void) IMPL_LINK_NOARG(SvxSecurityTabPage, CertPathPBHdl, Button*, void) { if (!mpCertPathDlg) - mpCertPathDlg = VclPtr<CertPathDialog>::Create(this); + mpCertPathDlg.reset(new CertPathDialog(GetDialogFrameWeld())); OUString sOrig = mpCertPathDlg->getDirectory(); - short nRet = mpCertPathDlg->Execute(); + short nRet = mpCertPathDlg->run(); if (nRet == RET_OK && sOrig != mpCertPathDlg->getDirectory()) { |