now drop TabPageParent intermediate

Change-Id: I47328f76342ac023628d9042bdfa8213a1c93d0c
Reviewed-on: https://gerrit.libreoffice.org/79469
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

37 files changed, 200 insertions, 201 deletions

diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 77ba4c0f4e97..fe8cd6c92d09 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -2025,7 +2025,7 @@ void ScModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet )
     }
 }
 
-std::unique_ptr<SfxTabPage> ScModule::CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet )
+std::unique_ptr<SfxTabPage> ScModule::CreateTabPage( sal_uInt16 nId, weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet )
 {
     std::unique_ptr<SfxTabPage> xRet;
     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
@@ -2035,66 +2035,66 @@ std::unique_ptr<SfxTabPage> ScModule::CreateTabPage( sal_uInt16 nId, TabPagePare
         {
             ::CreateTabPage ScTpLayoutOptionsCreate = pFact->GetTabPageCreatorFunc(SID_SC_TP_LAYOUT);
             if (ScTpLayoutOptionsCreate)
-                xRet = (*ScTpLayoutOptionsCreate)(pParent, &rSet);
+                xRet = (*ScTpLayoutOptionsCreate)(pPage, pController, &rSet);
             break;
         }
         case SID_SC_TP_CONTENT:
         {
             ::CreateTabPage ScTpContentOptionsCreate = pFact->GetTabPageCreatorFunc(SID_SC_TP_CONTENT);
             if (ScTpContentOptionsCreate)
-                xRet = (*ScTpContentOptionsCreate)(pParent, &rSet);
+                xRet = (*ScTpContentOptionsCreate)(pPage, pController, &rSet);
             break;
         }
         case SID_SC_TP_GRID:
-            xRet = SvxGridTabPage::Create(pParent, rSet);
+            xRet = SvxGridTabPage::Create(pPage, pController, rSet);
             break;
         case SID_SC_TP_USERLISTS:
         {
             ::CreateTabPage ScTpUserListsCreate = pFact->GetTabPageCreatorFunc(SID_SC_TP_USERLISTS);
             if (ScTpUserListsCreate)
-                xRet = (*ScTpUserListsCreate)(pParent, &rSet);
+                xRet = (*ScTpUserListsCreate)(pPage, pController, &rSet);
             break;
         }
         case SID_SC_TP_CALC:
         {
             ::CreateTabPage ScTpCalcOptionsCreate = pFact->GetTabPageCreatorFunc(SID_SC_TP_CALC);
             if (ScTpCalcOptionsCreate)
-                xRet = (*ScTpCalcOptionsCreate)(pParent, &rSet);
+                xRet = (*ScTpCalcOptionsCreate)(pPage, pController, &rSet);
             break;
         }
         case SID_SC_TP_FORMULA:
         {
             ::CreateTabPage ScTpFormulaOptionsCreate = pFact->GetTabPageCreatorFunc(SID_SC_TP_FORMULA);
             if (ScTpFormulaOptionsCreate)
-                xRet = (*ScTpFormulaOptionsCreate)(pParent, &rSet);
+                xRet = (*ScTpFormulaOptionsCreate)(pPage, pController, &rSet);
             break;
         }
         case SID_SC_TP_COMPATIBILITY:
         {
             ::CreateTabPage ScTpCompatOptionsCreate = pFact->GetTabPageCreatorFunc(SID_SC_TP_COMPATIBILITY);
             if (ScTpCompatOptionsCreate)
-                xRet = (*ScTpCompatOptionsCreate)(pParent, &rSet);
+                xRet = (*ScTpCompatOptionsCreate)(pPage, pController, &rSet);
             break;
         }
         case SID_SC_TP_CHANGES:
         {
             ::CreateTabPage ScRedlineOptionsTabPageCreate = pFact->GetTabPageCreatorFunc(SID_SC_TP_CHANGES);
             if (ScRedlineOptionsTabPageCreate)
-                xRet =(*ScRedlineOptionsTabPageCreate)(pParent, &rSet);
+                xRet =(*ScRedlineOptionsTabPageCreate)(pPage, pController, &rSet);
             break;
         }
         case RID_SC_TP_PRINT:
         {
             ::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc(RID_SC_TP_PRINT);
             if (ScTpPrintOptionsCreate)
-                xRet = (*ScTpPrintOptionsCreate)(pParent, &rSet);
+                xRet = (*ScTpPrintOptionsCreate)(pPage, pController, &rSet);
             break;
         }
         case RID_SC_TP_DEFAULTS:
         {
             ::CreateTabPage ScTpDefaultsOptionsCreate = pFact->GetTabPageCreatorFunc(RID_SC_TP_DEFAULTS);
             if (ScTpDefaultsOptionsCreate)
-                xRet = (*ScTpDefaultsOptionsCreate)(pParent, &rSet);
+                xRet = (*ScTpDefaultsOptionsCreate)(pPage, pController, &rSet);
             break;
         }
     }
diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx
index 68f720b3f88d..572e1dc362f6 100644
--- a/sc/source/ui/attrdlg/tabpages.cxx
+++ b/sc/source/ui/attrdlg/tabpages.cxx
@@ -34,8 +34,8 @@ const sal_uInt16 ScTabPageProtection::pProtectionRanges[] =
 
 // Zellschutz-Tabpage:
 
-ScTabPageProtection::ScTabPageProtection(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
-    : SfxTabPage(pParent, "modules/scalc/ui/cellprotectionpage.ui", "CellProtectionPage", &rCoreAttrs)
+ScTabPageProtection::ScTabPageProtection(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs)
+    : SfxTabPage(pPage, pController, "modules/scalc/ui/cellprotectionpage.ui", "CellProtectionPage", &rCoreAttrs)
     , m_xBtnHideCell(m_xBuilder->weld_check_button("checkHideAll"))
     , m_xBtnProtect(m_xBuilder->weld_check_button("checkProtected"))
     , m_xBtnHideFormula(m_xBuilder->weld_check_button("checkHideFormula"))
@@ -57,9 +57,9 @@ ScTabPageProtection::~ScTabPageProtection()
 {
 }
 
-std::unique_ptr<SfxTabPage> ScTabPageProtection::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> ScTabPageProtection::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
 {
-    return std::make_unique<ScTabPageProtection>(pParent, *rAttrSet);
+    return std::make_unique<ScTabPageProtection>(pPage, pController, *rAttrSet);
 }
 
 void ScTabPageProtection::Reset( const SfxItemSet* rCoreAttrs )
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 4af234bcfbc4..d0daf6debbc0 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -68,8 +68,8 @@ using namespace com::sun::star;
 
 // Sort Criteria Tab page
 
-ScTabPageSortFields::ScTabPageSortFields(TabPageParent pParent, const SfxItemSet& rArgSet)
-    : SfxTabPage(pParent, "modules/scalc/ui/sortcriteriapage.ui", "SortCriteriaPage", &rArgSet)
+ScTabPageSortFields::ScTabPageSortFields(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet)
+    : SfxTabPage(pPage, pController, "modules/scalc/ui/sortcriteriapage.ui", "SortCriteriaPage", &rArgSet)
     ,
 
         aStrUndefined   ( ScResId( SCSTR_UNDEFINED ) ),
@@ -123,9 +123,9 @@ void ScTabPageSortFields::Init()
     }
 }
 
-std::unique_ptr<SfxTabPage> ScTabPageSortFields::Create(TabPageParent pParent, const SfxItemSet* pArgSet)
+std::unique_ptr<SfxTabPage> ScTabPageSortFields::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* pArgSet)
 {
-    return std::make_unique<ScTabPageSortFields>(pParent, *pArgSet);
+    return std::make_unique<ScTabPageSortFields>(pPage, pController, *pArgSet);
 }
 
 void ScTabPageSortFields::Reset( const SfxItemSet* /* rArgSet */ )
@@ -473,8 +473,8 @@ void ScTabPageSortFields::AddSortKey( sal_uInt16 nItem )
 
 // Sort option Tab Page:
 
-ScTabPageSortOptions::ScTabPageSortOptions(TabPageParent pParent, const SfxItemSet& rArgSet)
-    : SfxTabPage(pParent, "modules/scalc/ui/sortoptionspage.ui", "SortOptionsPage", &rArgSet)
+ScTabPageSortOptions::ScTabPageSortOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet)
+    : SfxTabPage(pPage, pController, "modules/scalc/ui/sortoptionspage.ui", "SortOptionsPage", &rArgSet)
     , aStrRowLabel(ScResId(SCSTR_ROW_LABEL))
     , aStrColLabel(ScResId(SCSTR_COL_LABEL))
     , aStrUndefined(ScResId(SCSTR_UNDEFINED))
@@ -574,9 +574,9 @@ void ScTabPageSortOptions::Init()
     m_xLbLanguage->InsertLanguage( LANGUAGE_SYSTEM );
 }
 
-std::unique_ptr<SfxTabPage> ScTabPageSortOptions::Create(TabPageParent pParent, const SfxItemSet* rArgSet)
+std::unique_ptr<SfxTabPage> ScTabPageSortOptions::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rArgSet)
 {
-    return std::make_unique<ScTabPageSortOptions>(pParent, *rArgSet);
+    return std::make_unique<ScTabPageSortOptions>(pPage, pController, *rArgSet);
 }
 
 void ScTabPageSortOptions::Reset( const SfxItemSet* /* rArgSet */ )
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index 7cf70ff0c3dc..faaf04e7a48a 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -37,8 +37,8 @@
 
 // Subtotals group tabpage:
 
-ScTpSubTotalGroup::ScTpSubTotalGroup(TabPageParent pParent, const SfxItemSet& rArgSet)
-    : SfxTabPage(pParent, "modules/scalc/ui/subtotalgrppage.ui", "SubTotalGrpPage", &rArgSet)
+ScTpSubTotalGroup::ScTpSubTotalGroup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet)
+    : SfxTabPage(pPage, pController, "modules/scalc/ui/subtotalgrppage.ui", "SubTotalGrpPage", &rArgSet)
     , aStrNone(ScResId(SCSTR_NONE))
     , aStrColumn(ScResId(SCSTR_COLUMN))
     , pViewData(nullptr)
@@ -372,34 +372,34 @@ IMPL_LINK( ScTpSubTotalGroup, CheckHdl, const row_col&, rRowCol, void )
 
 // Derived Group TabPages:
 
-std::unique_ptr<SfxTabPage> ScTpSubTotalGroup1::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> ScTpSubTotalGroup1::Create( weld::Container* pPage, weld::DialogController* pController,
                                                  const SfxItemSet*  rArgSet )
 {
-    return std::make_unique<ScTpSubTotalGroup1>( pParent, *rArgSet );
+    return std::make_unique<ScTpSubTotalGroup1>( pPage, pController, *rArgSet );
 }
 
-std::unique_ptr<SfxTabPage> ScTpSubTotalGroup2::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> ScTpSubTotalGroup2::Create( weld::Container* pPage, weld::DialogController* pController,
                                        const SfxItemSet*    rArgSet )
 {
-    return std::make_unique<ScTpSubTotalGroup2>( pParent, *rArgSet );
+    return std::make_unique<ScTpSubTotalGroup2>( pPage, pController, *rArgSet );
 }
 
-std::unique_ptr<SfxTabPage> ScTpSubTotalGroup3::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> ScTpSubTotalGroup3::Create( weld::Container* pPage, weld::DialogController* pController,
                                        const SfxItemSet*    rArgSet )
 {
-    return std::make_unique<ScTpSubTotalGroup3>( pParent, *rArgSet );
+    return std::make_unique<ScTpSubTotalGroup3>( pPage, pController, *rArgSet );
 }
 
-ScTpSubTotalGroup1::ScTpSubTotalGroup1( TabPageParent pParent, const SfxItemSet& rArgSet ) :
-    ScTpSubTotalGroup( pParent, rArgSet )
+ScTpSubTotalGroup1::ScTpSubTotalGroup1( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet ) :
+    ScTpSubTotalGroup( pPage, pController, rArgSet )
 {}
 
-ScTpSubTotalGroup2::ScTpSubTotalGroup2( TabPageParent pParent, const SfxItemSet& rArgSet ) :
-    ScTpSubTotalGroup( pParent, rArgSet )
+ScTpSubTotalGroup2::ScTpSubTotalGroup2( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet ) :
+    ScTpSubTotalGroup( pPage, pController, rArgSet )
 {}
 
-ScTpSubTotalGroup3::ScTpSubTotalGroup3( TabPageParent pParent, const SfxItemSet& rArgSet ) :
-    ScTpSubTotalGroup( pParent, rArgSet )
+ScTpSubTotalGroup3::ScTpSubTotalGroup3( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet ) :
+    ScTpSubTotalGroup( pPage, pController, rArgSet )
 {}
 
 #define RESET(i) (ScTpSubTotalGroup::DoReset( (i), *rArgSet ))
@@ -416,9 +416,9 @@ bool ScTpSubTotalGroup3::FillItemSet( SfxItemSet* rArgSet ) { return FILLSET(3);
 
 // options tab page:
 
-ScTpSubTotalOptions::ScTpSubTotalOptions(TabPageParent pParent, const SfxItemSet& rArgSet)
+ScTpSubTotalOptions::ScTpSubTotalOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet)
 
-        :   SfxTabPage      ( pParent,
+        :   SfxTabPage      ( pPage, pController,
                               "modules/scalc/ui/subtotaloptionspage.ui", "SubTotalOptionsPage",
                               &rArgSet ),
             pViewData       ( nullptr ),
@@ -460,10 +460,10 @@ void ScTpSubTotalOptions::Init()
     FillUserSortListBox();
 }
 
-std::unique_ptr<SfxTabPage> ScTpSubTotalOptions::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> ScTpSubTotalOptions::Create(weld::Container* pPage, weld::DialogController* pController,
                                                const SfxItemSet* rArgSet)
 {
-    return std::make_unique<ScTpSubTotalOptions>(pParent, *rArgSet);
+    return std::make_unique<ScTpSubTotalOptions>(pPage, pController, *rArgSet);
 }
 
 void ScTpSubTotalOptions::Reset( const SfxItemSet* /* rArgSet */ )
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index de6504b55363..3c6660dec95b 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -325,8 +325,8 @@ bool lclGetStringListFromFormula( OUString& rStringList, const OUString& rFmlaSt
 
 } // namespace
 
-ScTPValidationValue::ScTPValidationValue(TabPageParent pParent, const SfxItemSet& rArgSet)
-    : SfxTabPage(pParent, "modules/scalc/ui/validationcriteriapage.ui",
+ScTPValidationValue::ScTPValidationValue(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet)
+    : SfxTabPage(pPage, pController, "modules/scalc/ui/validationcriteriapage.ui",
                  "ValidationCriteriaPage", &rArgSet)
     , maStrMin(ScResId(SCSTR_VALID_MINIMUM))
     , maStrMax(ScResId(SCSTR_VALID_MAXIMUM))
@@ -404,9 +404,9 @@ void ScTPValidationValue::Init()
     CheckHdl( *m_xCbShow );
 }
 
-std::unique_ptr<SfxTabPage> ScTPValidationValue::Create(TabPageParent pParent, const SfxItemSet* rArgSet)
+std::unique_ptr<SfxTabPage> ScTPValidationValue::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rArgSet)
 {
-    return std::make_unique<ScTPValidationValue>(pParent, *rArgSet);
+    return std::make_unique<ScTPValidationValue>(pPage, pController, *rArgSet);
 }
 
 void ScTPValidationValue::Reset( const SfxItemSet* rArgSet )
@@ -678,8 +678,8 @@ IMPL_LINK_NOARG(ScTPValidationValue, CheckHdl, weld::Button&, void)
 
 // Input Help Page
 
-ScTPValidationHelp::ScTPValidationHelp(TabPageParent pParent, const SfxItemSet& rArgSet)
-    : SfxTabPage(pParent, "modules/scalc/ui/validationhelptabpage.ui", "ValidationHelpTabPage", &rArgSet)
+ScTPValidationHelp::ScTPValidationHelp(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet)
+    : SfxTabPage(pPage, pController, "modules/scalc/ui/validationhelptabpage.ui", "ValidationHelpTabPage", &rArgSet)
     , m_xTsbHelp(m_xBuilder->weld_check_button("tsbhelp"))
     , m_xEdtTitle(m_xBuilder->weld_entry("title"))
     , m_xEdInputHelp(m_xBuilder->weld_text_view("inputhelp"))
@@ -691,10 +691,10 @@ ScTPValidationHelp::~ScTPValidationHelp()
 {
 }
 
-std::unique_ptr<SfxTabPage> ScTPValidationHelp::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> ScTPValidationHelp::Create(weld::Container* pPage, weld::DialogController* pController,
                                               const SfxItemSet* rArgSet)
 {
-    return std::make_unique<ScTPValidationHelp>(pParent, *rArgSet);
+    return std::make_unique<ScTPValidationHelp>(pPage, pController, *rArgSet);
 }
 
 void ScTPValidationHelp::Reset( const SfxItemSet* rArgSet )
@@ -728,10 +728,10 @@ bool ScTPValidationHelp::FillItemSet( SfxItemSet* rArgSet )
 
 // Error Alert Page
 
-ScTPValidationError::ScTPValidationError(TabPageParent pParent,
+ScTPValidationError::ScTPValidationError(weld::Container* pPage, weld::DialogController* pController,
                                          const SfxItemSet& rArgSet)
 
-    :   SfxTabPage      ( pParent,
+    :   SfxTabPage      ( pPage, pController,
                           "modules/scalc/ui/erroralerttabpage.ui", "ErrorAlertTabPage",
                           &rArgSet )
     , m_xTsbShow(m_xBuilder->weld_check_button("tsbshow"))
@@ -759,10 +759,10 @@ void ScTPValidationError::Init()
     SelectActionHdl(*m_xLbAction);
 }
 
-std::unique_ptr<SfxTabPage> ScTPValidationError::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> ScTPValidationError::Create(weld::Container* pPage, weld::DialogController* pController,
                                                const SfxItemSet* rArgSet)
 {
-    return std::make_unique<ScTPValidationError>(pParent, *rArgSet);
+    return std::make_unique<ScTPValidationError>(pPage, pController, *rArgSet);
 }
 
 void ScTPValidationError::Reset( const SfxItemSet* rArgSet )
diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx
index 615d7de0a13c..e7544e54128e 100644
--- a/sc/source/ui/docshell/tpstat.cxx
+++ b/sc/source/ui/docshell/tpstat.cxx
@@ -28,13 +28,13 @@
 
 // Dokumentinfo-Tabpage:
 
-std::unique_ptr<SfxTabPage> ScDocStatPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
+std::unique_ptr<SfxTabPage> ScDocStatPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet )
 {
-    return std::make_unique<ScDocStatPage>( pParent, *rSet );
+    return std::make_unique<ScDocStatPage>( pPage, pController, *rSet );
 }
 
-ScDocStatPage::ScDocStatPage(TabPageParent pParent, const SfxItemSet& rSet)
-    :   SfxTabPage(pParent, "modules/scalc/ui/statisticsinfopage.ui", "StatisticsInfoPage", &rSet)
+ScDocStatPage::ScDocStatPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "modules/scalc/ui/statisticsinfopage.ui", "StatisticsInfoPage", &rSet)
     , m_xFtTables(m_xBuilder->weld_label("nosheets"))
     , m_xFtCells(m_xBuilder->weld_label("nocells"))
     , m_xFtPages(m_xBuilder->weld_label("nopages"))
diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx
index dba8539c90d2..b32d848dd6aa 100644
--- a/sc/source/ui/inc/opredlin.hxx
+++ b/sc/source/ui/inc/opredlin.hxx
@@ -31,8 +31,8 @@ class ScRedlineOptionsTabPage : public SfxTabPage
     std::unique_ptr<ColorListBox> m_xMoveColorLB;
 
 public:
-    ScRedlineOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet );
-    static std::unique_ptr<SfxTabPage>  Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+    ScRedlineOptionsTabPage(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 ~ScRedlineOptionsTabPage() override;
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index 8c2660ea5319..9ea577b4f622 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -104,7 +104,7 @@ public:
     virtual SfxPrinter*     GetPrinter( bool bCreate = false ) override;
     virtual sal_uInt16      SetPrinter( SfxPrinter* pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL ) override;
     virtual bool            HasPrintOptionsPage() const override;
-    virtual std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(TabPageParent pParent, const SfxItemSet &rOptions) override;
+    virtual std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rOptions) override;
 
     void            AddAccessibilityObject( SfxListener& rObject );
     void            RemoveAccessibilityObject( SfxListener& rObject );
diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx
index 0f114fa13d9c..fd3c301e7653 100644
--- a/sc/source/ui/inc/scuitphfedit.hxx
+++ b/sc/source/ui/inc/scuitphfedit.hxx
@@ -54,7 +54,7 @@ public:
     void            ClearTextAreas();
 
 protected:
-                ScHFEditPage( TabPageParent pParent,
+                ScHFEditPage( weld::Container* pPage, weld::DialogController* pController,
                               const SfxItemSet& rCoreSet,
                               sal_uInt16        nWhich,
                               bool              bHeader );
@@ -116,29 +116,29 @@ private:
 class ScRightHeaderEditPage : public ScHFEditPage
 {
 public:
-    static std::unique_ptr<SfxTabPage>  Create( TabPageParent pParent, const SfxItemSet* rCoreSet );
-    ScRightHeaderEditPage( TabPageParent pParent, const SfxItemSet& rSet );
+    static std::unique_ptr<SfxTabPage>  Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet );
+    ScRightHeaderEditPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet );
 };
 
 class ScLeftHeaderEditPage : public ScHFEditPage
 {
 public:
-    static std::unique_ptr<SfxTabPage>  Create( TabPageParent pParent, const SfxItemSet* rCoreSet );
-    ScLeftHeaderEditPage( TabPageParent pParent, const SfxItemSet& rSet );
+    static std::unique_ptr<SfxTabPage>  Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet );
+    ScLeftHeaderEditPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet );
 };
 
 class ScRightFooterEditPage : public ScHFEditPage
 {
 public:
-    static std::unique_ptr<SfxTabPage>  Create( TabPageParent pParent, const SfxItemSet* rCoreSet );
-    ScRightFooterEditPage( TabPageParent pParent, const SfxItemSet& rSet );
+    static std::unique_ptr<SfxTabPage>  Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet );
+    ScRightFooterEditPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet );
 };
 
 class ScLeftFooterEditPage : public ScHFEditPage
 {
 public:
-    static std::unique_ptr<SfxTabPage>  Create( TabPageParent pParent, const SfxItemSet* rCoreSet );
-    ScLeftFooterEditPage( TabPageParent pParent, const SfxItemSet& rSet );
+    static std::unique_ptr<SfxTabPage>  Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet );
+    ScLeftFooterEditPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet );
 };
 
 #endif
diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx
index 9cdffb2144d3..ba8e35e4945f 100644
--- a/sc/source/ui/inc/tabpages.hxx
+++ b/sc/source/ui/inc/tabpages.hxx
@@ -26,8 +26,8 @@ class ScTabPageProtection : public SfxTabPage
 {
     static const sal_uInt16 pProtectionRanges[];
 public:
-    ScTabPageProtection(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
-    static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent,
+    ScTabPageProtection(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs);
+    static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController,
                                               const SfxItemSet* rAttrSet);
     virtual ~ScTabPageProtection() override;
 
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 3b6005afa36f..f1a67a7f96a8 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -319,7 +319,7 @@ public:
                                           SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL ) override;
 
     virtual bool            HasPrintOptionsPage() const override;
-    virtual std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(TabPageParent pParent, const SfxItemSet &rOptions) override;
+    virtual std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rOptions) override;
 
     void            ConnectObject( const SdrOle2Obj* pObj );
     void            ActivateObject( SdrOle2Obj* pObj, long nVerb );
diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx
index d32704f496f4..150a5a615d11 100644
--- a/sc/source/ui/inc/tpcalc.hxx
+++ b/sc/source/ui/inc/tpcalc.hxx
@@ -28,8 +28,8 @@ class ScDocOptions;
 class ScTpCalcOptions : public SfxTabPage
 {
 public:
-    ScTpCalcOptions(TabPageParent pParent, const SfxItemSet&  rCoreSet);
-    static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rCoreSet);
+    ScTpCalcOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet&  rCoreSet);
+    static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet);
     virtual ~ScTpCalcOptions() override;
     virtual bool        FillItemSet     ( SfxItemSet* rCoreSet ) override;
     virtual void        Reset           ( const SfxItemSet* rCoreSet ) override;
diff --git a/sc/source/ui/inc/tpcompatibility.hxx b/sc/source/ui/inc/tpcompatibility.hxx
index 4bceec955a15..4a61426a5431 100644
--- a/sc/source/ui/inc/tpcompatibility.hxx
+++ b/sc/source/ui/inc/tpcompatibility.hxx
@@ -15,8 +15,8 @@
 class ScTpCompatOptions : public SfxTabPage
 {
 public:
-    explicit ScTpCompatOptions(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
-    static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rCoreAttrs);
+    explicit ScTpCompatOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs);
+    static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreAttrs);
     virtual ~ScTpCompatOptions() override;
 
     virtual bool FillItemSet(SfxItemSet* rCoreAttrs) override;
diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx
index a2a88e7e95f9..44eea6e872a0 100644
--- a/sc/source/ui/inc/tpdefaults.hxx
+++ b/sc/source/ui/inc/tpdefaults.hxx
@@ -16,8 +16,8 @@
 class ScTpDefaultsOptions : public SfxTabPage
 {
 public:
-    explicit ScTpDefaultsOptions(TabPageParent pParent, const SfxItemSet& rCoreSet);
-    static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rCoreSet);
+    explicit ScTpDefaultsOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet);
+    static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet);
     virtual ~ScTpDefaultsOptions() override;
 
     virtual bool FillItemSet(SfxItemSet* rCoreSet) override;
diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx
index 2aee580c16a3..4de05560cfd3 100644
--- a/sc/source/ui/inc/tpformula.hxx
+++ b/sc/source/ui/inc/tpformula.hxx
@@ -28,8 +28,8 @@
 class ScTpFormulaOptions : public SfxTabPage
 {
 public:
-    explicit ScTpFormulaOptions(TabPageParent pParent, const SfxItemSet& rCoreSet);
-    static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rCoreSet);
+    explicit ScTpFormulaOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet);
+    static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet);
     virtual ~ScTpFormulaOptions() override;
 
     virtual bool FillItemSet(SfxItemSet* rCoreSet) override;
diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx
index 17d7c2a598aa..53c71e3d86c1 100644
--- a/sc/source/ui/inc/tphf.hxx
+++ b/sc/source/ui/inc/tphf.hxx
@@ -36,7 +36,7 @@ public:
     void            SetStyleDlg ( ScStyleDlg* pDlg ) { pStyleDlg = pDlg; }
 
 protected:
-    ScHFPage(TabPageParent pParent, const SfxItemSet& rSet, sal_uInt16 nSetId);
+    ScHFPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet, sal_uInt16 nSetId);
 
     virtual void    ActivatePage( const SfxItemSet& rSet ) override;
     virtual DeactivateRC   DeactivatePage( SfxItemSet* pSet ) override;
@@ -56,16 +56,16 @@ private:
 class ScHeaderPage : public ScHFPage
 {
 public:
-    static std::unique_ptr<SfxTabPage>  Create( TabPageParent pParent, const SfxItemSet* rSet );
-    ScHeaderPage(TabPageParent pParent, const SfxItemSet& rSet);
+    static std::unique_ptr<SfxTabPage>  Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
+    ScHeaderPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     static const sal_uInt16*      GetRanges();
 };
 
 class ScFooterPage : public ScHFPage
 {
 public:
-    static std::unique_ptr<SfxTabPage>  Create( TabPageParent pParent, const SfxItemSet* rSet );
-    ScFooterPage(TabPageParent pParent, const SfxItemSet& rSet);
+    static std::unique_ptr<SfxTabPage>  Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
+    ScFooterPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     static const sal_uInt16*      GetRanges();
 };
 
diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx
index ef15a39b7537..4e2d0f91712c 100644
--- a/sc/source/ui/inc/tpprint.hxx
+++ b/sc/source/ui/inc/tpprint.hxx
@@ -29,8 +29,8 @@ class ScTpPrintOptions : public SfxTabPage
     std::unique_ptr<weld::CheckButton>       m_xForceBreaksCB;
 
 public:
-    ScTpPrintOptions(TabPageParent pPage, const SfxItemSet& rCoreSet);
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rCoreSet );
+    ScTpPrintOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet);
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet );
     virtual ~ScTpPrintOptions() override;
 
     virtual bool        FillItemSet( SfxItemSet* rCoreSet ) override;
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
index 655ff11747aa..5765b7096e05 100644
--- a/sc/source/ui/inc/tpsort.hxx
+++ b/sc/source/ui/inc/tpsort.hxx
@@ -42,8 +42,8 @@ class ScViewData;
 class ScTabPageSortFields : public SfxTabPage
 {
 public:
-    ScTabPageSortFields(TabPageParent pParent, const SfxItemSet& rArgSet);
-    static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rArgSet);
+    ScTabPageSortFields(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet);
+    static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rArgSet);
     virtual ~ScTabPageSortFields() override;
 
     virtual bool        FillItemSet ( SfxItemSet* rArgSet ) override;
@@ -94,8 +94,8 @@ class ScDocument;
 class ScTabPageSortOptions : public SfxTabPage
 {
 public:
-    ScTabPageSortOptions(TabPageParent pParent, const SfxItemSet& rArgSet);
-    static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* pArgSet);
+    ScTabPageSortOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet);
+    static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* pArgSet);
 
     virtual bool        FillItemSet ( SfxItemSet* rArgSet ) override;
     virtual void        Reset       ( const SfxItemSet* rArgSet ) override;
diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx
index a317345dcadd..71d3dd7cd94b 100644
--- a/sc/source/ui/inc/tpstat.hxx
+++ b/sc/source/ui/inc/tpstat.hxx
@@ -25,8 +25,8 @@
 class ScDocStatPage: public SfxTabPage
 {
 public:
-    static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
-    ScDocStatPage(TabPageParent pParent, const SfxItemSet& rSet);
+    static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet);
+    ScDocStatPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     virtual ~ScDocStatPage() override;
 
 protected:
diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx
index 4f3c48ee880e..f4e52a5a6517 100644
--- a/sc/source/ui/inc/tpsubt.hxx
+++ b/sc/source/ui/inc/tpsubt.hxx
@@ -33,7 +33,7 @@ struct ScSubTotalParam;
 class ScTpSubTotalGroup : public SfxTabPage
 {
 protected:
-    ScTpSubTotalGroup(TabPageParent pParent, const SfxItemSet& rArgSet);
+    ScTpSubTotalGroup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet);
 
 public:
     virtual ~ScTpSubTotalGroup() override;
@@ -76,9 +76,9 @@ private:
 class ScTpSubTotalGroup1 final : public ScTpSubTotalGroup
 {
 public:
-    ScTpSubTotalGroup1( TabPageParent pParent,
+    ScTpSubTotalGroup1( weld::Container* pPage, weld::DialogController* pController,
                         const SfxItemSet&    rArgSet );
-    static std::unique_ptr<SfxTabPage> Create      ( TabPageParent pParent,
+    static std::unique_ptr<SfxTabPage> Create      ( weld::Container* pPage, weld::DialogController* pController,
             const SfxItemSet*     rArgSet );
     virtual ~ScTpSubTotalGroup1() override;
 
@@ -89,9 +89,9 @@ public:
 class ScTpSubTotalGroup2 final : public ScTpSubTotalGroup
 {
 public:
-    ScTpSubTotalGroup2( TabPageParent pParent,
+    ScTpSubTotalGroup2( weld::Container* pPage, weld::DialogController* pController,
                         const SfxItemSet&    rArgSet );
-    static std::unique_ptr<SfxTabPage> Create      ( TabPageParent pParent,
+    static std::unique_ptr<SfxTabPage> Create      ( weld::Container* pPage, weld::DialogController* pController,
             const SfxItemSet*     rArgSet );
     virtual ~ScTpSubTotalGroup2() override;
 
@@ -102,9 +102,9 @@ public:
 class ScTpSubTotalGroup3 final : public ScTpSubTotalGroup
 {
 public:
-    ScTpSubTotalGroup3( TabPageParent pParent,
+    ScTpSubTotalGroup3( weld::Container* pPage, weld::DialogController* pController,
                         const SfxItemSet&    rArgSet );
-    static  std::unique_ptr<SfxTabPage> Create      ( TabPageParent pParent,
+    static  std::unique_ptr<SfxTabPage> Create      ( weld::Container* pPage, weld::DialogController* pController,
             const SfxItemSet*     rArgSet );
     virtual ~ScTpSubTotalGroup3() override;
 
@@ -115,8 +115,8 @@ public:
 class ScTpSubTotalOptions final : public SfxTabPage
 {
 public:
-    ScTpSubTotalOptions(TabPageParent pParent, const SfxItemSet& rArgSet);
-    static std::unique_ptr<SfxTabPage>  Create      ( TabPageParent pParent,
+    ScTpSubTotalOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet);
+    static std::unique_ptr<SfxTabPage>  Create      ( weld::Container* pPage, weld::DialogController* pController,
             const SfxItemSet*     rArgSet );
     virtual ~ScTpSubTotalOptions() override;
 
diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx
index fe517c35a5a1..fe86f338ec9a 100644
--- a/sc/source/ui/inc/tptable.hxx
+++ b/sc/source/ui/inc/tptable.hxx
@@ -26,8 +26,8 @@ class ScTablePage : public SfxTabPage
 {
     static const sal_uInt16 pPageTableRanges[];
 public:
-    ScTablePage(TabPageParent pParent, const SfxItemSet& rCoreSet);
-    static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rCoreSet);
+    ScTablePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet);
+    static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet);
     virtual         ~ScTablePage() override;
 
     static  const sal_uInt16* GetRanges () { return pPageTableRanges; }
diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx
index 438d897569a9..dd3d4cf133a4 100644
--- a/sc/source/ui/inc/tpusrlst.hxx
+++ b/sc/source/ui/inc/tpusrlst.hxx
@@ -33,8 +33,8 @@ class ScRefAddress;
 class ScTpUserLists : public SfxTabPage
 {
 public:
-    ScTpUserLists(TabPageParent pParent, const SfxItemSet& rArgSet);
-    static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent,
+    ScTpUserLists(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet);
+    static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController,
                                           const SfxItemSet* rAttrSet);
     virtual ~ScTpUserLists() override;
     virtual bool        FillItemSet     ( SfxItemSet* rCoreAttrs ) override;
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 3e47c2d8ae03..bed1e1325e69 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -62,8 +62,8 @@ class ScTpContentOptions : public SfxTabPage
     DECL_LINK( CBHdl, weld::ToggleButton&, void );
 
 public:
-    ScTpContentOptions(TabPageParent pParent, const SfxItemSet& rArgSet);
-    static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rCoreSet);
+    ScTpContentOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet);
+    static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet);
     virtual ~ScTpContentOptions() override;
     virtual bool        FillItemSet     ( SfxItemSet* rCoreSet ) override;
     virtual void        Reset           ( const SfxItemSet* rCoreSet ) override;
@@ -100,8 +100,8 @@ class ScTpLayoutOptions : public SfxTabPage
 
 
 public:
-    ScTpLayoutOptions(TabPageParent pParent, const SfxItemSet&  rArgSet );
-    static  std::unique_ptr<SfxTabPage> Create(TabPageParent pParent,
+    ScTpLayoutOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet&  rArgSet );
+    static  std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController,
                                           const SfxItemSet* rCoreSet);
     virtual ~ScTpLayoutOptions() override;
     virtual bool        FillItemSet     ( SfxItemSet* rCoreSet ) override;
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index d5f33838f818..2bb9043e8fb3 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -77,8 +77,8 @@ class ScTPValidationValue : public ScRefHandlerCaller, public SfxTabPage
 {
     static const sal_uInt16 pValueRanges[];
 public:
-    explicit                    ScTPValidationValue(TabPageParent pParent, const SfxItemSet& rArgSet);
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rArgSet );
+    explicit                    ScTPValidationValue(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet);
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rArgSet );
     virtual                     ~ScTPValidationValue() override;
 
     static const sal_uInt16*    GetRanges() { return pValueRanges; }
@@ -237,8 +237,8 @@ private:
     std::unique_ptr<weld::TextView> m_xEdInputHelp;
 
 public:
-    ScTPValidationHelp(TabPageParent pParent, const SfxItemSet& rArgSet);
-    static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rArgSet);
+    ScTPValidationHelp(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet);
+    static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rArgSet);
     virtual ~ScTPValidationHelp() override;
 
     virtual bool        FillItemSet ( SfxItemSet* rArgSet ) override;
@@ -262,8 +262,8 @@ private:
     DECL_LINK(ClickSearchHdl, weld::Button&, void);
 
 public:
-    ScTPValidationError(TabPageParent pParent, const SfxItemSet& rArgSet);
-    static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rArgSet);
+    ScTPValidationError(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet);
+    static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rArgSet);
     virtual ~ScTPValidationError() override;
 
     virtual bool        FillItemSet ( SfxItemSet* rArgSet ) override;
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx
index c3a4d3f0f58a..4d8f1a24c483 100644
--- a/sc/source/ui/optdlg/opredlin.cxx
+++ b/sc/source/ui/optdlg/opredlin.cxx
@@ -28,12 +28,12 @@
 
 #include <opredlin.hxx>
 
-ScRedlineOptionsTabPage::ScRedlineOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "modules/scalc/ui/optchangespage.ui", "OptChangesPage", &rSet)
-    , m_xContentColorLB(new ColorListBox(m_xBuilder->weld_menu_button("changes"), pParent.GetFrameWeld()))
-    , m_xRemoveColorLB(new ColorListBox(m_xBuilder->weld_menu_button("deletions"), pParent.GetFrameWeld()))
-    , m_xInsertColorLB(new ColorListBox(m_xBuilder->weld_menu_button("entries"), pParent.GetFrameWeld()))
-    , m_xMoveColorLB(new ColorListBox(m_xBuilder->weld_menu_button("insertions"), pParent.GetFrameWeld()))
+ScRedlineOptionsTabPage::ScRedlineOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "modules/scalc/ui/optchangespage.ui", "OptChangesPage", &rSet)
+    , m_xContentColorLB(new ColorListBox(m_xBuilder->weld_menu_button("changes"), pController->getDialog()))
+    , m_xRemoveColorLB(new ColorListBox(m_xBuilder->weld_menu_button("deletions"), pController->getDialog()))
+    , m_xInsertColorLB(new ColorListBox(m_xBuilder->weld_menu_button("entries"), pController->getDialog()))
+    , m_xMoveColorLB(new ColorListBox(m_xBuilder->weld_menu_button("insertions"), pController->getDialog()))
 {
     m_xContentColorLB->SetSlotId(SID_AUTHOR_COLOR);
     m_xRemoveColorLB->SetSlotId(SID_AUTHOR_COLOR);
@@ -49,9 +49,9 @@ ScRedlineOptionsTabPage::~ScRedlineOptionsTabPage()
     m_xMoveColorLB.reset();
 }
 
-std::unique_ptr<SfxTabPage> ScRedlineOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
+std::unique_ptr<SfxTabPage> ScRedlineOptionsTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet )
 {
-    return std::make_unique<ScRedlineOptionsTabPage>( pParent, *rSet );
+    return std::make_unique<ScRedlineOptionsTabPage>( pPage, pController, *rSet );
 }
 
 bool ScRedlineOptionsTabPage::FillItemSet( SfxItemSet* /* rSet */ )
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index 5ea4b4089d08..923e11f60130 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -32,8 +32,8 @@
 
 #include <tpcalc.hxx>
 
-ScTpCalcOptions::ScTpCalcOptions(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
-    : SfxTabPage(pParent, "modules/scalc/ui/optcalculatepage.ui", "OptCalculatePage", &rCoreAttrs)
+ScTpCalcOptions::ScTpCalcOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs)
+    : SfxTabPage(pPage, pController, "modules/scalc/ui/optcalculatepage.ui", "OptCalculatePage", &rCoreAttrs)
     , pOldOptions(new ScDocOptions(
         static_cast<const ScTpCalcItem&>(rCoreAttrs.Get(
             GetWhich(SID_SCDOCOPTIONS))).GetDocOptions()))
@@ -77,9 +77,9 @@ void ScTpCalcOptions::Init()
     m_xBtnThread->connect_toggled( LINK( this, ScTpCalcOptions, CheckClickHdl ) );
 }
 
-std::unique_ptr<SfxTabPage> ScTpCalcOptions::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
+std::unique_ptr<SfxTabPage> ScTpCalcOptions::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
 {
-    return std::make_unique<ScTpCalcOptions>( pParent, *rAttrSet );
+    return std::make_unique<ScTpCalcOptions>( pPage, pController, *rAttrSet );
 }
 
 void ScTpCalcOptions::Reset( const SfxItemSet* /* rCoreAttrs */ )
diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx
index 17493b6948c3..65d1b80b4ddb 100644
--- a/sc/source/ui/optdlg/tpcompatibility.cxx
+++ b/sc/source/ui/optdlg/tpcompatibility.cxx
@@ -15,8 +15,8 @@
 #include <sc.hrc>
 #include <optutil.hxx>
 
-ScTpCompatOptions::ScTpCompatOptions(TabPageParent pParent, const SfxItemSet &rCoreAttrs)
-    : SfxTabPage(pParent, "modules/scalc/ui/optcompatibilitypage.ui", "OptCompatibilityPage", &rCoreAttrs)
+ScTpCompatOptions::ScTpCompatOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rCoreAttrs)
+    : SfxTabPage(pPage, pController, "modules/scalc/ui/optcompatibilitypage.ui", "OptCompatibilityPage", &rCoreAttrs)
     , m_xLbKeyBindings(m_xBuilder->weld_combo_box("keybindings"))
 {
 }
@@ -25,9 +25,9 @@ ScTpCompatOptions::~ScTpCompatOptions()
 {
 }
 
-std::unique_ptr<SfxTabPage> ScTpCompatOptions::Create(TabPageParent pParent, const SfxItemSet *rCoreAttrs)
+std::unique_ptr<SfxTabPage> ScTpCompatOptions::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rCoreAttrs)
 {
-    return std::make_unique<ScTpCompatOptions>(pParent, *rCoreAttrs);
+    return std::make_unique<ScTpCompatOptions>(pPage, pController, *rCoreAttrs);
 }
 
 bool ScTpCompatOptions::FillItemSet(SfxItemSet *rCoreAttrs)
diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx
index 456053258d48..a0c8234eefc9 100644
--- a/sc/source/ui/optdlg/tpdefaults.cxx
+++ b/sc/source/ui/optdlg/tpdefaults.cxx
@@ -14,8 +14,8 @@
 #include <defaultsoptions.hxx>
 #include <document.hxx>
 
-ScTpDefaultsOptions::ScTpDefaultsOptions(TabPageParent pParent, const SfxItemSet &rCoreSet)
-    : SfxTabPage(pParent, "modules/scalc/ui/optdefaultpage.ui", "OptDefaultPage", &rCoreSet)
+ScTpDefaultsOptions::ScTpDefaultsOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rCoreSet)
+    : SfxTabPage(pPage, pController, "modules/scalc/ui/optdefaultpage.ui", "OptDefaultPage", &rCoreSet)
     , m_xEdNSheets(m_xBuilder->weld_spin_button("sheetsnumber"))
     , m_xEdSheetPrefix(m_xBuilder->weld_entry("sheetprefix"))
 {
@@ -28,9 +28,9 @@ ScTpDefaultsOptions::~ScTpDefaultsOptions()
 {
 }
 
-std::unique_ptr<SfxTabPage> ScTpDefaultsOptions::Create(TabPageParent pParent, const SfxItemSet *rCoreAttrs)
+std::unique_ptr<SfxTabPage> ScTpDefaultsOptions::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rCoreAttrs)
 {
-    return std::make_unique<ScTpDefaultsOptions>(pParent, *rCoreAttrs);
+    return std::make_unique<ScTpDefaultsOptions>(pPage, pController, *rCoreAttrs);
 }
 
 bool ScTpDefaultsOptions::FillItemSet(SfxItemSet *rCoreSet)
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index 2edc691e3541..42e1e6e10dec 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -30,8 +30,8 @@
 
 #include <unotools/localedatawrapper.hxx>
 
-ScTpFormulaOptions::ScTpFormulaOptions(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
-    : SfxTabPage(pParent, "modules/scalc/ui/optformula.ui", "OptFormula", &rCoreAttrs)
+ScTpFormulaOptions::ScTpFormulaOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs)
+    : SfxTabPage(pPage, pController, "modules/scalc/ui/optformula.ui", "OptFormula", &rCoreAttrs)
     , mnDecSep(0)
     , mxLbFormulaSyntax(m_xBuilder->weld_combo_box("formulasyntax"))
     , mxCbEnglishFuncName(m_xBuilder->weld_check_button("englishfuncname"))
@@ -203,9 +203,9 @@ IMPL_LINK( ScTpFormulaOptions, SepEditOnFocusHdl, weld::Widget&, rControl, void
     OnFocusSeparatorInput(dynamic_cast<weld::Entry*>(&rControl));
 }
 
-std::unique_ptr<SfxTabPage> ScTpFormulaOptions::Create(TabPageParent pParent, const SfxItemSet* rCoreSet)
+std::unique_ptr<SfxTabPage> ScTpFormulaOptions::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet)
 {
-    return std::make_unique<ScTpFormulaOptions>(pParent, *rCoreSet);
+    return std::make_unique<ScTpFormulaOptions>(pPage, pController, *rCoreSet);
 }
 
 bool ScTpFormulaOptions::FillItemSet(SfxItemSet* rCoreSet)
diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx
index b3c5ee139f00..e8294c92f196 100644
--- a/sc/source/ui/optdlg/tpprint.cxx
+++ b/sc/source/ui/optdlg/tpprint.cxx
@@ -26,9 +26,9 @@
 #include <scmod.hxx>
 #include <sc.hrc>
 
-ScTpPrintOptions::ScTpPrintOptions( TabPageParent pPage,
+ScTpPrintOptions::ScTpPrintOptions( weld::Container* pPage, weld::DialogController* pController,
                                     const SfxItemSet& rCoreAttrs )
-    : SfxTabPage(pPage, "modules/scalc/ui/optdlg.ui", "optCalcPrintPage", &rCoreAttrs )
+    : SfxTabPage(pPage, pController, "modules/scalc/ui/optdlg.ui", "optCalcPrintPage", &rCoreAttrs )
     , m_xSkipEmptyPagesCB(m_xBuilder->weld_check_button("suppressCB"))
     , m_xSelectedSheetsCB(m_xBuilder->weld_check_button("printCB"))
     , m_xForceBreaksCB(m_xBuilder->weld_check_button("forceBreaksCB"))
@@ -39,9 +39,9 @@ ScTpPrintOptions::~ScTpPrintOptions()
 {
 }
 
-std::unique_ptr<SfxTabPage> ScTpPrintOptions::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> ScTpPrintOptions::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
 {
-    return std::make_unique<ScTpPrintOptions>(pParent, *rAttrSet);
+    return std::make_unique<ScTpPrintOptions>(pPage, pController, *rAttrSet);
 }
 
 DeactivateRC ScTpPrintOptions::DeactivatePage( SfxItemSet* pSetP )
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 3d7120935e9d..b243095191ea 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -44,9 +44,9 @@ static const sal_Unicode cDelimiter = ',';
 
 // Benutzerdefinierte Listen:
 
-ScTpUserLists::ScTpUserLists( TabPageParent pParent,
+ScTpUserLists::ScTpUserLists( weld::Container* pPage, weld::DialogController* pController,
                               const SfxItemSet&     rCoreAttrs )
-    : SfxTabPage(pParent, "modules/scalc/ui/optsortlists.ui", "OptSortLists",
+    : SfxTabPage(pPage, pController, "modules/scalc/ui/optsortlists.ui", "OptSortLists",
                           &rCoreAttrs )
     , mxFtLists(m_xBuilder->weld_label("listslabel"))
     , mxLbLists(m_xBuilder->weld_tree_view("lists"))
@@ -128,9 +128,9 @@ void ScTpUserLists::Init()
 
 }
 
-std::unique_ptr<SfxTabPage> ScTpUserLists::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
+std::unique_ptr<SfxTabPage> ScTpUserLists::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
 {
-    return std::make_unique<ScTpUserLists>(pParent, *rAttrSet);
+    return std::make_unique<ScTpUserLists>(pPage, pController, *rAttrSet);
 }
 
 void ScTpUserLists::Reset( const SfxItemSet* rCoreAttrs )
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 0fff707bac20..3e544ebaaa92 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -32,11 +32,11 @@
 #include <svx/colorbox.hxx>
 #include <svtools/unitconv.hxx>
 
-ScTpContentOptions::ScTpContentOptions(TabPageParent pParent, const SfxItemSet&  rArgSet)
-    : SfxTabPage(pParent, "modules/scalc/ui/tpviewpage.ui", "TpViewPage", &rArgSet)
+ScTpContentOptions::ScTpContentOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet&  rArgSet)
+    : SfxTabPage(pPage, pController, "modules/scalc/ui/tpviewpage.ui", "TpViewPage", &rArgSet)
     , m_xGridLB(m_xBuilder->weld_combo_box("grid"))
     , m_xColorFT(m_xBuilder->weld_label("color_label"))
-    , m_xColorLB(new ColorListBox(m_xBuilder->weld_menu_button("color"), pParent.GetFrameWeld()))
+    , m_xColorLB(new ColorListBox(m_xBuilder->weld_menu_button("color"), pController->getDialog()))
     , m_xBreakCB(m_xBuilder->weld_check_button("break"))
     , m_xGuideLineCB(m_xBuilder->weld_check_button("guideline"))
     , m_xFormulaCB(m_xBuilder->weld_check_button("formula"))
@@ -90,10 +90,10 @@ ScTpContentOptions::~ScTpContentOptions()
     m_xColorLB.reset();
 }
 
