From 6c8c47429936c30ebb760253fa4078c1e410eea5 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 17 Oct 2018 09:52:29 +0100 Subject: weld SwMailMergeFieldConnectionsDlg MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I15ee027db596c98eef878e2e174429c532789dad Reviewed-on: https://gerrit.libreoffice.org/61871 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sw/source/ui/envelp/mailmrge.cxx | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) (limited to 'sw/source/ui/envelp') diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index 6230ad636d48..9bcd53d6c206 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -634,22 +634,14 @@ void SwMailMergeCreateFromDlg::dispose() ModalDialog::dispose(); } -SwMailMergeFieldConnectionsDlg::SwMailMergeFieldConnectionsDlg(vcl::Window* pParent) - : ModalDialog(pParent, "MergeConnectDialog", - "modules/swriter/ui/mergeconnectdialog.ui") +SwMailMergeFieldConnectionsDlg::SwMailMergeFieldConnectionsDlg(weld::Window* pParent) + : GenericDialogController(pParent, "modules/swriter/ui/mergeconnectdialog.ui", "MergeConnectDialog") + , m_xUseExistingRB(m_xBuilder->weld_radio_button("existing")) { - get(m_pUseExistingRB, "existing"); } SwMailMergeFieldConnectionsDlg::~SwMailMergeFieldConnectionsDlg() { - disposeOnce(); -} - -void SwMailMergeFieldConnectionsDlg::dispose() -{ - m_pUseExistingRB.clear(); - ModalDialog::dispose(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit