diff options
Diffstat (limited to 'sw/source')
86 files changed, 375 insertions, 389 deletions
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 68eba76bdb55..28269c65852c 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -135,8 +135,8 @@ void SwCharDlg::PageCreated(const OString& rId, SfxTabPage &rPage) } } -SwCharURLPage::SwCharURLPage(TabPageParent pParent, const SfxItemSet& rCoreSet) - : SfxTabPage(pParent, "modules/swriter/ui/charurlpage.ui", "CharURLPage", &rCoreSet) +SwCharURLPage::SwCharURLPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/charurlpage.ui", "CharURLPage", &rCoreSet) , bModified(false) , m_xURLED(m_xBuilder->weld_entry("urled")) , m_xTextFT(m_xBuilder->weld_label("textft")) @@ -284,9 +284,9 @@ bool SwCharURLPage::FillItemSet(SfxItemSet* rSet) return bModified; } -std::unique_ptr<SfxTabPage> SwCharURLPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet) +std::unique_ptr<SfxTabPage> SwCharURLPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet) { - return std::make_unique<SwCharURLPage>(pParent, *rAttrSet); + return std::make_unique<SwCharURLPage>(pPage, pController, *rAttrSet); } IMPL_LINK_NOARG(SwCharURLPage, InsertFileHdl, weld::Button&, void) 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<SwDropCapsPage*>(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<SfxTabPage> SwDropCapsPage::Create(TabPageParent pParent, const SfxItemSet *rSet) +std::unique_ptr<SfxTabPage> SwDropCapsPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet) { - return std::make_unique<SwDropCapsPage>(pParent, *rSet); + return std::make_unique<SwDropCapsPage>(pPage, pController, *rSet); } bool SwDropCapsPage::FillItemSet(SfxItemSet *rSet) diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 83ed68c907ac..fe7458310a6d 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -42,8 +42,8 @@ const sal_uInt16 SwParagraphNumTabPage::aPageRg[] = { 0 }; -SwParagraphNumTabPage::SwParagraphNumTabPage(TabPageParent pParent, const SfxItemSet& rAttr) - : SfxTabPage(pParent, "modules/swriter/ui/numparapage.ui", "NumParaPage", &rAttr) +SwParagraphNumTabPage::SwParagraphNumTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttr) + : SfxTabPage(pPage, pController, "modules/swriter/ui/numparapage.ui", "NumParaPage", &rAttr) , msOutlineNumbering(SwResId(STR_OUTLINE_NUMBERING )) , bModified(false) , bCurNumrule(false) @@ -98,9 +98,9 @@ SwParagraphNumTabPage::~SwParagraphNumTabPage() { } -std::unique_ptr<SfxTabPage> SwParagraphNumTabPage::Create(TabPageParent pParent, const SfxItemSet* rSet) +std::unique_ptr<SfxTabPage> SwParagraphNumTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet) { - return std::make_unique<SwParagraphNumTabPage>(pParent, *rSet); + return std::make_unique<SwParagraphNumTabPage>(pPage, pController, *rSet); } bool SwParagraphNumTabPage::FillItemSet( SfxItemSet* rSet ) diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index 36bac20761bc..0a32569351fd 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -43,8 +43,8 @@ const sal_uInt16 SwCondCollPage::m_aPageRg[] = { 0 }; -SwCondCollPage::SwCondCollPage(TabPageParent pParent, const SfxItemSet &rSet) - : SfxTabPage(pParent, "modules/swriter/ui/conditionpage.ui", "ConditionPage", &rSet) +SwCondCollPage::SwCondCollPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/conditionpage.ui", "ConditionPage", &rSet) , m_rSh(::GetActiveView()->GetWrtShell()) , m_pCmds(SwCondCollItem::GetCmds()) , m_pFormat(nullptr) @@ -111,9 +111,9 @@ DeactivateRC SwCondCollPage::DeactivatePage(SfxItemSet * _pSet) return DeactivateRC::LeavePage; } -std::unique_ptr<SfxTabPage> SwCondCollPage::Create(TabPageParent pParent, const SfxItemSet *rSet) +std::unique_ptr<SfxTabPage> SwCondCollPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet) { - return std::make_unique<SwCondCollPage>(pParent, *rSet); + return std::make_unique<SwCondCollPage>(pPage, pController, *rSet); } bool SwCondCollPage::FillItemSet(SfxItemSet *rSet) diff --git a/sw/source/ui/chrdlg/tblnumfm.cxx b/sw/source/ui/chrdlg/tblnumfm.cxx index cb227959eefe..078706cc6468 100644 --- a/sw/source/ui/chrdlg/tblnumfm.cxx +++ b/sw/source/ui/chrdlg/tblnumfm.cxx @@ -35,8 +35,7 @@ SwNumFormatDlg::SwNumFormatDlg(weld::Widget* pParent, const SfxItemSet& rSet) ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc(RID_SVXPAGE_NUMBERFORMAT); if ( fnCreatePage ) { - TabPageParent pPageParent(get_content_area(), this); - std::unique_ptr<SfxTabPage> xNewPage = (*fnCreatePage)(pPageParent, &rSet); + std::unique_ptr<SfxTabPage> xNewPage = (*fnCreatePage)(get_content_area(), this, &rSet); SfxAllItemSet aSet(*(rSet.GetPool())); aSet.Put(xNewPage->GetItemSet().Get( SID_ATTR_NUMBERFORMAT_INFO)); xNewPage->PageCreated(aSet); diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index eff36f3e1f54..9a3546409763 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -103,8 +103,8 @@ public: SwAuthenticationSettingsDialog(weld::Window* pParent, SwMailMergeConfigItem& rItem); }; -SwMailConfigPage::SwMailConfigPage(TabPageParent pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "modules/swriter/ui/mailconfigpage.ui", "MailConfigPage", &rSet) +SwMailConfigPage::SwMailConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/mailconfigpage.ui", "MailConfigPage", &rSet) , m_pConfigItem(new SwMailMergeConfigItem) , m_xDisplayNameED(m_xBuilder->weld_entry("displayname")) , m_xAddressED(m_xBuilder->weld_entry("address")) @@ -128,9 +128,9 @@ SwMailConfigPage::~SwMailConfigPage() m_pConfigItem.reset(); } -std::unique_ptr<SfxTabPage> SwMailConfigPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet) +std::unique_ptr<SfxTabPage> SwMailConfigPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet) { - return std::make_unique<SwMailConfigPage>(pParent, *rAttrSet); + return std::make_unique<SwMailConfigPage>(pPage, pController, *rAttrSet); } bool SwMailConfigPage::FillItemSet( SfxItemSet* /*rSet*/ ) @@ -356,9 +356,8 @@ void SwTestAccountSettingsDialog::Test() SwMailConfigDlg::SwMailConfigDlg(weld::Window* pParent, SfxItemSet& rSet) : SfxSingleTabDialogController(pParent, &rSet) { - TabPageParent pPageParent(get_content_area(), this); // create TabPage - SetTabPage(SwMailConfigPage::Create(pPageParent, &rSet)); + SetTabPage(SwMailConfigPage::Create(get_content_area(), this, &rSet)); m_xDialog->set_title(SwResId(STR_MAILCONFIG_DLG_TITLE)); } diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index 4dfac04edb27..5561b2a24a4a 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -52,8 +52,8 @@ struct SwCompatibilityOptPage_Impl std::vector< SvtCompatibilityEntry > m_aList; }; -SwCompatibilityOptPage::SwCompatibilityOptPage(TabPageParent pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "modules/swriter/ui/optcompatpage.ui", "OptCompatPage", &rSet) +SwCompatibilityOptPage::SwCompatibilityOptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/optcompatpage.ui", "OptCompatPage", &rSet) , m_pWrtShell(nullptr) , m_pImpl(new SwCompatibilityOptPage_Impl) , m_nSavedOptions(0) @@ -340,9 +340,9 @@ void SwCompatibilityOptPage::WriteOptions() m_aConfigItem.AppendItem(rItem); } -std::unique_ptr<SfxTabPage> SwCompatibilityOptPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet) +std::unique_ptr<SfxTabPage> SwCompatibilityOptPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet) { - return std::make_unique<SwCompatibilityOptPage>(pParent, *rAttrSet); + return std::make_unique<SwCompatibilityOptPage>(pPage, pController, *rAttrSet); } bool SwCompatibilityOptPage::FillItemSet( SfxItemSet* ) diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 59bcb5cff276..02f36d51c149 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -81,8 +81,8 @@ FieldUnit SwFieldUnitTable::GetValue(sal_uInt32 nPos) return FieldUnit::NONE; } -SwLoadOptPage::SwLoadOptPage(TabPageParent pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "modules/swriter/ui/optgeneralpage.ui", "OptGeneralPage", &rSet) +SwLoadOptPage::SwLoadOptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/optgeneralpage.ui", "OptGeneralPage", &rSet) , m_pWrtShell(nullptr) , m_nLastTab(0) , m_nOldLinkMode(MANUAL) @@ -145,10 +145,10 @@ SwLoadOptPage::~SwLoadOptPage() { } -std::unique_ptr<SfxTabPage> SwLoadOptPage::Create( TabPageParent pParent, +std::unique_ptr<SfxTabPage> SwLoadOptPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet ) { - return std::make_unique<SwLoadOptPage>(pParent, *rAttrSet ); + return std::make_unique<SwLoadOptPage>(pPage, pController, *rAttrSet ); } IMPL_LINK_NOARG(SwLoadOptPage, StandardizedPageCountCheckHdl, weld::Button&, void) @@ -375,8 +375,7 @@ SwCaptionOptDlg::SwCaptionOptDlg(weld::Window* pParent, const SfxItemSet& rSet) "CaptionDialog") { // create TabPage - TabPageParent aParent(get_content_area(), this); - SetTabPage(SwCaptionOptPage::Create(aParent, &rSet)); + SetTabPage(SwCaptionOptPage::Create(get_content_area(), this, &rSet)); } SwCaptionPreview::SwCaptionPreview() @@ -430,8 +429,8 @@ IMPL_LINK(SwCaptionOptPage, TextFilterHdl, OUString&, rTest, bool) return true; } -SwCaptionOptPage::SwCaptionOptPage(TabPageParent pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "modules/swriter/ui/optcaptionpage.ui", "OptCaptionPage", &rSet) +SwCaptionOptPage::SwCaptionOptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/optcaptionpage.ui", "OptCaptionPage", &rSet) , m_sSWTable(SwResId(STR_CAPTION_TABLE)) , m_sSWFrame(SwResId(STR_CAPTION_FRAME)) , m_sSWGraphic(SwResId(STR_CAPTION_GRAPHIC)) @@ -545,10 +544,10 @@ SwCaptionOptPage::~SwCaptionOptPage() m_xPreview.reset(); } -std::unique_ptr<SfxTabPage> SwCaptionOptPage::Create(TabPageParent pParent, +std::unique_ptr<SfxTabPage> SwCaptionOptPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet) { - return std::make_unique<SwCaptionOptPage>(pParent, *rAttrSet); + return std::make_unique<SwCaptionOptPage>(pPage, pController, *rAttrSet); } bool SwCaptionOptPage::FillItemSet( SfxItemSet* ) diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 8f5a0ed6106c..8e891fc49281 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -94,8 +94,8 @@ void drawRect(vcl::RenderContext& rRenderContext, const tools::Rectangle &rRect, // Tools->Options->Writer->View // Tools->Options->Writer/Web->View -SwContentOptPage::SwContentOptPage(TabPageParent pParent, const SfxItemSet& rCoreSet) - : SfxTabPage(pParent, "modules/swriter/ui/viewoptionspage.ui", "ViewOptionsPage", &rCoreSet) +SwContentOptPage::SwContentOptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/viewoptionspage.ui", "ViewOptionsPage", &rCoreSet) , m_xCrossCB(m_xBuilder->weld_check_button("helplines")) , m_xHMetric(m_xBuilder->weld_combo_box("hrulercombobox")) , m_xVRulerCBox(m_xBuilder->weld_check_button("vruler")) @@ -170,10 +170,10 @@ SwContentOptPage::~SwContentOptPage() { } -std::unique_ptr<SfxTabPage> SwContentOptPage::Create( TabPageParent pParent, +std::unique_ptr<SfxTabPage> SwContentOptPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet) { - return std::make_unique<SwContentOptPage>(pParent, *rAttrSet); + return std::make_unique<SwContentOptPage>(pPage, pController, *rAttrSet); } static void lcl_SelectMetricLB(weld::ComboBox& rMetric, sal_uInt16 nSID, const SfxItemSet& rSet) @@ -277,9 +277,9 @@ IMPL_LINK(SwContentOptPage, VertRulerHdl, weld::ToggleButton&, rBox, void) } // TabPage Printer additional settings -SwAddPrinterTabPage::SwAddPrinterTabPage(TabPageParent pParent, +SwAddPrinterTabPage::SwAddPrinterTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet) - : SfxTabPage(pParent, "modules/swriter/ui/printoptionspage.ui", "PrintOptionsPage", &rCoreSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/printoptionspage.ui", "PrintOptionsPage", &rCoreSet) , sNone(SwResId(SW_STR_NONE)) , bAttrModified(false) , bPreview(false) @@ -350,10 +350,10 @@ void SwAddPrinterTabPage::SetPreview(bool bPrev) m_xPagesFrame->set_sensitive(!bPreview); } -std::unique_ptr<SfxTabPage> SwAddPrinterTabPage::Create( TabPageParent pParent, +std::unique_ptr<SfxTabPage> SwAddPrinterTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet ) { - return std::make_unique<SwAddPrinterTabPage>(pParent, *rAttrSet); + return std::make_unique<SwAddPrinterTabPage>(pPage, pController, *rAttrSet); } bool SwAddPrinterTabPage::FillItemSet( SfxItemSet* rCoreSet ) @@ -490,8 +490,8 @@ void SwAddPrinterTabPage::PageCreated( const SfxAllItemSet& aSet) } // Tabpage Standardfonts -SwStdFontTabPage::SwStdFontTabPage(TabPageParent pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "modules/swriter/ui/optfonttabpage.ui", "OptFontTabPage", &rSet) +SwStdFontTabPage::SwStdFontTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/optfonttabpage.ui", "OptFontTabPage", &rSet) , m_pPrt(nullptr) , m_pFontConfig(nullptr) , m_pWrtShell(nullptr) @@ -556,10 +556,10 @@ SwStdFontTabPage::~SwStdFontTabPage() m_pPrt.clear(); } -std::unique_ptr<SfxTabPage> SwStdFontTabPage::Create( TabPageParent pParent, +std::unique_ptr<SfxTabPage> SwStdFontTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet ) { - return std::make_unique<SwStdFontTabPage>(pParent, *rAttrSet); + return std::make_unique<SwStdFontTabPage>(pPage, pController, *rAttrSet); } static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType, @@ -996,8 +996,8 @@ void SwStdFontTabPage::PageCreated( const SfxAllItemSet& aSet) m_nFontGroup = sal::static_int_cast< sal_uInt8, sal_uInt16>( pFlagItem->GetValue() ); } -SwTableOptionsTabPage::SwTableOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "modules/swriter/ui/opttablepage.ui", "OptTablePage", &rSet) +SwTableOptionsTabPage::SwTableOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/opttablepage.ui", "OptTablePage", &rSet) , m_pWrtShell(nullptr) , m_bHTMLMode(false) , m_xHeaderCB(m_xBuilder->weld_check_button("header")) @@ -1025,10 +1025,10 @@ SwTableOptionsTabPage::~SwTableOptionsTabPage() { } -std::unique_ptr<SfxTabPage> SwTableOptionsTabPage::Create( TabPageParent pParent, +std::unique_ptr<SfxTabPage> SwTableOptionsTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet ) { - return std::make_unique<SwTableOptionsTabPage>(pParent, *rAttrSet); + return std::make_unique<SwTableOptionsTabPage>(pPage, pController, *rAttrSet); } bool SwTableOptionsTabPage::FillItemSet( SfxItemSet* ) @@ -1196,8 +1196,8 @@ void SwTableOptionsTabPage::PageCreated( const SfxAllItemSet& aSet) m_pWrtShell = pWrtSh->GetValue(); } -SwShdwCursorOptionsTabPage::SwShdwCursorOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "modules/swriter/ui/optformataidspage.ui", "OptFormatAidsPage", &rSet) +SwShdwCursorOptionsTabPage::SwShdwCursorOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/optformataidspage.ui", "OptFormatAidsPage", &rSet) , m_pWrtShell(nullptr) , m_xParaCB(m_xBuilder->weld_check_button("paragraph")) , m_xSHyphCB(m_xBuilder->weld_check_button("hyphens")) @@ -1258,9 +1258,9 @@ SwShdwCursorOptionsTabPage::~SwShdwCursorOptionsTabPage() { } -std::unique_ptr<SfxTabPage> SwShdwCursorOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) +std::unique_ptr<SfxTabPage> SwShdwCursorOptionsTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet ) { - return std::make_unique<SwShdwCursorOptionsTabPage>(pParent, *rSet ); + return std::make_unique<SwShdwCursorOptionsTabPage>(pPage, pController, *rSet); } void SwShdwCursorOptionsTabPage::PageCreated( const SfxAllItemSet& aSet ) @@ -1563,23 +1563,23 @@ namespace } } -SwRedlineOptionsTabPage::SwRedlineOptionsTabPage(TabPageParent pParent, +SwRedlineOptionsTabPage::SwRedlineOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) - : SfxTabPage(pParent, "modules/swriter/ui/optredlinepage.ui", "OptRedLinePage", &rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/optredlinepage.ui", "OptRedLinePage", &rSet) , m_xInsertLB(m_xBuilder->weld_combo_box("insert")) - , m_xInsertColorLB(new ColorListBox(m_xBuilder->weld_menu_button("insertcolor"), pParent.GetFrameWeld())) + , m_xInsertColorLB(new ColorListBox(m_xBuilder->weld_menu_button("insertcolor"), pController->getDialog())) , m_xInsertedPreviewWN(new FontPrevWindow) , m_xInsertedPreview(new weld::CustomWeld(*m_xBuilder, "insertedpreview", *m_xInsertedPreviewWN)) , m_xDeletedLB(m_xBuilder->weld_combo_box("deleted")) - , m_xDeletedColorLB(new ColorListBox(m_xBuilder->weld_menu_button("deletedcolor"), pParent.GetFrameWeld())) + , m_xDeletedColorLB(new ColorListBox(m_xBuilder->weld_menu_button("deletedcolor"), pController->getDialog())) , m_xDeletedPreviewWN(new FontPrevWindow) , m_xDeletedPreview(new weld::CustomWeld(*m_xBuilder, "deletedpreview", *m_xDeletedPreviewWN)) , m_xChangedLB(m_xBuilder->weld_combo_box("changed")) - , m_xChangedColorLB(new ColorListBox(m_xBuilder->weld_menu_button("changedcolor"), pParent.GetFrameWeld())) + , m_xChangedColorLB(new ColorListBox(m_xBuilder->weld_menu_button("changedcolor"), pController->getDialog())) , m_xChangedPreviewWN(new FontPrevWindow) , m_xChangedPreview(new weld::CustomWeld(*m_xBuilder, "changedpreview", *m_xChangedPreviewWN)) , m_xMarkPosLB(m_xBuilder->weld_combo_box("markpos")) - , m_xMarkColorLB(new ColorListBox(m_xBuilder->weld_menu_button("markcolor"), pParent.GetFrameWeld())) + , m_xMarkColorLB(new ColorListBox(m_xBuilder->weld_menu_button("markcolor"), pController->getDialog())) , m_xMarkPreviewWN(new SwMarkPreview) , m_xMarkPreview(new weld::CustomWeld(*m_xBuilder, "markpreview", *m_xMarkPreviewWN)) { @@ -1638,9 +1638,9 @@ SwRedlineOptionsTabPage::~SwRedlineOptionsTabPage() m_xMarkPreviewWN.reset(); } -std::unique_ptr<SfxTabPage> SwRedlineOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet) +std::unique_ptr<SfxTabPage> SwRedlineOptionsTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet) { - return std::make_unique<SwRedlineOptionsTabPage>(pParent, *rSet ); + return std::make_unique<SwRedlineOptionsTabPage>(pPage, pController, *rSet); } bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet* ) @@ -2004,8 +2004,8 @@ void SwRedlineOptionsTabPage::InitFontStyle(FontPrevWindow& rExampleWin, const O rExampleWin.SetBackColor(aBackCol); } -SwCompareOptionsTabPage::SwCompareOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "modules/swriter/ui/optcomparison.ui", "OptComparison", &rSet) +SwCompareOptionsTabPage::SwCompareOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/optcomparison.ui", "OptComparison", &rSet) , m_xAutoRB(m_xBuilder->weld_radio_button("auto")) , m_xWordRB(m_xBuilder->weld_radio_button("byword")) , m_xCharRB(m_xBuilder->weld_radio_button("bycharacter")) @@ -2026,9 +2026,9 @@ SwCompareOptionsTabPage::~SwCompareOptionsTabPage() { } -std::unique_ptr<SfxTabPage> SwCompareOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) +std::unique_ptr<SfxTabPage> SwCompareOptionsTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet ) { - return std::make_unique<SwCompareOptionsTabPage>(pParent, *rAttrSet ); + return std::make_unique<SwCompareOptionsTabPage>(pPage, pController, *rAttrSet); } bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet* ) @@ -2137,8 +2137,8 @@ IMPL_LINK_NOARG(SwCompareOptionsTabPage, IgnoreHdl, weld::Button&, void) #ifdef DBG_UTIL -SwTestTabPage::SwTestTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet) - : SfxTabPage( pParent, "modules/swriter/ui/opttestpage.ui", "OptTestPage", &rCoreSet) +SwTestTabPage::SwTestTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/opttestpage.ui", "OptTestPage", &rCoreSet) , bAttrModified( false ) , m_xTest1CBox(m_xBuilder->weld_check_button("unused")) , m_xTest2CBox(m_xBuilder->weld_check_button("dynamic")) @@ -2158,10 +2158,10 @@ SwTestTabPage::~SwTestTabPage() { } -std::unique_ptr<SfxTabPage> SwTestTabPage::Create( TabPageParent pParent, +std::unique_ptr<SfxTabPage> SwTestTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet ) { - return std::make_unique<SwTestTabPage>(pParent, *rAttrSet); + return std::make_unique<SwTestTabPage>(pPage, pController, *rAttrSet); } bool SwTestTabPage::FillItemSet( SfxItemSet* rCoreSet ) diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index ceea20e79223..aa18828648fc 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -92,14 +92,12 @@ std::unique_ptr<BuilderPage> SwMailMergeWizard::createPage(WizardState _nState) { OString sIdent(OString::number(_nState)); weld::Container* pPageContainer = m_xAssistant->append_page(sIdent); - // TODO eventually pass DialogController as distinct argument instead of bundling into TabPageParent - TabPageParent aParent(pPageContainer, this); std::unique_ptr<vcl::OWizardPage> xRet; switch(_nState) { case MM_DOCUMENTSELECTPAGE : - xRet = std::make_unique<SwMailMergeDocSelectPage>(this, aParent); + xRet = std::make_unique<SwMailMergeDocSelectPage>(pPageContainer, this); /* tdf#52986 Set help ID using SetRoadmapHelpId for all pages so that when by default the focus is on the left side pane of @@ -108,19 +106,19 @@ std::unique_ptr<BuilderPage> SwMailMergeWizard::createPage(WizardState _nState) SetRoadmapHelpId("modules/swriter/ui/mmselectpage/MMSelectPage"); break; case MM_OUTPUTTYPETPAGE : - xRet = std::make_unique<SwMailMergeOutputTypePage>(this, aParent); + xRet = std::make_unique<SwMailMergeOutputTypePage>(pPageContainer, this); SetRoadmapHelpId("modules/swriter/ui/mmoutputtypepage/MMOutputTypePage"); break; case MM_ADDRESSBLOCKPAGE : - xRet = std::make_unique<SwMailMergeAddressBlockPage>(this, aParent); + xRet = std::make_unique<SwMailMergeAddressBlockPage>(pPageContainer, this); SetRoadmapHelpId("modules/swriter/ui/mmaddressblockpage/MMAddressBlockPage"); break; case MM_GREETINGSPAGE : - xRet = std::make_unique<SwMailMergeGreetingsPage>(this, aParent); + xRet = std::make_unique<SwMailMergeGreetingsPage>(pPageContainer, this); SetRoadmapHelpId("modules/swriter/ui/mmsalutationpage/MMSalutationPage"); break; case MM_LAYOUTPAGE : - xRet = std::make_unique<SwMailMergeLayoutPage>(this, aParent); + xRet = std::make_unique<SwMailMergeLayoutPage>(pPageContainer, this); SetRoadmapHelpId("modules/swriter/ui/mmlayoutpage/MMLayoutPage"); break; } diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index da1fef364351..7ded7e7b9fc9 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -52,8 +52,8 @@ using namespace ::com::sun::star::sdb; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::sdbcx; -SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage(SwMailMergeWizard* pWizard, TabPageParent pParent) - : vcl::OWizardPage(pParent, "modules/swriter/ui/mmaddressblockpage.ui", "MMAddressBlockPage") +SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage(weld::Container* pPage, SwMailMergeWizard* pWizard) + : vcl::OWizardPage(pPage, pWizard, "modules/swriter/ui/mmaddressblockpage.ui", "MMAddressBlockPage") , m_pWizard(pWizard) , m_xAddressListPB(m_xBuilder->weld_button("addresslist")) , m_xCurrentAddressFI(m_xBuilder->weld_label("currentaddress")) diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index 0e76558d1c90..f48c3e117846 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -82,7 +82,7 @@ class SwMailMergeAddressBlockPage : public vcl::OWizardPage virtual bool canAdvance() const override; public: - SwMailMergeAddressBlockPage(SwMailMergeWizard* pWizard, TabPageParent pParent); + SwMailMergeAddressBlockPage(weld::Container* pPage, SwMailMergeWizard* pWizard); virtual ~SwMailMergeAddressBlockPage() override; SwMailMergeWizard* GetWizard() { return m_pWizard; } }; diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx index 80cb8403a337..21d0f96d74f9 100644 --- a/sw/source/ui/dbui/mmdocselectpage.cxx +++ b/sw/source/ui/dbui/mmdocselectpage.cxx @@ -42,8 +42,8 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace svt; -SwMailMergeDocSelectPage::SwMailMergeDocSelectPage(SwMailMergeWizard* pWizard, TabPageParent pParent) - : vcl::OWizardPage(pParent, "modules/swriter/ui/mmselectpage.ui", "MMSelectPage") +SwMailMergeDocSelectPage::SwMailMergeDocSelectPage(weld::Container* pPage, SwMailMergeWizard* pWizard) + : vcl::OWizardPage(pPage, pWizard, "modules/swriter/ui/mmselectpage.ui", "MMSelectPage") , m_pWizard(pWizard) , m_xCurrentDocRB(m_xBuilder->weld_radio_button("currentdoc")) , m_xNewDocRB(m_xBuilder->weld_radio_button("newdoc")) diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx index ef35e5c8f2e4..0930caf03982 100644 --- a/sw/source/ui/dbui/mmdocselectpage.hxx +++ b/sw/source/ui/dbui/mmdocselectpage.hxx @@ -46,7 +46,7 @@ class SwMailMergeDocSelectPage : public vcl::OWizardPage virtual bool commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) override; public: - SwMailMergeDocSelectPage(SwMailMergeWizard* pWizard, TabPageParent pParent); + SwMailMergeDocSelectPage(weld::Container* pPage, SwMailMergeWizard* pWizard); virtual ~SwMailMergeDocSelectPage() override; }; diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 83509f31d788..7e51b1645ccd 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -196,8 +196,8 @@ void SwGreetingsHandler::Contains(bool bContainsGreeting) m_xNeutralCB->set_sensitive(bContainsGreeting); } -SwMailMergeGreetingsPage::SwMailMergeGreetingsPage(SwMailMergeWizard* pWizard, TabPageParent pParent) - : vcl::OWizardPage(pParent, "modules/swriter/ui/mmsalutationpage.ui", "MMSalutationPage") +SwMailMergeGreetingsPage::SwMailMergeGreetingsPage(weld::Container* pPage, SwMailMergeWizard* pWizard) + : vcl::OWizardPage(pPage, pWizard, "modules/swriter/ui/mmsalutationpage.ui", "MMSalutationPage") , SwGreetingsHandler(pWizard->GetConfigItem(), *m_xBuilder) , m_xPreview(new SwAddressPreview(m_xBuilder->weld_scrolled_window("previewwin"))) , m_xPreviewFI(m_xBuilder->weld_label("previewft")) diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx index 576fb98ea1bc..14284d3224dd 100644 --- a/sw/source/ui/dbui/mmgreetingspage.hxx +++ b/sw/source/ui/dbui/mmgreetingspage.hxx @@ -106,7 +106,7 @@ class SwMailMergeGreetingsPage : public vcl::OWizardPage virtual void Activate() override; virtual bool commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) override; public: - SwMailMergeGreetingsPage(SwMailMergeWizard* pWizard, TabPageParent pParent); + SwMailMergeGreetingsPage(weld::Container* pPage, SwMailMergeWizard* pWizard); virtual ~SwMailMergeGreetingsPage() override; }; diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index bcf40f8b8ea0..ad2c452eae3b 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -75,8 +75,8 @@ using namespace ::com::sun::star::view; #define DEFAULT_ADDRESS_WIDTH (MM50*15)// 7,5 cm #define DEFAULT_ADDRESS_HEIGHT (MM50*7) // 3,5cm -SwMailMergeLayoutPage::SwMailMergeLayoutPage(SwMailMergeWizard* pWizard, TabPageParent pParent) - : vcl::OWizardPage(pParent, "modules/swriter/ui/mmlayoutpage.ui", "MMLayoutPage") +SwMailMergeLayoutPage::SwMailMergeLayoutPage(weld::Container* pPage, SwMailMergeWizard* pWizard) + : vcl::OWizardPage(pPage, pWizard, "modules/swriter/ui/mmlayoutpage.ui", "MMLayoutPage") , m_pExampleWrtShell(nullptr) , m_pAddressBlockFormat(nullptr) , m_bIsGreetingInserted(false) diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx index 5ebff3e1db9a..6bacb3c5518c 100644 --- a/sw/source/ui/dbui/mmlayoutpage.hxx +++ b/sw/source/ui/dbui/mmlayoutpage.hxx @@ -73,7 +73,7 @@ class SwMailMergeLayoutPage : public vcl::OWizardPage virtual void Activate() override; virtual bool commitPage(::vcl::WizardTypes::CommitPageReason _eReason) override; public: - SwMailMergeLayoutPage(SwMailMergeWizard* pWizard, TabPageParent pParent); + SwMailMergeLayoutPage(weld::Container* pPage, SwMailMergeWizard* pWizard); virtual ~SwMailMergeLayoutPage() override; static SwFrameFormat* InsertAddressAndGreeting(SwView const * pView, diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx index d74a7a0c85b1..83685a6692ea 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.cxx +++ b/sw/source/ui/dbui/mmoutputtypepage.cxx @@ -40,8 +40,8 @@ using namespace ::com::sun::star; -SwMailMergeOutputTypePage::SwMailMergeOutputTypePage(SwMailMergeWizard* pWizard, TabPageParent pParent) - : vcl::OWizardPage(pParent, "modules/swriter/ui/mmoutputtypepage.ui", "MMOutputTypePage") +SwMailMergeOutputTypePage::SwMailMergeOutputTypePage(weld::Container* pPage, SwMailMergeWizard* pWizard) + : vcl::OWizardPage(pPage, pWizard, "modules/swriter/ui/mmoutputtypepage.ui", "MMOutputTypePage") , m_pWizard(pWizard) , m_xLetterRB(m_xBuilder->weld_radio_button("letter")) , m_xMailRB(m_xBuilder->weld_radio_button("email")) diff --git a/sw/source/ui/dbui/mmoutputtypepage.hxx b/sw/source/ui/dbui/mmoutputtypepage.hxx index 73346dfe8bde..92a60da30941 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.hxx +++ b/sw/source/ui/dbui/mmoutputtypepage.hxx @@ -35,7 +35,7 @@ class SwMailMergeOutputTypePage : public vcl::OWizardPage DECL_LINK(TypeHdl_Impl, weld::ToggleButton&, void); public: - SwMailMergeOutputTypePage(SwMailMergeWizard* pWizard, TabPageParent pParent); + SwMailMergeOutputTypePage(weld::Container* pPage, SwMailMergeWizard* pWizard); virtual ~SwMailMergeOutputTypePage() override; }; #endif diff --git a/sw/source/ui/dialog/addrdlg.cxx b/sw/source/ui/dialog/addrdlg.cxx index 940f7f5d2646..839c084e93e1 100644 --- a/sw/source/ui/dialog/addrdlg.cxx +++ b/sw/source/ui/dialog/addrdlg.cxx @@ -29,8 +29,7 @@ SwAddrDlg::SwAddrDlg(weld::Window* pParent, const SfxItemSet& rSet) if ( fnCreatePage ) { // create TabPage - TabPageParent aParent(get_content_area(), this); - SetTabPage(fnCreatePage(aParent, &rSet)); + SetTabPage(fnCreatePage(get_content_area(), this, &rSet)); } } diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index 5aab6a714cc4..5dc9c1dfafa1 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -35,13 +35,13 @@ #include <vcl/settings.hxx> #include <vcl/svapp.hxx> -std::unique_ptr<SfxTabPage> SwDocStatPage::Create(TabPageParent pParent, const SfxItemSet *rSet) +std::unique_ptr<SfxTabPage> SwDocStatPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet) { - return std::make_unique<SwDocStatPage>(pParent, *rSet); + return std::make_unique<SwDocStatPage>(pPage, pController, *rSet); } -SwDocStatPage::SwDocStatPage(TabPageParent pParent, const SfxItemSet &rSet) - : SfxTabPage(pParent, "modules/swriter/ui/statisticsinfopage.ui", "StatisticsInfoPage", &rSet) +SwDocStatPage::SwDocStatPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/statisticsinfopage.ui", "StatisticsInfoPage", &rSet) , m_xPageNo(m_xBuilder->weld_label("nopages")) , m_xTableNo(m_xBuilder->weld_label("notables")) , m_xGrfNo(m_xBuilder->weld_label("nogrfs")) diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 1099f63c8ac9..ad94bc3e7026 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1473,8 +1473,8 @@ short SwInsertSectionTabDialog::Ok() return nRet; } -SwInsertSectionTabPage::SwInsertSectionTabPage(TabPageParent pParent, const SfxItemSet &rAttrSet) - : SfxTabPage(pParent, "modules/swriter/ui/sectionpage.ui", "SectionPage", &rAttrSet) +SwInsertSectionTabPage::SwInsertSectionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rAttrSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/sectionpage.ui", "SectionPage", &rAttrSet) , m_pWrtSh(nullptr) , m_xCurName(m_xBuilder->weld_entry_tree_view("sectionnames", "sectionnames-entry", "sectionnames-list")) @@ -1615,10 +1615,10 @@ void SwInsertSectionTabPage::Reset( const SfxItemSet* ) { } -std::unique_ptr<SfxTabPage> SwInsertSectionTabPage::Create(TabPageParent pParent, +std::unique_ptr<SfxTabPage> SwInsertSectionTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet) { - return std::make_unique<SwInsertSectionTabPage>(pParent, *rAttrSet); + return std::make_unique<SwInsertSectionTabPage>(pPage, pController, *rAttrSet); } IMPL_LINK(SwInsertSectionTabPage, ChangeHideHdl, weld::ToggleButton&, rBox, void) @@ -1776,8 +1776,8 @@ IMPL_LINK( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFil } } -SwSectionFootnoteEndTabPage::SwSectionFootnoteEndTabPage(TabPageParent pParent, const SfxItemSet &rAttrSet) - : SfxTabPage(pParent, "modules/swriter/ui/footnotesendnotestabpage.ui", "FootnotesEndnotesTabPage", &rAttrSet) +SwSectionFootnoteEndTabPage::SwSectionFootnoteEndTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rAttrSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/footnotesendnotestabpage.ui", "FootnotesEndnotesTabPage", &rAttrSet) , m_xFootnoteNtAtTextEndCB(m_xBuilder->weld_check_button("ftnntattextend")) , m_xFootnoteNtNumCB(m_xBuilder->weld_check_button("ftnntnum")) , m_xFootnoteOffsetLbl(m_xBuilder->weld_label("ftnoffset_label")) @@ -1953,10 +1953,10 @@ void SwSectionFootnoteEndTabPage::Reset( const SfxItemSet* rSet ) ResetState( false, rSet->Get( RES_END_AT_TXTEND, false )); } -std::unique_ptr<SfxTabPage> SwSectionFootnoteEndTabPage::Create( TabPageParent pParent, +std::unique_ptr<SfxTabPage> SwSectionFootnoteEndTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet) { - return std::make_unique<SwSectionFootnoteEndTabPage>(pParent, *rAttrSet); + return std::make_unique<SwSectionFootnoteEndTabPage>(pPage, pController, *rAttrSet); } IMPL_LINK( SwSectionFootnoteEndTabPage, FootEndHdl, weld::ToggleButton&, rBox, void ) @@ -2058,8 +2058,8 @@ void SwSectionPropertyTabDialog::PageCreated(const OString& rId, SfxTabPage &rPa static_cast<SwSectionIndentTabPage&>(rPage).SetWrtShell(rWrtSh); } -SwSectionIndentTabPage::SwSectionIndentTabPage(TabPageParent pParent, const SfxItemSet &rAttrSet) - : SfxTabPage(pParent, "modules/swriter/ui/indentpage.ui", "IndentPage", &rAttrSet) +SwSectionIndentTabPage::SwSectionIndentTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rAttrSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/indentpage.ui", "IndentPage", &rAttrSet) , m_xBeforeMF(m_xBuilder->weld_metric_spin_button("before", FieldUnit::CM)) , m_xAfterMF(m_xBuilder->weld_metric_spin_button("after", FieldUnit::CM)) , m_xPreviewWin(new weld::CustomWeld(*m_xBuilder, "preview", m_aPreviewWin)) @@ -2111,9 +2111,9 @@ void SwSectionIndentTabPage::Reset( const SfxItemSet* rSet) IndentModifyHdl(*m_xBeforeMF); } -std::unique_ptr<SfxTabPage> SwSectionIndentTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet) +std::unique_ptr<SfxTabPage> SwSectionIndentTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet) { - return std::make_unique<SwSectionIndentTabPage>(pParent, *rAttrSet); + return std::make_unique<SwSectionIndentTabPage>(pPage, pController, *rAttrSet); } void SwSectionIndentTabPage::SetWrtShell(SwWrtShell const & rSh) diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 12a3cd8a881e..9e01b25df43c 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -116,8 +116,8 @@ namespace { static long lUserW = 5669; // 10 cm static long lUserH = 5669; // 10 cm -SwEnvFormatPage::SwEnvFormatPage(TabPageParent pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "modules/swriter/ui/envformatpage.ui", "EnvFormatPage", &rSet) +SwEnvFormatPage::SwEnvFormatPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/envformatpage.ui", "EnvFormatPage", &rSet) , m_pDialog(nullptr) , m_xAddrLeftField(m_xBuilder->weld_metric_spin_button("leftaddr", FieldUnit::CM)) , m_xAddrTopField(m_xBuilder->weld_metric_spin_button("topaddr", FieldUnit::CM)) @@ -412,9 +412,9 @@ void SwEnvFormatPage::SetMinMax() 100 * (getfieldval(*m_xAddrTopField ) - 2 * 566), FieldUnit::TWIP); } -std::unique_ptr<SfxTabPage> SwEnvFormatPage::Create(TabPageParent pParent, const SfxItemSet* rSet) +std::unique_ptr<SfxTabPage> SwEnvFormatPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet) { - return std::make_unique<SwEnvFormatPage>(pParent, *rSet); + return std::make_unique<SwEnvFormatPage>(pPage, pController, *rSet); } void SwEnvFormatPage::ActivatePage(const SfxItemSet& rSet) diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index 531e3401a8ea..28da3d63d07d 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -55,11 +55,11 @@ class SwEnvFormatPage : public SfxTabPage SwEnvDlg *GetParentSwEnvDlg() { return m_pDialog; } public: - SwEnvFormatPage(TabPageParent pParent, const SfxItemSet& rSet); + SwEnvFormatPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); void Init(SwEnvDlg* pDialog); virtual ~SwEnvFormatPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index bf1871882cbc..23117247e948 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -180,8 +180,8 @@ short SwEnvDlg::Ok() return nRet; } -SwEnvPage::SwEnvPage(TabPageParent pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "modules/swriter/ui/envaddresspage.ui", "EnvAddressPage", &rSet) +SwEnvPage::SwEnvPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/envaddresspage.ui", "EnvAddressPage", &rSet) , m_pDialog(nullptr) , m_pSh(nullptr) , m_xAddrEdit(m_xBuilder->weld_text_view("addredit")) @@ -297,9 +297,9 @@ void SwEnvPage::InitDatabaseBox() } } -std::unique_ptr<SfxTabPage> SwEnvPage::Create(TabPageParent pParent, const SfxItemSet* rSet) +std::unique_ptr<SfxTabPage> SwEnvPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet) { - return std::make_unique<SwEnvPage>(pParent, *rSet); + return std::make_unique<SwEnvPage>(pPage, pController, *rSet); } void SwEnvPage::ActivatePage(const SfxItemSet& rSet) diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index fdfca438189e..5e4c74864eae 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -29,8 +29,8 @@ #include <bitmaps.hlst> -SwEnvPrtPage::SwEnvPrtPage(TabPageParent pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "modules/swriter/ui/envprinterpage.ui", "EnvPrinterPage", &rSet) +SwEnvPrtPage::SwEnvPrtPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/envprinterpage.ui", "EnvPrinterPage", &rSet) , m_xUpper(m_xBuilder->weld_widget("upper")) , m_xLower(m_xBuilder->weld_widget("lower")) , m_xTopButton(m_xBuilder->weld_radio_button("top")) @@ -127,9 +127,9 @@ IMPL_LINK(SwEnvPrtPage, ButtonHdl, weld::Button&, rBtn, void) } } -std::unique_ptr<SfxTabPage> SwEnvPrtPage::Create(TabPageParent pParent, const SfxItemSet* rSet) +std::unique_ptr<SfxTabPage> SwEnvPrtPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet) { - return std::make_unique<SwEnvPrtPage>(pParent, *rSet); + return std::make_unique<SwEnvPrtPage>(pPage, pController, *rSet); } void SwEnvPrtPage::ActivatePage(const SfxItemSet&) diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index e86c0df1a582..89f86a9c3b7f 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -54,10 +54,10 @@ class SwEnvPrtPage : public SfxTabPage SwEnvDlg* GetParentSwEnvDlg() {return static_cast<SwEnvDlg*>(GetDialogController()); } public: - SwEnvPrtPage(TabPageParent pParent, const SfxItemSet& rSet); + SwEnvPrtPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); virtual ~SwEnvPrtPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 1a64abb75f99..da4e0c5ffdc4 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -220,8 +220,8 @@ Printer *SwLabDlg::GetPrt() return nullptr; } -SwLabPage::SwLabPage(TabPageParent pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "modules/swriter/ui/cardmediumpage.ui", "CardMediumPage", &rSet) +SwLabPage::SwLabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/cardmediumpage.ui", "CardMediumPage", &rSet) , pDBManager(nullptr) , aItem(static_cast<const SwLabItem&>(rSet.Get(FN_LABEL))) , m_xAddressFrame(m_xBuilder->weld_widget("addressframe")) @@ -238,7 +238,7 @@ SwLabPage::SwLabPage(TabPageParent pParent, const SfxItemSet& rSet) , m_xHiddenSortTypeBox(m_xBuilder->weld_combo_box("hiddentype")) , m_xFormatInfo(m_xBuilder->weld_label("formatinfo")) { - WaitObject aWait(pParent.pParent); + weld::WaitObject aWait(GetDialogFrameWeld()); m_xWritingEdit->set_size_request(m_xWritingEdit->get_approximate_digit_width() * 30, m_xWritingEdit->get_height_rows(10)); @@ -446,9 +446,9 @@ void SwLabPage::InitDatabaseBox() } } -std::unique_ptr<SfxTabPage> SwLabPage::Create(TabPageParent pParent, const SfxItemSet* rSet) +std::unique_ptr<SfxTabPage> SwLabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet) { - return std::make_unique<SwLabPage>(pParent, *rSet); + return std::make_unique<SwLabPage>(pPage, pController, *rSet); } void SwLabPage::ActivatePage(const SfxItemSet& rSet) @@ -546,8 +546,8 @@ void SwLabPage::Reset(const SfxItemSet* rSet) m_xSheetButton->set_active(true); } -SwPrivateDataPage::SwPrivateDataPage(TabPageParent pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "modules/swriter/ui/privateuserpage.ui", "PrivateUserPage", &rSet) +SwPrivateDataPage::SwPrivateDataPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/privateuserpage.ui", "PrivateUserPage", &rSet) , m_xFirstNameED(m_xBuilder->weld_entry("firstname")) , m_xNameED(m_xBuilder->weld_entry("lastname")) , m_xShortCutED(m_xBuilder->weld_entry("shortname")) @@ -574,9 +574,9 @@ SwPrivateDataPage::~SwPrivateDataPage() { } -std::unique_ptr<SfxTabPage> SwPrivateDataPage::Create(TabPageParent pParent, const SfxItemSet* rSet) +std::unique_ptr<SfxTabPage> SwPrivateDataPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet) { - return std::make_unique<SwPrivateDataPage>(pParent, *rSet); + return std::make_unique<SwPrivateDataPage>(pPage, pController, *rSet); } void SwPrivateDataPage::ActivatePage(const SfxItemSet& rSet) @@ -643,8 +643,8 @@ void SwPrivateDataPage::Reset(const SfxItemSet* rSet) m_xMailED->set_text(aItem.m_aPrivMail); } -SwBusinessDataPage::SwBusinessDataPage(TabPageParent pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "modules/swriter/ui/businessdatapage.ui", "BusinessDataPage", &rSet) +SwBusinessDataPage::SwBusinessDataPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/businessdatapage.ui", "BusinessDataPage", &rSet) , m_xCompanyED(m_xBuilder->weld_entry("company")) , m_xCompanyExtED(m_xBuilder->weld_entry("company2")) , m_xSloganED(m_xBuilder->weld_entry("slogan")) @@ -667,9 +667,9 @@ SwBusinessDataPage::~SwBusinessDataPage() { } -std::unique_ptr<SfxTabPage> SwBusinessDataPage::Create(TabPageParent pParent, const SfxItemSet* rSet) +std::unique_ptr<SfxTabPage> SwBusinessDataPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet) { - return std::make_unique<SwBusinessDataPage>(pParent, *rSet); + return std::make_unique<SwBusinessDataPage>(pPage, pController, *rSet); } void SwBusinessDataPage::ActivatePage(const SfxItemSet& rSet) diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 91442147431e..e1bd1dc63130 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -284,8 +284,8 @@ void SwLabPreview::UpdateItem(const SwLabItem& rItem) Invalidate(); } -SwLabFormatPage::SwLabFormatPage(TabPageParent pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "modules/swriter/ui/labelformatpage.ui", "LabelFormatPage", &rSet) +SwLabFormatPage::SwLabFormatPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/labelformatpage.ui", "LabelFormatPage", &rSet) , aPreviewIdle("SwLabFormatPage Preview") , aItem(static_cast<const SwLabItem&>( rSet.Get(FN_LABEL) )) , bModified(false) @@ -403,9 +403,9 @@ void SwLabFormatPage::ChangeMinMax() m_xPHeightField->set_range(long(100) * lMinPHeight, long(100) * lMax, FieldUnit::TWIP); } -std::unique_ptr<SfxTabPage> SwLabFormatPage::Create(TabPageParent pParent, const SfxItemSet* rSet) +std::unique_ptr<SfxTabPage> SwLabFormatPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet) { - return std::make_unique<SwLabFormatPage>(pParent, *rSet); + return std::make_unique<SwLabFormatPage>(pPage, pController, *rSet); } void SwLabFormatPage::ActivatePage(const SfxItemSet& rSet) diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index f4d55963cec1..d11e4a193f79 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -96,10 +96,10 @@ class SwLabFormatPage : public SfxTabPage void ChangeMinMax(); public: - SwLabFormatPage(TabPageParent pParent, const SfxItemSet& rSet); + SwLabFormatPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); virtual ~SwLabFormatPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index cefe4136f3c8..7edfa3167fe9 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -27,8 +27,8 @@ #include <cmdid.h> -SwLabPrtPage::SwLabPrtPage(TabPageParent pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "modules/swriter/ui/labeloptionspage.ui", "LabelOptionsPage", &rSet) +SwLabPrtPage::SwLabPrtPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/labeloptionspage.ui", "LabelOptionsPage", &rSet) , pPrinter(nullptr) , m_xPageButton(m_xBuilder->weld_radio_button("entirepage")) , m_xSingleButton(m_xBuilder->weld_radio_button("singlelabel")) @@ -86,9 +86,9 @@ IMPL_LINK( SwLabPrtPage, CountHdl, weld::Button&, rButton, void ) } } -std::unique_ptr<SfxTabPage> SwLabPrtPage::Create(TabPageParent pParent, const SfxItemSet* rSet) +std::unique_ptr<SfxTabPage> SwLabPrtPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet) { - return std::make_unique<SwLabPrtPage>(pParent, *rSet ); + return std::make_unique<SwLabPrtPage>(pPage, pController, *rSet ); } void SwLabPrtPage::ActivatePage( const SfxItemSet& rSet ) diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index 8c35033ded01..c69d44ea4514 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -45,10 +45,10 @@ class SwLabPrtPage : public SfxTabPage SwLabDlg* GetParentSwLabDlg() {return static_cast<SwLabDlg*>(GetDialogController());} public: - SwLabPrtPage(TabPageParent pParent, const SfxItemSet& rSet); + SwLabPrtPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); virtual ~SwLabPrtPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index ff81d3bfe17e..5634b4c2c5eb 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -55,11 +55,11 @@ class SwLabPage : public SfxTabPage SwLabRec* GetSelectedEntryPos(); public: - SwLabPage(TabPageParent pParent, const SfxItemSet& rSet); + SwLabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); virtual ~SwLabPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; @@ -98,10 +98,10 @@ class SwPrivateDataPage : public SfxTabPage std::unique_ptr<weld::Entry> m_xMailED; public: - SwPrivateDataPage(TabPageParent pParent, const SfxItemSet& rSet); + SwPrivateDataPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); virtual ~SwPrivateDataPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; @@ -127,10 +127,10 @@ class SwBusinessDataPage : public SfxTabPage std::unique_ptr<weld::Entry> m_xMailED; public: - SwBusinessDataPage(TabPageParent pParent, const SfxItemSet& rSet); + SwBusinessDataPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); virtual ~SwBusinessDataPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index e8b959ee3ed3..d6e49e76c847 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -33,8 +33,8 @@ #define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 -SwFieldDBPage::SwFieldDBPage(TabPageParent pParent, const SfxItemSet *const pCoreSet) - : SwFieldPage(pParent, "modules/swriter/ui/flddbpage.ui", "FieldDbPage", pCoreSet) +SwFieldDBPage::SwFieldDBPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *const pCoreSet) + : SwFieldPage(pPage, pController, "modules/swriter/ui/flddbpage.ui", "FieldDbPage", pCoreSet) , m_nOldFormat(0) , m_nOldSubType(0) , m_xTypeLB(m_xBuilder->weld_tree_view("type")) @@ -255,10 +255,10 @@ bool SwFieldDBPage::FillItemSet(SfxItemSet* ) return false; } -std::unique_ptr<SfxTabPage> SwFieldDBPage::Create( TabPageParent pParent, +std::unique_ptr<SfxTabPage> SwFieldDBPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *const pAttrSet ) { - return std::make_unique<SwFieldDBPage>( pParent, pAttrSet ); + return std::make_unique<SwFieldDBPage>( pPage, pController, pAttrSet ); } sal_uInt16 SwFieldDBPage::GetGroup() diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index aac2b5fa31e8..ad16a62863bf 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -61,11 +61,11 @@ protected: virtual sal_uInt16 GetGroup() override; public: - SwFieldDBPage(TabPageParent pParent, const SfxItemSet* rSet); + SwFieldDBPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet); virtual ~SwFieldDBPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index e077868cb552..92d263a6efd1 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -51,8 +51,8 @@ void FillFieldSelect(weld::TreeView& rListBox) rListBox.append_text(SwResId(FLD_SELECT[i])); } -SwFieldDokInfPage::SwFieldDokInfPage(TabPageParent pParent, const SfxItemSet *const pCoreSet) - : SwFieldPage(pParent, "modules/swriter/ui/flddocinfopage.ui", "FieldDocInfoPage", pCoreSet) +SwFieldDokInfPage::SwFieldDokInfPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *const pCoreSet) + : SwFieldPage(pPage, pController, "modules/swriter/ui/flddocinfopage.ui", "FieldDocInfoPage", pCoreSet) , nOldSel(0) , nOldFormat(0) , m_xTypeTLB(m_xBuilder->weld_tree_view("type")) @@ -443,10 +443,10 @@ bool SwFieldDokInfPage::FillItemSet(SfxItemSet* ) return false; } -std::unique_ptr<SfxTabPage> SwFieldDokInfPage::Create( TabPageParent pParent, +std::unique_ptr<SfxTabPage> SwFieldDokInfPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *const pAttrSet) { - return std::make_unique<SwFieldDokInfPage>(pParent, pAttrSet); + return std::make_unique<SwFieldDokInfPage>(pPage, pController, pAttrSet); } sal_uInt16 SwFieldDokInfPage::GetGroup() diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index 15c09d9084c5..826f5b562627 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -52,10 +52,10 @@ protected: virtual sal_uInt16 GetGroup() override; public: - SwFieldDokInfPage(TabPageParent pWindow, const SfxItemSet* pSet); + SwFieldDokInfPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* pSet); virtual ~SwFieldDokInfPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index d1d04e96457b..01346a4b94d8 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -32,8 +32,8 @@ #define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 -SwFieldDokPage::SwFieldDokPage(TabPageParent pParent, const SfxItemSet *const pCoreSet) - : SwFieldPage(pParent, "modules/swriter/ui/flddocumentpage.ui", +SwFieldDokPage::SwFieldDokPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *const pCoreSet) + : SwFieldPage(pPage, pController, "modules/swriter/ui/flddocumentpage.ui", "FieldDocumentPage", pCoreSet) , nOldSel(0) , nOldFormat(0) @@ -608,10 +608,10 @@ bool SwFieldDokPage::FillItemSet(SfxItemSet* ) return false; } -std::unique_ptr<SfxTabPage> SwFieldDokPage::Create(TabPageParent pParent, +std::unique_ptr<SfxTabPage> SwFieldDokPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *const pAttrSet) { - return std::make_unique<SwFieldDokPage>(pParent, pAttrSet); + return std::make_unique<SwFieldDokPage>(pPage, pController, pAttrSet); } sal_uInt16 SwFieldDokPage::GetGroup() diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx index 2fd437d7e4b9..ce61dd15e695 100644 --- a/sw/source/ui/fldui/flddok.hxx +++ b/sw/source/ui/fldui/flddok.hxx @@ -55,11 +55,11 @@ protected: virtual sal_uInt16 GetGroup() override; public: - SwFieldDokPage(TabPageParent pWindow, const SfxItemSet * pSet); + SwFieldDokPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet * pSet); virtual ~SwFieldDokPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 8cd8577920d9..72caa96ec481 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -175,21 +175,19 @@ void SwFieldEditDlg::Init() SfxTabPage* SwFieldEditDlg::CreatePage(sal_uInt16 nGroup) { - TabPageParent pPageParent(get_content_area(), this); - // create TabPage std::unique_ptr<SfxTabPage> xTabPage; switch (nGroup) { case GRP_DOC: - xTabPage = SwFieldDokPage::Create(pPageParent, nullptr); + xTabPage = SwFieldDokPage::Create(get_content_area(), this, nullptr); break; case GRP_FKT: - xTabPage = SwFieldFuncPage::Create(pPageParent, nullptr); + xTabPage = SwFieldFuncPage::Create(get_content_area(), this, nullptr); break; case GRP_REF: - xTabPage = SwFieldRefPage::Create(pPageParent, nullptr); + xTabPage = SwFieldRefPage::Create(get_content_area(), this, nullptr); break; case GRP_REG: { @@ -204,17 +202,17 @@ SfxTabPage* SwFieldEditDlg::CreatePage(sal_uInt16 nGroup) xDocProps->getUserDefinedProperties(), uno::UNO_QUERY_THROW); pSet->Put( SfxUnoAnyItem( SID_DOCINFO, uno::makeAny(xUDProps) ) ); - xTabPage = SwFieldDokInfPage::Create(pPageParent, pSet); + xTabPage = SwFieldDokInfPage::Create(get_content_area(), this, pSet); break; } #if HAVE_FEATURE_DBCONNECTIVITY case GRP_DB: - xTabPage = SwFieldDBPage::Create(pPageParent, nullptr); + xTabPage = SwFieldDBPage::Create(get_content_area(), this, nullptr); static_cast<SwFieldDBPage*>(xTabPage.get())->SetWrtShell(*pSh); break; #endif case GRP_VAR: - xTabPage = SwFieldVarPage::Create(pPageParent, nullptr); + xTabPage = SwFieldVarPage::Create(get_content_area(), this, nullptr); break; } diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index f140b30dd201..ab0f4cc95a92 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -38,8 +38,8 @@ using namespace ::com::sun::star; -SwFieldFuncPage::SwFieldFuncPage(TabPageParent pParent, const SfxItemSet *const pCoreSet) - : SwFieldPage(pParent, "modules/swriter/ui/fldfuncpage.ui", "FieldFuncPage", pCoreSet) +SwFieldFuncPage::SwFieldFuncPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *const pCoreSet) + : SwFieldPage(pPage, pController, "modules/swriter/ui/fldfuncpage.ui", "FieldFuncPage", pCoreSet) , nOldFormat(0) , bDropDownLBChanged(false) , m_xTypeLB(m_xBuilder->weld_tree_view("type")) @@ -575,10 +575,10 @@ bool SwFieldFuncPage::FillItemSet(SfxItemSet* ) return false; } -std::unique_ptr<SfxTabPage> SwFieldFuncPage::Create( TabPageParent pParent, +std::unique_ptr<SfxTabPage> SwFieldFuncPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *const pAttrSet) { - return std::make_unique<SwFieldFuncPage>(pParent, pAttrSet); + return std::make_unique<SwFieldFuncPage>(pPage, pController, pAttrSet); } sal_uInt16 SwFieldFuncPage::GetGroup() diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx index 78588ad65cb4..43632c0241d9 100644 --- a/sw/source/ui/fldui/fldfunc.hxx +++ b/sw/source/ui/fldui/fldfunc.hxx @@ -79,10 +79,10 @@ protected: virtual sal_uInt16 GetGroup() override; public: - SwFieldFuncPage(TabPageParent pParent, const SfxItemSet* pSet); + SwFieldFuncPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* pSet); virtual ~SwFieldFuncPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx index ba7673cf367d..a55a97e3c90c 100644 --- a/sw/source/ui/fldui/fldpage.cxx +++ b/sw/source/ui/fldui/fldpage.cxx @@ -42,9 +42,9 @@ using namespace ::com::sun::star; // note: pAttrSet may be null if the dialog is restored on startup -SwFieldPage::SwFieldPage(TabPageParent pParent, const OUString& rUIXMLDescription, +SwFieldPage::SwFieldPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet *pAttrSet) - : SfxTabPage(pParent, rUIXMLDescription, rID, pAttrSet) + : SfxTabPage(pPage, pController, rUIXMLDescription, rID, pAttrSet) , m_pCurField(nullptr) , m_pWrtShell(nullptr) , m_nTypeSel(-1) diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx index 98cfd6760be9..178465d981fb 100644 --- a/sw/source/ui/fldui/fldpage.hxx +++ b/sw/source/ui/fldui/fldpage.hxx @@ -71,7 +71,7 @@ protected: bool bIsAutomaticLanguage = true); public: - SwFieldPage(TabPageParent pParent, const OUString& rUIXMLDescription, + SwFieldPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet *pAttrSet); virtual ~SwFieldPage() override; diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index e41c9d7c1599..2c9064dbf8bc 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -51,8 +51,8 @@ static sal_uInt16 nFieldDlgFormatSel = 0; #define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 -SwFieldRefPage::SwFieldRefPage(TabPageParent pParent, const SfxItemSet *const pCoreSet ) - : SwFieldPage(pParent, "modules/swriter/ui/fldrefpage.ui", "FieldRefPage", pCoreSet) +SwFieldRefPage::SwFieldRefPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *const pCoreSet ) + : SwFieldPage(pPage, pController, "modules/swriter/ui/fldrefpage.ui", "FieldRefPage", pCoreSet) , maOutlineNodes() , maNumItems() , mpSavedSelectedTextNode(nullptr) @@ -1084,10 +1084,10 @@ bool SwFieldRefPage::FillItemSet(SfxItemSet* ) return false; } -std::unique_ptr<SfxTabPage> SwFieldRefPage::Create( TabPageParent pParent, +std::unique_ptr<SfxTabPage> SwFieldRefPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *const pAttrSet) { - return std::make_unique<SwFieldRefPage>(pParent, pAttrSet); + return std::make_unique<SwFieldRefPage>(pPage, pController, pAttrSet); } sal_uInt16 SwFieldRefPage::GetGroup() diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index d578e109ac87..8dc9a311bcfe 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -77,10 +77,10 @@ protected: virtual sal_uInt16 GetGroup() override; public: - SwFieldRefPage(TabPageParent pParent, const SfxItemSet* pSet); + SwFieldRefPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* pSet); virtual ~SwFieldRefPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index b5aa075a6544..99d6b1b8dcc4 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -39,8 +39,8 @@ #define USER_DATA_VERSION_1 "1" #define USER_DATA_VERSION USER_DATA_VERSION_1 -SwFieldVarPage::SwFieldVarPage(TabPageParent pParent, const SfxItemSet *const pCoreSet ) - : SwFieldPage(pParent, "modules/swriter/ui/fldvarpage.ui", "FieldVarPage", pCoreSet) +SwFieldVarPage::SwFieldVarPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *const pCoreSet ) + : SwFieldPage(pPage, pController, "modules/swriter/ui/fldvarpage.ui", "FieldVarPage", pCoreSet) , m_xTypeLB(m_xBuilder->weld_tree_view("type")) , m_xSelection(m_xBuilder->weld_widget("selectframe")) , m_xSelectionLB(m_xBuilder->weld_tree_view("select")) @@ -1203,10 +1203,10 @@ bool SwFieldVarPage::FillItemSet(SfxItemSet* ) return false; } -std::unique_ptr<SfxTabPage> SwFieldVarPage::Create( TabPageParent pParent, +std::unique_ptr<SfxTabPage> SwFieldVarPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *const pAttrSet) { - return std::make_unique<SwFieldVarPage>( pParent, pAttrSet ); + return std::make_unique<SwFieldVarPage>( pPage, pController, pAttrSet ); } sal_uInt16 SwFieldVarPage::GetGroup() diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index d47d3f819da8..f6f0c570a107 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -69,8 +69,8 @@ protected: virtual sal_uInt16 GetGroup() override; public: - SwFieldVarPage(TabPageParent pParent, const SfxItemSet* pSet); - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); + SwFieldVarPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* pSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); virtual ~SwFieldVarPage() override; virtual bool FillItemSet( SfxItemSet* rSet ) override; diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 6e27d1d7dcd1..e90d25598b0a 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -167,7 +167,7 @@ SwColumnDlg::SwColumnDlg(weld::Window* pParent, SwWrtShell& rSh) assert(pColPgSet); // create TabPage - m_xTabPage = std::make_unique<SwColumnPage>(TabPageParent(m_xContentArea.get(), this), *pColPgSet); + m_xTabPage = std::make_unique<SwColumnPage>(m_xContentArea.get(), this, *pColPgSet); m_xTabPage->GetApplyLabel()->show(); weld::ComboBox* pApplyToLB = m_xTabPage->GetApplyComboBox(); pApplyToLB->show(); @@ -382,8 +382,8 @@ void SwColumnPage::ResetColWidth() constexpr sal_uInt16 g_nMinWidth(MINLAY); // Now as TabPage -SwColumnPage::SwColumnPage(TabPageParent pParent, const SfxItemSet &rSet) - : SfxTabPage(pParent, "modules/swriter/ui/columnpage.ui", "ColumnPage", &rSet) +SwColumnPage::SwColumnPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/columnpage.ui", "ColumnPage", &rSet) , m_nFirstVis(0) , m_pModifiedField(nullptr) , m_bFormat(false) @@ -408,7 +408,7 @@ SwColumnPage::SwColumnPage(TabPageParent pParent, const SfxItemSet &rSet) , m_xLinePosDLB(m_xBuilder->weld_combo_box("lineposlb")) , m_xTextDirectionFT(m_xBuilder->weld_label("textdirectionft")) , m_xTextDirectionLB(new svx::FrameDirectionListBox(m_xBuilder->weld_combo_box("textdirectionlb"))) - , m_xLineColorDLB(new ColorListBox(m_xBuilder->weld_menu_button("colorlb"), pParent.GetFrameWeld())) + , m_xLineColorDLB(new ColorListBox(m_xBuilder->weld_menu_button("colorlb"), pController->getDialog())) , m_xLineTypeDLB(new SvtLineListBox(m_xBuilder->weld_menu_button("linestylelb"))) , m_xEd1(new SwPercentField(m_xBuilder->weld_metric_spin_button("width1mf", FieldUnit::CM))) , m_xEd2(new SwPercentField(m_xBuilder->weld_metric_spin_button("width2mf", FieldUnit::CM))) @@ -598,9 +598,9 @@ void SwColumnPage::Reset(const SfxItemSet *rSet) } // create TabPage -std::unique_ptr<SfxTabPage> SwColumnPage::Create(TabPageParent pParent, const SfxItemSet *rSet) +std::unique_ptr<SfxTabPage> SwColumnPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet) { - return std::make_unique<SwColumnPage>(pParent, *rSet); + return std::make_unique<SwColumnPage>(pPage, pController, *rSet); } // stuff attributes into the Set when OK diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 9add39674904..60fd1f2660b3 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -608,8 +608,8 @@ namespace } } -SwFramePage::SwFramePage(TabPageParent pParent, const SfxItemSet &rSet) - : SfxTabPage(pParent, "modules/swriter/ui/frmtypepage.ui", "FrameTypePage", &rSet) +SwFramePage::SwFramePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/frmtypepage.ui", "FrameTypePage", &rSet) , m_bAtHorzPosModified(false) , m_bAtVertPosModified(false) , m_bFormat(false) @@ -820,9 +820,9 @@ void SwFramePage::setOptimalRelWidth() m_xHoriRelationLB->clear(); } -std::unique_ptr<SfxTabPage> SwFramePage::Create(TabPageParent pParent, const SfxItemSet *rSet) +std::unique_ptr<SfxTabPage> SwFramePage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet) { - return std::make_unique<SwFramePage>(pParent, *rSet); + return std::make_unique<SwFramePage>(pPage, pController, *rSet); } void SwFramePage::EnableGraficMode() @@ -2288,8 +2288,8 @@ void SwFramePage::EnableVerticalPositioning( bool bEnable ) m_xVertRelationLB->set_sensitive( bEnable ); } -SwGrfExtPage::SwGrfExtPage(TabPageParent pParent, const SfxItemSet &rSet) - : SfxTabPage(pParent, "modules/swriter/ui/picturepage.ui", "PicturePage", &rSet) +SwGrfExtPage::SwGrfExtPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/picturepage.ui", "PicturePage", &rSet) , m_bHtmlMode(false) , m_xMirror(m_xBuilder->weld_widget("flipframe")) , m_xMirrorVertBox(m_xBuilder->weld_check_button("vert")) @@ -2323,9 +2323,9 @@ SwGrfExtPage::~SwGrfExtPage() m_xGrfDlg.reset(); } -std::unique_ptr<SfxTabPage> SwGrfExtPage::Create(TabPageParent pParent, const SfxItemSet *rSet) +std::unique_ptr<SfxTabPage> SwGrfExtPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet) { - return std::make_unique<SwGrfExtPage>(pParent, *rSet); + return std::make_unique<SwGrfExtPage>(pPage, pController, *rSet); } void SwGrfExtPage::Reset(const SfxItemSet *rSet) @@ -2658,8 +2658,8 @@ void BmpWindow::SetBitmapEx(const BitmapEx& rBmp) } // set URL and ImageMap at frames -SwFrameURLPage::SwFrameURLPage(TabPageParent pParent, const SfxItemSet &rSet) - : SfxTabPage(pParent, "modules/swriter/ui/frmurlpage.ui", "FrameURLPage", &rSet) +SwFrameURLPage::SwFrameURLPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/frmurlpage.ui", "FrameURLPage", &rSet) , m_xURLED(m_xBuilder->weld_entry("url")) , m_xSearchPB(m_xBuilder->weld_button("search")) , m_xNameED(m_xBuilder->weld_entry("name")) @@ -2747,9 +2747,9 @@ bool SwFrameURLPage::FillItemSet(SfxItemSet *rSet) return bModified; } -std::unique_ptr<SfxTabPage> SwFrameURLPage::Create(TabPageParent pParent, const SfxItemSet *rSet) +std::unique_ptr<SfxTabPage> SwFrameURLPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet) { - return std::make_unique<SwFrameURLPage>(pParent, *rSet); + return std::make_unique<SwFrameURLPage>(pPage, pController, *rSet); } IMPL_LINK_NOARG(SwFrameURLPage, InsertFileHdl, weld::Button&, void) @@ -2771,8 +2771,8 @@ IMPL_LINK_NOARG(SwFrameURLPage, InsertFileHdl, weld::Button&, void) } } -SwFrameAddPage::SwFrameAddPage(TabPageParent pParent, const SfxItemSet &rSet) - : SfxTabPage(pParent, "modules/swriter/ui/frmaddpage.ui", "FrameAddPage", &rSet) +SwFrameAddPage::SwFrameAddPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/frmaddpage.ui", "FrameAddPage", &rSet) , m_pWrtSh(nullptr) , m_bHtmlMode(false) , m_bFormat(false) @@ -2814,9 +2814,9 @@ SwFrameAddPage::~SwFrameAddPage() m_xTextFlowLB.reset(); } -std::unique_ptr<SfxTabPage> SwFrameAddPage::Create(TabPageParent pParent, const SfxItemSet *rSet) +std::unique_ptr<SfxTabPage> SwFrameAddPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet) { - return std::make_unique<SwFrameAddPage>(pParent, *rSet); + return std::make_unique<SwFrameAddPage>(pPage, pController, *rSet); } void SwFrameAddPage::Reset(const SfxItemSet *rSet ) diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx index 5459ff96b1ca..2fccc5172b32 100644 --- a/sw/source/ui/frmdlg/pattern.cxx +++ b/sw/source/ui/frmdlg/pattern.cxx @@ -31,10 +31,7 @@ SwBackgroundDlg::SwBackgroundDlg(weld::Window* pParent, const SfxItemSet& rSet) SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ); if ( fnCreatePage ) - { - TabPageParent pPageParent(get_content_area(), this); - SetTabPage((*fnCreatePage)(pPageParent, &rSet)); - } + SetTabPage((*fnCreatePage)(get_content_area(), this, &rSet)); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx index 06d99bb2a78d..c65945628d95 100644 --- a/sw/source/ui/frmdlg/uiborder.cxx +++ b/sw/source/ui/frmdlg/uiborder.cxx @@ -39,8 +39,7 @@ SwBorderDlg::SwBorderDlg(weld::Window* pParent, SfxItemSet& rSet, SwBorderModes if (fnCreatePage) { - TabPageParent pPageParent(get_content_area(), this); - std::unique_ptr<SfxTabPage> xNewPage = (*fnCreatePage)(pPageParent, &rSet); + std::unique_ptr<SfxTabPage> xNewPage = (*fnCreatePage)(get_content_area(), this, &rSet); SfxAllItemSet aSet(*(rSet.GetPool())); aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE, static_cast<sal_uInt16>(nType))); if(SwBorderModes::TABLE == nType) diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 3b3f5909768a..46deb3d0f602 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -58,16 +58,15 @@ SwWrapDlg::SwWrapDlg(weld::Window* pParent, SfxItemSet& rSet, SwWrtShell* pWrtSh : SfxSingleTabDialogController(pParent, &rSet, "modules/swriter/ui/wrapdialog.ui", "WrapDialog") { // create TabPage - TabPageParent pPageParent(get_content_area(), this); - auto xNewPage = SwWrapTabPage::Create(pPageParent, &rSet); + auto xNewPage = SwWrapTabPage::Create(get_content_area(), this, &rSet); SwWrapTabPage* pWrapPage = static_cast<SwWrapTabPage*>(xNewPage.get()); pWrapPage->SetFormatUsed(false, bDrawMode); pWrapPage->SetShell(pWrtShell); SetTabPage(std::move(xNewPage)); } -SwWrapTabPage::SwWrapTabPage(TabPageParent pParent, const SfxItemSet &rSet) - : SfxTabPage(pParent, "modules/swriter/ui/wrappage.ui", "WrapPage", &rSet) +SwWrapTabPage::SwWrapTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/wrappage.ui", "WrapPage", &rSet) , m_nAnchorId(RndStdIds::FLY_AT_PARA) , m_nHtmlMode(0) , m_pWrtSh(nullptr) @@ -115,9 +114,9 @@ SwWrapTabPage::~SwWrapTabPage() { } -std::unique_ptr<SfxTabPage> SwWrapTabPage::Create(TabPageParent pParent, const SfxItemSet *rSet) +std::unique_ptr<SfxTabPage> SwWrapTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet) { - return std::make_unique<SwWrapTabPage>(pParent, *rSet); + return std::make_unique<SwWrapTabPage>(pPage, pController, *rSet); } void SwWrapTabPage::Reset(const SfxItemSet *rSet) diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index a23cf50987b2..3afac2a604ce 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -699,8 +699,8 @@ IMPL_LINK(SwAddStylesDlg_Impl, LeftRightHdl, weld::Button&, rBtn, void) } } -SwTOXSelectTabPage::SwTOXSelectTabPage(TabPageParent pParent, const SfxItemSet& rAttrSet) - : SfxTabPage(pParent, "modules/swriter/ui/tocindexpage.ui", "TocIndexPage", &rAttrSet) +SwTOXSelectTabPage::SwTOXSelectTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/tocindexpage.ui", "TocIndexPage", &rAttrSet) , sAutoMarkType(SwResId(STR_AUTOMARK_TYPE)) , m_bWaitingInitialSettings(true) , m_xTitleED(m_xBuilder->weld_entry("title")) @@ -1173,9 +1173,9 @@ DeactivateRC SwTOXSelectTabPage::DeactivatePage(SfxItemSet* _pSet) return DeactivateRC::LeavePage; } -std::unique_ptr<SfxTabPage> SwTOXSelectTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet) +std::unique_ptr<SfxTabPage> SwTOXSelectTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet) { - return std::make_unique<SwTOXSelectTabPage>(pParent, *rAttrSet); + return std::make_unique<SwTOXSelectTabPage>(pPage, pController, *rAttrSet); } IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, weld::ComboBox&, rBox, void) @@ -1770,8 +1770,8 @@ namespace }; } -SwTOXEntryTabPage::SwTOXEntryTabPage(TabPageParent pParent, const SfxItemSet& rAttrSet) - : SfxTabPage(pParent, "modules/swriter/ui/tocentriespage.ui", "TocEntriesPage", &rAttrSet) +SwTOXEntryTabPage::SwTOXEntryTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/tocentriespage.ui", "TocEntriesPage", &rAttrSet) , sDelimStr(SwResId(STR_DELIM)) , sNoCharStyle(SwResId(STR_NO_CHAR_STYLE)) , m_pCurrentForm(nullptr) @@ -2112,9 +2112,9 @@ DeactivateRC SwTOXEntryTabPage::DeactivatePage( SfxItemSet* /*pSet*/) return DeactivateRC::LeavePage; } -std::unique_ptr<SfxTabPage> SwTOXEntryTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet) +std::unique_ptr<SfxTabPage> SwTOXEntryTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet) { - return std::make_unique<SwTOXEntryTabPage>(pParent, *rAttrSet); + return std::make_unique<SwTOXEntryTabPage>(pPage, pController, *rAttrSet); } IMPL_LINK_NOARG(SwTOXEntryTabPage, EditStyleHdl, weld::Button&, void) @@ -3348,8 +3348,8 @@ sal_uInt32 SwTokenWindow::GetControlIndex(FormTokenType eType) const return nIndex; } -SwTOXStylesTabPage::SwTOXStylesTabPage(TabPageParent pParent, const SfxItemSet& rAttrSet) - : SfxTabPage(pParent, "modules/swriter/ui/tocstylespage.ui", "TocStylesPage", &rAttrSet) +SwTOXStylesTabPage::SwTOXStylesTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/tocstylespage.ui", "TocStylesPage", &rAttrSet) , m_xLevelLB(m_xBuilder->weld_tree_view("levels")) , m_xAssignBT(m_xBuilder->weld_button("assign")) , m_xParaLayLB(m_xBuilder->weld_tree_view("styles")) @@ -3459,10 +3459,10 @@ DeactivateRC SwTOXStylesTabPage::DeactivatePage( SfxItemSet* /*pSet*/ ) return DeactivateRC::LeavePage; } -std::unique_ptr<SfxTabPage> SwTOXStylesTabPage::Create(TabPageParent pParent, +std::unique_ptr<SfxTabPage> SwTOXStylesTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet) { - return std::make_unique<SwTOXStylesTabPage>(pParent, *rAttrSet); + return std::make_unique<SwTOXStylesTabPage>(pPage, pController, *rAttrSet); } IMPL_LINK_NOARG(SwTOXStylesTabPage, EditStyleHdl, weld::Button&, void) diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 081ad7fb7f03..0265fb6fef9d 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -63,9 +63,9 @@ IMPL_LINK(SwFootNoteOptionDlg, OkHdl, weld::Button&, rBtn, void) SfxTabDialogController::OkHdl(rBtn); } -SwEndNoteOptionPage::SwEndNoteOptionPage(TabPageParent pParent, bool bEN, +SwEndNoteOptionPage::SwEndNoteOptionPage(weld::Container* pPage, weld::DialogController* pController, bool bEN, const SfxItemSet &rSet) - : SfxTabPage(pParent, + : SfxTabPage(pPage, pController, bEN ? OUString("modules/swriter/ui/endnotepage.ui") : OUString("modules/swriter/ui/footnotepage.ui"), bEN ? OString("EndnotePage") : OString("FootnotePage"), &rSet) @@ -209,9 +209,9 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet* ) m_xPageTemplBox->set_active_text(pInf->GetPageDesc(*pSh->GetDoc())->GetName()); } -std::unique_ptr<SfxTabPage> SwEndNoteOptionPage::Create( TabPageParent pParent, const SfxItemSet *rSet ) +std::unique_ptr<SfxTabPage> SwEndNoteOptionPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet ) { - return std::make_unique<SwEndNoteOptionPage>(pParent, true, *rSet); + return std::make_unique<SwEndNoteOptionPage>(pPage, pController, true, *rSet); } // Different kinds of numbering; because the Listbox has varying numbers of @@ -369,8 +369,8 @@ bool SwEndNoteOptionPage::FillItemSet( SfxItemSet * ) return true; } -SwFootNoteOptionPage::SwFootNoteOptionPage(TabPageParent pParent, const SfxItemSet &rSet) - : SwEndNoteOptionPage(pParent, false, rSet) +SwFootNoteOptionPage::SwFootNoteOptionPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet) + : SwEndNoteOptionPage(pPage, pController, false, rSet) { } @@ -378,9 +378,9 @@ SwFootNoteOptionPage::~SwFootNoteOptionPage() { } -std::unique_ptr<SfxTabPage> SwFootNoteOptionPage::Create(TabPageParent pParent, const SfxItemSet *rSet ) +std::unique_ptr<SfxTabPage> SwFootNoteOptionPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet ) { - return std::make_unique<SwFootNoteOptionPage>(pParent, *rSet); + return std::make_unique<SwFootNoteOptionPage>(pPage, pController, *rSet); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index fb02e5732773..1feac619dc97 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -61,10 +61,10 @@ class SwEndNoteOptionPage : public SfxTabPage DECL_LINK(NumCountHdl, weld::ComboBox&, void); public: - SwEndNoteOptionPage(TabPageParent pParent, bool bEndNote, const SfxItemSet &rSet); + SwEndNoteOptionPage(weld::Container* pPage, weld::DialogController* pController, bool bEndNote, const SfxItemSet &rSet); virtual ~SwEndNoteOptionPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet); virtual bool FillItemSet(SfxItemSet *rSet) override; virtual void Reset( const SfxItemSet* ) override; @@ -74,8 +74,8 @@ public: class SwFootNoteOptionPage : public SwEndNoteOptionPage { public: - SwFootNoteOptionPage(TabPageParent pParent, const SfxItemSet &rSet ); - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); + SwFootNoteOptionPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet ); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet); virtual ~SwFootNoteOptionPage() override; }; diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index a11e639f3797..ae637765fbe5 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -55,8 +55,8 @@ static bool bLastRelative = false; //dialog to this one, except with a different preview window impl. //TODO, determine if SwNumPositionTabPage and SvxNumPositionTabPage can be //merged -SwNumPositionTabPage::SwNumPositionTabPage(TabPageParent pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "modules/swriter/ui/outlinepositionpage.ui", "OutlinePositionPage", &rSet) +SwNumPositionTabPage::SwNumPositionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/outlinepositionpage.ui", "OutlinePositionPage", &rSet) , pSaveNum(nullptr) , pWrtSh(nullptr) , pOutlineDlg(nullptr) @@ -491,10 +491,10 @@ void SwNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode() m_xIndentAtMF->set_visible( bLabelAlignmentPosAndSpaceModeActive ); } -std::unique_ptr<SfxTabPage> SwNumPositionTabPage::Create( TabPageParent pParent, +std::unique_ptr<SfxTabPage> SwNumPositionTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet) { - return std::make_unique<SwNumPositionTabPage>(pParent, *rAttrSet); + return std::make_unique<SwNumPositionTabPage>(pPage, pController, *rAttrSet); } void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh) diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 88353b9025a3..5336288fe9a1 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -383,9 +383,9 @@ short SwOutlineTabDialog::Ok() return RET_OK; } -SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(TabPageParent pPage, +SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) - : SfxTabPage(pPage, "modules/swriter/ui/outlinenumberingpage.ui", "OutlineNumberingPage", &rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/outlinenumberingpage.ui", "OutlineNumberingPage", &rSet) , aNoFormatName(SwResId(SW_STR_NONE)) , pSh(nullptr) , pNumRule(nullptr) @@ -801,10 +801,10 @@ void SwOutlineSettingsTabPage::Reset( const SfxItemSet* rSet ) ActivatePage(*rSet); } -std::unique_ptr<SfxTabPage> SwOutlineSettingsTabPage::Create(TabPageParent pParent, +std::unique_ptr<SfxTabPage> SwOutlineSettingsTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet) { - return std::make_unique<SwOutlineSettingsTabPage>(pParent, *rAttrSet); + return std::make_unique<SwOutlineSettingsTabPage>(pPage, pController, *rAttrSet); } void SwOutlineSettingsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType) diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index e4004b3c3ae4..910bccd1c7f6 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -105,8 +105,8 @@ IMPL_LINK(SwFootNotePage, LineColorSelected_Impl, ColorListBox&, rColorBox, void m_xLineTypeBox->SetColor(rColorBox.GetSelectEntryColor()); } -SwFootNotePage::SwFootNotePage(TabPageParent pParent, const SfxItemSet &rSet) - : SfxTabPage(pParent, "modules/swriter/ui/footnoteareapage.ui", "FootnoteAreaPage", &rSet) +SwFootNotePage::SwFootNotePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/footnoteareapage.ui", "FootnoteAreaPage", &rSet) , lMaxHeight(0) , m_xMaxHeightPageBtn(m_xBuilder->weld_radio_button("maxheightpage")) , m_xMaxHeightBtn(m_xBuilder->weld_radio_button("maxheight")) @@ -115,7 +115,7 @@ SwFootNotePage::SwFootNotePage(TabPageParent pParent, const SfxItemSet &rSet) , m_xLinePosBox(m_xBuilder->weld_combo_box("position")) , m_xLineTypeBox(new SvtLineListBox(m_xBuilder->weld_menu_button("style"))) , m_xLineWidthEdit(m_xBuilder->weld_metric_spin_button("thickness", FieldUnit::POINT)) - , m_xLineColorBox(new ColorListBox(m_xBuilder->weld_menu_button("color"), pParent.GetFrameWeld())) + , m_xLineColorBox(new ColorListBox(m_xBuilder->weld_menu_button("color"), pController->getDialog())) , m_xLineLengthEdit(m_xBuilder->weld_metric_spin_button("length", FieldUnit::PERCENT)) , m_xLineDistEdit(m_xBuilder->weld_metric_spin_button("spacingtocontents", FieldUnit::CM)) { @@ -135,9 +135,9 @@ SwFootNotePage::~SwFootNotePage() m_xLineTypeBox.reset(); } -std::unique_ptr<SfxTabPage> SwFootNotePage::Create(TabPageParent pParent, const SfxItemSet *rSet) +std::unique_ptr<SfxTabPage> SwFootNotePage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet) { - return std::make_unique<SwFootNotePage>(pParent, *rSet); + return std::make_unique<SwFootNotePage>(pPage, pController, *rSet); } void SwFootNotePage::Reset(const SfxItemSet *rSet) diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 334550268531..8eec83f45d8e 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -42,8 +42,8 @@ #include <swmodule.hxx> #include <view.hxx> -SwTextGridPage::SwTextGridPage(TabPageParent pParent, const SfxItemSet &rSet) - : SfxTabPage(pParent, "modules/swriter/ui/textgridpage.ui", "TextGridPage", &rSet) +SwTextGridPage::SwTextGridPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/textgridpage.ui", "TextGridPage", &rSet) , m_nRubyUserValue(0) , m_bRubyUserValue(false) , m_aPageSize(MM50, MM50) @@ -71,7 +71,7 @@ SwTextGridPage::SwTextGridPage(TabPageParent pParent, const SfxItemSet &rSet) , m_xDisplayFL(m_xBuilder->weld_widget("frameFL_DISPLAY")) , m_xDisplayCB(m_xBuilder->weld_check_button("checkCB_DISPLAY")) , m_xPrintCB(m_xBuilder->weld_check_button("checkCB_PRINT")) - , m_xColorLB(new ColorListBox(m_xBuilder->weld_menu_button("listLB_COLOR"), pParent.GetFrameWeld())) + , m_xColorLB(new ColorListBox(m_xBuilder->weld_menu_button("listLB_COLOR"), pController->getDialog())) { Link<weld::SpinButton&,void> aLink = LINK(this, SwTextGridPage, CharorLineChangedHdl); m_xCharsPerLineNF->connect_value_changed(aLink); @@ -129,9 +129,9 @@ SwTextGridPage::~SwTextGridPage() m_xColorLB.reset(); } -std::unique_ptr<SfxTabPage> SwTextGridPage::Create(TabPageParent pParent, const SfxItemSet *rSet) +std::unique_ptr<SfxTabPage> SwTextGridPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet) { - return std::make_unique<SwTextGridPage>(pParent, *rSet); + return std::make_unique<SwTextGridPage>(pPage, pController, *rSet); } bool SwTextGridPage::FillItemSet(SfxItemSet *rSet) diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index a990769bde37..09062a61ee17 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -64,8 +64,8 @@ using namespace ::com::sun::star; -SwFormatTablePage::SwFormatTablePage(TabPageParent pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "modules/swriter/ui/formattablepage.ui", "FormatTablePage", &rSet) +SwFormatTablePage::SwFormatTablePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/formattablepage.ui", "FormatTablePage", &rSet) , pTableData(nullptr) , nSaveWidth(0) , nMinTableWidth(MINLAY) @@ -366,9 +366,9 @@ void SwFormatTablePage::ModifyHdl(const weld::MetricSpinButton& rEdit) bModified = true; } -std::unique_ptr<SfxTabPage> SwFormatTablePage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet) +std::unique_ptr<SfxTabPage> SwFormatTablePage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet) { - return std::make_unique<SwFormatTablePage>(pParent, *rAttrSet); + return std::make_unique<SwFormatTablePage>(pPage, pController, *rAttrSet); } bool SwFormatTablePage::FillItemSet( SfxItemSet* rCoreSet ) @@ -699,8 +699,8 @@ DeactivateRC SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet ) } //Description: Page column configuration -SwTableColumnPage::SwTableColumnPage(TabPageParent pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "modules/swriter/ui/tablecolumnpage.ui", "TableColumnPage", &rSet) +SwTableColumnPage::SwTableColumnPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/tablecolumnpage.ui", "TableColumnPage", &rSet) , pTableData(nullptr) , m_pSizeHdlEvent(nullptr) , nTableWidth(0) @@ -774,9 +774,9 @@ SwTableColumnPage::~SwTableColumnPage() } } -std::unique_ptr<SfxTabPage> SwTableColumnPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet) +std::unique_ptr<SfxTabPage> SwTableColumnPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet) { - return std::make_unique<SwTableColumnPage>(pParent, *rAttrSet); + return std::make_unique<SwTableColumnPage>(pPage, pController, *rAttrSet); } void SwTableColumnPage::Reset( const SfxItemSet* ) @@ -1224,8 +1224,8 @@ void SwTableTabDlg::PageCreated(const OString& rId, SfxTabPage& rPage) } } -SwTextFlowPage::SwTextFlowPage(TabPageParent pParent, const SfxItemSet& rSet) - : SfxTabPage(pParent, "modules/swriter/ui/tabletextflowpage.ui", "TableTextFlowPage", &rSet) +SwTextFlowPage::SwTextFlowPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) + : SfxTabPage(pPage, pController, "modules/swriter/ui/tabletextflowpage.ui", "TableTextFlowPage", &rSet) , pShell(nullptr) , bPageBreak(true) , bHtmlMode(false) @@ -1280,10 +1280,10 @@ SwTextFlowPage::~SwTextFlowPage() { } -std::unique_ptr<SfxTabPage> SwTextFlowPage::Create(TabPageParent pParent, +std::unique_ptr<SfxTabPage> SwTextFlowPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet) { - return std::make_unique<SwTextFlowPage>(pParent, *rAttrSet); + return std::make_unique<SwTextFlowPage>(pPage, pController, *rAttrSet); } bool SwTextFlowPage::FillItemSet( SfxItemSet* rSet ) diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx index 196465f731cb..9c7e24592014 100644 --- a/sw/source/uibase/app/appopt.cxx +++ b/sw/source/uibase/app/appopt.cxx @@ -404,7 +404,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) ApplyUsrPref( aViewOpt, pAppView, bTextDialog? SvViewOpt::DestText : SvViewOpt::DestWeb); } -std::unique_ptr<SfxTabPage> SwModule::CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) +std::unique_ptr<SfxTabPage> SwModule::CreateTabPage( sal_uInt16 nId, weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet ) { std::unique_ptr<SfxTabPage> xRet; SfxAllItemSet aSet(*(rSet.GetPool())); @@ -415,12 +415,12 @@ std::unique_ptr<SfxTabPage> SwModule::CreateTabPage( sal_uInt16 nId, TabPagePare { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( nId ); - xRet = (*fnCreatePage)( pParent, &rSet ); + xRet = (*fnCreatePage)( pPage, pController, &rSet ); break; } case RID_SW_TP_HTML_OPTGRID_PAGE: case RID_SVXPAGE_GRID: - xRet = SvxGridTabPage::Create(pParent, rSet); + xRet = SvxGridTabPage::Create(pPage, pController, rSet); break; case RID_SW_TP_STD_FONT: @@ -429,7 +429,7 @@ std::unique_ptr<SfxTabPage> SwModule::CreateTabPage( sal_uInt16 nId, TabPagePare { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( nId ); - xRet = (*fnCreatePage)( pParent, &rSet ); + xRet = (*fnCreatePage)( pPage, pController, &rSet ); if(RID_SW_TP_STD_FONT != nId) { aSet.Put (SfxUInt16Item(SID_FONTMODE_TYPE, RID_SW_TP_STD_FONT_CJK == nId ? FONT_GROUP_CJK : FONT_GROUP_CTL)); @@ -442,7 +442,7 @@ std::unique_ptr<SfxTabPage> SwModule::CreateTabPage( sal_uInt16 nId, TabPagePare { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( nId ); - xRet = (*fnCreatePage)( pParent, &rSet ); + xRet = (*fnCreatePage)( pPage, pController, &rSet ); aSet.Put (SfxBoolItem(SID_FAX_LIST, true)); xRet->PageCreated(aSet); } @@ -452,7 +452,7 @@ std::unique_ptr<SfxTabPage> SwModule::CreateTabPage( sal_uInt16 nId, TabPagePare { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( nId ); - xRet = (*fnCreatePage)( pParent, &rSet ); + xRet = (*fnCreatePage)( pPage, pController, &rSet ); SwView* pCurrView = GetView(); if(pCurrView) { @@ -477,7 +477,7 @@ std::unique_ptr<SfxTabPage> SwModule::CreateTabPage( sal_uInt16 nId, TabPagePare { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( nId ); - xRet = (*fnCreatePage)( pParent, &rSet ); + xRet = (*fnCreatePage)( pPage, pController, &rSet ); if (nId == RID_SW_TP_OPTSHDWCRSR || nId == RID_SW_TP_HTML_OPTSHDWCRSR) { SwView* pCurrView = GetView(); @@ -493,21 +493,21 @@ std::unique_ptr<SfxTabPage> SwModule::CreateTabPage( sal_uInt16 nId, TabPagePare { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( nId ); - xRet = (*fnCreatePage)( pParent, &rSet ); + xRet = (*fnCreatePage)( pPage, pController, &rSet ); break; } case RID_SW_TP_BACKGROUND: { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND ); - xRet = (*fnCreatePage)( pParent, &rSet ); + xRet = (*fnCreatePage)( pPage, pController, &rSet ); break; } case RID_SW_TP_OPTCAPTION_PAGE: { SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SW_TP_OPTCAPTION_PAGE ); - xRet = (*fnCreatePage)( pParent, &rSet ); + xRet = (*fnCreatePage)( pPage, pController, &rSet ); } break; } diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx index 58067ee3fe2a..660d60da0723 100644 --- a/sw/source/uibase/inc/chrdlg.hxx +++ b/sw/source/uibase/inc/chrdlg.hxx @@ -59,10 +59,10 @@ class SwCharURLPage : public SfxTabPage DECL_LINK(EventHdl, weld::Button&, void); public: - SwCharURLPage(TabPageParent pParent, const SfxItemSet& rSet); + SwCharURLPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); virtual ~SwCharURLPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index 8b339c8aa48e..c2f05d96fec6 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -168,10 +168,10 @@ class SwColumnPage : public SfxTabPage static const sal_uInt16 aPageRg[]; public: - SwColumnPage(TabPageParent pParent, const SfxItemSet &rSet); + SwColumnPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet); virtual ~SwColumnPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aPageRg; } virtual bool FillItemSet(SfxItemSet *rSet) override; diff --git a/sw/source/uibase/inc/docstdlg.hxx b/sw/source/uibase/inc/docstdlg.hxx index 86c4a018412b..56119d057fbd 100644 --- a/sw/source/uibase/inc/docstdlg.hxx +++ b/sw/source/uibase/inc/docstdlg.hxx @@ -26,10 +26,10 @@ class SwDocStatPage final : public SfxTabPage { public: - SwDocStatPage(TabPageParent pParent, const SfxItemSet &rSet); + SwDocStatPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet); virtual ~SwDocStatPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet); private: virtual bool FillItemSet( SfxItemSet *rSet) override; diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx index 140f43347056..ca1420493fb2 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -147,10 +147,10 @@ friend class SwDropCapsPict; static const sal_uInt16 aPageRg[]; public: - SwDropCapsPage(TabPageParent pParent, const SfxItemSet &rSet); + SwDropCapsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet); virtual ~SwDropCapsPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aPageRg; } diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index d62fd85f7477..7455d35791a0 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -104,11 +104,11 @@ class SwEnvPage : public SfxTabPage SwEnvDlg* GetParentSwEnvDlg() { return m_pDialog; } public: - SwEnvPage(TabPageParent pParent, const SfxItemSet& rSet); + SwEnvPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); void Init(SwEnvDlg* pDialog); virtual ~SwEnvPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index 34c76fa25500..01fe977ee6c7 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -176,10 +176,10 @@ class SwFramePage: public SfxTabPage static const sal_uInt16 aPageRg[]; public: - SwFramePage(TabPageParent pParent, const SfxItemSet &rSet); + SwFramePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet); virtual ~SwFramePage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aPageRg; } virtual bool FillItemSet(SfxItemSet *rSet) override; @@ -229,8 +229,8 @@ class SwGrfExtPage : public SfxTabPage virtual void ActivatePage(const SfxItemSet& rSet) override; public: - SwGrfExtPage(TabPageParent pParent, const SfxItemSet &rSet); - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); + SwGrfExtPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet); virtual ~SwGrfExtPage() override; virtual bool FillItemSet(SfxItemSet *rSet) override; @@ -253,10 +253,10 @@ class SwFrameURLPage : public SfxTabPage DECL_LINK(InsertFileHdl, weld::Button&, void); public: - SwFrameURLPage(TabPageParent pParent, const SfxItemSet &rSet); + SwFrameURLPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet); virtual ~SwFrameURLPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet); virtual bool FillItemSet(SfxItemSet *rSet) override; virtual void Reset(const SfxItemSet *rSet) override; @@ -303,10 +303,10 @@ class SwFrameAddPage : public SfxTabPage static const sal_uInt16 aAddPgRg[]; public: - SwFrameAddPage(TabPageParent pParent, const SfxItemSet &rSet); + SwFrameAddPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet); virtual ~SwFrameAddPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aAddPgRg; } virtual bool FillItemSet(SfxItemSet *rSet) override; diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx index 651589229c93..be6dfe137c15 100644 --- a/sw/source/uibase/inc/mailconfigpage.hxx +++ b/sw/source/uibase/inc/mailconfigpage.hxx @@ -48,10 +48,10 @@ class SwMailConfigPage : public SfxTabPage DECL_LINK(SecureHdl, weld::ToggleButton&, void); public: - SwMailConfigPage(TabPageParent pParent, const SfxItemSet& rSet); + SwMailConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); virtual ~SwMailConfigPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index ed1844fd9dcb..9d536066915c 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -92,7 +92,7 @@ class SwNumPositionTabPage : public SfxTabPage public: - SwNumPositionTabPage(TabPageParent pParent, const SfxItemSet& rSet); + SwNumPositionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); virtual ~SwNumPositionTabPage() override; virtual void ActivatePage(const SfxItemSet& rSet) override; @@ -100,7 +100,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; - static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); void SetOutlineTabDialog(SwOutlineTabDialog* pDlg){pOutlineDlg = pDlg;} diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx index fe2d66e5530d..1589220e6b8b 100644 --- a/sw/source/uibase/inc/numpara.hxx +++ b/sw/source/uibase/inc/numpara.hxx @@ -62,10 +62,10 @@ class SwParagraphNumTabPage final : public SfxTabPage SfxStyleFamily nFamily ); public: - SwParagraphNumTabPage(TabPageParent pParent, const SfxItemSet& rSet ); + SwParagraphNumTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet ); virtual ~SwParagraphNumTabPage() override; - static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return aPageRg; } diff --git a/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx index e19f10f8aa68..d0b565aae4b2 100644 --- a/sw/source/uibase/inc/optcomp.hxx +++ b/sw/source/uibase/inc/optcomp.hxx @@ -65,10 +65,10 @@ private: void WriteOptions(); public: - SwCompatibilityOptPage(TabPageParent pParent, const SfxItemSet& rSet); + SwCompatibilityOptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); virtual ~SwCompatibilityOptPage() override; - static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); + static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index 2c3461eab7d4..2a6a8a498aac 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -81,10 +81,10 @@ private: DECL_LINK(StandardizedPageCountCheckHdl, weld::Button&, void); public: - SwLoadOptPage(TabPageParent pParent, const SfxItemSet& rSet); + SwLoadOptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); virtual ~SwLoadOptPage() override; - static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; @@ -183,10 +183,10 @@ private: void InvalidatePreview(); public: - SwCaptionOptPage(TabPageParent pParent, const SfxItemSet& rSet); + SwCaptionOptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); virtual ~SwCaptionOptPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index 2778ea6ae131..0abb5f29b6db 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -59,10 +59,10 @@ class SwContentOptPage : public SfxTabPage DECL_LINK(VertRulerHdl, weld::ToggleButton&, void); public: - SwContentOptPage(TabPageParent pParent, const SfxItemSet& rSet); + SwContentOptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); virtual ~SwContentOptPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; @@ -103,10 +103,10 @@ class SwAddPrinterTabPage : public SfxTabPage DECL_LINK(SelectHdl, weld::ComboBox&, void); public: - SwAddPrinterTabPage(TabPageParent pParent, const SfxItemSet& rSet); + SwAddPrinterTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); virtual ~SwAddPrinterTabPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; @@ -166,8 +166,8 @@ class SwStdFontTabPage : public SfxTabPage DECL_LINK(LoseFocusHdl, weld::Widget&, void ); public: - SwStdFontTabPage(TabPageParent pParent, const SfxItemSet& rSet); - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); + SwStdFontTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); virtual ~SwStdFontTabPage() override; virtual bool FillItemSet(SfxItemSet* rSet) override; @@ -203,10 +203,10 @@ class SwTableOptionsTabPage : public SfxTabPage DECL_LINK(CheckBoxHdl, weld::Button&, void); public: - SwTableOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet); + SwTableOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); virtual ~SwTableOptionsTabPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; @@ -244,10 +244,10 @@ class SwShdwCursorOptionsTabPage : public SfxTabPage std::unique_ptr<weld::CheckButton> m_xMathBaselineAlignmentCB; public: - SwShdwCursorOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet); + SwShdwCursorOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); virtual ~SwShdwCursorOptionsTabPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; @@ -317,10 +317,10 @@ class SwRedlineOptionsTabPage : public SfxTabPage static void InitFontStyle(FontPrevWindow& rExampleWin, const OUString& rText); public: - SwRedlineOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet); + SwRedlineOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); virtual ~SwRedlineOptionsTabPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; @@ -333,10 +333,10 @@ public: class SwTestTabPage : public SfxTabPage { public: - SwTestTabPage(TabPageParent pParent, const SfxItemSet& rSet); + SwTestTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); virtual ~SwTestTabPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; @@ -374,10 +374,10 @@ class SwCompareOptionsTabPage : public SfxTabPage DECL_LINK(IgnoreHdl, weld::Button&, void); public: - SwCompareOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet); + SwCompareOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); virtual ~SwCompareOptionsTabPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet ); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index 76bc778c3d80..58f2383936fe 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -99,8 +99,8 @@ class SwOutlineSettingsTabPage : public SfxTabPage void CheckForStartValue_Impl(sal_uInt16 nNumberingType); public: - SwOutlineSettingsTabPage(TabPageParent pParent, const SfxItemSet& rSet); - static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, + SwOutlineSettingsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); + static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); virtual ~SwOutlineSettingsTabPage() override; diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx index b74e522f8a9d..c174aee48b01 100644 --- a/sw/source/uibase/inc/pgfnote.hxx +++ b/sw/source/uibase/inc/pgfnote.hxx @@ -29,8 +29,8 @@ class SwFootNotePage: public SfxTabPage { static const sal_uInt16 aPageRg[]; public: - SwFootNotePage(TabPageParent pParent, const SfxItemSet &rSet); - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); + SwFootNotePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet); virtual ~SwFootNotePage() override; static const sal_uInt16* GetRanges() { return aPageRg; } diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx index 826c67f44c2f..a43aee7b4686 100644 --- a/sw/source/uibase/inc/pggrid.hxx +++ b/sw/source/uibase/inc/pggrid.hxx @@ -73,10 +73,10 @@ class SwTextGridPage: public SfxTabPage DECL_LINK(DisplayGridHdl, weld::ToggleButton&, void); public: - SwTextGridPage(TabPageParent pParent, const SfxItemSet &rSet); + SwTextGridPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet); virtual ~SwTextGridPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet); static const sal_uInt16* GetRanges(); virtual bool FillItemSet(SfxItemSet *rSet) override; diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index 4d1414efe362..711d5d9faf6e 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -201,7 +201,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ) override; SAL_DLLPRIVATE virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL ) override; SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const override; - SAL_DLLPRIVATE virtual std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(TabPageParent pParent, const SfxItemSet &rOptions) override; + SAL_DLLPRIVATE virtual std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rOptions) override; SAL_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill ); diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index f4597d9f1f33..fe800e41ca26 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -157,7 +157,7 @@ class SwInsertSectionTabPage : public SfxTabPage DECL_LINK( DlgClosedHdl, sfx2::FileDialogHelper*, void ); public: - SwInsertSectionTabPage(TabPageParent pParent, const SfxItemSet &rAttrSet); + SwInsertSectionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rAttrSet); virtual ~SwInsertSectionTabPage() override; void SetWrtShell(SwWrtShell& rSh); @@ -165,7 +165,7 @@ public: virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet* ) override; - static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); }; @@ -196,13 +196,13 @@ class SwSectionFootnoteEndTabPage : public SfxTabPage void ResetState( bool bFootnote, const SwFormatFootnoteEndAtTextEnd& ); public: - SwSectionFootnoteEndTabPage(TabPageParent pParent, const SfxItemSet &rAttrSet); + SwSectionFootnoteEndTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rAttrSet); virtual ~SwSectionFootnoteEndTabPage() override; virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet* ) override; - static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); }; @@ -215,13 +215,13 @@ class SwSectionIndentTabPage : public SfxTabPage DECL_LINK(IndentModifyHdl, weld::MetricSpinButton&, void); public: - SwSectionIndentTabPage(TabPageParent pParent, const SfxItemSet &rAttrSet); + SwSectionIndentTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rAttrSet); virtual ~SwSectionIndentTabPage() override; virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet* ) override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); void SetWrtShell(SwWrtShell const & rSh); }; diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index a00b7c354def..7e8093540fba 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -56,10 +56,10 @@ class SwCondCollPage : public SfxTabPage static const sal_uInt16 m_aPageRg[]; public: - SwCondCollPage(TabPageParent pParent, const SfxItemSet &rSet); + SwCondCollPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet); virtual ~SwCondCollPage() override; - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return m_aPageRg; } virtual bool FillItemSet( SfxItemSet *rSet) override; diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index a0e3da23cd54..20eb82bf8631 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -204,7 +204,7 @@ class SwTOXSelectTabPage : public SfxTabPage void FillTOXDescription(); public: - SwTOXSelectTabPage(TabPageParent pParent, const SfxItemSet& rAttrSet); + SwTOXSelectTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet); virtual ~SwTOXSelectTabPage() override; virtual bool FillItemSet( SfxItemSet* ) override; @@ -213,7 +213,7 @@ public: virtual void ActivatePage( const SfxItemSet& ) override; virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; - static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); void SelectType(TOXTypes eSet); //preset TOXType, GlobalDoc @@ -382,7 +382,7 @@ class SwTOXEntryTabPage : public SfxTabPage DECL_LINK(ModifyClickHdl, weld::ToggleButton&, void); public: - SwTOXEntryTabPage(TabPageParent pParent, const SfxItemSet& rAttrSet); + SwTOXEntryTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet); virtual ~SwTOXEntryTabPage() override; virtual bool FillItemSet( SfxItemSet* ) override; @@ -390,7 +390,7 @@ public: virtual void ActivatePage( const SfxItemSet& ) override; virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; - static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); void SetWrtShell(SwWrtShell& rSh); @@ -422,7 +422,7 @@ class SwTOXStylesTabPage : public SfxTabPage } public: - SwTOXStylesTabPage(TabPageParent pParent, const SfxItemSet& rAttrSet); + SwTOXStylesTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet); virtual ~SwTOXStylesTabPage() override; virtual bool FillItemSet( SfxItemSet* ) override; @@ -431,7 +431,7 @@ public: virtual void ActivatePage( const SfxItemSet& ) override; virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; - static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, + static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); }; diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index 4abeca2a4fa6..60313ffd4da6 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -79,8 +79,8 @@ class SwWrapTabPage: public SfxTabPage static const sal_uInt16 m_aWrapPageRg[]; public: - SwWrapTabPage(TabPageParent pParent, const SfxItemSet &rSet); - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet); + SwWrapTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet); virtual ~SwWrapTabPage() override; virtual bool FillItemSet(SfxItemSet *rSet) override; diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx index 6aea6553c59f..92a02e734f87 100644 --- a/sw/source/uibase/table/tablepg.hxx +++ b/sw/source/uibase/table/tablepg.hxx @@ -74,8 +74,8 @@ class SwFormatTablePage : public SfxTabPage DECL_LINK(ValueChangedHdl, weld::MetricSpinButton&, void); public: - SwFormatTablePage(TabPageParent pParent, const SfxItemSet& rSet ); - static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); + SwFormatTablePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet ); + static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); virtual ~SwFormatTablePage() override; virtual bool FillItemSet( SfxItemSet* rSet ) override; @@ -122,8 +122,8 @@ class SwTableColumnPage : public SfxTabPage DECL_LINK(SizeHdl, void*, void); public: - SwTableColumnPage(TabPageParent pParent, const SfxItemSet& rSet); - static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet); + SwTableColumnPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); + static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); virtual ~SwTableColumnPage() override; virtual bool FillItemSet( SfxItemSet* rSet ) override; @@ -166,8 +166,8 @@ class SwTextFlowPage : public SfxTabPage DECL_LINK(HeadLineCBClickHdl, weld::ToggleButton&, void); public: - SwTextFlowPage(TabPageParent pParent, const SfxItemSet& rSet); - static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet); + SwTextFlowPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet); + static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet); virtual ~SwTextFlowPage() override; virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index 7306f7560795..e40ee2807de4 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -1696,10 +1696,10 @@ bool SwPagePreview::HasPrintOptionsPage() const return true; } -std::unique_ptr<SfxTabPage> SwPagePreview::CreatePrintOptionsPage(TabPageParent pParent, +std::unique_ptr<SfxTabPage> SwPagePreview::CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rOptions) { - return ::CreatePrintOptionsPage(pParent, rOptions, !m_bNormalPrint); + return ::CreatePrintOptionsPage(pPage, pController, rOptions, !m_bNormalPrint); } void SwPagePreviewWin::SetViewShell( SwViewShell* pShell ) diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx index 52f82f0ab69a..98ddeefbeec3 100644 --- a/sw/source/uibase/uiview/viewprt.cxx +++ b/sw/source/uibase/uiview/viewprt.cxx @@ -174,10 +174,10 @@ namespace // TabPage for application-specific print options -std::unique_ptr<SfxTabPage> SwView::CreatePrintOptionsPage(TabPageParent pParent, +std::unique_ptr<SfxTabPage> SwView::CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet) { - return ::CreatePrintOptionsPage(pParent, rSet, false); + return ::CreatePrintOptionsPage(pPage, pController, rSet, false); } // Print dispatcher @@ -307,7 +307,7 @@ void SwView::NotifyCursor(SfxViewShell* pViewShell) const // Create page printer/additions for SwView and SwPagePreview -std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(TabPageParent pParent, +std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rOptions, bool bPreview) { @@ -318,7 +318,7 @@ std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(TabPageParent pParent, if (!fnCreatePage) return nullptr; - std::unique_ptr<SfxTabPage> xSfxPage = fnCreatePage(pParent, &rOptions); + std::unique_ptr<SfxTabPage> xSfxPage = fnCreatePage(pPage, pController, &rOptions); OSL_ENSURE(xSfxPage, "No page"); if (!xSfxPage) return nullptr; |