diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-16 20:52:37 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-17 10:03:27 +0200 |
| commit | 8a35cafb58c38e84541a44f8534c0511d2400e75 (patch) | |
| tree | 276c93c12f6e4a9a562384a612224c00fd7ec121 /sw/source/ui/index | |
| parent | 82fb4c66103073043d17b5cea845e35410b826f3 (diff) | |
weld SwMultiTOXMarkDlg
Change-Id: Idff6120f0a04bd94ec8402ae02daa9599f133698
Reviewed-on: https://gerrit.libreoffice.org/53004
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/index')
| -rw-r--r-- | sw/source/ui/index/multmrk.cxx | 50 |
1 files changed, 20 insertions, 30 deletions
diff --git a/sw/source/ui/index/multmrk.cxx b/sw/source/ui/index/multmrk.cxx index 0e16c05355ae..735927a58ff5 100644 --- a/sw/source/ui/index/multmrk.cxx +++ b/sw/source/ui/index/multmrk.cxx @@ -18,56 +18,46 @@ */ #include <swtypes.hxx> - #include <multmrk.hxx> #include <toxmgr.hxx> -SwMultiTOXMarkDlg::SwMultiTOXMarkDlg(vcl::Window* pParent, SwTOXMgr& rTOXMgr) - : SvxStandardDialog(pParent, "SelectIndexDialog", - "modules/swriter/ui/selectindexdialog.ui") - , rMgr(rTOXMgr) - , nPos(0) +SwMultiTOXMarkDlg::SwMultiTOXMarkDlg(weld::Window* pParent, SwTOXMgr& rTOXMgr) + : GenericDialogController(pParent, "modules/swriter/ui/selectindexdialog.ui", "SelectIndexDialog") + , m_rMgr(rTOXMgr) + , m_nPos(0) + , m_xTextFT(m_xBuilder->weld_label("type")) + , m_xTOXLB(m_xBuilder->weld_tree_view("treeview")) { - get(m_pTextFT, "type"); - get(m_pTOXLB, "treeview"); - m_pTOXLB->set_height_request(m_pTOXLB->GetTextHeight() * 10); - m_pTOXLB->set_width_request(m_pTOXLB->approximate_char_width() * 25); + m_xTOXLB->set_size_request(m_xTOXLB->get_approximate_digit_width() * 32, + m_xTOXLB->get_height_rows(8)); - m_pTOXLB->SetSelectHdl(LINK(this, SwMultiTOXMarkDlg, SelectHdl)); + m_xTOXLB->connect_changed(LINK(this, SwMultiTOXMarkDlg, SelectHdl)); - sal_uInt16 nSize = rMgr.GetTOXMarkCount(); + sal_uInt16 nSize = m_rMgr.GetTOXMarkCount(); for(sal_uInt16 i=0; i < nSize; ++i) - m_pTOXLB->InsertEntry(rMgr.GetTOXMark(i)->GetText()); + m_xTOXLB->append_text(m_rMgr.GetTOXMark(i)->GetText()); - m_pTOXLB->SelectEntryPos(0); - m_pTextFT->SetText(rMgr.GetTOXMark(0)->GetTOXType()->GetTypeName()); + m_xTOXLB->select(0); + m_xTextFT->set_label(m_rMgr.GetTOXMark(0)->GetTOXType()->GetTypeName()); } -IMPL_LINK( SwMultiTOXMarkDlg, SelectHdl, ListBox&, rBox, void ) +IMPL_LINK( SwMultiTOXMarkDlg, SelectHdl, weld::TreeView&, rBox, void ) { - if(rBox.GetSelectedEntryPos() != LISTBOX_ENTRY_NOTFOUND) - { SwTOXMark* pMark = rMgr.GetTOXMark(rBox.GetSelectedEntryPos()); - m_pTextFT->SetText(pMark->GetTOXType()->GetTypeName()); - nPos = rBox.GetSelectedEntryPos(); + if (rBox.get_selected_index() != -1) + { + SwTOXMark* pMark = m_rMgr.GetTOXMark(rBox.get_selected_index()); + m_xTextFT->set_label(pMark->GetTOXType()->GetTypeName()); + m_nPos = rBox.get_selected_index(); } } void SwMultiTOXMarkDlg::Apply() { - rMgr.SetCurTOXMark(nPos); + m_rMgr.SetCurTOXMark(m_nPos); } SwMultiTOXMarkDlg::~SwMultiTOXMarkDlg() { - disposeOnce(); } -void SwMultiTOXMarkDlg::dispose() -{ - m_pTextFT.clear(); - m_pTOXLB.clear(); - SvxStandardDialog::dispose(); -} - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |