diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-08-22 09:15:51 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-08-23 16:28:12 +0200 |
commit | 693d9ff29e7838bafcad5faa7a4e7355807c54cb (patch) | |
tree | dc343d9002fb6dd0abda2875fbff233f6111eda9 /sw/source/ui/dialog/swdlgfact.hxx | |
parent | 61f75f05adb171064d9ba17b4684069de36fa11a (diff) |
weld SwMailMergeWizard
Change-Id: I03a7fd1f7676792387155db986d710a001887c8d
Reviewed-on: https://gerrit.libreoffice.org/77977
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/ui/dialog/swdlgfact.hxx')
-rw-r--r-- | sw/source/ui/dialog/swdlgfact.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index d149f5ce9e5b..656de1e57e3e 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -637,14 +637,14 @@ public: class SwMailMergeWizard; class AbstractMailMergeWizard_Impl : public AbstractMailMergeWizard { - VclPtr<SwMailMergeWizard> pDlg; + std::shared_ptr<SwMailMergeWizard> m_xDlg; public: - explicit AbstractMailMergeWizard_Impl( SwMailMergeWizard* p ) - : pDlg(p) - {} + explicit AbstractMailMergeWizard_Impl(std::unique_ptr<SwMailMergeWizard> p) + : m_xDlg(std::move(p)) + { + } virtual ~AbstractMailMergeWizard_Impl() override; - virtual void dispose() override; virtual bool StartExecuteAsync(VclAbstractDialog::AsyncContext &rCtx) override; virtual short Execute() override; |