diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-03-28 21:25:30 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-04-01 15:45:07 +0200 |
commit | e6f7e778aa0a91e567e6f7d19fecf4af6b8d089f (patch) | |
tree | 25f86c784ffea3efc527f00807fc7f76333017d3 /sw/source/ui/dbui/mmgreetingspage.cxx | |
parent | 330df37c7e2af0564bcd2de1f171bed4befcc074 (diff) |
weld SwAssignFieldsDialog
Change-Id: I1242f89b4a2809c730b9bc7c2b6b7207edabd47f
Reviewed-on: https://gerrit.libreoffice.org/70015
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/dbui/mmgreetingspage.cxx')
-rw-r--r-- | sw/source/ui/dbui/mmgreetingspage.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 2723fb04849e..b017e509893a 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -109,9 +109,8 @@ void SwGreetingsHandler::UpdatePreview() IMPL_LINK_NOARG(SwMailMergeGreetingsPage, AssignHdl_Impl, weld::Button&, void) { const OUString sPreview(m_xFemaleLB->get_active_text() + "\n" + m_xMaleLB->get_active_text()); - ScopedVclPtr<SwAssignFieldsDialog> pDlg( - VclPtr<SwAssignFieldsDialog>::Create(nullptr /*TODO*/, m_rConfigItem, sPreview, false)); - if(RET_OK == pDlg->Execute()) + SwAssignFieldsDialog aDlg(GetFrameWeld(), m_rConfigItem, sPreview, false); + if (RET_OK == aDlg.run()) { UpdatePreview(); m_pWizard->UpdateRoadmap(); |