diff options
Diffstat (limited to 'sc/source/ui/pagedlg/tphf.cxx')
| -rw-r--r-- | sc/source/ui/pagedlg/tphf.cxx | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 604c8520ccbf..f037e0c2ee08 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -42,8 +42,8 @@ // class ScHFPage -ScHFPage::ScHFPage(TabPageParent pParent, const SfxItemSet& rSet, sal_uInt16 nSetId) - : SvxHFPage(pParent, rSet, nSetId) +ScHFPage::ScHFPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet, sal_uInt16 nSetId) + : SvxHFPage(pPage, pController, rSet, nSetId) , aDataSet(*rSet.GetPool(), svl::Items<ATTR_PAGE, ATTR_PAGE, ATTR_PAGE_HEADERLEFT, ATTR_PAGE_FOOTERRIGHT>{}) , nPageUsage(SvxPageUsage::All) , pStyleDlg(nullptr) @@ -180,24 +180,23 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl, void*, void) { OUString aText; SfxSingleTabDialogController aDlg(GetDialogFrameWeld(), &aDataSet); - TabPageParent pPageParent(aDlg.get_content_area(), &aDlg); bool bRightPage = m_xCntSharedBox->get_active() || (SvxPageUsage::Left != nPageUsage); if ( nId == SID_ATTR_PAGE_HEADERSET ) { aText = ScResId( STR_PAGEHEADER ); if ( bRightPage ) - aDlg.SetTabPage(ScRightHeaderEditPage::Create(pPageParent, &aDataSet)); + aDlg.SetTabPage(ScRightHeaderEditPage::Create(aDlg.get_content_area(), &aDlg, &aDataSet)); else - aDlg.SetTabPage(ScLeftHeaderEditPage::Create(pPageParent, &aDataSet)); + aDlg.SetTabPage(ScLeftHeaderEditPage::Create(aDlg.get_content_area(), &aDlg, &aDataSet)); } else { aText = ScResId( STR_PAGEFOOTER ); if ( bRightPage ) - aDlg.SetTabPage(ScRightFooterEditPage::Create(pPageParent, &aDataSet)); + aDlg.SetTabPage(ScRightFooterEditPage::Create(aDlg.get_content_area(), &aDlg, &aDataSet)); else - aDlg.SetTabPage(ScLeftFooterEditPage::Create(pPageParent, &aDataSet)); + aDlg.SetTabPage(ScLeftFooterEditPage::Create(aDlg.get_content_area(), &aDlg, &aDataSet)); } SvxNumType eNumType = aDataSet.Get(ATTR_PAGE).GetNumType(); @@ -217,14 +216,14 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl, void*, void) // class ScHeaderPage -ScHeaderPage::ScHeaderPage(TabPageParent pParent, const SfxItemSet& rSet) - : ScHFPage(pParent, rSet, SID_ATTR_PAGE_HEADERSET) +ScHeaderPage::ScHeaderPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) + : ScHFPage(pPage, pController, rSet, SID_ATTR_PAGE_HEADERSET) { } -std::unique_ptr<SfxTabPage> ScHeaderPage::Create(TabPageParent pParent, const SfxItemSet* rCoreSet) +std::unique_ptr<SfxTabPage> ScHeaderPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet) { - return std::make_unique<ScHeaderPage>(pParent, *rCoreSet); + return std::make_unique<ScHeaderPage>(pPage, pController, *rCoreSet); } const sal_uInt16* ScHeaderPage::GetRanges() @@ -234,14 +233,14 @@ const sal_uInt16* ScHeaderPage::GetRanges() // class ScFooterPage -ScFooterPage::ScFooterPage(TabPageParent pParent, const SfxItemSet& rSet) - : ScHFPage( pParent, rSet, SID_ATTR_PAGE_FOOTERSET ) +ScFooterPage::ScFooterPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) + : ScHFPage( pPage, pController, rSet, SID_ATTR_PAGE_FOOTERSET ) { } -std::unique_ptr<SfxTabPage> ScFooterPage::Create(TabPageParent pParent, const SfxItemSet* rCoreSet) +std::unique_ptr<SfxTabPage> ScFooterPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet) { - return std::make_unique<ScFooterPage>(pParent, *rCoreSet); + return std::make_unique<ScFooterPage>(pPage, pController, *rCoreSet); } const sal_uInt16* ScFooterPage::GetRanges() |