diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-06-27 11:25:21 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-09-20 21:23:45 +0200 |
| commit | ca7c24dafe7aba7c2d71994d2561f1ae3d59257e (patch) | |
| tree | 55fb1d24d6f706868519d3a821510433d8824397 /sw/source/ui/dialog/swdlgfact.hxx | |
| parent | 15521912ccbba14fe5f5b91009bfec154c7f29a1 (diff) | |
weld SwDBTablePreviewDialog and SwMailMergeDlg
Change-Id: Icb7c96b6e9a4d6777fbd0cb4a8eb54547413d390
Reviewed-on: https://gerrit.libreoffice.org/74798
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, 8 insertions, 2 deletions
diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index e9f619132948..fb631418ac81 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -524,7 +524,13 @@ public: class SwMailMergeDlg; class AbstractMailMergeDlg_Impl : public AbstractMailMergeDlg { - DECL_ABSTDLG_BASE(AbstractMailMergeDlg_Impl,SwMailMergeDlg) + std::unique_ptr<SwMailMergeDlg> m_xDlg; +public: + explicit AbstractMailMergeDlg_Impl(std::unique_ptr<SwMailMergeDlg> p) + : m_xDlg(std::move(p)) + { + } + virtual short Execute() override; virtual DBManagerOptions GetMergeType() override ; virtual const OUString& GetSaveFilter() const override; virtual css::uno::Sequence< css::uno::Any > GetSelection() const override ; @@ -747,7 +753,7 @@ public: virtual VclPtr<AbstractJavaEditDialog> CreateJavaEditDialog(weld::Window* pParent, SwWrtShell* pWrtSh) override; virtual VclPtr<AbstractMailMergeDlg> CreateMailMergeDlg( - vcl::Window* pParent, SwWrtShell& rSh, + weld::Window* pParent, SwWrtShell& rSh, const OUString& rSourceName, const OUString& rTableName, sal_Int32 nCommandType, |