diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-02 17:27:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-02 21:55:07 +0200 |
| commit | 0c466688fef13295e2a5fcbe23e215b528c4f781 (patch) | |
| tree | 38619027f0530bf143aa64243a359925a78b1142 /sw/source/ui/table | |
| parent | cc78e723723bac34a43e5f3ad05947f775abe0db (diff) | |
weld SwMergeTableDlg
Change-Id: Idbe96bb8150fc695408faa38342237191aceb777
Reviewed-on: https://gerrit.libreoffice.org/52271
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/ui/table')
| -rw-r--r-- | sw/source/ui/table/mergetbl.cxx | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/sw/source/ui/table/mergetbl.cxx b/sw/source/ui/table/mergetbl.cxx index b00fca6ca93e..fa51a3b60aa3 100644 --- a/sw/source/ui/table/mergetbl.cxx +++ b/sw/source/ui/table/mergetbl.cxx @@ -20,29 +20,25 @@ #include <swtypes.hxx> #include <mergetbl.hxx> -SwMergeTableDlg::SwMergeTableDlg( vcl::Window *pParent, bool& rWithPrev ) - : SvxStandardDialog(pParent, "MergeTableDialog", "modules/swriter/ui/mergetabledialog.ui") +SwMergeTableDlg::SwMergeTableDlg(weld::Window *pParent, bool& rWithPrev) + : GenericDialogController(pParent, "modules/swriter/ui/mergetabledialog.ui", "MergeTableDialog") , m_rMergePrev(rWithPrev) + , m_xMergePrevRB(m_xBuilder->weld_radio_button("prev")) { - get(m_pMergePrevRB, "prev"); - m_pMergePrevRB->Check(); + m_xMergePrevRB->set_active(true); } -SwMergeTableDlg::~SwMergeTableDlg() -{ - disposeOnce(); -} - -void SwMergeTableDlg::dispose() +void SwMergeTableDlg::Apply() { - m_pMergePrevRB.clear(); - SvxStandardDialog::dispose(); + m_rMergePrev = m_xMergePrevRB->get_active(); } - -void SwMergeTableDlg::Apply() +short SwMergeTableDlg::execute() { - m_rMergePrev = m_pMergePrevRB->IsChecked(); + int nRet = run(); + if (nRet == RET_OK) + Apply(); + return nRet; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |