From deb37c44ecfb8f6aa7c2ceec4771b0505fa7b6bb Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Tue, 24 Sep 2019 14:10:48 +0100 Subject: now drop TabPageParent intermediate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I47328f76342ac023628d9042bdfa8213a1c93d0c Reviewed-on: https://gerrit.libreoffice.org/79469 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- sw/source/ui/chrdlg/drpcps.cxx | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'sw/source/ui/chrdlg/drpcps.cxx') diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 82ab519c4b60..0c539a16901d 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -453,14 +453,13 @@ void SwDropCapsPict::InitPrinter_() SwDropCapsDlg::SwDropCapsDlg(weld::Window *pParent, const SfxItemSet &rSet) : SfxSingleTabDialogController(pParent, &rSet) { - TabPageParent pPageParent(get_content_area(), this); - auto xNewPage(SwDropCapsPage::Create(pPageParent, &rSet)); + auto xNewPage(SwDropCapsPage::Create(get_content_area(), this, &rSet)); static_cast(xNewPage.get())->SetFormat(false); SetTabPage(std::move(xNewPage)); } -SwDropCapsPage::SwDropCapsPage(TabPageParent pParent, const SfxItemSet &rSet) - : SfxTabPage(pParent, "modules/swriter/ui/dropcapspage.ui", "DropCapPage", &rSet) +SwDropCapsPage::SwDropCapsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/dropcapspage.ui", "DropCapPage", &rSet) , bModified(false) , bFormat(true) , rSh(::GetActiveView()->GetWrtShell()) @@ -520,9 +519,9 @@ DeactivateRC SwDropCapsPage::DeactivatePage(SfxItemSet * _pSet) return DeactivateRC::LeavePage; } -std::unique_ptr SwDropCapsPage::Create(TabPageParent pParent, const SfxItemSet *rSet) +std::unique_ptr SwDropCapsPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet) { - return std::make_unique(pParent, *rSet); + return std::make_unique(pPage, pController, *rSet); } bool SwDropCapsPage::FillItemSet(SfxItemSet *rSet) -- cgit