diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-10 09:04:43 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-10 13:16:13 +0200 |
| commit | 916260dcbe84fcde76ee66c752391123f44ea4da (patch) | |
| tree | 388a0202519e03422ecb4c577811ffc2acc2cb44 /sw/source/ui/table | |
| parent | 0e8d0c725ed135dd7c95e6963e585326b2d97d3b (diff) | |
weld SwTableTabDlg
Change-Id: I343ddfd5ba1e42711b74815517ab931e0905dd07
Reviewed-on: https://gerrit.libreoffice.org/60243
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/table')
| -rw-r--r-- | sw/source/ui/table/tabledlg.cxx | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index ba617f7f8177..7be5d0a313c6 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -1150,35 +1150,33 @@ void SwTableColumnPage::SetVisibleWidth(sal_uInt16 nPos, SwTwips nNewWidth) } -SwTableTabDlg::SwTableTabDlg(vcl::Window* pParent, - const SfxItemSet* pItemSet, SwWrtShell* pSh) - : SfxTabDialog(pParent, "TablePropertiesDialog", - "modules/swriter/ui/tableproperties.ui", pItemSet) +SwTableTabDlg::SwTableTabDlg(weld::Window* pParent, const SfxItemSet* pItemSet, SwWrtShell* pSh) + : SfxTabDialogController(pParent, "modules/swriter/ui/tableproperties.ui", "TablePropertiesDialog", pItemSet) , pShell(pSh) { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); AddTabPage("table", &SwFormatTablePage::Create, nullptr); - m_nTextFlowId = AddTabPage("textflow", &SwTextFlowPage::Create, nullptr); + AddTabPage("textflow", &SwTextFlowPage::Create, nullptr); AddTabPage("columns", &SwTableColumnPage::Create, nullptr); - m_nBackgroundId = AddTabPage("background", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BKG), nullptr); - m_nBorderId = AddTabPage("borders", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BORDER), nullptr); + AddTabPage("background", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BKG), nullptr); + AddTabPage("borders", pFact->GetTabPageCreatorFunc(RID_SVXPAGE_BORDER), nullptr); } -void SwTableTabDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage) +void SwTableTabDlg::PageCreated(const OString& rId, SfxTabPage& rPage) { SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool())); - if (nId == m_nBackgroundId) + if (rId == "background") { SvxBackgroundTabFlags const nFlagType = SvxBackgroundTabFlags::SHOW_TBLCTL; aSet.Put (SfxUInt32Item(SID_FLAG_TYPE, static_cast<sal_uInt32>(nFlagType))); rPage.PageCreated(aSet); } - else if (nId == m_nBorderId) + else if (rId == "borders") { aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE, static_cast<sal_uInt16>(SwBorderModes::TABLE))); rPage.PageCreated(aSet); } - else if (nId == m_nTextFlowId) + else if (rId == "textflow") { static_cast<SwTextFlowPage&>(rPage).SetShell(pShell); const FrameTypeFlags eType = pShell->GetFrameType(nullptr,true); |