-std::unique_ptr<SfxTabPage> ScTpContentOptions::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> ScTpContentOptions::Create( weld::Container* pPage, weld::DialogController* pController,
                                                const SfxItemSet*     rCoreSet )
 {
-    return std::make_unique<ScTpContentOptions>(pParent, *rCoreSet);
+    return std::make_unique<ScTpContentOptions>(pPage, pController, *rCoreSet);
 }
 
 bool    ScTpContentOptions::FillItemSet( SfxItemSet* rCoreSet )
@@ -300,8 +300,8 @@ IMPL_LINK( ScTpContentOptions, GridHdl, weld::ComboBox&, rLb, void )
     m_xLocalOptions->SetOption( VOPT_GRID_ONTOP, bGridOnTop );
 }
 
-ScTpLayoutOptions::ScTpLayoutOptions(TabPageParent pParent, const SfxItemSet& rArgSet)
-    : SfxTabPage(pParent, "modules/scalc/ui/scgeneralpage.ui", "ScGeneralPage", &rArgSet)
+ScTpLayoutOptions::ScTpLayoutOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet)
+    : SfxTabPage(pPage, pController, "modules/scalc/ui/scgeneralpage.ui", "ScGeneralPage", &rArgSet)
     , pDoc(nullptr)
     , m_xUnitLB(m_xBuilder->weld_combo_box("unitlb"))
     , m_xTabMF(m_xBuilder->weld_metric_spin_button("tabmf", FieldUnit::CM))
@@ -353,10 +353,10 @@ ScTpLayoutOptions::~ScTpLayoutOptions()
 {
 }
 
-std::unique_ptr<SfxTabPage> ScTpLayoutOptions::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> ScTpLayoutOptions::Create( weld::Container* pPage, weld::DialogController* pController,
                                               const SfxItemSet*   rCoreSet )
 {
-    auto xNew = std::make_unique<ScTpLayoutOptions>(pParent, *rCoreSet);
+    auto xNew = std::make_unique<ScTpLayoutOptions>(pPage, pController, *rCoreSet);
 
     ScDocShell* pDocSh = dynamic_cast< ScDocShell *>( SfxObjectShell::Current() );
     if (pDocSh!=nullptr)
diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx
index 4a1d5590e731..539aa5955a1c 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -40,11 +40,11 @@
 
 // class ScHFEditPage
 
-ScHFEditPage::ScHFEditPage(TabPageParent pParent,
+ScHFEditPage::ScHFEditPage(weld::Container* pPage, weld::DialogController* pController,
                            const SfxItemSet& rCoreAttrs,
                            sal_uInt16 nWhichId,
                            bool bHeader)
-    : SfxTabPage(pParent, "modules/scalc/ui/headerfootercontent.ui", "HeaderFooterContent", &rCoreAttrs)
+    : SfxTabPage(pPage, pController, "modules/scalc/ui/headerfootercontent.ui", "HeaderFooterContent", &rCoreAttrs)
     , nWhich( nWhichId )
     , m_bDropDownActive(false)
     , m_nTimeToggled(-1)
@@ -67,9 +67,9 @@ ScHFEditPage::ScHFEditPage(TabPageParent pParent,
     , m_xFtCustomized(m_xBuilder->weld_label("labelSTR_HF_CUSTOMIZED"))
     , m_xLeft(m_xBuilder->weld_widget("labelFT_LEFT"))
     , m_xRight(m_xBuilder->weld_widget("labelFT_RIGHT"))
-    , m_xWndLeft(new ScEditWindow(Left, pParent.GetFrameWeld()))
-    , m_xWndCenter(new ScEditWindow(Center, pParent.GetFrameWeld()))
-    , m_xWndRight(new ScEditWindow(Right, pParent.GetFrameWeld()))
+    , m_xWndLeft(new ScEditWindow(Left, pController->getDialog()))
+    , m_xWndCenter(new ScEditWindow(Center, pController->getDialog()))
+    , m_xWndRight(new ScEditWindow(Right, pController->getDialog()))
     , m_xWndLeftWnd(new weld::CustomWeld(*m_xBuilder, "textviewWND_LEFT", *m_xWndLeft))
     , m_xWndCenterWnd(new weld::CustomWeld(*m_xBuilder, "textviewWND_CENTER", *m_xWndCenter))
     , m_xWndRightWnd(new weld::CustomWeld(*m_xBuilder, "textviewWND_RIGHT", *m_xWndRight))
@@ -781,58 +781,58 @@ IMPL_LINK(ScHFEditPage, MenuHdl, const OString&, rSelectedId, void)
 
 // class ScRightHeaderEditPage
 
-ScRightHeaderEditPage::ScRightHeaderEditPage( TabPageParent pParent, const SfxItemSet& rCoreSet )
-    : ScHFEditPage( pParent,
+ScRightHeaderEditPage::ScRightHeaderEditPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet )
+    : ScHFEditPage( pPage, pController,
                     rCoreSet,
                     rCoreSet.GetPool()->GetWhich(SID_SCATTR_PAGE_HEADERRIGHT ),
                     true )
     {}
 
-std::unique_ptr<SfxTabPage> ScRightHeaderEditPage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet )
+std::unique_ptr<SfxTabPage> ScRightHeaderEditPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet )
 {
-    return std::make_unique<ScRightHeaderEditPage>( pParent, *rCoreSet );
+    return std::make_unique<ScRightHeaderEditPage>( pPage, pController, *rCoreSet );
 }
 
 // class ScLeftHeaderEditPage
 
-ScLeftHeaderEditPage::ScLeftHeaderEditPage( TabPageParent pParent, const SfxItemSet& rCoreSet )
-    : ScHFEditPage( pParent,
+ScLeftHeaderEditPage::ScLeftHeaderEditPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet )
+    : ScHFEditPage( pPage, pController,
                     rCoreSet,
                     rCoreSet.GetPool()->GetWhich(SID_SCATTR_PAGE_HEADERLEFT ),
                     true )
     {}
 
-std::unique_ptr<SfxTabPage> ScLeftHeaderEditPage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet )
+std::unique_ptr<SfxTabPage> ScLeftHeaderEditPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet )
 {
-    return std::make_unique<ScLeftHeaderEditPage>( pParent, *rCoreSet );
+    return std::make_unique<ScLeftHeaderEditPage>( pPage, pController, *rCoreSet );
 }
 
 // class ScRightFooterEditPage
 
-ScRightFooterEditPage::ScRightFooterEditPage( TabPageParent pParent, const SfxItemSet& rCoreSet )
-    : ScHFEditPage( pParent,
+ScRightFooterEditPage::ScRightFooterEditPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet )
+    : ScHFEditPage( pPage, pController,
                     rCoreSet,
                     rCoreSet.GetPool()->GetWhich(SID_SCATTR_PAGE_FOOTERRIGHT ),
                     false )
     {}
 
-std::unique_ptr<SfxTabPage> ScRightFooterEditPage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet )
+std::unique_ptr<SfxTabPage> ScRightFooterEditPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet )
 {
-    return std::make_unique<ScRightFooterEditPage>( pParent, *rCoreSet );
+    return std::make_unique<ScRightFooterEditPage>( pPage, pController, *rCoreSet );
 }
 
 // class ScLeftFooterEditPage
 
-ScLeftFooterEditPage::ScLeftFooterEditPage( TabPageParent pParent, const SfxItemSet& rCoreSet )
-    : ScHFEditPage( pParent,
+ScLeftFooterEditPage::ScLeftFooterEditPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet )
+    : ScHFEditPage( pPage, pController,
                     rCoreSet,
                     rCoreSet.GetPool()->GetWhich(SID_SCATTR_PAGE_FOOTERLEFT ),
                     false )
     {}
 
-std::unique_ptr<SfxTabPage> ScLeftFooterEditPage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet )
+std::unique_ptr<SfxTabPage> ScLeftFooterEditPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet )
 {
-    return std::make_unique<ScLeftFooterEditPage>( pParent, *rCoreSet );
+    return std::make_unique<ScLeftFooterEditPage>( pPage, pController, *rCoreSet );
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx
index 604c8520ccbf..f037e0c2ee08 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -42,8 +42,8 @@
 
 // class ScHFPage
 
-ScHFPage::ScHFPage(TabPageParent pParent, const SfxItemSet& rSet, sal_uInt16 nSetId)
-    : SvxHFPage(pParent, rSet, nSetId)
+ScHFPage::ScHFPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet, sal_uInt16 nSetId)
+    : SvxHFPage(pPage, pController, rSet, nSetId)
     , aDataSet(*rSet.GetPool(), svl::Items<ATTR_PAGE, ATTR_PAGE, ATTR_PAGE_HEADERLEFT, ATTR_PAGE_FOOTERRIGHT>{})
     , nPageUsage(SvxPageUsage::All)
     , pStyleDlg(nullptr)
@@ -180,24 +180,23 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl, void*, void)
     {
         OUString  aText;
         SfxSingleTabDialogController aDlg(GetDialogFrameWeld(), &aDataSet);
-        TabPageParent pPageParent(aDlg.get_content_area(), &aDlg);
         bool bRightPage = m_xCntSharedBox->get_active() || (SvxPageUsage::Left != nPageUsage);
 
         if ( nId == SID_ATTR_PAGE_HEADERSET )
         {
             aText = ScResId( STR_PAGEHEADER );
             if ( bRightPage )
-                aDlg.SetTabPage(ScRightHeaderEditPage::Create(pPageParent, &aDataSet));
+                aDlg.SetTabPage(ScRightHeaderEditPage::Create(aDlg.get_content_area(), &aDlg, &aDataSet));
             else
-                aDlg.SetTabPage(ScLeftHeaderEditPage::Create(pPageParent, &aDataSet));
+                aDlg.SetTabPage(ScLeftHeaderEditPage::Create(aDlg.get_content_area(), &aDlg, &aDataSet));
         }
         else
         {
             aText = ScResId( STR_PAGEFOOTER );
             if ( bRightPage )
-                aDlg.SetTabPage(ScRightFooterEditPage::Create(pPageParent, &aDataSet));
+                aDlg.SetTabPage(ScRightFooterEditPage::Create(aDlg.get_content_area(), &aDlg, &aDataSet));
             else
-                aDlg.SetTabPage(ScLeftFooterEditPage::Create(pPageParent, &aDataSet));
+                aDlg.SetTabPage(ScLeftFooterEditPage::Create(aDlg.get_content_area(), &aDlg, &aDataSet));
         }
 
         SvxNumType eNumType = aDataSet.Get(ATTR_PAGE).GetNumType();
@@ -217,14 +216,14 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl, void*, void)
 
 // class ScHeaderPage
 
-ScHeaderPage::ScHeaderPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : ScHFPage(pParent, rSet, SID_ATTR_PAGE_HEADERSET)
+ScHeaderPage::ScHeaderPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : ScHFPage(pPage, pController, rSet, SID_ATTR_PAGE_HEADERSET)
 {
 }
 
-std::unique_ptr<SfxTabPage> ScHeaderPage::Create(TabPageParent pParent, const SfxItemSet* rCoreSet)
+std::unique_ptr<SfxTabPage> ScHeaderPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet)
 {
-    return std::make_unique<ScHeaderPage>(pParent, *rCoreSet);
+    return std::make_unique<ScHeaderPage>(pPage, pController, *rCoreSet);
 }
 
 const sal_uInt16* ScHeaderPage::GetRanges()
@@ -234,14 +233,14 @@ const sal_uInt16* ScHeaderPage::GetRanges()
 
 // class ScFooterPage
 
-ScFooterPage::ScFooterPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : ScHFPage( pParent, rSet, SID_ATTR_PAGE_FOOTERSET )
+ScFooterPage::ScFooterPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : ScHFPage( pPage, pController, rSet, SID_ATTR_PAGE_FOOTERSET )
 {
 }
 
-std::unique_ptr<SfxTabPage> ScFooterPage::Create(TabPageParent pParent, const SfxItemSet* rCoreSet)
+std::unique_ptr<SfxTabPage> ScFooterPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet)
 {
-    return std::make_unique<ScFooterPage>(pParent, *rCoreSet);
+    return std::make_unique<ScFooterPage>(pPage, pController, *rCoreSet);
 }
 
 const sal_uInt16* ScFooterPage::GetRanges()
diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index 5656364d6c4c..692fc245f617 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -94,8 +94,8 @@ bool WAS_DEFAULT(sal_uInt16 w, SfxItemSet const & s)
 #define SC_TPTABLE_SCALE_TO         1
 #define SC_TPTABLE_SCALE_TO_PAGES   2
 
-ScTablePage::ScTablePage(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
-    : SfxTabPage(pParent, "modules/scalc/ui/sheetprintpage.ui", "SheetPrintPage", &rCoreAttrs)
+ScTablePage::ScTablePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs)
+    : SfxTabPage(pPage, pController, "modules/scalc/ui/sheetprintpage.ui", "SheetPrintPage", &rCoreAttrs)
     , m_nOrigScalePageWidth(0)
     , m_nOrigScalePageHeight(0)
     , m_xBtnTopDown(m_xBuilder->weld_radio_button("radioBTN_TOPDOWN"))
@@ -142,9 +142,9 @@ ScTablePage::~ScTablePage()
 {
 }
 
-std::unique_ptr<SfxTabPage> ScTablePage::Create(TabPageParent pParent, const SfxItemSet* rCoreSet)
+std::unique_ptr<SfxTabPage> ScTablePage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet)
 {
-    return std::make_unique<ScTablePage>(pParent, *rCoreSet);
+    return std::make_unique<ScTablePage>(pPage, pController, *rCoreSet);
 }
 
 void ScTablePage::Reset( const SfxItemSet* rCoreSet )
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 8d72ef4c6185..9c6c49f7e37a 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -524,12 +524,12 @@ bool ScPreviewShell::HasPrintOptionsPage() const
     return true;
 }
 
-std::unique_ptr<SfxTabPage> ScPreviewShell::CreatePrintOptionsPage(TabPageParent pParent, const SfxItemSet &rOptions)
+std::unique_ptr<SfxTabPage> ScPreviewShell::CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rOptions)
 {
     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
     ::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc(RID_SC_TP_PRINT);
     if ( ScTpPrintOptionsCreate )
-        return ScTpPrintOptionsCreate(pParent, &rOptions);
+        return ScTpPrintOptionsCreate(pPage, pController, &rOptions);
     return nullptr;
 }
 
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 4c907049c2a0..9bf853e23197 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1035,12 +1035,12 @@ bool ScTabViewShell::HasPrintOptionsPage() const
     return true;
 }
 
-std::unique_ptr<SfxTabPage> ScTabViewShell::CreatePrintOptionsPage(TabPageParent pParent, const SfxItemSet &rOptions )
+std::unique_ptr<SfxTabPage> ScTabViewShell::CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rOptions )
 {
     ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
     ::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc(RID_SC_TP_PRINT);
     if ( ScTpPrintOptionsCreate )
-        return ScTpPrintOptionsCreate(pParent, &rOptions);
+        return ScTpPrintOptionsCreate(pPage, pController, &rOptions);
     return nullptr;
 }