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>
author: Caolán McNamara <caolanm@redhat.com> 2019-09-24 14:10:48 +0100
committer: Caolán McNamara <caolanm@redhat.com> 2019-09-26 09:54:49 +0200
commit: deb37c44ecfb8f6aa7c2ceec4771b0505fa7b6bb (patch)
tree: 3953ca620e27fed0442272fdabea9735fd6f3dcd /cui
parent: a37e559ed123789f6bc8f7972242d6461ce692ab (diff)
116 files changed, 565 insertions, 572 deletions
diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx
index 08fb276030be..6f0da7cd834c 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -38,8 +38,8 @@
 
 #include <dlgname.hxx>
 
-SvxMenuConfigPage::SvxMenuConfigPage(TabPageParent pParent, const SfxItemSet& rSet, bool bIsMenuBar)
-    : SvxConfigPage(pParent, rSet)
+SvxMenuConfigPage::SvxMenuConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet, bool bIsMenuBar)
+    : SvxConfigPage(pPage, pController, rSet)
     , m_bIsMenuBar(bIsMenuBar)
 {
     m_xGearBtn = m_xBuilder->weld_menu_button("menugearbtn");
diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx b/cui/source/customize/SvxNotebookbarConfigPage.cxx
index 5c439ab8182b..26c0de69a21a 100644
--- a/cui/source/customize/SvxNotebookbarConfigPage.cxx
+++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx
@@ -99,8 +99,10 @@ static OUString getModuleId(const OUString& sModuleName)
         return "None";
 }
 
-SvxNotebookbarConfigPage::SvxNotebookbarConfigPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SvxConfigPage(pParent, rSet)
+SvxNotebookbarConfigPage::SvxNotebookbarConfigPage(weld::Container* pPage,
+                                                   weld::DialogController* pController,
+                                                   const SfxItemSet& rSet)
+    : SvxConfigPage(pPage, pController, rSet)
 {
     m_xDescriptionFieldLb->set_visible(false);
     m_xSearchEdit->set_visible(false);
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx
index 39de9ba9f08d..60dffd4e0c4f 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -43,8 +43,8 @@
 
 #include <dlgname.hxx>
 
-SvxToolbarConfigPage::SvxToolbarConfigPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SvxConfigPage(pParent, rSet)
+SvxToolbarConfigPage::SvxToolbarConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SvxConfigPage(pPage, pController, rSet)
 {
     m_xGearBtn = m_xBuilder->weld_menu_button("toolbargearbtn");
     m_xGearBtn->show();
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 2cdca489eb75..ca0bfbf574c1 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -814,8 +814,8 @@ IMPL_LINK(SfxAcceleratorConfigPage, KeyInputHdl, const KeyEvent&, rKey, bool)
     return false;
 }
 
-SfxAcceleratorConfigPage::SfxAcceleratorConfigPage(TabPageParent pParent, const SfxItemSet& aSet )
-    : SfxTabPage(pParent, "cui/ui/accelconfigpage.ui", "AccelConfigPage", &aSet)
+SfxAcceleratorConfigPage::SfxAcceleratorConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& aSet )
+    : SfxTabPage(pPage, pController, "cui/ui/accelconfigpage.ui", "AccelConfigPage", &aSet)
     , m_pMacroInfoItem()
     , aLoadAccelConfigStr(CuiResId(RID_SVXSTR_LOADACCELCONFIG))
     , aSaveAccelConfigStr(CuiResId(RID_SVXSTR_SAVEACCELCONFIG))
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 0246f66d82a8..4200f2e8238b 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -161,35 +161,35 @@ SvxConfigPage::CanConfig( const OUString& aModuleId )
     return !(aModuleId == "com.sun.star.script.BasicIDE" || aModuleId == "com.sun.star.frame.Bibliography");
 }
 
-static std::unique_ptr<SfxTabPage> CreateSvxMenuConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
+static std::unique_ptr<SfxTabPage> CreateSvxMenuConfigPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet )
 {
-    return std::make_unique<SvxMenuConfigPage>(pParent, *rSet);
+    return std::make_unique<SvxMenuConfigPage>(pPage, pController, *rSet);
 }
 
-static std::unique_ptr<SfxTabPage> CreateSvxContextMenuConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
+static std::unique_ptr<SfxTabPage> CreateSvxContextMenuConfigPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet )
 {
-    return std::make_unique<SvxMenuConfigPage>(pParent, *rSet, false);
+    return std::make_unique<SvxMenuConfigPage>(pPage, pController, *rSet, false);
 }
 
-static std::unique_ptr<SfxTabPage> CreateKeyboardConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
+static std::unique_ptr<SfxTabPage> CreateKeyboardConfigPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet )
 {
-       return std::make_unique<SfxAcceleratorConfigPage>(pParent, *rSet);
+       return std::make_unique<SfxAcceleratorConfigPage>(pPage, pController, *rSet);
 }
 
-static std::unique_ptr<SfxTabPage> CreateSvxNotebookbarConfigPage(TabPageParent pParent,
+static std::unique_ptr<SfxTabPage> CreateSvxNotebookbarConfigPage(weld::Container* pPage, weld::DialogController* pController,
                                                          const SfxItemSet* rSet)
 {
-    return std::make_unique<SvxNotebookbarConfigPage>(pParent, *rSet);
+    return std::make_unique<SvxNotebookbarConfigPage>(pPage, pController, *rSet);
 }
 
-static std::unique_ptr<SfxTabPage> CreateSvxToolbarConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
+static std::unique_ptr<SfxTabPage> CreateSvxToolbarConfigPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet )
 {
-    return std::make_unique<SvxToolbarConfigPage>(pParent, *rSet);
+    return std::make_unique<SvxToolbarConfigPage>(pPage, pController, *rSet);
 }
 
-static std::unique_ptr<SfxTabPage> CreateSvxEventConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
+static std::unique_ptr<SfxTabPage> CreateSvxEventConfigPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet )
 {
-    return std::make_unique<SvxEventConfigPage>(pParent, *rSet, SvxEventConfigPage::EarlyInit());
+    return std::make_unique<SvxEventConfigPage>(pPage, pController, *rSet, SvxEventConfigPage::EarlyInit());
 }
 
 /******************************************************************************
@@ -969,8 +969,8 @@ IMPL_LINK(SvxMenuEntriesListBox, KeyInputHdl, const KeyEvent&, rKeyEvent, bool)
  * both tabpages to add, delete, move and rename items etc.
  *
  *****************************************************************************/
-SvxConfigPage::SvxConfigPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/menuassignpage.ui", "MenuAssignPage", &rSet)
+SvxConfigPage::SvxConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/menuassignpage.ui", "MenuAssignPage", &rSet)
     , m_aUpdateDataTimer("UpdateDataTimer")
     , bInitialised(false)
     , pCurrentSaveInData(nullptr)
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index 155708aba3ce..72cd08b168fa 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -36,9 +36,9 @@
 using namespace ::com::sun::star;
 
 
-SvxEventConfigPage::SvxEventConfigPage(TabPageParent pParent, const SfxItemSet& rSet,
+SvxEventConfigPage::SvxEventConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet,
     SvxEventConfigPage::EarlyInit)
-    : SvxMacroTabPage_(pParent, "cui/ui/eventsconfigpage.ui", "EventsConfigPage", rSet)
+    : SvxMacroTabPage_(pPage, pController, "cui/ui/eventsconfigpage.ui", "EventsConfigPage", rSet)
     , m_xSaveInListBox(m_xBuilder->weld_combo_box("savein"))
 {
     mpImpl->xEventLB = m_xBuilder->weld_tree_view("events");
diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx
index 869ada7ebef4..8db1fdaff7c8 100644
--- a/cui/source/customize/eventdlg.hxx
+++ b/cui/source/customize/eventdlg.hxx
@@ -41,7 +41,7 @@ public:
 
     /// this is only to let callers know that there is a LateInit which *must* be called
     struct EarlyInit { };
-    SvxEventConfigPage(TabPageParent pParent, const SfxItemSet& rSet, EarlyInit);
+    SvxEventConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet, EarlyInit);
     virtual ~SvxEventConfigPage() override;
 
     void            LateInit( const css::uno::Reference< css::frame::XFrame >& _rxFrame );
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index d7d005487832..00478e2f7bf1 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -72,9 +72,9 @@ void SvxMacroTabPage_::EnableButtons()
     }
 }
 
-SvxMacroTabPage_::SvxMacroTabPage_(TabPageParent pParent, const OUString& rUIXMLDescription,
+SvxMacroTabPage_::SvxMacroTabPage_(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription,
     const OString& rID, const SfxItemSet& rAttrSet)
-    : SfxTabPage(pParent, rUIXMLDescription, rID, &rAttrSet)
+    : SfxTabPage(pPage, pController, rUIXMLDescription, rID, &rAttrSet)
     , bDocModified(false)
     , bAppEvents(false)
     , bInitialized(false)
@@ -582,12 +582,12 @@ std::pair< OUString, OUString  > SvxMacroTabPage_::GetPairFromAny( const Any& aA
     return std::make_pair( type, url );
 }
 
-SvxMacroTabPage::SvxMacroTabPage(TabPageParent pParent,
+SvxMacroTabPage::SvxMacroTabPage(weld::Container* pPage, weld::DialogController* pController,
     const Reference< frame::XFrame >& _rxDocumentFrame,
     const SfxItemSet& rSet,
     Reference< container::XNameReplace > const & xNameReplace,
     sal_uInt16 nSelectedIndex)
-    : SvxMacroTabPage_(pParent, "cui/ui/macroassignpage.ui", "MacroAssignPage", rSet)
+    : SvxMacroTabPage_(pPage, pController, "cui/ui/macroassignpage.ui", "MacroAssignPage", rSet)
 {
     mpImpl->xEventLB = m_xBuilder->weld_tree_view("assignments");
     mpImpl->xEventLB->set_size_request(mpImpl->xEventLB->get_approximate_digit_width() * 70,
@@ -615,8 +615,7 @@ SvxMacroAssignDlg::SvxMacroAssignDlg(weld::Window* pParent, const Reference< fra
     const Reference< container::XNameReplace >& xNameReplace, sal_uInt16 nSelectedIndex)
         : SvxMacroAssignSingleTabDialog(pParent, rSet)
 {
-    TabPageParent pPageParent(get_content_area(), this);
-    SetTabPage(std::make_unique<SvxMacroTabPage>(pPageParent, _rxDocumentFrame, rSet, xNameReplace, nSelectedIndex));
+    SetTabPage(std::make_unique<SvxMacroTabPage>(get_content_area(), this, _rxDocumentFrame, rSet, xNameReplace, nSelectedIndex));
 }
 
 IMPL_LINK_NOARG(AssignComponentDialog, ButtonHandler, weld::Button&, void)
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 360effa6dc5f..caa9b92291c1 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -454,8 +454,7 @@ void SpellDialog::StartSpellOptDlg_Impl()
     SfxItemSet aSet( SfxGetpApp()->GetPool(), svl::Items<SID_AUTOSPELL_CHECK,SID_AUTOSPELL_CHECK>{});
     SfxSingleTabDialogController aDlg(m_xDialog.get(), &aSet, "cui/ui/spelloptionsdialog.ui", "SpellOptionsDialog");
 
-    TabPageParent aParent(aDlg.get_content_area(), &aDlg);
-    std::unique_ptr<SfxTabPage> xPage = SvxLinguTabPage::Create(aParent, &aSet);
+    std::unique_ptr<SfxTabPage> xPage = SvxLinguTabPage::Create(aDlg.get_content_area(), &aDlg, &aSet);
     static_cast<SvxLinguTabPage*>(xPage.get())->HideGroups( GROUP_MODULES );
     aDlg.SetTabPage(std::move(xPage));
     if (RET_OK == aDlg.run())
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index b7fdc641da19..7b197b3967e9 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -504,8 +504,8 @@ void GalleryThemeProperties::PageCreated(const OString& rId, SfxTabPage &rPage)
         static_cast<TPGalleryThemeProperties&>( rPage ).SetXChgData( pData );
 }
 
-TPGalleryThemeGeneral::TPGalleryThemeGeneral(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/gallerygeneralpage.ui", "GalleryGeneralPage", &rSet)
+TPGalleryThemeGeneral::TPGalleryThemeGeneral(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/gallerygeneralpage.ui", "GalleryGeneralPage", &rSet)
     , pData(nullptr)
     , m_xFiMSImage(m_xBuilder->weld_image("image"))
     , m_xEdtMSName(m_xBuilder->weld_entry("name"))
@@ -574,13 +574,13 @@ bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet* /*rSet*/ )
     return true;
 }
 
-std::unique_ptr<SfxTabPage> TPGalleryThemeGeneral::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> TPGalleryThemeGeneral::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
 {
-    return std::make_unique<TPGalleryThemeGeneral>(pParent, *rSet);
+    return std::make_unique<TPGalleryThemeGeneral>(pPage, pController, *rSet);
 }
 
-TPGalleryThemeProperties::TPGalleryThemeProperties(TabPageParent pWindow, const SfxItemSet& rSet)
-    : SfxTabPage(pWindow, "cui/ui/galleryfilespage.ui", "GalleryFilesPage", &rSet)
+TPGalleryThemeProperties::TPGalleryThemeProperties(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/galleryfilespage.ui", "GalleryFilesPage", &rSet)
     , pData(nullptr)
     , bEntriesFound(false)
     , bInputAllowed(true)
@@ -641,9 +641,9 @@ TPGalleryThemeProperties::~TPGalleryThemeProperties()
     aFilterEntryList.clear();
 }
 
-std::unique_ptr<SfxTabPage> TPGalleryThemeProperties::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> TPGalleryThemeProperties::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
 {
-    return std::make_unique<TPGalleryThemeProperties>(pParent, *rSet);
+    return std::make_unique<TPGalleryThemeProperties>(pPage, pController, *rSet);
 }
 
 OUString TPGalleryThemeProperties::addExtension( const OUString& _rDisplayText, const OUString& _rExtension )
diff --git a/cui/source/inc/SvxMenuConfigPage.hxx b/cui/source/inc/SvxMenuConfigPage.hxx
index 78061d9fd562..881f805fe097 100644
--- a/cui/source/inc/SvxMenuConfigPage.hxx
+++ b/cui/source/inc/SvxMenuConfigPage.hxx
@@ -56,7 +56,7 @@ private:
     virtual void    SelectElement() override;
 
 public:
-    SvxMenuConfigPage(TabPageParent pParent, const SfxItemSet& rItemSet, bool bIsMenuBar = true);
+    SvxMenuConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rItemSet, bool bIsMenuBar = true);
     virtual ~SvxMenuConfigPage() override;
 
     SaveInData* CreateSaveInData(
diff --git a/cui/source/inc/SvxNotebookbarConfigPage.hxx b/cui/source/inc/SvxNotebookbarConfigPage.hxx
index a945c4b47a86..7793d6e6415b 100644
--- a/cui/source/inc/SvxNotebookbarConfigPage.hxx
+++ b/cui/source/inc/SvxNotebookbarConfigPage.hxx
@@ -54,7 +54,8 @@ public:
         OUString sUIItemId;
         OUString sClassType;
     };
-    SvxNotebookbarConfigPage(TabPageParent pParent, const SfxItemSet& rItemSet);
+    SvxNotebookbarConfigPage(weld::Container* pPage, weld::DialogController* pController,
+                             const SfxItemSet& rItemSet);
     virtual ~SvxNotebookbarConfigPage() override;
     SaveInData* CreateSaveInData(const css::uno::Reference<css::ui::XUIConfigurationManager>&,
                                  const css::uno::Reference<css::ui::XUIConfigurationManager>&,
diff --git a/cui/source/inc/SvxToolbarConfigPage.hxx b/cui/source/inc/SvxToolbarConfigPage.hxx
index a4998e9862d6..54204676456c 100644
--- a/cui/source/inc/SvxToolbarConfigPage.hxx
+++ b/cui/source/inc/SvxToolbarConfigPage.hxx
@@ -55,7 +55,7 @@ private:
     virtual void    SelectElement() override;
 
 public:
-    SvxToolbarConfigPage(TabPageParent pParent, const SfxItemSet& rItemSet);
+    SvxToolbarConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rItemSet);
     virtual ~SvxToolbarConfigPage() override;
 
     void            AddFunction(int nTarget = -1);
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index c351274dc281..41df1d05896f 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -139,7 +139,7 @@ private:
     void                        ResetConfig();
 
 public:
-                                SfxAcceleratorConfigPage(TabPageParent pParent, const SfxItemSet& rItemSet);
+                                SfxAcceleratorConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rItemSet);
     virtual                     ~SfxAcceleratorConfigPage() override;
 
     virtual bool                FillItemSet( SfxItemSet* ) override;
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index 69ae8ead2e82..b571601c61bd 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -50,8 +50,8 @@ class AlignmentTabPage : public SfxTabPage
 
 public:
     virtual             ~AlignmentTabPage() override;
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
-    explicit            AlignmentTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet);
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
+    explicit            AlignmentTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet);
 
     static const sal_uInt16*  GetRanges() { return s_pRanges; }
 
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 61a239b968bf..3def561b87d0 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -66,10 +66,10 @@ private:
     void InsertEntry(const OUString& rTxt);
 
 public:
-    OfaAutocorrOptionsPage(TabPageParent pParent, const SfxItemSet& rSet);
+    OfaAutocorrOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     virtual ~OfaAutocorrOptionsPage() 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;
@@ -119,8 +119,8 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
     void CreateEntry(const OUString& rTxt, sal_uInt16 nCol);
 
 public:
-    OfaSwAutoFmtOptionsPage(TabPageParent pParent, const SfxItemSet& rSet);
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
+    OfaSwAutoFmtOptionsPage(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 ~OfaSwAutoFmtOptionsPage() override;
 
@@ -190,10 +190,10 @@ private:
                             LanguageType eNewLanguage);
 
 public:
-    OfaAutocorrReplacePage(TabPageParent pParent, const SfxItemSet& rSet);
+    OfaAutocorrReplacePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     virtual ~OfaAutocorrReplacePage() 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;
@@ -245,10 +245,10 @@ private:
                                         LanguageType eOldLanguage,
                                         LanguageType eNewLanguage);
 public:
-    OfaAutocorrExceptPage(TabPageParent pParent, const SfxItemSet& rSet);
+    OfaAutocorrExceptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     virtual ~OfaAutocorrExceptPage() 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;
@@ -301,8 +301,8 @@ private:
                             sal_uInt16 nCol, sal_uInt16 nTextCol);
 
 public:
-    OfaQuoteTabPage(TabPageParent pParent, const SfxItemSet& rSet);
-    static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent,
+    OfaQuoteTabPage(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 ~OfaQuoteTabPage() override;
 
@@ -336,8 +336,8 @@ private:
     DECL_LINK(KeyReleaseHdl, const KeyEvent&, bool);
 
 public:
-    OfaAutoCompleteTabPage(TabPageParent pParent, const SfxItemSet& rSet);
-    static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent,
+    OfaAutoCompleteTabPage(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 ~OfaAutoCompleteTabPage() override;
 
@@ -398,10 +398,10 @@ private:
 
 public:
     /// construction via Create()
-    OfaSmartTagOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+    OfaSmartTagOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     virtual ~OfaSmartTagOptionsTabPage() 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/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 86d52da29511..782e56d9f811 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -44,8 +44,8 @@ class SvxBackgroundTabPage : public SvxTabPage
 {
     static const sal_uInt16 pPageRanges[];
 public:
-    SvxBackgroundTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet);
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+    SvxBackgroundTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet);
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
     virtual ~SvxBackgroundTabPage() override;
 
     // returns the area of the which-values
@@ -163,10 +163,10 @@ class SvxBkgTabPage : public SvxAreaTabPage
 
     DECL_LINK(TblDestinationHdl_Impl, weld::ComboBox&, void);
 public:
-    SvxBkgTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+    SvxBkgTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
     virtual ~SvxBkgTabPage() override;
 
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
     virtual bool FillItemSet( SfxItemSet* ) override;
     virtual void ActivatePage( const SfxItemSet& ) override;
     virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 30e2ad5318df..a138620017e1 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -79,9 +79,9 @@ class SvxBorderTabPage : public SfxTabPage
     static const sal_uInt16 pRanges[];
 
 public:
-    SvxBorderTabPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
+    SvxBorderTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs);
     virtual ~SvxBorderTabPage() override;
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
                                 const SfxItemSet* rAttrSet);
     static const sal_uInt16*      GetRanges() { return pRanges; }
 
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index eeb7644049b8..e360d79f096e 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -404,7 +404,7 @@ protected:
     std::unique_ptr<weld::Button>              m_xRemoveCommandButton;
 
 
-    SvxConfigPage(TabPageParent, const SfxItemSet&);
+    SvxConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet&);
 
     DECL_LINK(MoveHdl, weld::Button&, void);
     DECL_LINK(SelectFunctionHdl, weld::TreeView&, void);
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 8d98176d3bfc..15906a085657 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -40,7 +40,7 @@ protected:
 
     bool                m_bPreviewBackgroundToCharacter;
 
-    SvxCharBasePage(TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet& rAttrSet);
+    SvxCharBasePage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet& rAttrSet);
 
     void SetPrevFontWidthScale( const SfxItemSet& rSet );
     void SetPrevFontEscapement( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc );
@@ -138,8 +138,8 @@ public:
     virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
 
 public:
-    SvxCharNamePage(TabPageParent pParent, const SfxItemSet& rSet);
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+    SvxCharNamePage(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 ~SvxCharNamePage() override;
 
     static const sal_uInt16* GetRanges() { return pNameRanges; }
@@ -209,8 +209,8 @@ private:
     DECL_LINK(ColorBoxSelectHdl_Impl, ColorListBox&, void);
 
 public:
-    SvxCharEffectsPage(TabPageParent pParent, const SfxItemSet& rSet);
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+    SvxCharEffectsPage(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 ~SvxCharEffectsPage() override;
 
     virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
@@ -279,8 +279,8 @@ private:
     void FontModifyHdl_Impl();
 
 public:
-    SvxCharPositionPage(TabPageParent pParent, const SfxItemSet& rSet);
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+    SvxCharPositionPage(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 ~SvxCharPositionPage() override;
 
     virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
@@ -318,8 +318,8 @@ private:
     DECL_LINK(CharacterMapHdl_Impl, weld::TreeView&, void);
 
 public:
-    SvxCharTwoLinesPage(TabPageParent pParent, const SfxItemSet& rSet);
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+    SvxCharTwoLinesPage(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 ~SvxCharTwoLinesPage() override;
 
     virtual void        ActivatePage( const SfxItemSet& rSet ) override;
diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx
index d89fa4521676..1b41851476a1 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -58,10 +58,10 @@ private:
 
 public:
 
-    SvxConnectionPage(TabPageParent pWindow, const SfxItemSet& rInAttrs);
+    SvxConnectionPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
     virtual ~SvxConnectionPage() override;
 
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
     static const sal_uInt16* GetRanges() { return pRanges; }
 
     virtual bool        FillItemSet( SfxItemSet* ) override;
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 751557c850fa..35142bf1c935 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -203,9 +203,9 @@ private:
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
 
 public:
-    TPGalleryThemeGeneral(TabPageParent pParent, const SfxItemSet& rSet);
+    TPGalleryThemeGeneral(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     void                SetXChgData( ExchangeData* pData );
-    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 );
 };
 
 class TPGalleryThemeProperties : public SfxTabPage
@@ -261,7 +261,7 @@ class TPGalleryThemeProperties : public SfxTabPage
     DECL_LINK(DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void);
 
 public:
-    TPGalleryThemeProperties(TabPageParent pWindow, const SfxItemSet& rSet);
+    TPGalleryThemeProperties(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     virtual ~TPGalleryThemeProperties() override;
 
     void                SetXChgData( ExchangeData* pData );
@@ -269,7 +269,7 @@ public:
 
     void                StartSearchFiles( const OUString& _rFolderURL, short _nDlgResult );
 
-    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);
 };
 
 #endif // INCLUDED_CUI_SOURCE_INC_CUIGALDLG_HXX
diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index 64c152699315..fa2310d1729d 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -60,10 +60,10 @@ protected:
     virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
 
 public:
-    SvxGeneralTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+    SvxGeneralTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     virtual ~SvxGeneralTabPage() 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/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 368090dc14bf..0ef979f11c85 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -186,10 +186,10 @@ class SvxTransparenceTabPage : public SfxTabPage
     void InvalidatePreview (bool bEnable = true );
 
 public:
-    SvxTransparenceTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+    SvxTransparenceTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
     virtual ~SvxTransparenceTabPage() override;
 
-    static std::unique_ptr<SfxTabPage> Create(TabPageParent, const SfxItemSet*);
+    static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet*);
     static const sal_uInt16* GetRanges() { return pTransparenceRanges; }
 
     virtual bool FillItemSet(SfxItemSet*) override;
@@ -262,10 +262,10 @@ private:
     DeactivateRC DeactivatePage_Impl( SfxItemSet* pSet );
 
 public:
-    SvxAreaTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+    SvxAreaTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
     virtual ~SvxAreaTabPage() override;
 
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
     static const sal_uInt16* GetRanges() { return pAreaRanges; }
 
     virtual bool FillItemSet( SfxItemSet* ) override;
@@ -321,10 +321,10 @@ private:
     DECL_LINK(SelectShadowHdl_Impl, ColorListBox&, void);
 
 public:
-    SvxShadowTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+    SvxShadowTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
     virtual ~SvxShadowTabPage() override;
 
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
     static const sal_uInt16* GetRanges() { return pShadowRanges; }
 
     virtual bool FillItemSet( SfxItemSet* ) override;
@@ -396,12 +396,12 @@ private:
     sal_Int32 SearchGradientList(const OUString& rGradientName);
 
 public:
-    SvxGradientTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+    SvxGradientTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
     virtual ~SvxGradientTabPage() override;
 
     void    Construct();
 
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
     virtual bool FillItemSet( SfxItemSet* ) override;
     virtual void Reset( const SfxItemSet * ) override;
 
@@ -464,12 +464,12 @@ private:
     sal_Int32 SearchHatchList(const OUString& rHatchName);
 
 public:
-    SvxHatchTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+    SvxHatchTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
     virtual ~SvxHatchTabPage() override;
 
     void    Construct();
 
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
     virtual bool FillItemSet( SfxItemSet* ) override;
     virtual void Reset( const SfxItemSet * ) override;
 
@@ -544,12 +544,12 @@ private:
     sal_Int32 SearchBitmapList(const GraphicObject& rGraphicObject);
 
 public:
-    SvxBitmapTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+    SvxBitmapTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
     virtual ~SvxBitmapTabPage() override;
 
     void    Construct();
 
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
 
     virtual bool FillItemSet( SfxItemSet* ) override;
     virtual void Reset( const SfxItemSet * ) override;
@@ -598,12 +598,12 @@ private:
     sal_Int32 SearchPatternList(const OUString& rPatternName);
 
 public:
-    SvxPatternTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+    SvxPatternTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
     virtual ~SvxPatternTabPage() override;
 
     void    Construct();
 
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
     virtual bool FillItemSet( SfxItemSet* ) override;
     virtual void Reset( const SfxItemSet * ) override;
 
@@ -712,12 +712,12 @@ private:
     sal_Int32 FindInPalette( const Color& rColor );
 
 public:
-    SvxColorTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+    SvxColorTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
     virtual ~SvxColorTabPage() override;
 
     void    Construct();
 
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
     virtual bool FillItemSet( SfxItemSet* ) override;
     virtual void Reset( const SfxItemSet * ) override;
 
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index ae42ecc947bb..87ae008da36e 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -200,12 +200,12 @@ public:
 
     void ShowSymbolControls(bool bOn);
 
-    SvxLineTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+    SvxLineTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
     virtual ~SvxLineTabPage() override;
 
     void    Construct();
 
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
     static const sal_uInt16* GetRanges() { return pLineRanges; }
 
     virtual bool FillItemSet( SfxItemSet* ) override;
@@ -291,12 +291,12 @@ private:
     void CheckChanges_Impl();
 
 public:
-    SvxLineDefTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+    SvxLineDefTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
     virtual ~SvxLineDefTabPage() override;
 
     void    Construct();
 
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
     virtual bool FillItemSet( SfxItemSet* ) override;
     virtual void Reset( const SfxItemSet * ) override;
 
@@ -351,12 +351,12 @@ private:
     void CheckChanges_Impl();
 
 public:
-    SvxLineEndDefTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+    SvxLineEndDefTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
     virtual ~SvxLineEndDefTabPage() override;
 
     void    Construct();
 
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
     virtual bool FillItemSet( SfxItemSet* ) override;
     virtual void Reset( const SfxItemSet * ) override;
 
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index dc3d9d17b232..06ea7809cb8b 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -68,10 +68,10 @@ namespace svx
         void openLinkDialog(const OUString& sOldName, const OUString& sOldLocation, int nEntry = -1);
 
     public:
-        DbRegistrationOptionsPage(TabPageParent pParent, const SfxItemSet& rSet);
+        DbRegistrationOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
         virtual ~DbRegistrationOptionsPage() 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;
diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx
index 7e3987a795e1..3d3c99de1c00 100644
--- a/cui/source/inc/dstribut.hxx
+++ b/cui/source/inc/dstribut.hxx
@@ -40,7 +40,7 @@ class SvxDistributePage : public SfxTabPage
     std::unique_ptr<weld::RadioButton> m_xBtnVerBottom;
 
 public:
-    SvxDistributePage(TabPageParent pWindow, const SfxItemSet& rInAttrs,
+    SvxDistributePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs,
         SvxDistributeHorizontal eHor,
         SvxDistributeVertical eVer);
     virtual ~SvxDistributePage() override;
diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index 1294c2cbab77..afdc7cb6ba6f 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -95,8 +95,8 @@ class SvxGrfCropPage : public SfxTabPage
 
     static Size     GetGrfOrigSize(const Graphic&);
 public:
-    SvxGrfCropPage(TabPageParent pParent, const SfxItemSet &rSet);
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet *rSet );
+    SvxGrfCropPage(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 ~SvxGrfCropPage() override;
 
     virtual bool FillItemSet( SfxItemSet *rSet ) override;
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 267d4b8f9233..792ce61fc1a0 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -78,10 +78,10 @@ private:
     DECL_LINK(SelectCaptTypeHdl_Impl, SvtValueSet*, void);
 
 public:
-    SvxCaptionTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+    SvxCaptionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
     virtual ~SvxCaptionTabPage() override;
 
-    static std::unique_ptr<SfxTabPage>  Create( TabPageParent, const SfxItemSet* );
+    static std::unique_ptr<SfxTabPage>  Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
     static const sal_uInt16*  GetRanges() { return pCaptionRanges; }
 
     virtual bool        FillItemSet( SfxItemSet* ) override;
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index 07ed15d2108a..2069cc4c2ea7 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -51,7 +51,7 @@ class SfxMacroTabPage final : public SfxTabPage
 
 public:
     SfxMacroTabPage(
-        TabPageParent pParent,
+        weld::Container* pPage, weld::DialogController* pController,
         const css::uno::Reference< css::frame::XFrame >& rxDocumentFrame,
         const SfxItemSet& rSet
     );
@@ -72,7 +72,7 @@ public:
     bool                        IsReadOnly() const override;
 
     // --------- inherit from the base -------------
-    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 );
 };
 
 class SfxMacroAssignDlg : public SfxSingleTabDialogController
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index 145463fadea5..c761e19423b7 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -70,7 +70,7 @@ protected:
     bool bDocModified, bAppEvents, bInitialized;
     EventDisplayNames aDisplayNames;
 
-    SvxMacroTabPage_(TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet& rItemSet);
+    SvxMacroTabPage_(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet& rItemSet);
 
     void                        EnableButtons();
     static css::uno::Any  GetPropsByName( const OUString& eventName, EventsHash& eventsHash );
@@ -95,7 +95,7 @@ class SvxMacroTabPage : public SvxMacroTabPage_
 {
 public:
     SvxMacroTabPage(
-        TabPageParent pParent,
+        weld::Container* pPage, weld::DialogController* pController,
         const css::uno::Reference< css::frame::XFrame >& _rxDocumentFrame,
         const SfxItemSet& rSet,
         css::uno::Reference< css::container::XNameReplace > const & xNameReplace,
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index 58a38e822f2b..7915fcc381ea 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -67,10 +67,10 @@ private:
 
 public:
 
-    SvxMeasurePage(TabPageParent pWindow, const SfxItemSet& rInAttrs);
+    SvxMeasurePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
     virtual ~SvxMeasurePage() override;
 
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
     static const sal_uInt16* GetRanges() { return pRanges; }
 
     virtual bool        FillItemSet( SfxItemSet* ) override;
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index b822cd369f9b..5d68d4082ae9 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -60,8 +60,8 @@ class SvxNumberFormatTabPage : public SfxTabPage
     static const sal_uInt16 pRanges[];
 
 public:
-    SvxNumberFormatTabPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
+    SvxNumberFormatTabPage(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 ~SvxNumberFormatTabPage() override;
     // Returns area information.
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index fffe71e4dee4..56131e25c841 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -73,10 +73,10 @@ class SvxSingleNumPickTabPage final : public SfxTabPage
     DECL_LINK(DoubleClickHdl_Impl, SvtValueSet*, void);
 
 public:
-    SvxSingleNumPickTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+    SvxSingleNumPickTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     virtual ~SvxSingleNumPickTabPage() 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 void        ActivatePage(const SfxItemSet& rSet) override;
@@ -102,10 +102,10 @@ class SvxBulletPickTabPage final : public SfxTabPage
     DECL_LINK(NumSelectHdl_Impl, SvtValueSet*, void);
     DECL_LINK(DoubleClickHdl_Impl, SvtValueSet*, void);
 public:
-    SvxBulletPickTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+    SvxBulletPickTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     virtual ~SvxBulletPickTabPage() 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 void        ActivatePage(const SfxItemSet& rSet) override;
@@ -140,10 +140,10 @@ class SvxNumPickTabPage final : public SfxTabPage
     DECL_LINK(DoubleClickHdl_Impl, SvtValueSet*, void);
 
 public:
-    SvxNumPickTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+    SvxNumPickTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     virtual ~SvxNumPickTabPage() 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 void        ActivatePage(const SfxItemSet& rSet) override;
@@ -179,10 +179,10 @@ class SvxBitmapPickTabPage final : public SfxTabPage
     DECL_LINK(ClickAddBrowseHdl_Impl, weld::Button&, void);
 
 public:
-    SvxBitmapPickTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+    SvxBitmapPickTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     virtual ~SvxBitmapPickTabPage() 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 void        ActivatePage(const SfxItemSet& rSet) override;
@@ -279,10 +279,10 @@ class SvxNumOptionsTabPage : public SfxTabPage
     void EditModifyHdl_Impl(const weld::Entry*);
 
 public:
-    SvxNumOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+    SvxNumOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     virtual ~SvxNumOptionsTabPage() 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 void        ActivatePage(const SfxItemSet& rSet) override;
@@ -364,7 +364,7 @@ class SvxNumPositionTabPage : public SfxTabPage
     DECL_LINK(IndentAtHdl_Impl, weld::MetricSpinButton&, void);
 
 public:
-    SvxNumPositionTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+    SvxNumPositionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     virtual ~SvxNumPositionTabPage() override;
 
     virtual void        ActivatePage(const SfxItemSet& rSet) override;
@@ -372,7 +372,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                SetMetric(FieldUnit eSet);
diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx
index ab38e033811a..f46a7d1a34db 100644
--- a/cui/source/inc/optasian.hxx
+++ b/cui/source/inc/optasian.hxx
@@ -47,10 +47,10 @@ class SvxAsianLayoutPage : public SfxTabPage
     DECL_LINK(ModifyHdl, weld::Entry&, void);
 
 public:
-    SvxAsianLayoutPage(TabPageParent pParent, const SfxItemSet& rSet );
+    SvxAsianLayoutPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet );
     virtual ~SvxAsianLayoutPage() 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 );
     static const sal_uInt16*  GetRanges();
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
     virtual void        Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index e0740cf8602a..37b3f0900f2e 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -133,8 +133,8 @@ private:
     void                UpdateDicBox_Impl();
 
 public:
-    SvxLinguTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet);
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+    SvxLinguTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet);
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
     virtual ~SvxLinguTabPage() override;
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index 7dd36f6b47ab..5dea8c1f201a 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -58,8 +58,8 @@ private:
                              const OUString& _rUserPath, const OUString& _rWritablePath );
 
 public:
-    SvxPathTabPage( TabPageParent pParent, const SfxItemSet& rSet );
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+    SvxPathTabPage( 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 ~SvxPathTabPage() override;
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index 3448d8572202..04648e4342ac 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -161,8 +161,8 @@ protected:
     virtual DeactivateRC   DeactivatePage( SfxItemSet* pSet ) override;
 
 public:
-    SvxPageDescPage(TabPageParent pParent, const SfxItemSet& rSet);
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+    SvxPageDescPage(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 ~SvxPageDescPage() override;
 
     // returns the range of the Which values
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 3df98a5bed07..51fe77596c41 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -98,8 +98,8 @@ protected:
 
 
 public:
-    SvxStdParagraphTabPage(TabPageParent pParent, const SfxItemSet& rSet);
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+    SvxStdParagraphTabPage(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 ~SvxStdParagraphTabPage() override;
 
     DECL_LINK(ELRLoseFocusHdl, weld::MetricSpinButton&, void);
@@ -161,8 +161,8 @@ protected:
     virtual DeactivateRC    DeactivatePage( SfxItemSet* pSet ) override;
 
 public:
-    SvxParaAlignTabPage(TabPageParent pParent, const SfxItemSet& rSet);
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+    SvxParaAlignTabPage(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 ~SvxParaAlignTabPage() override;
 
     static const sal_uInt16* GetRanges() { return pAlignRanges; }
@@ -194,8 +194,8 @@ class SvxExtParagraphTabPage: public SfxTabPage
     static const sal_uInt16 pExtRanges[];
 
 public:
-    SvxExtParagraphTabPage(TabPageParent pParent, const SfxItemSet& rSet);
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
+    SvxExtParagraphTabPage(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 ~SvxExtParagraphTabPage() override;
 
@@ -286,8 +286,8 @@ class SvxAsianTabPage : public SfxTabPage
     std::unique_ptr<weld::CheckButton> m_xScriptSpaceCB;
 
 public:
-    SvxAsianTabPage(TabPageParent pParent, const SfxItemSet& rSet);
-    static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
+    SvxAsianTabPage(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 ~SvxAsianTabPage() override;
 
     static const sal_uInt16*      GetRanges();
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx
index d02d915a3b6e..1fe926566073 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -109,8 +109,8 @@ class SvxSwPosSizeTabPage : public SfxTabPage
     void setOptimalRelWidth();
 
 public:
-    SvxSwPosSizeTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+    SvxSwPosSizeTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
     virtual ~SvxSwPosSizeTabPage() override;
 
     static const sal_uInt16*     GetRanges();
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index 38c95d2f52ce..a49d0e99095a 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -62,8 +62,8 @@ class SvxTabulatorTabPage : public SfxTabPage
     static const sal_uInt16 pRanges[];
 
 public:
-    SvxTabulatorTabPage(TabPageParent pParent, const SfxItemSet& rSet);
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+    SvxTabulatorTabPage(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 ~SvxTabulatorTabPage() override;
 
     static const sal_uInt16* GetRanges() { return pRanges; }
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index b5b2ae409e1e..4b22395f7910 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -78,10 +78,10 @@ private:
     sal_uInt16 GetSelectedDirection() const;
 
 public:
-    SvxTextAnimationPage(TabPageParent pPage, const SfxItemSet& rInAttrs);
+    SvxTextAnimationPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
     virtual ~SvxTextAnimationPage() override;
 
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
     static const sal_uInt16* GetRanges() { return pRanges; }
 
     virtual bool        FillItemSet( SfxItemSet* ) override;
diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx
index 0cc80c9e64ff..392794de9543 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -74,10 +74,10 @@ private:
 
 public:
 
-    SvxTextAttrPage(TabPageParent pWindow, const SfxItemSet& rInAttrs);
+    SvxTextAttrPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
     virtual ~SvxTextAttrPage() override;
 
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
     static const sal_uInt16*  GetRanges() { return pRanges; }
 
     virtual bool        FillItemSet( SfxItemSet* ) override;
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index f90b7318534a..973ff69dbddb 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -129,10 +129,10 @@ private:
     DECL_LINK( ClickAutoHdl, weld::ToggleButton&, void );
 
 public:
-    SvxPositionSizeTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+    SvxPositionSizeTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
     virtual ~SvxPositionSizeTabPage() override;
 
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
     static const sal_uInt16* GetRanges() {  return pPosSizeRanges; }
 
     virtual bool FillItemSet( SfxItemSet* ) override;
@@ -186,10 +186,10 @@ private:
     std::unique_ptr<weld::CustomWeld> m_xCtlAngle;
 
 public:
-    SvxAngleTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+    SvxAngleTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
     virtual ~SvxAngleTabPage() override;
 
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
     static const sal_uInt16*  GetRanges() { return pAngleRanges; }
 
     virtual bool FillItemSet( SfxItemSet* ) override;
@@ -232,10 +232,10 @@ private:
     std::unique_ptr<weld::MetricSpinButton> m_aControlY[2];
 
 public:
-    SvxSlantTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+    SvxSlantTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
     virtual ~SvxSlantTabPage() override;
 
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
     static const sal_uInt16* GetRanges() {  return pSlantRanges; }
 
     virtual bool FillItemSet( SfxItemSet* ) override;
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index 6f6449b52be0..45ca5d9f3e07 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -46,8 +46,8 @@ namespace offapp
         return false;
     }
 
-    ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(TabPageParent pParent, const SfxItemSet& _rAttrSet)
-        : SfxTabPage(pParent, "cui/ui/connpooloptions.ui", "ConnPoolPage", &_rAttrSet)
+    ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet)
+        : SfxTabPage(pPage, pController, "cui/ui/connpooloptions.ui", "ConnPoolPage", &_rAttrSet)
         , m_sYes(CuiResId(RID_SVXSTR_YES))
         , m_sNo(CuiResId(RID_SVXSTR_NO))
         , m_xEnablePooling(m_xBuilder->weld_check_button("connectionpooling"))
@@ -125,9 +125,9 @@ namespace offapp
     {
     }
 
-    std::unique_ptr<SfxTabPage> ConnectionPoolOptionsPage::Create(TabPageParent pParent, const SfxItemSet* _rAttrSet)
+    std::unique_ptr<SfxTabPage> ConnectionPoolOptionsPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* _rAttrSet)
     {
-        return std::make_unique<ConnectionPoolOptionsPage>(pParent, *_rAttrSet);
+        return std::make_unique<ConnectionPoolOptionsPage>(pPage, pController, *_rAttrSet);
     }
 
     void ConnectionPoolOptionsPage::implInitControls(const SfxItemSet& _rSet)
diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx
index 41acf9cc453a..4e9420d76cb2 100644
--- a/cui/source/options/connpooloptions.hxx
+++ b/cui/source/options/connpooloptions.hxx
@@ -43,9 +43,9 @@ namespace offapp
         std::unique_ptr<weld::SpinButton> m_xTimeout;
 
     public:
-        ConnectionPoolOptionsPage(TabPageParent _pParent, const SfxItemSet& _rAttrSet);
+        ConnectionPoolOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet);
         virtual ~ConnectionPoolOptionsPage() 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);
 
     private:
         virtual bool        FillItemSet(SfxItemSet* _rSet) override;
diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx
index 08682efb1360..f58985d90b35 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -32,8 +32,7 @@ SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(weld::Window *pParent,
 {
     // m_xPage will be implicitly destroyed by the
     // SfxSingleTabDialog destructor
-    TabPageParent pPageParent(get_content_area(), this);
-    SetTabPage(SvxJSearchOptionsPage::Create(pPageParent, &rOptionsSet)); //! implicitly calls m_xPage->Reset(...)!
+    SetTabPage(SvxJSearchOptionsPage::Create(get_content_area(), this, &rOptionsSet)); //! implicitly calls m_xPage->Reset(...)!
     m_pPage = static_cast<SvxJSearchOptionsPage*>(GetTabPage());
     m_pPage->EnableSaveOptions(false);
     m_pPage->SetTransliterationFlags(nInitialFlags);
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index a58819d3caea..2e60ef473787 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -61,8 +61,7 @@ DatabaseRegistrationDialog::DatabaseRegistrationDialog(weld::Window* pParent, co
     : RegistrationItemSetHolder(rInAttrs)
     , SfxSingleTabDialogController(pParent, &getRegistrationItems())
 {
-    TabPageParent aParent(get_content_area(), this);
-    SetTabPage(DbRegistrationOptionsPage::Create(aParent, &getRegistrationItems()));
+    SetTabPage(DbRegistrationOptionsPage::Create(get_content_area(), this, &getRegistrationItems()));
     m_xDialog->set_title(CuiResId(RID_SVXSTR_REGISTERED_DATABASES));
 }
 
@@ -80,8 +79,8 @@ short DatabaseRegistrationDialog::run()
 
 // class DbRegistrationOptionsPage --------------------------------------------------
 
-DbRegistrationOptionsPage::DbRegistrationOptionsPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/dbregisterpage.ui", "DbRegisterPage", &rSet)
+DbRegistrationOptionsPage::DbRegistrationOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/dbregisterpage.ui", "DbRegisterPage", &rSet)
     , m_nOldCount(0)
     , m_bModified(false)
     , m_xNew(m_xBuilder->weld_button("new"))
@@ -117,10 +116,10 @@ DbRegistrationOptionsPage::~DbRegistrationOptionsPage()
         delete reinterpret_cast<DatabaseRegistration*>(m_xPathBox->get_id(i).toInt64());
 }
 
-std::unique_ptr<SfxTabPage> DbRegistrationOptionsPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> DbRegistrationOptionsPage::Create( weld::Container* pPage, weld::DialogController* pController,
                                     const SfxItemSet* rAttrSet )
 {
-    return std::make_unique<DbRegistrationOptionsPage>(pParent, *rAttrSet);
+    return std::make_unique<DbRegistrationOptionsPage>(pPage, pController, *rAttrSet);
 }
 
 bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet* rCoreSet )
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index c308dd72d7ad..4cedb534c6f9 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -32,8 +32,8 @@
 /*                                                                   */
 /*********************************************************************/
 
-SvxFontSubstTabPage::SvxFontSubstTabPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/optfontspage.ui", "OptFontsPage", &rSet)
+SvxFontSubstTabPage::SvxFontSubstTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/optfontspage.ui", "OptFontsPage", &rSet)
     , m_xConfig(new SvtFontSubstConfig)
     , m_bSorted(false)
     , m_xUseTableCB(m_xBuilder->weld_check_button("usetable"))
@@ -140,10 +140,10 @@ SvxFontSubstTabPage::~SvxFontSubstTabPage()
 {
 }
 
-std::unique_ptr<SfxTabPage> SvxFontSubstTabPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxFontSubstTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
                                                 const SfxItemSet* rAttrSet)
 {
-    return std::make_unique<SvxFontSubstTabPage>(pParent, *rAttrSet);
+    return std::make_unique<SvxFontSubstTabPage>(pPage, pController, *rAttrSet);
 }
 
 bool  SvxFontSubstTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index a250a80c8bfa..880c11675858 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -50,8 +50,8 @@ class SvxFontSubstTabPage : public SfxTabPage
     void            setColSizes();
 
 public:
-    SvxFontSubstTabPage(TabPageParent pParent, const SfxItemSet& rSet);
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet);
+    SvxFontSubstTabPage(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 ~SvxFontSubstTabPage() override;
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
     virtual void        Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index a251ea81ce94..a394ff955a4a 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -22,9 +22,9 @@
 #include <vcl/svapp.hxx>
 #include <officecfg/Office/Common.hxx>
 
-SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage(TabPageParent pParent,
+SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage(weld::Container* pPage, weld::DialogController* pController,
     const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/optaccessibilitypage.ui", "OptAccessibilityPage", &rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/optaccessibilitypage.ui", "OptAccessibilityPage", &rSet)
     , m_xAccessibilityTool(m_xBuilder->weld_check_button("acctool"))
     , m_xTextSelectionInReadonly(m_xBuilder->weld_check_button("textselinreadonly"))
     , m_xAnimatedGraphics(m_xBuilder->weld_check_button("animatedgraphics"))
@@ -43,9 +43,9 @@ SvxAccessibilityOptionsTabPage::~SvxAccessibilityOptionsTabPage()
 {
 }
 
-std::unique_ptr<SfxTabPage> SvxAccessibilityOptionsTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> SvxAccessibilityOptionsTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
 {
-    return std::make_unique<SvxAccessibilityOptionsTabPage>(pParent, *rAttrSet);
+    return std::make_unique<SvxAccessibilityOptionsTabPage>(pPage, pController, *rAttrSet);
 }
 
 bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx
index 5f00ec328b50..93886c73555d 100644
--- a/cui/source/options/optaccessibility.hxx
+++ b/cui/source/options/optaccessibility.hxx
@@ -32,10 +32,10 @@ class SvxAccessibilityOptionsTabPage : public SfxTabPage
     std::unique_ptr<weld::CheckButton> m_xPagePreviews;
 
 public:
-    SvxAccessibilityOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+    SvxAccessibilityOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     virtual ~SvxAccessibilityOptionsTabPage() 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/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 2b053e30998a..9c57cac8eaac 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -100,8 +100,8 @@ void SvxAsianLayoutPage_Impl::addForbiddenCharacters(
 
 static LanguageType eLastUsedLanguageTypeForForbiddenCharacters(USHRT_MAX);
 
-SvxAsianLayoutPage::SvxAsianLayoutPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/optasianpage.ui", "OptAsianPage", &rSet)
+SvxAsianLayoutPage::SvxAsianLayoutPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/optasianpage.ui", "OptAsianPage", &rSet)
     , pImpl(new SvxAsianLayoutPage_Impl)
     , m_xCharKerningRB(m_xBuilder->weld_radio_button("charkerning"))
     , m_xCharPunctKerningRB(m_xBuilder->weld_radio_button("charpunctkerning"))
@@ -131,9 +131,9 @@ SvxAsianLayoutPage::~SvxAsianLayoutPage()
 {
 }
 
-std::unique_ptr<SfxTabPage> SvxAsianLayoutPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> SvxAsianLayoutPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
 {
-    return std::make_unique<SvxAsianLayoutPage>(pParent, *rAttrSet);
+    return std::make_unique<SvxAsianLayoutPage>(pPage, pController, *rAttrSet);
 }
 
 bool SvxAsianLayoutPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx
index 4563ed3887a6..c550d9440edd 100644
--- a/cui/source/options/optbasic.cxx
+++ b/cui/source/options/optbasic.cxx
@@ -21,8 +21,8 @@
 #include <basic/codecompletecache.hxx>
 #include <officecfg/Office/BasicIDE.hxx>
 
-SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/optbasicidepage.ui", "OptBasicIDEPage", &rSet)
+SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/optbasicidepage.ui", "OptBasicIDEPage", &rSet)
     , m_xCodeCompleteChk(m_xBuilder->weld_check_button("codecomplete_enable"))
     , m_xAutocloseProcChk(m_xBuilder->weld_check_button("autoclose_proc"))
     , m_xAutocloseParenChk(m_xBuilder->weld_check_button("autoclose_paren"))
@@ -118,9 +118,9 @@ void SvxBasicIDEOptionsPage::Reset( const SfxItemSet* /*rSet*/ )
     m_xUseExtendedTypesChk->save_state();
 }
 
-std::unique_ptr<SfxTabPage> SvxBasicIDEOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
+std::unique_ptr<SfxTabPage> SvxBasicIDEOptionsPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
 {
-    return std::make_unique<SvxBasicIDEOptionsPage>( pParent, *rAttrSet );
+    return std::make_unique<SvxBasicIDEOptionsPage>(pPage, pController, *rAttrSet);
 }
 
 void SvxBasicIDEOptionsPage::FillUserData()
diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx
index 63f2fed9b299..5510fc12994c 100644
--- a/cui/source/options/optbasic.hxx
+++ b/cui/source/options/optbasic.hxx
@@ -35,10 +35,10 @@ private:
     void LoadConfig();
 
 public:
-    SvxBasicIDEOptionsPage(TabPageParent pParent, const SfxItemSet& rSet);
+    SvxBasicIDEOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     virtual ~SvxBasicIDEOptionsPage() 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;
     virtual void FillUserData() override;
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 2f6938101f85..c2526074366c 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -88,8 +88,8 @@ void SvxDefaultColorOptPage::FillBoxChartColorLB()
     m_xLbChartColors->thaw();
 }
 
-SvxDefaultColorOptPage::SvxDefaultColorOptPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
-    : SfxTabPage(pParent, "cui/ui/optchartcolorspage.ui", "OptChartColorsPage", &rInAttrs)
+SvxDefaultColorOptPage::SvxDefaultColorOptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+    : SfxTabPage(pPage, pController, "cui/ui/optchartcolorspage.ui", "OptChartColorsPage", &rInAttrs)
     , m_xLbChartColors(m_xBuilder->weld_tree_view("colors"))
     , m_xLbPaletteSelector(m_xBuilder->weld_combo_box("paletteselector"))
     , m_xPBDefault(m_xBuilder->weld_button("default"))
@@ -141,9 +141,9 @@ void SvxDefaultColorOptPage::Construct()
     m_xLbChartColors->select( 0 );
 }
 
-std::unique_ptr<SfxTabPage> SvxDefaultColorOptPage::Create( TabPageParent pParent, const SfxItemSet* rAttrs )
+std::unique_ptr<SfxTabPage> SvxDefaultColorOptPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrs )
 {
-    return std::make_unique<SvxDefaultColorOptPage>( pParent, *rAttrs );
+    return std::make_unique<SvxDefaultColorOptPage>( pPage, pController, *rAttrs );
 }
 
 bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet* rOutAttrs )
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index 8a0da42f3b66..f8b0dcb8f1f4 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -65,12 +65,12 @@ private:
     void FillBoxChartColorLB();
 
 public:
-    SvxDefaultColorOptPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+    SvxDefaultColorOptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
     virtual ~SvxDefaultColorOptPage() override;
 
     void    Construct();
 
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
+    static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs );
     virtual bool        FillItemSet( SfxItemSet* rOutAttrs ) override;
     virtual void        Reset( const SfxItemSet* rInAttrs ) override;
 
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 828ecfd3c481..3ab68a498949 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -693,13 +693,13 @@ IMPL_LINK(ColorConfigCtrl_Impl, ControlFocusHdl, weld::Widget&, rCtrl, void)
 }
 
 // SvxColorOptionsTabPage
-SvxColorOptionsTabPage::SvxColorOptionsTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet)
-    : SfxTabPage(pParent, "cui/ui/optappearancepage.ui", "OptAppearancePage", &rCoreSet)
+SvxColorOptionsTabPage::SvxColorOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet)
+    : SfxTabPage(pPage, pController, "cui/ui/optappearancepage.ui", "OptAppearancePage", &rCoreSet)
     , bFillItemSetCalled(false)
     , m_xColorSchemeLB(m_xBuilder->weld_combo_box("colorschemelb"))
     , m_xSaveSchemePB(m_xBuilder->weld_button("save"))
     , m_xDeleteSchemePB(m_xBuilder->weld_button("delete"))
-    , m_xColorConfigCT(new ColorConfigCtrl_Impl(pParent.GetFrameWeld(), *m_xBuilder))
+    , m_xColorConfigCT(new ColorConfigCtrl_Impl(pController->getDialog(), *m_xBuilder))
     , m_xTable(m_xBuilder->weld_widget("table"))
     , m_xOnFT(m_xBuilder->weld_label("on"))
     , m_xElementFT(m_xBuilder->weld_label("uielements"))
@@ -743,9 +743,9 @@ SvxColorOptionsTabPage::~SvxColorOptionsTabPage()
     m_xColorConfigCT.reset();
 }
 
-std::unique_ptr<SfxTabPage> SvxColorOptionsTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> SvxColorOptionsTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
 {
-    return std::make_unique<SvxColorOptionsTabPage>(pParent, *rAttrSet);
+    return std::make_unique<SvxColorOptionsTabPage>(pPage, pController, *rAttrSet);
 }
 
 bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet*  )
diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx
index a3b6349d75b8..8e59592bfbee 100644
--- a/cui/source/options/optcolor.hxx
+++ b/cui/source/options/optcolor.hxx
@@ -49,10 +49,10 @@ class SvxColorOptionsTabPage : public SfxTabPage
     void UpdateColorConfig();
 
 public:
-    SvxColorOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+    SvxColorOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     virtual ~SvxColorOptionsTabPage() 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/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index 35a207bc9f54..983f077e7ff8 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -37,8 +37,8 @@ IMPL_LINK_NOARG(SvxCTLOptionsPage, SequenceCheckingCB_Hdl, weld::Button&, void)
     }
 }
 
-SvxCTLOptionsPage::SvxCTLOptionsPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/optctlpage.ui", "OptCTLPage", &rSet)
+SvxCTLOptionsPage::SvxCTLOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/optctlpage.ui", "OptCTLPage", &rSet)
     , m_xSequenceCheckingCB(m_xBuilder->weld_check_button("sequencechecking"))
     , m_xRestrictedCB(m_xBuilder->weld_check_button("restricted"))
     , m_xTypeReplaceCB(m_xBuilder->weld_check_button("typeandreplace"))
@@ -53,9 +53,9 @@ SvxCTLOptionsPage::~SvxCTLOptionsPage()
 {
 }
 
-std::unique_ptr<SfxTabPage> SvxCTLOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
+std::unique_ptr<SfxTabPage> SvxCTLOptionsPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
 {
-    return std::make_unique<SvxCTLOptionsPage>( pParent, *rAttrSet );
+    return std::make_unique<SvxCTLOptionsPage>( pPage, pController, *rAttrSet );
 }
 
 bool SvxCTLOptionsPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx
index f92cbcdb3db3..5f8e807b1cec 100644
--- a/cui/source/options/optctl.hxx
+++ b/cui/source/options/optctl.hxx
@@ -36,9 +36,9 @@ private:
     DECL_LINK( SequenceCheckingCB_Hdl, weld::Button&, void );
 
 public:
-    SvxCTLOptionsPage(TabPageParent pParent, const SfxItemSet& rSet);
+    SvxCTLOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     virtual ~SvxCTLOptionsPage() 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/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 0a07a4bc83fd..5708f14a3575 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -36,8 +36,8 @@ enum class MSFltrPg2_CheckBoxEntries {
 };
 
 
-OfaMSFilterTabPage::OfaMSFilterTabPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/optfltrpage.ui", "OptFltrPage", &rSet)
+OfaMSFilterTabPage::OfaMSFilterTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/optfltrpage.ui", "OptFltrPage", &rSet)
     , m_xWBasicCodeCB(m_xBuilder->weld_check_button("wo_basic"))
     , m_xWBasicWbctblCB(m_xBuilder->weld_check_button("wo_exec"))
     , m_xWBasicStgCB(m_xBuilder->weld_check_button("wo_saveorig"))
@@ -65,10 +65,10 @@ IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, weld::Button&,
     m_xEBasicExectblCB->set_sensitive(m_xEBasicCodeCB->get_active());
 }
 
-std::unique_ptr<SfxTabPage> OfaMSFilterTabPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> OfaMSFilterTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
                                                const SfxItemSet* rAttrSet )
 {
-    return std::make_unique<OfaMSFilterTabPage>(pParent, *rAttrSet);
+    return std::make_unique<OfaMSFilterTabPage>(pPage, pController, *rAttrSet);
 }
 
 bool OfaMSFilterTabPage::FillItemSet( SfxItemSet* )
@@ -123,8 +123,8 @@ void OfaMSFilterTabPage::Reset( const SfxItemSet* )
     m_xPBasicStgCB->save_state();
 }
 
-OfaMSFilterTabPage2::OfaMSFilterTabPage2(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/optfltrembedpage.ui", "OptFilterPage", &rSet)
+OfaMSFilterTabPage2::OfaMSFilterTabPage2(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/optfltrembedpage.ui", "OptFilterPage", &rSet)
     , sChgToFromMath(CuiResId(RID_SVXSTR_CHG_MATH))
     , sChgToFromWriter(CuiResId(RID_SVXSTR_CHG_WRITER))
     , sChgToFromCalc(CuiResId(RID_SVXSTR_CHG_CALC))
@@ -147,10 +147,10 @@ OfaMSFilterTabPage2::~OfaMSFilterTabPage2()
 {
 }
 
-std::unique_ptr<SfxTabPage> OfaMSFilterTabPage2::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> OfaMSFilterTabPage2::Create( weld::Container* pPage, weld::DialogController* pController,
                                                 const SfxItemSet* rAttrSet )
 {
-    return std::make_unique<OfaMSFilterTabPage2>( pParent, *rAttrSet );
+    return std::make_unique<OfaMSFilterTabPage2>( pPage, pController, *rAttrSet );
 }
 
 bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index a4e9edd88214..efc95684328a 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -35,10 +35,10 @@ class OfaMSFilterTabPage : public SfxTabPage
     DECL_LINK(LoadWordBasicCheckHdl_Impl, weld::Button&, void);
     DECL_LINK(LoadExcelBasicCheckHdl_Impl, weld::Button&, void);
 public:
-    OfaMSFilterTabPage(TabPageParent pParent, const SfxItemSet& rSet );
+    OfaMSFilterTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet );
     virtual ~OfaMSFilterTabPage() 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;
@@ -68,8 +68,8 @@ class OfaMSFilterTabPage2 : public SfxTabPage
     int                 GetEntry4Type( MSFltrPg2_CheckBoxEntries _nType ) const;
 
 public:
-    OfaMSFilterTabPage2(TabPageParent pParent, const SfxItemSet& rSet);
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+    OfaMSFilterTabPage2(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 ~OfaMSFilterTabPage2() override;
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 2568d901464e..c8d8f0f494ac 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -226,8 +226,8 @@ bool lcl_HasSystemFilePicker()
 }
 }
 
-OfaMiscTabPage::OfaMiscTabPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/optgeneralpage.ui", "OptGeneralPage", &rSet)
+OfaMiscTabPage::OfaMiscTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/optgeneralpage.ui", "OptGeneralPage", &rSet)
     , m_xExtHelpCB(m_xBuilder->weld_check_button("exthelp"))
     , m_xPopUpNoHelpCB(m_xBuilder->weld_check_button("popupnohelp"))
     , m_xShowTipOfTheDay(m_xBuilder->weld_check_button("cbShowTipOfTheDay"))
@@ -283,9 +283,9 @@ OfaMiscTabPage::~OfaMiscTabPage()
 {
 }
 
-std::unique_ptr<SfxTabPage> OfaMiscTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
+std::unique_ptr<SfxTabPage> OfaMiscTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
 {
-    return std::make_unique<OfaMiscTabPage>( pParent, *rAttrSet );
+    return std::make_unique<OfaMiscTabPage>( pPage, pController, *rAttrSet );
 }
 
 bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
@@ -599,8 +599,8 @@ static bool DisplayNameCompareLessThan(const vcl::IconThemeInfo& rInfo1, const v
     return rInfo1.GetDisplayName().compareTo(rInfo2.GetDisplayName()) < 0;
 }
 
-OfaViewTabPage::OfaViewTabPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/optviewpage.ui", "OptViewPage", &rSet)
+OfaViewTabPage::OfaViewTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/optviewpage.ui", "OptViewPage", &rSet)
     , nSizeLB_InitialSelection(0)
     , nSidebarSizeLB_InitialSelection(0)
     , nNotebookbarSizeLB_InitialSelection(0)
@@ -704,9 +704,9 @@ IMPL_LINK_NOARG(OfaViewTabPage, OnForceOpenGLToggled, weld::ToggleButton&, void)
     }
 }
 
-std::unique_ptr<SfxTabPage> OfaViewTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
+std::unique_ptr<SfxTabPage> OfaViewTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
 {
-    return std::make_unique<OfaViewTabPage>(pParent, *rAttrSet);
+    return std::make_unique<OfaViewTabPage>(pPage, pController, *rAttrSet);
 }
 
 bool OfaViewTabPage::FillItemSet( SfxItemSet* )
@@ -1092,8 +1092,8 @@ namespace
     }
 }
 
-OfaLanguagesTabPage::OfaLanguagesTabPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/optlanguagespage.ui", "OptLanguagesPage", &rSet)
+OfaLanguagesTabPage::OfaLanguagesTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/optlanguagespage.ui", "OptLanguagesPage", &rSet)
     , pLangConfig(new LanguageConfig_Impl)
     , m_bDatePatternsValid(false)
     , m_xUserInterfaceLB(m_xBuilder->weld_combo_box("userinterface"))
@@ -1238,9 +1238,9 @@ OfaLanguagesTabPage::~OfaLanguagesTabPage()
 {
 }
 
-std::unique_ptr<SfxTabPage> OfaLanguagesTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
+std::unique_ptr<SfxTabPage> OfaLanguagesTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
 {
-    return std::make_unique<OfaLanguagesTabPage>(pParent, *rAttrSet);
+    return std::make_unique<OfaLanguagesTabPage>(pPage, pController, *rAttrSet);
 }
 
 static void lcl_Update(std::unique_ptr<SfxVoidItem> pInvalidItems[], std::unique_ptr<SfxBoolItem> pBoolItems[], sal_uInt16 nCount)
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index e32b65eaeac1..5a3737a4f591 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -60,10 +60,10 @@ protected:
     virtual DeactivateRC   DeactivatePage( SfxItemSet* pSet ) override;
 
 public:
-    OfaMiscTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+    OfaMiscTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     virtual ~OfaMiscTabPage() 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;
@@ -118,10 +118,10 @@ private:
     void UpdateOGLStatus();
 
 public:
-    OfaViewTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+    OfaViewTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     virtual ~OfaViewTabPage() 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;
@@ -164,10 +164,10 @@ class OfaLanguagesTabPage : public SfxTabPage
     DECL_LINK(DatePatternsHdl, weld::Entry&, void);
 
 public:
-    OfaLanguagesTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+    OfaLanguagesTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     virtual ~OfaLanguagesTabPage() 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/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 55068ffcad0d..71b61b0cca79 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -206,9 +206,8 @@ public:
     }
 };
 
-
-SvxGeneralTabPage::SvxGeneralTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet)
-    : SfxTabPage(pParent, "cui/ui/optuserpage.ui", "OptUserPage", &rCoreSet)
+SvxGeneralTabPage::SvxGeneralTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet)
+    : SfxTabPage(pPage, pController, "cui/ui/optuserpage.ui", "OptUserPage", &rCoreSet)
     , m_xUseDataCB(m_xBuilder->weld_check_button("usefordocprop"))
     , m_xCryptoFrame(m_xBuilder->weld_widget( "cryptography"))
     , m_xSigningKeyLB(m_xBuilder->weld_combo_box("signingkey"))
@@ -336,9 +335,9 @@ void SvxGeneralTabPage::SetLinks ()
 }
 
 
-std::unique_ptr<SfxTabPage> SvxGeneralTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
+std::unique_ptr<SfxTabPage> SvxGeneralTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
 {
-    return std::make_unique<SvxGeneralTabPage>( pParent, *rAttrSet );
+    return std::make_unique<SvxGeneralTabPage>( pPage, pController, *rAttrSet );
 }
 
 bool SvxGeneralTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 8b8c07c26f86..cfe4dc78473e 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -22,8 +22,8 @@
 #include "opthtml.hxx"
 
 
-OfaHtmlTabPage::OfaHtmlTabPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/opthtmlpage.ui", "OptHtmlPage", &rSet)
+OfaHtmlTabPage::OfaHtmlTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/opthtmlpage.ui", "OptHtmlPage", &rSet)
     , m_xSize1NF(m_xBuilder->weld_spin_button("size1"))
     , m_xSize2NF(m_xBuilder->weld_spin_button("size2"))
     , m_xSize3NF(m_xBuilder->weld_spin_button("size3"))
@@ -64,10 +64,10 @@ OfaHtmlTabPage::~OfaHtmlTabPage()
 {
 }
 
-std::unique_ptr<SfxTabPage> OfaHtmlTabPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> OfaHtmlTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
                                            const SfxItemSet* rAttrSet )
 {
-    return std::make_unique<OfaHtmlTabPage>(pParent, *rAttrSet);
+    return std::make_unique<OfaHtmlTabPage>(pPage, pController, *rAttrSet);
 }
 
 bool OfaHtmlTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx
index f0b26e7b3e08..96131571fcd9 100644
--- a/cui/source/options/opthtml.hxx
+++ b/cui/source/options/opthtml.hxx
@@ -46,9 +46,9 @@ class OfaHtmlTabPage : public SfxTabPage
     DECL_LINK(CheckBoxHdl_Impl, weld::ToggleButton&, void);
 
 public:
-    OfaHtmlTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+    OfaHtmlTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     virtual ~OfaHtmlTabPage() 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/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 71df2eda60f1..16785d64c10a 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -128,8 +128,8 @@ IMPL_STATIC_LINK(SvxProxyTabPage, NoSpaceTextFilterHdl, OUString&, rTest, bool)
 /*  SvxProxyTabPage                                                 */
 /*                                                                  */
 /********************************************************************/
-SvxProxyTabPage::SvxProxyTabPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/optproxypage.ui", "OptProxyPage", &rSet)
+SvxProxyTabPage::SvxProxyTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/optproxypage.ui", "OptProxyPage", &rSet)
     , m_xProxyModeLB(m_xBuilder->weld_combo_box("proxymode"))
     , m_xHttpProxyFT(m_xBuilder->weld_label("httpft"))
     , m_xHttpProxyED(m_xBuilder->weld_entry("http"))
@@ -185,9 +185,9 @@ SvxProxyTabPage::~SvxProxyTabPage()
 {
 }
 
-std::unique_ptr<SfxTabPage> SvxProxyTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet )
+std::unique_ptr<SfxTabPage> SvxProxyTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
 {
-    return std::make_unique<SvxProxyTabPage>(pParent, *rAttrSet);
+    return std::make_unique<SvxProxyTabPage>(pPage, pController, *rAttrSet);
 }
 
 void SvxProxyTabPage::ReadConfigData_Impl()
@@ -495,8 +495,8 @@ IMPL_STATIC_LINK(SvxProxyTabPage, LoseFocusHdl_Impl, weld::Widget&, rControl, vo
 /*  SvxSecurityTabPage                                             */
 /*                                                                  */
 /********************************************************************/
-SvxSecurityTabPage::SvxSecurityTabPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/optsecuritypage.ui", "OptSecurityPage", &rSet)
+SvxSecurityTabPage::SvxSecurityTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/optsecuritypage.ui", "OptSecurityPage", &rSet)
     , mpSecOptions(new SvtSecurityOptions)
     , m_xSecurityOptionsPB(m_xBuilder->weld_button("options"))
     , m_xSavePasswordsCB(m_xBuilder->weld_check_button("savepassword"))
@@ -786,9 +786,9 @@ void SvxSecurityTabPage::InitControls()
     }
 }
 
-std::unique_ptr<SfxTabPage> SvxSecurityTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet )
+std::unique_ptr<SfxTabPage> SvxSecurityTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
 {
-    return std::make_unique<SvxSecurityTabPage>(pParent, *rAttrSet);
+    return std::make_unique<SvxSecurityTabPage>(pPage, pController, *rAttrSet);
 }
 
 void SvxSecurityTabPage::ActivatePage( const SfxItemSet& )
@@ -864,8 +864,8 @@ struct SvxEMailTabPage_Impl
     bool bROHideContent;
 };
 
-SvxEMailTabPage::SvxEMailTabPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage( pParent, "cui/ui/optemailpage.ui", "OptEmailPage", &rSet)
+SvxEMailTabPage::SvxEMailTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage( pPage, pController, "cui/ui/optemailpage.ui", "OptEmailPage", &rSet)
     , pImpl(new SvxEMailTabPage_Impl)
     , m_xMailContainer(m_xBuilder->weld_container("program"))
     , m_xMailerURLFI(m_xBuilder->weld_image("lockemail"))
@@ -888,9 +888,9 @@ SvxEMailTabPage::~SvxEMailTabPage()
 
 /* -------------------------------------------------------------------------*/
 
-std::unique_ptr<SfxTabPage> SvxEMailTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
+std::unique_ptr<SfxTabPage> SvxEMailTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
 {
-    return std::make_unique<SvxEMailTabPage>(pParent, *rAttrSet);
+    return std::make_unique<SvxEMailTabPage>(pPage, pController, *rAttrSet);
 }
 
 /* -------------------------------------------------------------------------*/
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 1abc8a0a9985..4d434ce8d03d 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -66,9 +66,9 @@ private:
     DECL_STATIC_LINK(SvxProxyTabPage, LoseFocusHdl_Impl, weld::Widget&, void);
 
 public:
-    SvxProxyTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+    SvxProxyTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     virtual ~SvxProxyTabPage() 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;
 };
@@ -123,8 +123,8 @@ protected:
     virtual DeactivateRC   DeactivatePage( SfxItemSet* pSet ) override;
 
 public:
-    SvxSecurityTabPage(TabPageParent pParent, const SfxItemSet& rSet);
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+    SvxSecurityTabPage(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 ~SvxSecurityTabPage() override;
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
     virtual void        Reset( const SfxItemSet* rSet ) override;
@@ -149,10 +149,10 @@ class SvxEMailTabPage : public SfxTabPage
     DECL_LINK(FileDialogHdl_Impl, weld::Button&, void);
 
 public:
-    SvxEMailTabPage(TabPageParent pParent, const SfxItemSet& rSet );
+    SvxEMailTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet );
     virtual ~SvxEMailTabPage() 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/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 2e8fccf8e69f..308e6cc5ada7 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -65,8 +65,8 @@ using namespace ::com::sun::star::ui::dialogs;
 using namespace ::com::sun::star::uno;
 
 // class SvxJavaOptionsPage ----------------------------------------------
-SvxJavaOptionsPage::SvxJavaOptionsPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/optadvancedpage.ui", "OptAdvancedPage", &rSet)
+SvxJavaOptionsPage::SvxJavaOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/optadvancedpage.ui", "OptAdvancedPage", &rSet)
     , m_aResetIdle("cui options SvxJavaOptionsPage Reset")
     , xDialogListener(new ::svt::DialogClosedListener())
     , m_xJavaEnableCB(m_xBuilder->weld_check_button("javaenabled"))
@@ -469,9 +469,9 @@ void SvxJavaOptionsPage::RequestRestart(svtools::RestartReason eReason)
         pParentDlg->SetNeedsRestart(eReason);
 }
 
-std::unique_ptr<SfxTabPage> SvxJavaOptionsPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> SvxJavaOptionsPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
 {
-    return std::make_unique<SvxJavaOptionsPage>(pParent, *rAttrSet);
+    return std::make_unique<SvxJavaOptionsPage>(pPage, pController, *rAttrSet);
 }
 
 bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ )
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index fec960a5c609..4375b2079e8d 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -106,10 +106,10 @@ private:
     void                    RequestRestart( svtools::RestartReason eReason );
 
 public:
-    SvxJavaOptionsPage(TabPageParent pParent, const SfxItemSet& rSet);
+    SvxJavaOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     virtual ~SvxJavaOptionsPage() 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;
diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx
index b110ad1c9fd6..46a97e0848b2 100644
--- a/cui/source/options/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -25,8 +25,8 @@
 using namespace com::sun::star::i18n;
 
 
-SvxJSearchOptionsPage::SvxJSearchOptionsPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/optjsearchpage.ui", "OptJSearchPage", &rSet)
+SvxJSearchOptionsPage::SvxJSearchOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/optjsearchpage.ui", "OptJSearchPage", &rSet)
     , m_xMatchCase(m_xBuilder->weld_check_button("matchcase"))
     , m_xMatchFullHalfWidth(m_xBuilder->weld_check_button("matchfullhalfwidth"))
     , m_xMatchHiraganaKatakana(m_xBuilder->weld_check_button("matchhiraganakatakana"))
@@ -55,9 +55,9 @@ SvxJSearchOptionsPage::~SvxJSearchOptionsPage()
 {
 }
 
-std::unique_ptr<SfxTabPage> SvxJSearchOptionsPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SvxJSearchOptionsPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
 {
-    return std::make_unique<SvxJSearchOptionsPage>(pParent, *rSet);
+    return std::make_unique<SvxJSearchOptionsPage>(pPage, pController, *rSet);
 }
 
 void SvxJSearchOptionsPage::SetTransliterationFlags( TransliterationFlags nSettings )
diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx
index 526b1f430d89..8b2d68ddcf4d 100644
--- a/cui/source/options/optjsearch.hxx
+++ b/cui/source/options/optjsearch.hxx
@@ -56,9 +56,9 @@ private:
     TransliterationFlags GetTransliterationFlags_Impl();
 
 public:
-    SvxJSearchOptionsPage(TabPageParent pParent, const SfxItemSet& rSet);
+    SvxJSearchOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     virtual ~SvxJSearchOptionsPage() 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        Reset( const SfxItemSet* rSet ) override;
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 9f30b60d71f5..f2e4b7c8e4e3 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -811,8 +811,8 @@ void SvxLinguData_Impl::Reconfigure( const OUString &rDisplayName, bool bEnable
 
 // class SvxLinguTabPage -------------------------------------------------
 
-SvxLinguTabPage::SvxLinguTabPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/optlingupage.ui", "OptLinguPage", &rSet)
+SvxLinguTabPage::SvxLinguTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/optlingupage.ui", "OptLinguPage", &rSet)
     , sCapitalWords   (CuiResId(RID_SVXSTR_CAPITAL_WORDS))
     , sWordsWithDigits(CuiResId(RID_SVXSTR_WORDS_WITH_DIGITS))
     , sSpellSpecial   (CuiResId(RID_SVXSTR_SPELL_SPECIAL))
@@ -896,10 +896,10 @@ SvxLinguTabPage::~SvxLinguTabPage()
     pLinguData.reset();
 }
 
-std::unique_ptr<SfxTabPage> SvxLinguTabPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxLinguTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
                                             const SfxItemSet* rAttrSet )
 {
-    return std::make_unique<SvxLinguTabPage>( pParent, *rAttrSet );
+    return std::make_unique<SvxLinguTabPage>( pPage, pController, *rAttrSet );
 }
 
 bool SvxLinguTabPage::FillItemSet( SfxItemSet* rCoreSet )
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index 35f726472d40..e85ef1d7e23a 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -26,8 +26,8 @@
 
 #include "optopencl.hxx"
 
-SvxOpenCLTabPage::SvxOpenCLTabPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/optopenclpage.ui", "OptOpenCLPage", &rSet)
+SvxOpenCLTabPage::SvxOpenCLTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/optopenclpage.ui", "OptOpenCLPage", &rSet)
     , maConfig(OpenCLConfig::get())
     , mxUseOpenCL(m_xBuilder->weld_check_button("useopencl"))
     , mxOclUsed(m_xBuilder->weld_label("openclused"))
@@ -45,9 +45,9 @@ SvxOpenCLTabPage::~SvxOpenCLTabPage()
 {
 }
 
-std::unique_ptr<SfxTabPage> SvxOpenCLTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> SvxOpenCLTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
 {
-    return std::make_unique<SvxOpenCLTabPage>(pParent, *rAttrSet);
+    return std::make_unique<SvxOpenCLTabPage>(pPage, pController, *rAttrSet);
 }
 
 bool SvxOpenCLTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optopencl.hxx b/cui/source/options/optopencl.hxx
index c9a73531ef71..f9fbca43edf1 100644
--- a/cui/source/options/optopencl.hxx
+++ b/cui/source/options/optopencl.hxx
@@ -33,8 +33,8 @@ private:
     std::unique_ptr<weld::Label> mxOclNotUsed;
 
 public:
-    SvxOpenCLTabPage(TabPageParent pParent, const SfxItemSet& rSet);
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+    SvxOpenCLTabPage(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 ~SvxOpenCLTabPage() override;
 
     virtual bool            FillItemSet( SfxItemSet* rSet ) override;
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 5f026366efac..dfc493a4e852 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -178,8 +178,8 @@ static bool IsMultiPath_Impl( const sal_uInt16 nIndex )
 
 // class SvxPathTabPage --------------------------------------------------
 
-SvxPathTabPage::SvxPathTabPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage( pParent, "cui/ui/optpathspage.ui", "OptPathsPage", &rSet)
+SvxPathTabPage::SvxPathTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage( pPage, pController, "cui/ui/optpathspage.ui", "OptPathsPage", &rSet)
     , pImpl(new OptPath_Impl)
     , xDialogListener ( new ::svt::DialogClosedListener() )
     , m_xStandardBtn(m_xBuilder->weld_button("default"))
@@ -205,10 +205,10 @@ SvxPathTabPage::~SvxPathTabPage()
         delete reinterpret_cast<PathUserData_Impl*>(m_xPathBox->get_id(i).toInt64());
 }
 
-std::unique_ptr<SfxTabPage> SvxPathTabPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxPathTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
                                            const SfxItemSet* rAttrSet )
 {
-    return std::make_unique<SvxPathTabPage>( pParent, *rAttrSet );
+    return std::make_unique<SvxPathTabPage>( pPage, pController, *rAttrSet );
 }
 
 bool SvxPathTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 14cc52f86a24..72f736ce406b 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -66,8 +66,8 @@ SvxSaveTabPage_Impl::SvxSaveTabPage_Impl() : bInitialized( false )
 
 // class SvxSaveTabPage --------------------------------------------------
 
-SvxSaveTabPage::SvxSaveTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet)
-    : SfxTabPage( pParent, "cui/ui/optsavepage.ui", "OptSavePage", &rCoreSet )
+SvxSaveTabPage::SvxSaveTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet)
+    : SfxTabPage( pPage, pController, "cui/ui/optsavepage.ui", "OptSavePage", &rCoreSet )
     , pImpl(new SvxSaveTabPage_Impl)
     , m_xLoadUserSettingsCB(m_xBuilder->weld_check_button("load_settings"))
     , m_xLoadDocPrinterCB(m_xBuilder->weld_check_button("load_docprinter"))
@@ -179,10 +179,10 @@ SvxSaveTabPage::~SvxSaveTabPage()
 {
 }
 
-std::unique_ptr<SfxTabPage> SvxSaveTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxSaveTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
                                           const SfxItemSet* rAttrSet)
 {
-    return std::make_unique<SvxSaveTabPage>(pParent, *rAttrSet);
+    return std::make_unique<SvxSaveTabPage>(pPage, pController, *rAttrSet);
 }
 
 void SvxSaveTabPage::DetectHiddenControls()
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index fd8b037b0953..4314bdda1ddf 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -70,10 +70,10 @@ private:
     void    DetectHiddenControls();
 
 public:
-    SvxSaveTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+    SvxSaveTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
     virtual ~SvxSaveTabPage() 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/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 5d085986faff..2f39687cc87d 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -43,8 +43,8 @@
 
 using namespace ::css;
 
-SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/optonlineupdatepage.ui", "OptOnlineUpdatePage", &rSet)
+SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/optonlineupdatepage.ui", "OptOnlineUpdatePage", &rSet)
     , m_xNeverChecked(m_xBuilder->weld_label("neverchecked"))
     , m_xAutoCheckCheckBox(m_xBuilder->weld_check_button("autocheck"))
     , m_xEveryDayButton(m_xBuilder->weld_radio_button("everyday"))
@@ -175,9 +175,9 @@ void SvxOnlineUpdateTabPage::UpdateUserAgent()
     }
 }
 
-std::unique_ptr<SfxTabPage> SvxOnlineUpdateTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
+std::unique_ptr<SfxTabPage> SvxOnlineUpdateTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
 {
-    return std::make_unique<SvxOnlineUpdateTabPage>( pParent, *rAttrSet );
+    return std::make_unique<SvxOnlineUpdateTabPage>( pPage, pController, *rAttrSet );
 }
 
 bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx
index 5c7b3fb20ed3..bd418991ce5e 100644
--- a/cui/source/options/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
@@ -58,8 +58,8 @@ private:
     void                    UpdateUserAgent();
 
 public:
-    SvxOnlineUpdateTabPage(TabPageParent pParent, const SfxItemSet& rSet);
-    static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+    SvxOnlineUpdateTabPage(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 ~SvxOnlineUpdateTabPage() override;
 
     virtual bool            FillItemSet( SfxItemSet* rSet ) override;
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index a3f905106661..a732053bab7f 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -29,8 +29,11 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 
 // persona
-SvxPersonalizationTabPage::SvxPersonalizationTabPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/personalization_tab.ui", "PersonalizationTabPage", &rSet)
+SvxPersonalizationTabPage::SvxPersonalizationTabPage(weld::Container* pPage,
+                                                     weld::DialogController* pController,
+                                                     const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/personalization_tab.ui", "PersonalizationTabPage",
+                 &rSet)
     , m_xNoPersona(m_xBuilder->weld_radio_button("no_persona"))
     , m_xDefaultPersona(m_xBuilder->weld_radio_button("default_persona"))
 {
@@ -47,10 +50,11 @@ SvxPersonalizationTabPage::SvxPersonalizationTabPage(TabPageParent pParent, cons
 
 SvxPersonalizationTabPage::~SvxPersonalizationTabPage() {}
 
-std::unique_ptr<SfxTabPage> SvxPersonalizationTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxPersonalizationTabPage::Create(weld::Container* pPage,
+                                                              weld::DialogController* pController,
                                                               const SfxItemSet* rSet)
 {
-    return std::make_unique<SvxPersonalizationTabPage>(pParent, *rSet);
+    return std::make_unique<SvxPersonalizationTabPage>(pPage, pController, *rSet);
 }
 
 bool SvxPersonalizationTabPage::FillItemSet(SfxItemSet*)
diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx
index a045059e92a8..072a89b8135f 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -27,10 +27,12 @@ private:
     std::vector<OUString> m_vDefaultPersonaSettings;
 
 public:
-    SvxPersonalizationTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+    SvxPersonalizationTabPage(weld::Container* pPage, weld::DialogController* pController,
+                              const SfxItemSet& rSet);
     virtual ~SvxPersonalizationTabPage() 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);
 
     /// Apply the settings ([OK] button).
     virtual bool FillItemSet(SfxItemSet* rSet) override;
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index e484d9afe924..4163cc906945 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -267,8 +267,8 @@ void MailMergeCfg_Impl::Notify( const css::uno::Sequence< OUString >& )
 {
 }
 
-//typedef SfxTabPage* (*FNCreateTabPage)(TabPageParent pParent, const SfxItemSet &rAttrSet);
-static std::unique_ptr<SfxTabPage> CreateGeneralTabPage(sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet)
+//typedef SfxTabPage* (*FNCreateTabPage)(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rAttrSet);
+static std::unique_ptr<SfxTabPage> CreateGeneralTabPage(sal_uInt16 nId, weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
 {
     CreateTabPage fnCreate = nullptr;
     switch(nId)
@@ -309,7 +309,7 @@ static std::unique_ptr<SfxTabPage> CreateGeneralTabPage(sal_uInt16 nId, TabPageP
 #endif
     }
 
-    return fnCreate ? (*fnCreate)( pParent, &rSet ) : nullptr;
+    return fnCreate ? (*fnCreate)( pPage, pController, &rSet ) : nullptr;
 }
 
 struct OptionsMapping_Impl
@@ -901,12 +901,10 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
                 *pGroupInfo->m_pInItemSet->GetPool(),
                 pGroupInfo->m_pInItemSet->GetRanges());
 
-        TabPageParent pPageParent(xTabBox.get(), this);
-
-        pPageInfo->m_xPage = ::CreateGeneralTabPage(pPageInfo->m_nPageId, pPageParent, *pGroupInfo->m_pInItemSet);
+        pPageInfo->m_xPage = ::CreateGeneralTabPage(pPageInfo->m_nPageId, xTabBox.get(), this, *pGroupInfo->m_pInItemSet);
 
         if(!pPageInfo->m_xPage && pGroupInfo->m_pModule)
-            pPageInfo->m_xPage = pGroupInfo->m_pModule->CreateTabPage(pPageInfo->m_nPageId, pPageParent, *pGroupInfo->m_pInItemSet);
+            pPageInfo->m_xPage = pGroupInfo->m_pModule->CreateTabPage(pPageInfo->m_nPageId, xTabBox.get(), this, *pGroupInfo->m_pInItemSet);
 
         DBG_ASSERT( pPageInfo->m_xPage, "tabpage could not created");
         if ( pPageInfo->m_xPage )
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 91fbd29fcdce..c82d07848d07 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -96,8 +96,8 @@ void lcl_SetJustifyMethodToItemSet(SfxItemSet& rSet, sal_uInt16 nWhichJM, const
 
 }//namespace
 
-AlignmentTabPage::AlignmentTabPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
-    : SfxTabPage(pParent, "cui/ui/cellalignment.ui", "CellAlignPage", &rCoreAttrs)
+AlignmentTabPage::AlignmentTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs)
+    : SfxTabPage(pPage, pController, "cui/ui/cellalignment.ui", "CellAlignPage", &rCoreAttrs)
     , m_aVsRefEdge(nullptr)
     // text alignment
     , m_xLbHorAlign(m_xBuilder->weld_combo_box("comboboxHorzAlign"))
@@ -160,9 +160,9 @@ AlignmentTabPage::~AlignmentTabPage()
     m_xLbFrameDir.reset();
 }
 
-std::unique_ptr<SfxTabPage> AlignmentTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> AlignmentTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
 {
-    return std::make_unique<AlignmentTabPage>(pParent, *rAttrSet);
+    return std::make_unique<AlignmentTabPage>(pPage, pController, *rAttrSet);
 }
 
 bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet )
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index ff6095642cea..f92d254e30fb 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -177,8 +177,8 @@ IMPL_LINK_NOARG(OfaAutoCorrDlg, SelectLanguageHdl, weld::ComboBox&, void)
     }
 }
 
-OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/acoroptionspage.ui", "AutocorrectOptionsPage", &rSet)
+OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/acoroptionspage.ui", "AutocorrectOptionsPage", &rSet)
     , m_sInput(CuiResId(RID_SVXSTR_USE_REPLACE))
     , m_sDoubleCaps(CuiResId(RID_SVXSTR_CPTL_STT_WORD))
     , m_sStartCap(CuiResId(RID_SVXSTR_CPTL_STT_SENT))
@@ -199,10 +199,10 @@ OfaAutocorrOptionsPage::~OfaAutocorrOptionsPage()
 {
 }
 
-std::unique_ptr<SfxTabPage> OfaAutocorrOptionsPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> OfaAutocorrOptionsPage::Create(weld::Container* pPage, weld::DialogController* pController,
                                                            const SfxItemSet* rSet)
 {
-    return std::make_unique<OfaAutocorrOptionsPage>(pParent, *rSet);
+    return std::make_unique<OfaAutocorrOptionsPage>(pPage, pController, *rSet);
 }
 
 #define CBCOL_FIRST     0
@@ -343,9 +343,9 @@ enum OfaAutoFmtOptions
     MERGE_SINGLE_LINE_PARA
 };
 
-OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage(TabPageParent pParent,
+OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage(weld::Container* pPage, weld::DialogController* pController,
                                                  const SfxItemSet& rSet )
-    : SfxTabPage(pParent, "cui/ui/applyautofmtpage.ui", "ApplyAutoFmtPage", &rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/applyautofmtpage.ui", "ApplyAutoFmtPage", &rSet)
     , sDeleteEmptyPara(CuiResId(RID_SVXSTR_DEL_EMPTY_PARA))
     , sUseReplaceTbl(CuiResId(RID_SVXSTR_USE_REPLACE))
     , sCapitalStartWord(CuiResId(RID_SVXSTR_CPTL_STT_WORD))
@@ -397,10 +397,10 @@ OfaSwAutoFmtOptionsPage::~OfaSwAutoFmtOptionsPage()
     delete reinterpret_cast<ImpUserData*>(m_xCheckLB->get_id(MERGE_SINGLE_LINE_PARA).toInt64());
 }
 
-std::unique_ptr<SfxTabPage> OfaSwAutoFmtOptionsPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> OfaSwAutoFmtOptionsPage::Create(weld::Container* pPage, weld::DialogController* pController,
                                                             const SfxItemSet* rAttrSet)
 {
-    return std::make_unique<OfaSwAutoFmtOptionsPage>(pParent, *rAttrSet);
+    return std::make_unique<OfaSwAutoFmtOptionsPage>(pPage, pController, *rAttrSet);
 }
 
 bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet*  )
@@ -654,9 +654,9 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl, weld::Button&, void)
 }
 
 
-OfaAutocorrReplacePage::OfaAutocorrReplacePage(TabPageParent pParent,
+OfaAutocorrReplacePage::OfaAutocorrReplacePage(weld::Container* pPage, weld::DialogController* pController,
                                                const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/acorreplacepage.ui", "AcorReplacePage", &rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/acorreplacepage.ui", "AcorReplacePage", &rSet)
     , eLang(eLastDialogLanguage)
     , bHasSelectionText(false)
     , bFirstSelect(true)
@@ -708,9 +708,9 @@ OfaAutocorrReplacePage::~OfaAutocorrReplacePage()
     pCharClass.reset();
 }
 
-std::unique_ptr<SfxTabPage> OfaAutocorrReplacePage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> OfaAutocorrReplacePage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
 {
-    return std::make_unique<OfaAutocorrReplacePage>(pParent, *rSet);
+    return std::make_unique<OfaAutocorrReplacePage>(pPage, pController, *rSet);
 }
 
 void OfaAutocorrReplacePage::ActivatePage( const SfxItemSet& )
@@ -1175,8 +1175,8 @@ static bool lcl_FindInArray(std::vector<OUString>& rStrings, const OUString& rSt
     return false;
 }
 
-OfaAutocorrExceptPage::OfaAutocorrExceptPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/acorexceptpage.ui", "AcorExceptPage", &rSet)
+OfaAutocorrExceptPage::OfaAutocorrExceptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/acorexceptpage.ui", "AcorExceptPage", &rSet)
     , eLang(eLastDialogLanguage)
     , m_xAbbrevED(m_xBuilder->weld_entry("abbrev"))
     , m_xAbbrevLB(m_xBuilder->weld_tree_view("abbrevlist"))
@@ -1219,10 +1219,10 @@ OfaAutocorrExceptPage::~OfaAutocorrExceptPage()
     pCompareClass.reset();
 }
 
-std::unique_ptr<SfxTabPage> OfaAutocorrExceptPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> OfaAutocorrExceptPage::Create(weld::Container* pPage, weld::DialogController* pController,
                                                  const SfxItemSet* rSet)
 {
-    return std::make_unique<OfaAutocorrExceptPage>(pParent, *rSet);
+    return std::make_unique<OfaAutocorrExceptPage>(pPage, pController, *rSet);
 }
 
 void    OfaAutocorrExceptPage::ActivatePage( const SfxItemSet& )
@@ -1524,8 +1524,8 @@ void OfaQuoteTabPage::CreateEntry(weld::TreeView& rCheckLB, const OUString& rTxt
     rCheckLB.set_text(nRow, rTxt, nTextCol);
 }
 
-OfaQuoteTabPage::OfaQuoteTabPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/applylocalizedpage.ui", "ApplyLocalizedPage", &rSet)
+OfaQuoteTabPage::OfaQuoteTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/applylocalizedpage.ui", "ApplyLocalizedPage", &rSet)
     , sNonBrkSpace(CuiResId(RID_SVXSTR_NON_BREAK_SPACE))
     , sOrdinal(CuiResId(RID_SVXSTR_ORDINAL))
     , cSglStartQuote(0)
@@ -1585,10 +1585,10 @@ OfaQuoteTabPage::~OfaQuoteTabPage()
 {
 }
 
-std::unique_ptr<SfxTabPage> OfaQuoteTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> OfaQuoteTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
                                                     const SfxItemSet* rAttrSet)
 {
-    return std::make_unique<OfaQuoteTabPage>(pParent, *rAttrSet);
+    return std::make_unique<OfaQuoteTabPage>(pPage, pController, *rAttrSet);
 }
 
 bool OfaQuoteTabPage::FillItemSet( SfxItemSet*  )
@@ -1843,9 +1843,9 @@ OUString OfaQuoteTabPage::ChangeStringExt_Impl( sal_UCS4 cChar )
     return aOUStr;
 }
 
-OfaAutoCompleteTabPage::OfaAutoCompleteTabPage(TabPageParent pParent,
+OfaAutoCompleteTabPage::OfaAutoCompleteTabPage(weld::Container* pPage, weld::DialogController* pController,
     const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/wordcompletionpage.ui",
+    : SfxTabPage(pPage, pController, "cui/ui/wordcompletionpage.ui",
                  "WordCompletionPage", &rSet)
     , m_pAutoCompleteList(nullptr)
     , m_nAutoCmpltListCnt(0)
@@ -1901,10 +1901,10 @@ OfaAutoCompleteTabPage::~OfaAutoCompleteTabPage()
 {
 }
 
-std::unique_ptr<SfxTabPage> OfaAutoCompleteTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> OfaAutoCompleteTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
                                                   const SfxItemSet* rSet)
 {
-    return std::make_unique<OfaAutoCompleteTabPage>(pParent, *rSet);
+    return std::make_unique<OfaAutoCompleteTabPage>(pPage, pController, *rSet);
 }
 
 bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet* )
@@ -2093,9 +2093,9 @@ IMPL_LINK(OfaAutoCompleteTabPage, KeyReleaseHdl, const KeyEvent&, rEvent, bool)
 
 // class OfaSmartTagOptionsTabPage ---------------------------------------------
 
-OfaSmartTagOptionsTabPage::OfaSmartTagOptionsTabPage(TabPageParent pParent,
+OfaSmartTagOptionsTabPage::OfaSmartTagOptionsTabPage(weld::Container* pPage, weld::DialogController* pController,
                                                      const SfxItemSet& rSet )
-    : SfxTabPage(pParent, "cui/ui/smarttagoptionspage.ui", "SmartTagOptionsPage", &rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/smarttagoptionspage.ui", "SmartTagOptionsPage", &rSet)
     , m_xMainCB(m_xBuilder->weld_check_button("main"))
     , m_xSmartTagTypesLB(m_xBuilder->weld_tree_view("list"))
     , m_xPropertiesPB(m_xBuilder->weld_button("properties"))
@@ -2117,9 +2117,9 @@ OfaSmartTagOptionsTabPage::~OfaSmartTagOptionsTabPage()
 {
 }
 
-std::unique_ptr<SfxTabPage> OfaSmartTagOptionsTabPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> OfaSmartTagOptionsTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
 {
-    return std::make_unique<OfaSmartTagOptionsTabPage>(pParent, *rSet);
+    return std::make_unique<OfaSmartTagOptionsTabPage>(pPage, pController, *rSet);
 }
 
 /** This struct is used to associate list box entries with smart tag data
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index fd2b034607fa..cb736167d251 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -254,8 +254,8 @@ void BackgroundPreviewImpl::Paint(vcl::RenderContext& rRenderContext, const ::to
 
 #define HDL(hdl) LINK(this,SvxBackgroundTabPage,hdl)
 
-SvxBackgroundTabPage::SvxBackgroundTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet)
-    : SvxTabPage(pParent, "cui/ui/backgroundpage.ui", "BackgroundPage", rCoreSet)
+SvxBackgroundTabPage::SvxBackgroundTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet)
+    : SvxTabPage(pPage, pController, "cui/ui/backgroundpage.ui", "BackgroundPage", rCoreSet)
     , nHtmlMode(0)
     , bAllowShowSelector(true)
     , bIsGraphicValid(false)
@@ -330,9 +330,9 @@ SvxBackgroundTabPage::~SvxBackgroundTabPage()
     m_xWndPosition.reset();
 }
 
-std::unique_ptr<SfxTabPage> SvxBackgroundTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> SvxBackgroundTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
 {
-    return std::make_unique<SvxBackgroundTabPage>(pParent, *rAttrSet);
+    return std::make_unique<SvxBackgroundTabPage>(pPage, pController, *rAttrSet);
 }
 
 void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
@@ -1357,8 +1357,8 @@ static sal_uInt16 lcl_GetTableDestSlot(sal_Int32 nTblDest)
     }
 }
 
-SvxBkgTabPage::SvxBkgTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
-    : SvxAreaTabPage(pParent, rInAttrs),
+SvxBkgTabPage::SvxBkgTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+    : SvxAreaTabPage(pPage, pController, rInAttrs),
     bHighlighting(false),
     bCharBackColor(false),
     maSet(rInAttrs)
@@ -1526,10 +1526,10 @@ bool SvxBkgTabPage::FillItemSet( SfxItemSet* rCoreSet )
     return true;
 }
 
-std::unique_ptr<SfxTabPage> SvxBkgTabPage::Create(TabPageParent pWindow, const SfxItemSet* rAttrs)
+std::unique_ptr<SfxTabPage> SvxBkgTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrs)
 {
-    auto xRet = std::make_unique<SvxBkgTabPage>(pWindow, *rAttrs);
-    xRet->SetOptimalSize(pWindow.pController);
+    auto xRet = std::make_unique<SvxBkgTabPage>(pPage, pController, *rAttrs);
+    xRet->SetOptimalSize(pController);
     return xRet;
 }
 
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 375d8b3fc1ad..57534beb059c 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -227,8 +227,8 @@ void MarginControlsWrapper::SetControlDontKnow()
     mrBottomWrp.set_text(sEmpty);
 }
 
-SvxBorderTabPage::SvxBorderTabPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
-    : SfxTabPage(pParent, "cui/ui/borderpage.ui", "BorderPage", &rCoreAttrs)
+SvxBorderTabPage::SvxBorderTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs)
+    : SfxTabPage(pPage, pController, "cui/ui/borderpage.ui", "BorderPage", &rCoreAttrs)
     , nMinValue(0)
     , nSWMode(SwBorderModes::NONE)
     , mnBoxSlot(SID_ATTR_BORDER_OUTER)
@@ -250,7 +250,7 @@ SvxBorderTabPage::SvxBorderTabPage(TabPageParent pParent, const SfxItemSet& rCor
     , m_xUserDefFT(m_xBuilder->weld_label("userdefft"))
     , m_xFrameSelWin(new weld::CustomWeld(*m_xBuilder, "framesel", m_aFrameSel))
     , m_xLbLineStyle(new SvtLineListBox(m_xBuilder->weld_menu_button("linestylelb")))
-    , m_xLbLineColor(new ColorListBox(m_xBuilder->weld_menu_button("linecolorlb"), pParent.GetFrameWeld()))
+    , m_xLbLineColor(new ColorListBox(m_xBuilder->weld_menu_button("linecolorlb"), pController->getDialog()))
     , m_xLineWidthMF(m_xBuilder->weld_metric_spin_button("linewidthmf", FieldUnit::POINT))
     , m_xSpacingFrame(m_xBuilder->weld_container("spacing"))
     , m_xLeftFT(m_xBuilder->weld_label("leftft"))
@@ -268,7 +268,7 @@ SvxBorderTabPage::SvxBorderTabPage(TabPageParent pParent, const SfxItemSet& rCor
     , m_xFtShadowSize(m_xBuilder->weld_label("distanceft"))
     , m_xEdShadowSize(m_xBuilder->weld_metric_spin_button("distancemf", FieldUnit::MM))
     , m_xFtShadowColor(m_xBuilder->weld_label("shadowcolorft"))
-    , m_xLbShadowColor(new ColorListBox(m_xBuilder->weld_menu_button("shadowcolorlb"), pParent.GetFrameWeld()))
+    , m_xLbShadowColor(new ColorListBox(m_xBuilder->weld_menu_button("shadowcolorlb"), pController->getDialog()))
     , m_xPropertiesFrame(m_xBuilder->weld_container("properties"))
     , m_xMergeWithNextCB(m_xBuilder->weld_check_button("mergewithnext"))
     , m_xMergeAdjacentBordersCB(m_xBuilder->weld_check_button("mergeadjacent"))
@@ -544,10 +544,10 @@ SvxBorderTabPage::~SvxBorderTabPage()
     m_xWndPresets.reset();
 }
 
-std::unique_ptr<SfxTabPage> SvxBorderTabPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxBorderTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
                                              const SfxItemSet* rAttrSet )
 {
-    return std::make_unique<SvxBorderTabPage>(pParent, *rAttrSet);
+    return std::make_unique<SvxBorderTabPage>(pPage, pController, *rAttrSet);
 }
 
 void SvxBorderTabPage::ResetFrameLine_Impl( svx::FrameBorderType eBorder, const SvxBorderLine* pCoreLine, bool bValid )
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 548b77ae7495..c6ac69619522 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -157,8 +157,8 @@ inline SvxFont& SvxCharBasePage::GetPreviewCTLFont()
     return m_aPreviewWin.GetCTLFont();
 }
 
-SvxCharBasePage::SvxCharBasePage(TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet& rItemset)
-    : SfxTabPage(pParent, rUIXMLDescription, rID, &rItemset)
+SvxCharBasePage::SvxCharBasePage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet& rItemset)
+    : SfxTabPage(pPage, pController, rUIXMLDescription, rID, &rItemset)
     , m_bPreviewBackgroundToCharacter( false )
 {
 }
@@ -212,8 +212,8 @@ struct SvxCharNamePage_Impl
 
 // class SvxCharNamePage -------------------------------------------------
 
-SvxCharNamePage::SvxCharNamePage(TabPageParent pParent, const SfxItemSet& rInSet)
-    : SvxCharBasePage(pParent, "cui/ui/charnamepage.ui", "CharNamePage", rInSet)
+SvxCharNamePage::SvxCharNamePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInSet)
+    : SvxCharBasePage(pPage, pController, "cui/ui/charnamepage.ui", "CharNamePage", rInSet)
     , m_pImpl(new SvxCharNamePage_Impl)
     , m_xEastFrame(m_xBuilder->weld_widget("asian"))
     , m_xEastFontNameFT(m_xBuilder->weld_label("eastfontnameft"))
@@ -1190,9 +1190,9 @@ DeactivateRC SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet )
     return DeactivateRC::LeavePage;
 }
 
-std::unique_ptr<SfxTabPage> SvxCharNamePage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SvxCharNamePage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
 {
-    return std::make_unique<SvxCharNamePage>(pParent, *rSet );
+    return std::make_unique<SvxCharNamePage>(pPage, pController, *rSet );
 }
 
 void SvxCharNamePage::Reset( const SfxItemSet* rSet )
@@ -1311,14 +1311,14 @@ void SvxCharNamePage::PageCreated(const SfxAllItemSet& aSet)
 }
 // class SvxCharEffectsPage ----------------------------------------------
 
-SvxCharEffectsPage::SvxCharEffectsPage(TabPageParent pParent, const SfxItemSet& rInSet)
-    : SvxCharBasePage(pParent, "cui/ui/effectspage.ui", "EffectsPage", rInSet)
+SvxCharEffectsPage::SvxCharEffectsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInSet)
+    : SvxCharBasePage(pPage, pController, "cui/ui/effectspage.ui", "EffectsPage", rInSet)
     , m_bOrigFontColor(false)
     , m_bNewFontColor(false)
     , m_bEnableNoneFontColor(false)
     , m_bUnderlineColorDisabled(false)
     , m_xFontColorFT(m_xBuilder->weld_label("fontcolorft"))
-    , m_xFontColorLB(new ColorListBox(m_xBuilder->weld_menu_button("fontcolorlb"), pParent.GetFrameWeld()))
+    , m_xFontColorLB(new ColorListBox(m_xBuilder->weld_menu_button("fontcolorlb"), pController->getDialog()))
     , m_xEffectsFT(m_xBuilder->weld_label("effectsft"))
     , m_xEffectsLB(m_xBuilder->weld_combo_box("effectslb"))
     , m_xReliefFT(m_xBuilder->weld_label("reliefft"))
@@ -1329,11 +1329,11 @@ SvxCharEffectsPage::SvxCharEffectsPage(TabPageParent pParent, const SfxItemSet&
     , m_xHiddenBtn(m_xBuilder->weld_check_button("hiddencb"))
     , m_xOverlineLB(m_xBuilder->weld_combo_box("overlinelb"))
     , m_xOverlineColorFT(m_xBuilder->weld_label("overlinecolorft"))
-    , m_xOverlineColorLB(new ColorListBox(m_xBuilder->weld_menu_button("overlinecolorlb"), pParent.GetFrameWeld()))
+    , m_xOverlineColorLB(new ColorListBox(m_xBuilder->weld_menu_button("overlinecolorlb"), pController->getDialog()))
     , m_xStrikeoutLB(m_xBuilder->weld_combo_box("strikeoutlb"))
     , m_xUnderlineLB(m_xBuilder->weld_combo_box("underlinelb"))
     , m_xUnderlineColorFT(m_xBuilder->weld_label("underlinecolorft"))
-    , m_xUnderlineColorLB(new ColorListBox(m_xBuilder->weld_menu_button("underlinecolorlb"), pParent.GetFrameWeld()))
+    , m_xUnderlineColorLB(new ColorListBox(m_xBuilder->weld_menu_button("underlinecolorlb"), pController->getDialog()))
     , m_xIndividualWordsBtn(m_xBuilder->weld_check_button("individualwordscb"))
     , m_xEmphasisFT(m_xBuilder->weld_label("emphasisft"))
     , m_xEmphasisLB(m_xBuilder->weld_combo_box("emphasislb"))
@@ -1669,9 +1669,9 @@ DeactivateRC SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet )
     return DeactivateRC::LeavePage;
 }
 
-std::unique_ptr<SfxTabPage> SvxCharEffectsPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
+std::unique_ptr<SfxTabPage> SvxCharEffectsPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet )
 {
-    return std::make_unique<SvxCharEffectsPage>( pParent, *rSet );
+    return std::make_unique<SvxCharEffectsPage>( pPage, pController, *rSet );
 }
 
 void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
@@ -2432,8 +2432,8 @@ void SvxCharEffectsPage::PageCreated(const SfxAllItemSet& aSet)
 
 // class SvxCharPositionPage ---------------------------------------------
 
-SvxCharPositionPage::SvxCharPositionPage(TabPageParent pParent, const SfxItemSet& rInSet)
-    : SvxCharBasePage(pParent, "cui/ui/positionpage.ui", "PositionPage", rInSet)
+SvxCharPositionPage::SvxCharPositionPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInSet)
+    : SvxCharBasePage(pPage, pController, "cui/ui/positionpage.ui", "PositionPage", rInSet)
     , m_nSuperEsc(short(DFLT_ESC_SUPER))
     , m_nSubEsc(short(DFLT_ESC_SUB))
     , m_nScaleWidthItemSetVal(100)
@@ -2660,9 +2660,9 @@ DeactivateRC SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet )
     return DeactivateRC::LeavePage;
 }
 
-std::unique_ptr<SfxTabPage> SvxCharPositionPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SvxCharPositionPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
 {
-    return std::make_unique<SvxCharPositionPage>(pParent, *rSet);
+    return std::make_unique<SvxCharPositionPage>(pPage, pController, *rSet);
 }
 
 void SvxCharPositionPage::Reset( const SfxItemSet* rSet )
@@ -3045,8 +3045,8 @@ void SvxCharPositionPage::PageCreated(const SfxAllItemSet& aSet)
 }
 // class SvxCharTwoLinesPage ------------------------------------------------
 
-SvxCharTwoLinesPage::SvxCharTwoLinesPage(TabPageParent pParent, const SfxItemSet& rInSet)
-    : SvxCharBasePage(pParent, "cui/ui/twolinespage.ui", "TwoLinesPage", rInSet)
+SvxCharTwoLinesPage::SvxCharTwoLinesPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInSet)
+    : SvxCharBasePage(pPage, pController, "cui/ui/twolinespage.ui", "TwoLinesPage", rInSet)
     , m_nStartBracketPosition( 0 )
     , m_nEndBracketPosition( 0 )
     , m_xTwoLinesBtn(m_xBuilder->weld_check_button("twolines"))
@@ -3179,9 +3179,9 @@ DeactivateRC SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet )
     return DeactivateRC::LeavePage;
 }
 
-std::unique_ptr<SfxTabPage> SvxCharTwoLinesPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SvxCharTwoLinesPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
 {
-    return std::make_unique<SvxCharTwoLinesPage>(pParent, *rSet);
+    return std::make_unique<SvxCharTwoLinesPage>(pPage, pController, *rSet);
 }
 
 void SvxCharTwoLinesPage::Reset( const SfxItemSet* rSet )
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index b64ea936ede0..70b38bbc95af 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -48,8 +48,7 @@ const sal_uInt16 SvxConnectionPage::pRanges[] =
 SvxConnectionDialog::SvxConnectionDialog(weld::Window* pParent, const SfxItemSet& rInAttrs, const SdrView* pSdrView)
     : SfxSingleTabDialogController(pParent, &rInAttrs)
 {
-    TabPageParent pPageParent(get_content_area(), this);
-    auto xPage = std::make_unique<SvxConnectionPage>(pPageParent, rInAttrs);
+    auto xPage = std::make_unique<SvxConnectionPage>(get_content_area(), this, rInAttrs);
 
     xPage->SetView(pSdrView);
     xPage->Construct();
@@ -64,8 +63,8 @@ SvxConnectionDialog::SvxConnectionDialog(weld::Window* pParent, const SfxItemSet
 |*
 \************************************************************************/
 
-SvxConnectionPage::SvxConnectionPage(TabPageParent pWindow, const SfxItemSet& rInAttrs)
-    : SfxTabPage(pWindow, "cui/ui/connectortabpage.ui", "ConnectorTabPage", &rInAttrs)
+SvxConnectionPage::SvxConnectionPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+    : SfxTabPage(pPage, pController, "cui/ui/connectortabpage.ui", "ConnectorTabPage", &rInAttrs)
     , rOutAttrs(rInAttrs)
     , aAttrSet(*rInAttrs.GetPool())
     , pView(nullptr)
@@ -304,10 +303,10 @@ void SvxConnectionPage::Construct()
 |* creates the page
 |*
 \************************************************************************/
-std::unique_ptr<SfxTabPage> SvxConnectionPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxConnectionPage::Create(weld::Container* pPage, weld::DialogController* pController,
                                              const SfxItemSet* rAttrs)
 {
-    return std::make_unique<SvxConnectionPage>(pParent, *rAttrs);
+    return std::make_unique<SvxConnectionPage>(pPage, pController, *rAttrs);
 }
 
 IMPL_LINK_NOARG(SvxConnectionPage, ChangeAttrListBoxHdl_Impl, weld::ComboBox&, void)
diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx
index de3ca435f362..e1653ca4d65e 100644
--- a/cui/source/tabpages/dstribut.cxx
+++ b/cui/source/tabpages/dstribut.cxx
@@ -32,8 +32,7 @@ SvxDistributeDialog::SvxDistributeDialog(weld::Window* pParent,
     : SfxSingleTabDialogController(pParent, &rInAttrs, "cui/ui/distributiondialog.ui",
                                    "DistributionDialog")
 {
-    TabPageParent pPageParent(get_content_area(), this);
-    SetTabPage(std::make_unique<SvxDistributePage>(pPageParent, rInAttrs, eHor, eVer));
+    SetTabPage(std::make_unique<SvxDistributePage>(get_content_area(), this, rInAttrs, eHor, eVer));
     mpPage = static_cast<SvxDistributePage*>(GetTabPage());
 }
 
@@ -47,10 +46,10 @@ SvxDistributeDialog::~SvxDistributeDialog()
 |*
 \************************************************************************/
 
-SvxDistributePage::SvxDistributePage(TabPageParent pWindow,
+SvxDistributePage::SvxDistributePage(weld::Container* pPage, weld::DialogController* pController,
     const SfxItemSet& rInAttrs, SvxDistributeHorizontal eHor,
     SvxDistributeVertical eVer)
-    : SfxTabPage(pWindow, "cui/ui/distributionpage.ui", "DistributionPage",
+    : SfxTabPage(pPage, pController, "cui/ui/distributionpage.ui", "DistributionPage",
         &rInAttrs)
     , m_eDistributeHor(eHor)
     , m_eDistributeVer(eVer)
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index a9030218e0d9..21314063bf2b 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -49,8 +49,8 @@ static int lcl_GetValue(const weld::MetricSpinButton& rMetric, FieldUnit eUnit)
     description: crop graphic
  --------------------------------------------------------------------*/
 
-SvxGrfCropPage::SvxGrfCropPage(TabPageParent pParent, const SfxItemSet &rSet)
-    : SfxTabPage(pParent, "cui/ui/croppage.ui", "CropPage", &rSet)
+SvxGrfCropPage::SvxGrfCropPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/croppage.ui", "CropPage", &rSet)
     , nOldWidth(0)
     , nOldHeight(0)
     , bSetOrigSize(false)
@@ -106,9 +106,9 @@ SvxGrfCropPage::~SvxGrfCropPage()
     m_xExampleWN.reset();
 }
 
-std::unique_ptr<SfxTabPage> SvxGrfCropPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
+std::unique_ptr<SfxTabPage> SvxGrfCropPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet)
 {
-    return std::make_unique<SvxGrfCropPage>(pParent, *rSet);
+    return std::make_unique<SvxGrfCropPage>(pPage, pController, *rSet);
 }
 
 void SvxGrfCropPage::Reset( const SfxItemSet *rSet )
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 7480e488cbaa..440734c130a2 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -66,8 +66,8 @@ const sal_uInt16 SvxCaptionTabPage::pCaptionRanges[] =
     0
 };
 
-SvxCaptionTabPage::SvxCaptionTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
-    : SfxTabPage(pParent, "cui/ui/calloutpage.ui", "CalloutPage", &rInAttrs)
+SvxCaptionTabPage::SvxCaptionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+    : SfxTabPage(pPage, pController, "cui/ui/calloutpage.ui", "CalloutPage", &rInAttrs)
     , nCaptionType(SdrCaptionType::Type1)
     , nGap(0)
     , nEscDir(SdrCaptionEscDir::Horizontal)
@@ -332,10 +332,10 @@ void SvxCaptionTabPage::Reset( const SfxItemSet*  )
     SetupType_Impl( nCaptionType );
 }
 
-std::unique_ptr<SfxTabPage> SvxCaptionTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxCaptionTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
                                              const SfxItemSet* rOutAttrs)
 {
-    return std::make_unique<SvxCaptionTabPage>(pParent, *rOutAttrs);
+    return std::make_unique<SvxCaptionTabPage>(pPage, pController, *rOutAttrs);
 }
 
 void SvxCaptionTabPage::SetupExtension_Impl( sal_uInt16 nType )
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index e2ea708880cf..7319847e85d6 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -98,8 +98,8 @@ void SfxMacroTabPage::EnableButtons()
         mpImpl->m_xAssignPB->set_sensitive(false);
 }
 
-SfxMacroTabPage::SfxMacroTabPage(TabPageParent pParent, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rAttrSet )
-    : SfxTabPage(pParent, "cui/ui/eventassignpage.ui", "EventAssignPage", &rAttrSet)
+SfxMacroTabPage::SfxMacroTabPage(weld::Container* pPage, weld::DialogController* pController, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rAttrSet )
+    : SfxTabPage(pPage, pController, "cui/ui/eventassignpage.ui", "EventAssignPage", &rAttrSet)
 {
     mpImpl.reset(new SfxMacroTabPage_Impl);
 
@@ -363,15 +363,15 @@ void SfxMacroTabPage::FillEvents()
 
 namespace
 {
-    std::unique_ptr<SfxMacroTabPage> CreateSfxMacroTabPage(TabPageParent pParent, const SfxItemSet& rAttrSet)
+    std::unique_ptr<SfxMacroTabPage> CreateSfxMacroTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet)
     {
-        return std::make_unique<SfxMacroTabPage>( pParent, nullptr, rAttrSet );
+        return std::make_unique<SfxMacroTabPage>( pPage, pController, nullptr, rAttrSet );
     }
 }
 
-std::unique_ptr<SfxTabPage> SfxMacroTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> SfxMacroTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
 {
-    return CreateSfxMacroTabPage(pParent, *rAttrSet);
+    return CreateSfxMacroTabPage(pPage, pController, *rAttrSet);
 }
 
 SfxMacroAssignDlg::SfxMacroAssignDlg(weld::Widget* pParent,
@@ -379,8 +379,7 @@ SfxMacroAssignDlg::SfxMacroAssignDlg(weld::Widget* pParent,
     : SfxSingleTabDialogController(pParent, &rSet,"cui/ui/eventassigndialog.ui",
                                    "EventAssignDialog")
 {
-    TabPageParent pPageParent(get_content_area(), this);
-    std::unique_ptr<SfxMacroTabPage> xPage = CreateSfxMacroTabPage(pPageParent, rSet);
+    std::unique_ptr<SfxMacroTabPage> xPage = CreateSfxMacroTabPage(get_content_area(), this, rSet);
     xPage->SetFrame(rxDocumentFrame);
     SetTabPage(std::move(xPage));
     GetTabPage()->LaunchFillGroup();
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 9ca74cff4514..e7a7fbe12fdf 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -52,8 +52,7 @@ SvxMeasureDialog::SvxMeasureDialog(weld::Window* pParent, const SfxItemSet& rInA
                                 const SdrView* pSdrView)
     : SfxSingleTabDialogController(pParent, &rInAttrs)
 {
-    TabPageParent pPageParent(get_content_area(), this);
-    auto xPage = std::make_unique<SvxMeasurePage>(pPageParent, rInAttrs);
+    auto xPage = std::make_unique<SvxMeasurePage>(get_content_area(), this, rInAttrs);
 
     xPage->SetView(pSdrView);
     xPage->Construct();
@@ -68,8 +67,8 @@ SvxMeasureDialog::SvxMeasureDialog(weld::Window* pParent, const SfxItemSet& rInA
 |*
 \************************************************************************/
 
-SvxMeasurePage::SvxMeasurePage(TabPageParent pWindow, const SfxItemSet& rInAttrs)
-    : SvxTabPage(pWindow, "cui/ui/dimensionlinestabpage.ui", "DimensionLinesTabPage", rInAttrs)
+SvxMeasurePage::SvxMeasurePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+    : SvxTabPage(pPage, pController, "cui/ui/dimensionlinestabpage.ui", "DimensionLinesTabPage", rInAttrs)
     , rOutAttrs(rInAttrs)
     , aAttrSet(*rInAttrs.GetPool())
     , pView(nullptr)
@@ -520,10 +519,10 @@ void SvxMeasurePage::Construct()
     m_aCtlPreview.Invalidate();
 }
 
-std::unique_ptr<SfxTabPage> SvxMeasurePage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxMeasurePage::Create(weld::Container* pPage, weld::DialogController* pController,
                                           const SfxItemSet* rAttrs)
 {
-    return std::make_unique<SvxMeasurePage>(pParent, *rAttrs);
+    return std::make_unique<SvxMeasurePage>(pPage, pController, *rAttrs);
 }
 
 void SvxMeasurePage::PointChanged(weld::DrawingArea* pDrawingArea, RectPoint /*eRP*/)
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index d8a9fee0948a..18517527dca6 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -186,9 +186,9 @@ void SvxNumberPreview::Paint(vcl::RenderContext& rRenderContext, const ::tools::
 
 #define HDL(hdl) LINK( this, SvxNumberFormatTabPage, hdl )
 
-SvxNumberFormatTabPage::SvxNumberFormatTabPage(TabPageParent pParent,
+SvxNumberFormatTabPage::SvxNumberFormatTabPage(weld::Container* pPage, weld::DialogController* pController,
     const SfxItemSet& rCoreAttrs)
-    : SfxTabPage(pParent, "cui/ui/numberingformatpage.ui", "NumberingFormatPage", &rCoreAttrs)
+    : SfxTabPage(pPage, pController, "cui/ui/numberingformatpage.ui", "NumberingFormatPage", &rCoreAttrs)
     , nInitFormat(ULONG_MAX)
     , bLegacyAutomaticCurrency(false)
     , sAutomaticLangEntry(CuiResId(RID_SVXSTR_AUTO_ENTRY))
@@ -307,10 +307,10 @@ void SvxNumberFormatTabPage::Init_Impl()
     m_xLbLanguage->InsertLanguage( LANGUAGE_SYSTEM );
 }
 
-std::unique_ptr<SfxTabPage> SvxNumberFormatTabPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxNumberFormatTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
                                                    const SfxItemSet* rAttrSet )
 {
-    return std::make_unique<SvxNumberFormatTabPage>(pParent, *rAttrSet);
+    return std::make_unique<SvxNumberFormatTabPage>(pPage, pController, *rAttrSet);
 }
 
 
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 093debdf6319..82ba9fb3b5ba 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -159,8 +159,8 @@ static const vcl::Font& lcl_GetDefaultBulletFont()
     return aDefBulletFont;
 }
 
-SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/picknumberingpage.ui", "PickNumberingPage", &rSet)
+SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/picknumberingpage.ui", "PickNumberingPage", &rSet)
     , nActNumLvl(SAL_MAX_UINT16)
     , bModified(false)
     , bPreset(false)
@@ -207,10 +207,10 @@ SvxSingleNumPickTabPage::~SvxSingleNumPickTabPage()
     m_xExamplesVS.reset();
 }
 
-std::unique_ptr<SfxTabPage> SvxSingleNumPickTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxSingleNumPickTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
                                                    const SfxItemSet* rAttrSet)
 {
-    return std::make_unique<SvxSingleNumPickTabPage>(pParent, *rAttrSet);
+    return std::make_unique<SvxSingleNumPickTabPage>(pPage, pController, *rAttrSet);
 }
 
 bool  SvxSingleNumPickTabPage::FillItemSet( SfxItemSet* rSet )
@@ -338,8 +338,8 @@ IMPL_LINK_NOARG(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, SvtValueSet*, void
     rOk.clicked();
 }
 
-SvxBulletPickTabPage::SvxBulletPickTabPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/pickbulletpage.ui", "PickBulletPage", &rSet)
+SvxBulletPickTabPage::SvxBulletPickTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/pickbulletpage.ui", "PickBulletPage", &rSet)
     , nActNumLvl(SAL_MAX_UINT16)
     , bModified(false)
     , bPreset(false)
@@ -359,10 +359,10 @@ SvxBulletPickTabPage::~SvxBulletPickTabPage()
     m_xExamplesVS.reset();
 }
 
-std::unique_ptr<SfxTabPage> SvxBulletPickTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxBulletPickTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
                                                 const SfxItemSet* rAttrSet)
 {
-    return std::make_unique<SvxBulletPickTabPage>(pParent, *rAttrSet);
+    return std::make_unique<SvxBulletPickTabPage>(pPage, pController, *rAttrSet);
 }
 
 bool  SvxBulletPickTabPage::FillItemSet( SfxItemSet* rSet )
@@ -487,8 +487,8 @@ void SvxBulletPickTabPage::PageCreated(const SfxAllItemSet& aSet)
         sBulletCharFormatName = pBulletCharFmt->GetValue();
 }
 
-SvxNumPickTabPage::SvxNumPickTabPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/pickoutlinepage.ui", "PickOutlinePage", &rSet)
+SvxNumPickTabPage::SvxNumPickTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/pickoutlinepage.ui", "PickOutlinePage", &rSet)
     , nActNumLvl(SAL_MAX_UINT16)
     , nNumItemId(SID_ATTR_NUMBERING_RULE)
     , bModified(false)
@@ -542,10 +542,10 @@ SvxNumPickTabPage::~SvxNumPickTabPage()
     m_xExamplesVS.reset();
 }
 
-std::unique_ptr<SfxTabPage> SvxNumPickTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxNumPickTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
                                              const SfxItemSet* rAttrSet)
 {
-    return std::make_unique<SvxNumPickTabPage>(pParent, *rAttrSet);
+    return std::make_unique<SvxNumPickTabPage>(pPage, pController, *rAttrSet);
 }
 
 bool  SvxNumPickTabPage::FillItemSet( SfxItemSet* rSet )
@@ -726,8 +726,8 @@ void SvxNumPickTabPage::PageCreated(const SfxAllItemSet& aSet)
         SetCharFormatNames( pNumCharFmt->GetValue(),pBulletCharFmt->GetValue());
 }
 
-SvxBitmapPickTabPage::SvxBitmapPickTabPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/pickgraphicpage.ui", "PickGraphicPage", &rSet)
+SvxBitmapPickTabPage::SvxBitmapPickTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/pickgraphicpage.ui", "PickGraphicPage", &rSet)
     , nActNumLvl(SAL_MAX_UINT16)
     , nNumItemId(SID_ATTR_NUMBERING_RULE)
     , bModified(false)
@@ -780,10 +780,10 @@ SvxBitmapPickTabPage::~SvxBitmapPickTabPage()
     m_xExamplesVS.reset();
 }
 
-std::unique_ptr<SfxTabPage> SvxBitmapPickTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxBitmapPickTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
                                                 const SfxItemSet* rAttrSet)
 {
-    return std::make_unique<SvxBitmapPickTabPage>(pParent, *rAttrSet);
+    return std::make_unique<SvxBitmapPickTabPage>(pPage, pController, *rAttrSet);
 }
 
 void  SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet)
@@ -1011,9 +1011,9 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl, weld::Button&, voi
 }
 
 // tabpage numbering options
-SvxNumOptionsTabPage::SvxNumOptionsTabPage(TabPageParent pParent,
+SvxNumOptionsTabPage::SvxNumOptionsTabPage(weld::Container* pPage, weld::DialogController* pController,
                                const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/numberingoptionspage.ui", "NumberingOptionsPage", &rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/numberingoptionspage.ui", "NumberingOptionsPage", &rSet)
     , bLastWidthModified(false)
     , bModified(false)
     , bPreset(false)
@@ -1033,7 +1033,7 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(TabPageParent pParent,
     , m_xCharFmtFT(m_xBuilder->weld_label("charstyleft"))
     , m_xCharFmtLB(m_xBuilder->weld_combo_box("charstyle"))
     , m_xBulColorFT(m_xBuilder->weld_label("colorft"))
-    , m_xBulColLB(new ColorListBox(m_xBuilder->weld_menu_button("color"), pParent.GetFrameWeld()))
+    , m_xBulColLB(new ColorListBox(m_xBuilder->weld_menu_button("color"), pController->getDialog()))
     , m_xBulRelSizeFT(m_xBuilder->weld_label("relsizeft"))
     , m_xBulRelSizeMF(m_xBuilder->weld_metric_spin_button("relsize", FieldUnit::PERCENT))
     , m_xAllLevelFT(m_xBuilder->weld_label("sublevelsft"))
@@ -1123,10 +1123,10 @@ void SvxNumOptionsTabPage::SetMetric(FieldUnit eMetric)
     m_xHeightMF->set_unit(eMetric);
 }
 
-std::unique_ptr<SfxTabPage> SvxNumOptionsTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxNumOptionsTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
                                                 const SfxItemSet* rAttrSet)
 {
-    return std::make_unique<SvxNumOptionsTabPage>(pParent, *rAttrSet);
+    return std::make_unique<SvxNumOptionsTabPage>(pPage, pController, *rAttrSet);
 };
 
 void    SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet)
@@ -2453,8 +2453,8 @@ void SvxNumberingPreview::Paint(vcl::RenderContext& rRenderContext, const ::tool
 //dialog to this one, except with a different preview window impl.
 //TODO, determine if SwNumPositionTabPage and SvxNumPositionTabPage can be
 //merged
-SvxNumPositionTabPage::SvxNumPositionTabPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/numberingpositionpage.ui", "NumberingPositionPage", &rSet)
+SvxNumPositionTabPage::SvxNumPositionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/numberingpositionpage.ui", "NumberingPositionPage", &rSet)
     , m_pLevelHdlEvent(nullptr)
     , nActNumLvl(1)
     , nNumItemId(SID_ATTR_NUMBERING_RULE)
@@ -2916,10 +2916,10 @@ void SvxNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode()
     m_xIndentAtMF->set_visible( bLabelAlignmentPosAndSpaceModeActive );
 }
 
-std::unique_ptr<SfxTabPage> SvxNumPositionTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxNumPositionTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
                                                  const SfxItemSet* rAttrSet)
 {
-    return std::make_unique<SvxNumPositionTabPage>(pParent, *rAttrSet);
+    return std::make_unique<SvxNumPositionTabPage>(pPage, pController, *rAttrSet);
 }
 
 void SvxNumPositionTabPage::SetMetric(FieldUnit eMetric)
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 75c963016988..5f161edca0e7 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -133,13 +133,13 @@ static bool IsEqualSize_Impl( const SvxSizeItem* pSize, const Size& rSize )
 
 // class SvxPageDescPage --------------------------------------------------
 
-std::unique_ptr<SfxTabPage> SvxPageDescPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
+std::unique_ptr<SfxTabPage> SvxPageDescPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet )
 {
-    return std::make_unique<SvxPageDescPage>(pParent, *rSet);
+    return std::make_unique<SvxPageDescPage>(pPage, pController, *rSet);
 }
 
-SvxPageDescPage::SvxPageDescPage(TabPageParent pParent, const SfxItemSet& rAttr)
-    : SfxTabPage(pParent, "cui/ui/pageformatpage.ui", "PageFormatPage", &rAttr)
+SvxPageDescPage::SvxPageDescPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttr)
+    : SfxTabPage(pPage, pController, "cui/ui/pageformatpage.ui", "PageFormatPage", &rAttr)
     , bLandscape(false)
     , eMode(SVX_PAGE_MODE_STANDARD)
     , ePaperStart(PAPER_A3)
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index b4299d7425f3..7990744f1cc3 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -205,9 +205,9 @@ IMPL_LINK_NOARG(SvxStdParagraphTabPage, ELRLoseFocusHdl, weld::MetricSpinButton&
     ELRLoseFocus();
 }
 
-std::unique_ptr<SfxTabPage> SvxStdParagraphTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SvxStdParagraphTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
 {
-    return std::make_unique<SvxStdParagraphTabPage>(pParent, *rSet);
+    return std::make_unique<SvxStdParagraphTabPage>(pPage, pController, *rSet);
 }
 
 bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
@@ -669,8 +669,8 @@ DeactivateRC SvxStdParagraphTabPage::DeactivatePage( SfxItemSet* _pSet )
     return DeactivateRC::LeavePage;
 }
 
-SvxStdParagraphTabPage::SvxStdParagraphTabPage(TabPageParent pParent,  const SfxItemSet& rAttr)
-    : SfxTabPage(pParent, "cui/ui/paraindentspacing.ui", "ParaIndentSpacing", &rAttr)
+SvxStdParagraphTabPage::SvxStdParagraphTabPage(weld::Container* pPage, weld::DialogController* pController,  const SfxItemSet& rAttr)
+    : SfxTabPage(pPage, pController, "cui/ui/paraindentspacing.ui", "ParaIndentSpacing", &rAttr)
     , nWidth(11905 /*567 * 50*/)
     , nMinFixDist(0)
     , bRelativeMode(false)
@@ -991,8 +991,8 @@ void SvxStdParagraphTabPage::PageCreated(const SfxAllItemSet& aSet)
 #define LASTLINECOUNT_OLD       3
 #define LASTLINECOUNT_NEW       4
 
-SvxParaAlignTabPage::SvxParaAlignTabPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/paragalignpage.ui", "ParaAlignPage", &rSet)
+SvxParaAlignTabPage::SvxParaAlignTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/paragalignpage.ui", "ParaAlignPage", &rSet)
     , m_xLeft(m_xBuilder->weld_radio_button("radioBTN_LEFTALIGN"))
     , m_xRight(m_xBuilder->weld_radio_button("radioBTN_RIGHTALIGN"))
     , m_xCenter(m_xBuilder->weld_radio_button("radioBTN_CENTERALIGN"))
@@ -1059,9 +1059,9 @@ DeactivateRC SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet )
     return DeactivateRC::LeavePage;
 }
 
-std::unique_ptr<SfxTabPage> SvxParaAlignTabPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SvxParaAlignTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
 {
-    return std::make_unique<SvxParaAlignTabPage>(pParent, *rSet);
+    return std::make_unique<SvxParaAlignTabPage>(pPage, pController, *rSet);
 }
 
 bool SvxParaAlignTabPage::FillItemSet( SfxItemSet* rOutSet )
@@ -1356,9 +1356,9 @@ void SvxParaAlignTabPage::PageCreated (const SfxAllItemSet& aSet)
         EnableJustifyExt();
 }
 
-std::unique_ptr<SfxTabPage> SvxExtParagraphTabPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SvxExtParagraphTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
 {
-    return std::make_unique<SvxExtParagraphTabPage>(pParent, *rSet);
+    return std::make_unique<SvxExtParagraphTabPage>(pPage, pController, *rSet);
 }
 
 bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
@@ -1899,8 +1899,8 @@ void SvxExtParagraphTabPage::DisablePageBreak()
     m_xPagenumEdit->set_sensitive(false);
 }
 
-SvxExtParagraphTabPage::SvxExtParagraphTabPage(TabPageParent pParent, const SfxItemSet& rAttr)
-    : SfxTabPage(pParent, "cui/ui/textflowpage.ui", "TextFlowPage", &rAttr)
+SvxExtParagraphTabPage::SvxExtParagraphTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttr)
+    : SfxTabPage(pPage, pController, "cui/ui/textflowpage.ui", "TextFlowPage", &rAttr)
     , bPageBreak(true)
     , bHtmlMode(false)
     , nStdPos(0)
@@ -2209,8 +2209,8 @@ void SvxExtParagraphTabPage::PageCreated(const SfxAllItemSet& aSet)
                     DisablePageBreak();
 }
 
-SvxAsianTabPage::SvxAsianTabPage(TabPageParent pParent, const SfxItemSet& rSet)
-    : SfxTabPage(pParent, "cui/ui/asiantypography.ui", "AsianTypography", &rSet)
+SvxAsianTabPage::SvxAsianTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+    : SfxTabPage(pPage, pController, "cui/ui/asiantypography.ui", "AsianTypography", &rSet)
     , m_xForbiddenRulesCB(m_xBuilder->weld_check_button("checkForbidList"))
     , m_xHangingPunctCB(m_xBuilder->weld_check_button("checkHangPunct"))
     , m_xScriptSpaceCB(m_xBuilder->weld_check_button("checkApplySpacing"))
@@ -2221,9 +2221,9 @@ SvxAsianTabPage::~SvxAsianTabPage()
 {
 }
 
-std::unique_ptr<SfxTabPage> SvxAsianTabPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SvxAsianTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
 {
-    return std::make_unique<SvxAsianTabPage>(pParent, *rSet);
+    return std::make_unique<SvxAsianTabPage>(pPage, pController, *rSet);
 }
 
 const sal_uInt16*     SvxAsianTabPage::GetRanges()
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 0e6a3a0ace28..d57c5443a65e 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -511,8 +511,8 @@ static LB lcl_GetLBRelationsForStrID(const FrmMap* _pMap,
     return nLBRelations;
 }
 
-SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
-    : SfxTabPage(pParent, "cui/ui/swpossizepage.ui", "SwPosSizePage", &rInAttrs)
+SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+    : SfxTabPage(pPage, pController, "cui/ui/swpossizepage.ui", "SwPosSizePage", &rInAttrs)
     , m_pVMap(nullptr)
     , m_pHMap(nullptr)
     , m_pSdrView(nullptr)
@@ -702,9 +702,9 @@ void SvxSwPosSizeTabPage::setOptimalRelWidth()
     m_xHoriLB->clear();
 }
 
-std::unique_ptr<SfxTabPage> SvxSwPosSizeTabPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SvxSwPosSizeTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
 {
-    return std::make_unique<SvxSwPosSizeTabPage>(pParent, *rSet);
+    return std::make_unique<SvxSwPosSizeTabPage>(pPage, pController, *rSet);
 }
 
 const sal_uInt16* SvxSwPosSizeTabPage::GetRanges()
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 71eb7ffd1417..5c347ffd5612 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -59,8 +59,8 @@ void TabWin_Impl::Paint(vcl::RenderContext& rRenderContext, const ::tools::Recta
     Ruler::DrawTab(rRenderContext, rRenderContext.GetSettings().GetStyleSettings().GetFontColor(), aPoint, nTabStyle);
 }
 
-SvxTabulatorTabPage::SvxTabulatorTabPage(TabPageParent pParent, const SfxItemSet& rAttr)
-    : SfxTabPage(pParent, "cui/ui/paratabspage.ui", "ParagraphTabsPage", &rAttr)
+SvxTabulatorTabPage::SvxTabulatorTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttr)
+    : SfxTabPage(pPage, pController, "cui/ui/paratabspage.ui", "ParagraphTabsPage", &rAttr)
     , aCurrentTab(0)
     , aNewTabs(std::make_unique<SvxTabStopItem>(0, 0, SvxTabAdjust::Left, GetWhich(SID_ATTR_TABSTOP)))
     , nDefDist(0)
@@ -208,9 +208,9 @@ bool SvxTabulatorTabPage::FillItemSet(SfxItemSet* rSet)
     return bModified;
 }
 
-std::unique_ptr<SfxTabPage> SvxTabulatorTabPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SvxTabulatorTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
 {
-    return std::make_unique<SvxTabulatorTabPage>(pParent, *rSet);
+    return std::make_unique<SvxTabulatorTabPage>(pPage, pController, *rSet);
 }
 
 void SvxTabulatorTabPage::Reset(const SfxItemSet* rSet)
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index 3a20a1e08ba1..9f4acaa05b76 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -75,15 +75,13 @@ void SvxTextTabDialog::PageCreated(const OString& rId, SfxTabPage &rPage)
     }
 }
 
-
 /*************************************************************************
 |*
 |* Page
 |*
 \************************************************************************/
-
-SvxTextAnimationPage::SvxTextAnimationPage(TabPageParent pPage, const SfxItemSet& rInAttrs)
-    : SfxTabPage(pPage, "cui/ui/textanimtabpage.ui", "TextAnimation", &rInAttrs)
+SvxTextAnimationPage::SvxTextAnimationPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+    : SfxTabPage(pPage, pController, "cui/ui/textanimtabpage.ui", "TextAnimation", &rInAttrs)
     , rOutAttrs(rInAttrs)
     , eAniKind(SdrTextAniKind::NONE)
     , m_aUpState(TRISTATE_INDET)
@@ -377,9 +375,9 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet* rAttrs)
 |*
 \************************************************************************/
 
-std::unique_ptr<SfxTabPage> SvxTextAnimationPage::Create(TabPageParent pParent, const SfxItemSet* rAttrs)
+std::unique_ptr<SfxTabPage> SvxTextAnimationPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrs)
 {
-    return std::make_unique<SvxTextAnimationPage>(pParent, *rAttrs);
+    return std::make_unique<SvxTextAnimationPage>(pPage, pController, *rAttrs);
 }
 
 IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl, weld::ComboBox&, void)
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 579c2b0436fa..b82e57ba3233 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -48,8 +48,8 @@ const sal_uInt16 SvxTextAttrPage::pRanges[] =
 |* dialog (page) for copying objects
 |*
 \************************************************************************/
-SvxTextAttrPage::SvxTextAttrPage(TabPageParent pPage, const SfxItemSet& rInAttrs)
-    : SvxTabPage(pPage, "cui/ui/textattrtabpage.ui", "TextAttributesPage", rInAttrs)
+SvxTextAttrPage::SvxTextAttrPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+    : SvxTabPage(pPage, pController, "cui/ui/textattrtabpage.ui", "TextAttributesPage", rInAttrs)
     , rOutAttrs(rInAttrs)
     , m_eObjKind(OBJ_NONE)
     , bAutoGrowSizeEnabled(false)
@@ -474,9 +474,9 @@ void SvxTextAttrPage::Construct()
     m_xTsbWordWrapText->set_visible( bWordWrapTextEnabled );
 }
 
-std::unique_ptr<SfxTabPage> SvxTextAttrPage::Create(TabPageParent pWindow, const SfxItemSet* rAttrs)
+std::unique_ptr<SfxTabPage> SvxTextAttrPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrs)
 {
-    return std::make_unique<SvxTextAttrPage>(pWindow, *rAttrs);
+    return std::make_unique<SvxTextAttrPage>(pPage, pController, *rAttrs);
 }
 
 /** Check whether we have to uncheck the "Full width" check box.
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 44f9864b147c..d0c70b60c456 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -70,8 +70,8 @@ void lclExtendSize(Size& rSize, const Size& rInputSize)
 |*
 \************************************************************************/
 
-SvxAreaTabPage::SvxAreaTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
-    : SfxTabPage(pParent, "cui/ui/areatabpage.ui", "AreaTabPage", &rInAttrs)
+SvxAreaTabPage::SvxAreaTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+    : SfxTabPage(pPage, pController, "cui/ui/areatabpage.ui", "AreaTabPage", &rInAttrs)
     // local fixed not o be changed values for local pointers
     , maFixed_ChangeType(ChangeType::NONE)
     // init with pointers to fixed ChangeType
@@ -111,33 +111,31 @@ void SvxAreaTabPage::SetOptimalSize(weld::DialogController* pController)
 {
     m_xFillTab->set_size_request(-1, -1);
 
-    TabPageParent aFillTab(m_xFillTab.get(), pController);
-
     // Calculate optimal size of all pages...
-    m_xFillTabPage = SvxColorTabPage::Create(aFillTab, &m_rXFSet);
+    m_xFillTabPage = SvxColorTabPage::Create(m_xFillTab.get(), pController, &m_rXFSet);
     Size aSize(m_xFillTab->get_preferred_size());
 
     if (m_xBtnGradient->get_visible())
     {
-        m_xFillTabPage = SvxGradientTabPage::Create(aFillTab, &m_rXFSet);
+        m_xFillTabPage = SvxGradientTabPage::Create(m_xFillTab.get(), pController, &m_rXFSet);
         Size aGradientSize = m_xFillTab->get_preferred_size();
         lclExtendSize(aSize, aGradientSize);
     }
     if (m_xBtnBitmap->get_visible())
     {
-        m_xFillTabPage = SvxBitmapTabPage::Create(aFillTab, &m_rXFSet);
+        m_xFillTabPage = SvxBitmapTabPage::Create(m_xFillTab.get(), pController, &m_rXFSet);
         Size aBitmapSize = m_xFillTab->get_preferred_size();
         lclExtendSize(aSize, aBitmapSize);
     }
     if (m_xBtnHatch->get_visible())
     {
-        m_xFillTabPage = SvxHatchTabPage::Create(aFillTab, &m_rXFSet);
+        m_xFillTabPage = SvxHatchTabPage::Create(m_xFillTab.get(), pController, &m_rXFSet);
         Size aHatchSize = m_xFillTab->get_preferred_size();
         lclExtendSize(aSize, aHatchSize);
     }
     if (m_xBtnPattern->get_visible())
     {
-        m_xFillTabPage = SvxPatternTabPage::Create(aFillTab, &m_rXFSet);
+        m_xFillTabPage = SvxPatternTabPage::Create(m_xFillTab.get(), pController, &m_rXFSet);
         Size aPatternSize = m_xFillTab->get_preferred_size();
         lclExtendSize(aSize, aPatternSize);
     }
@@ -327,16 +325,16 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs )
     }
 }
 
-std::unique_ptr<SfxTabPage> SvxAreaTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrs)
+std::unique_ptr<SfxTabPage> SvxAreaTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrs)
 {
-    auto xRet = std::make_unique<SvxAreaTabPage>(pParent, *rAttrs);
-    xRet->SetOptimalSize(pParent.pController);
+    auto xRet = std::make_unique<SvxAreaTabPage>(pPage, pController, *rAttrs);
+    xRet->SetOptimalSize(pController);
     return xRet;
 }
 
 namespace {
 
-std::unique_ptr<SfxTabPage> lcl_CreateFillStyleTabPage(sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet)
+std::unique_ptr<SfxTabPage> lcl_CreateFillStyleTabPage(sal_uInt16 nId, weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
 {
     CreateTabPage fnCreate = nullptr;
     switch(nId)
@@ -348,7 +346,7 @@ std::unique_ptr<SfxTabPage> lcl_CreateFillStyleTabPage(sal_uInt16 nId, TabPagePa
         case BITMAP: fnCreate = &SvxBitmapTabPage::Create; break;
         case PATTERN: fnCreate = &SvxPatternTabPage::Create; break;
     }
-    return fnCreate ? (*fnCreate)( pParent, &rSet ) : nullptr;
+    return fnCreate ? (*fnCreate)( pPage, pController, &rSet ) : nullptr;
 }
 
 }
@@ -373,8 +371,7 @@ void SvxAreaTabPage::SelectFillType(weld::ToggleButton& rButton, const SfxItemSe
     {
         maBox.SelectButton(&rButton);
         FillType eFillType = static_cast<FillType>(maBox.GetCurrentButtonPos());
-        TabPageParent aFillTab(m_xFillTab.get(), GetDialogController());
-        m_xFillTabPage = lcl_CreateFillStyleTabPage(eFillType, aFillTab, m_rXFSet);
+        m_xFillTabPage = lcl_CreateFillStyleTabPage(eFillType, m_xFillTab.get(), GetDialogController(), m_rXFSet);
         if (m_xFillTabPage)
             m_xFillTabPage->SetDialogController(GetDialogController());
         CreatePage(eFillType, m_xFillTabPage.get());
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 64ac9d6413a5..13d49dabd1ae 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -68,8 +68,8 @@ const sal_uInt16 SvxBitmapTabPage::pBitmapRanges[] =
     0
 };
 
-SvxBitmapTabPage::SvxBitmapTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
-    : SfxTabPage(pParent, "cui/ui/bitmaptabpage.ui", "BitmapTabPage", &rInAttrs)
+SvxBitmapTabPage::SvxBitmapTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+    : SfxTabPage(pPage, pController, "cui/ui/bitmaptabpage.ui", "BitmapTabPage", &rInAttrs)
     , m_rOutAttrs(rInAttrs)
     , m_pnBitmapListState(nullptr)
     , m_fObjectWidth(0.0)
@@ -416,9 +416,9 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs )
     ClickBitmapHdl_Impl();
 }
 
-std::unique_ptr<SfxTabPage> SvxBitmapTabPage::Create(TabPageParent pWindow, const SfxItemSet* rAttrs)
+std::unique_ptr<SfxTabPage> SvxBitmapTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrs)
 {
-    return std::make_unique<SvxBitmapTabPage>(pWindow, *rAttrs);
+    return std::make_unique<SvxBitmapTabPage>(pPage, pController, *rAttrs);
 }
 
 void SvxBitmapTabPage::ClickBitmapHdl_Impl()
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 936a1b8df51f..70e36bfb3d09 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -37,8 +37,8 @@
 
 using namespace com::sun::star;
 
-SvxColorTabPage::SvxColorTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
-    : SfxTabPage(pParent, "cui/ui/colorpage.ui", "ColorPage", &rInAttrs)
+SvxColorTabPage::SvxColorTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+    : SfxTabPage(pPage, pController, "cui/ui/colorpage.ui", "ColorPage", &rInAttrs)
     , rOutAttrs           ( rInAttrs )
     // All the horrific pointers we store and should not
     , pnColorListState( nullptr )
@@ -262,9 +262,9 @@ void SvxColorTabPage::Reset( const SfxItemSet* rSet )
     UpdateModified();
 }
 
-std::unique_ptr<SfxTabPage> SvxColorTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> SvxColorTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
 {
-    return std::make_unique<SvxColorTabPage>(pParent, *rOutAttrs);
+    return std::make_unique<SvxColorTabPage>(pPage, pController, *rOutAttrs);
 }
 
 // is called when the content of the MtrFields is changed for color values
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 3a5733f856b4..1dc2e6d7704e 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -40,8 +40,8 @@
 
 using namespace com::sun::star;
 
-SvxGradientTabPage::SvxGradientTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
-    : SfxTabPage(pParent, "cui/ui/gradientpage.ui", "GradientPage", &rInAttrs)
+SvxGradientTabPage::SvxGradientTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+    : SfxTabPage(pPage, pController, "cui/ui/gradientpage.ui", "GradientPage", &rInAttrs)
     , m_rOutAttrs(rInAttrs)
     , m_pnGradientListState(nullptr)
     , m_pnColorListState(nullptr)
@@ -56,9 +56,9 @@ SvxGradientTabPage::SvxGradientTabPage(TabPageParent pParent, const SfxItemSet&
     , m_xSliderAngle(m_xBuilder->weld_scale("angleslider"))
     , m_xMtrBorder(m_xBuilder->weld_metric_spin_button("bordermtr", FieldUnit::PERCENT))
     , m_xSliderBorder(m_xBuilder->weld_scale("borderslider"))
-    , m_xLbColorFrom(new ColorListBox(m_xBuilder->weld_menu_button("colorfromlb"), pParent.GetFrameWeld()))
+    , m_xLbColorFrom(new ColorListBox(m_xBuilder->weld_menu_button("colorfromlb"), pController->getDialog()))
     , m_xMtrColorFrom(m_xBuilder->weld_metric_spin_button("colorfrommtr", FieldUnit::PERCENT))
-    , m_xLbColorTo(new ColorListBox(m_xBuilder->weld_menu_button("colortolb"), pParent.GetFrameWeld()))
+    , m_xLbColorTo(new ColorListBox(m_xBuilder->weld_menu_button("colortolb"), pController->getDialog()))
     , m_xMtrColorTo(m_xBuilder->weld_metric_spin_button("colortomtr", FieldUnit::PERCENT))
     , m_xGradientLB(new SvxPresetListBox(m_xBuilder->weld_scrolled_window("gradientpresetlistwin")))
     , m_xMtrIncrement(m_xBuilder->weld_spin_button("incrementmtr"))
@@ -227,10 +227,10 @@ void SvxGradientTabPage::Reset( const SfxItemSet* )
         m_xBtnModify->set_sensitive(false);
 }
 
-std::unique_ptr<SfxTabPage> SvxGradientTabPage::Create( TabPageParent pWindow,
+std::unique_ptr<SfxTabPage> SvxGradientTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
                                                const SfxItemSet* rOutAttrs )
 {
-    return std::make_unique<SvxGradientTabPage>(pWindow, *rOutAttrs);
+    return std::make_unique<SvxGradientTabPage>(pPage, pController, *rOutAttrs);
 }
 
 IMPL_LINK( SvxGradientTabPage, ModifiedListBoxHdl_Impl, weld::ComboBox&, rListBox, void )
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 88fc1f57ee47..26df4b40c5d5 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -43,8 +43,8 @@
 
 using namespace com::sun::star;
 
-SvxHatchTabPage::SvxHatchTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
-    : SfxTabPage(pParent, "cui/ui/hatchpage.ui", "HatchPage", &rInAttrs)
+SvxHatchTabPage::SvxHatchTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+    : SfxTabPage(pPage, pController, "cui/ui/hatchpage.ui", "HatchPage", &rInAttrs)
     , m_rOutAttrs(rInAttrs)
     , m_pnHatchingListState(nullptr)
     , m_pnColorListState(nullptr)
@@ -54,9 +54,9 @@ SvxHatchTabPage::SvxHatchTabPage(TabPageParent pParent, const SfxItemSet& rInAtt
     , m_xMtrAngle(m_xBuilder->weld_metric_spin_button("anglemtr", FieldUnit::DEGREE))
     , m_xSliderAngle(m_xBuilder->weld_scale("angleslider"))
     , m_xLbLineType(m_xBuilder->weld_combo_box("linetypelb"))
-    , m_xLbLineColor(new ColorListBox(m_xBuilder->weld_menu_button("linecolorlb"), pParent.GetFrameWeld()))
+    , m_xLbLineColor(new ColorListBox(m_xBuilder->weld_menu_button("linecolorlb"), pController->getDialog()))
     , m_xCbBackgroundColor(m_xBuilder->weld_check_button("backgroundcolor"))
-    , m_xLbBackgroundColor(new ColorListBox(m_xBuilder->weld_menu_button("backgroundcolorlb"), pParent.GetFrameWeld()))
+    , m_xLbBackgroundColor(new ColorListBox(m_xBuilder->weld_menu_button("backgroundcolorlb"), pController->getDialog()))
     , m_xHatchLB(new SvxPresetListBox(m_xBuilder->weld_scrolled_window("hatchpresetlistwin")))
     , m_xBtnAdd(m_xBuilder->weld_button("add"))
     , m_xBtnModify(m_xBuilder->weld_button("modify"))
@@ -266,10 +266,10 @@ void SvxHatchTabPage::Reset( const SfxItemSet* rSet )
     m_aCtlPreview.Invalidate();
 }
 
-std::unique_ptr<SfxTabPage> SvxHatchTabPage::Create( TabPageParent pWindow,
+std::unique_ptr<SfxTabPage> SvxHatchTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
                                             const SfxItemSet* rSet )
 {
-    return std::make_unique<SvxHatchTabPage>(pWindow, *rSet);
+    return std::make_unique<SvxHatchTabPage>(pPage, pController, *rSet);
 }
 
 IMPL_LINK( SvxHatchTabPage, ModifiedListBoxHdl_Impl, weld::ComboBox&, rListBox, void )
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 00e2e4eb10ec..92db00bd2f70 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -80,8 +80,8 @@ const sal_uInt16 SvxLineTabPage::pLineRanges[] =
     0
 };
 
-SvxLineTabPage::SvxLineTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
-    : SfxTabPage(pParent, "cui/ui/linetabpage.ui", "LineTabPage", &rInAttrs)
+SvxLineTabPage::SvxLineTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+    : SfxTabPage(pPage, pController, "cui/ui/linetabpage.ui", "LineTabPage", &rInAttrs)
     , m_pSymbolList(nullptr)
     , m_bNewSize(false)
     , m_nSymbolType(SVX_SYMBOLTYPE_UNKNOWN) // unknown respectively unchanged
@@ -102,7 +102,7 @@ SvxLineTabPage::SvxLineTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs
     , m_pPosLineEndLb(nullptr)
     , m_xBoxColor(m_xBuilder->weld_widget("boxCOLOR"))
     , m_xLbLineStyle(new SvxLineLB(m_xBuilder->weld_combo_box("LB_LINE_STYLE")))
-    , m_xLbColor(new ColorListBox(m_xBuilder->weld_menu_button("LB_COLOR"), pParent.GetFrameWeld()))
+    , m_xLbColor(new ColorListBox(m_xBuilder->weld_menu_button("LB_COLOR"), pController->getDialog()))
     , m_xBoxWidth(m_xBuilder->weld_widget("boxWIDTH"))
     , m_xMtrLineWidth(m_xBuilder->weld_metric_spin_button("MTR_FLD_LINE_WIDTH", FieldUnit::CM))
     , m_xBoxTransparency(m_xBuilder->weld_widget("boxTRANSPARENCY"))
@@ -1176,10 +1176,10 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
     ChangePreviewHdl_Impl( nullptr );
 }
 
-std::unique_ptr<SfxTabPage> SvxLineTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxLineTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
                                           const SfxItemSet* rAttrs)
 {
-    return std::make_unique<SvxLineTabPage>(pParent, *rAttrs);
+    return std::make_unique<SvxLineTabPage>(pPage, pController, *rAttrs);
 }
 
 IMPL_LINK_NOARG(SvxLineTabPage, ChangePreviewListBoxHdl_Impl, ColorListBox&, void)
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 4ed54c75aa1e..f5bac204f13d 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -50,8 +50,8 @@
 using namespace com::sun::star;
 
 
-SvxLineDefTabPage::SvxLineDefTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
-    : SfxTabPage(pParent, "cui/ui/linestyletabpage.ui", "LineStylePage", &rInAttrs)
+SvxLineDefTabPage::SvxLineDefTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+    : SfxTabPage(pPage, pController, "cui/ui/linestyletabpage.ui", "LineStylePage", &rInAttrs)
     , rOutAttrs(rInAttrs)
     , aXLineAttr(rInAttrs.GetPool())
     , rXLSet(aXLineAttr.GetItemSet())
@@ -296,9 +296,9 @@ void SvxLineDefTabPage::Reset( const SfxItemSet* rAttrs )
     }
 }
 
-std::unique_ptr<SfxTabPage> SvxLineDefTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs )
+std::unique_ptr<SfxTabPage> SvxLineDefTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs )
 {
-    return std::make_unique<SvxLineDefTabPage>(pParent, *rOutAttrs);
+    return std::make_unique<SvxLineDefTabPage>(pPage, pController, *rOutAttrs);
 }
 
 IMPL_LINK(SvxLineDefTabPage, SelectLinestyleListBoxHdl_Impl, weld::ComboBox&, rListBox, void)
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 3d108c81626b..eac0b4763d5f 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -49,8 +49,8 @@
 
 #define XOUT_WIDTH    150
 
-SvxLineEndDefTabPage::SvxLineEndDefTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
-    : SfxTabPage(pParent , "cui/ui/lineendstabpage.ui", "LineEndPage", &rInAttrs)
+SvxLineEndDefTabPage::SvxLineEndDefTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+    : SfxTabPage(pPage, pController, "cui/ui/lineendstabpage.ui", "LineEndPage", &rInAttrs)
     , rOutAttrs(rInAttrs)
     , pPolyObj(nullptr)
     , aXLineAttr(rInAttrs.GetPool())
@@ -231,9 +231,9 @@ void SvxLineEndDefTabPage::Reset( const SfxItemSet* )
     }
 }
 
-std::unique_ptr<SfxTabPage> SvxLineEndDefTabPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SvxLineEndDefTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
 {
-    return std::make_unique<SvxLineEndDefTabPage>(pParent, *rSet );
+    return std::make_unique<SvxLineEndDefTabPage>(pPage, pController, *rSet );
 }
 
 void SvxLineEndDefTabPage::SelectLineEndHdl_Impl()
diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx
index e4770e00bd6e..ecf3b75bdf2f 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -69,16 +69,16 @@ public:
     void SetBackgroundColor( Color aColor ) { aBackgroundColor = aColor; }
 };
 
-SvxPatternTabPage::SvxPatternTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
-    : SvxTabPage(pParent, "cui/ui/patterntabpage.ui", "PatternTabPage", rInAttrs)
+SvxPatternTabPage::SvxPatternTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+    : SvxTabPage(pPage, pController, "cui/ui/patterntabpage.ui", "PatternTabPage", rInAttrs)
     , m_rOutAttrs(rInAttrs)
     , m_pnPatternListState(nullptr)
     , m_pnColorListState(nullptr)
     , m_aXFillAttr(rInAttrs.GetPool())
     , m_rXFSet(m_aXFillAttr.GetItemSet())
     , m_xCtlPixel(new SvxPixelCtl(this))
-    , m_xLbColor(new ColorListBox(m_xBuilder->weld_menu_button("LB_COLOR"), pParent.GetFrameWeld()))
-    , m_xLbBackgroundColor(new ColorListBox(m_xBuilder->weld_menu_button("LB_BACKGROUND_COLOR"), pParent.GetFrameWeld()))
+    , m_xLbColor(new ColorListBox(m_xBuilder->weld_menu_button("LB_COLOR"), pController->getDialog()))
+    , m_xLbBackgroundColor(new ColorListBox(m_xBuilder->weld_menu_button("LB_BACKGROUND_COLOR"), pController->getDialog()))
     , m_xPatternLB(new SvxPresetListBox(m_xBuilder->weld_scrolled_window("patternpresetlistwin")))
     , m_xBtnAdd(m_xBuilder->weld_button("BTN_ADD"))
     , m_xBtnModify(m_xBuilder->weld_button("BTN_MODIFY"))
@@ -233,10 +233,10 @@ void SvxPatternTabPage::Reset( const SfxItemSet*  )
     }
 }
 
-std::unique_ptr<SfxTabPage> SvxPatternTabPage::Create( TabPageParent pWindow,
+std::unique_ptr<SfxTabPage> SvxPatternTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
                                              const SfxItemSet* rSet )
 {
-    return std::make_unique<SvxPatternTabPage>(pWindow, *rSet);
+    return std::make_unique<SvxPatternTabPage>(pPage, pController, *rSet);
 }
 
 IMPL_LINK_NOARG(SvxPatternTabPage, ChangePatternHdl_Impl, SvtValueSet*, void)
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index b5e9c18d4961..1c8c5051d0b9 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -52,8 +52,8 @@ const sal_uInt16 SvxShadowTabPage::pShadowRanges[] =
     0
 };
 
-SvxShadowTabPage::SvxShadowTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
-    : SvxTabPage(pParent, "cui/ui/shadowtabpage.ui", "ShadowTabPage", rInAttrs)
+SvxShadowTabPage::SvxShadowTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+    : SvxTabPage(pPage, pController, "cui/ui/shadowtabpage.ui", "ShadowTabPage", rInAttrs)
     , m_rOutAttrs(rInAttrs)
     , m_pnColorListState(nullptr)
     , m_nPageType(PageType::Area)
@@ -64,7 +64,7 @@ SvxShadowTabPage::SvxShadowTabPage(TabPageParent pParent, const SfxItemSet& rInA
     , m_xTsbShowShadow(m_xBuilder->weld_check_button("TSB_SHOW_SHADOW"))
     , m_xGridShadow(m_xBuilder->weld_widget("gridSHADOW"))
     , m_xMtrDistance(m_xBuilder->weld_metric_spin_button("MTR_FLD_DISTANCE", FieldUnit::CM))
-    , m_xLbShadowColor(new ColorListBox(m_xBuilder->weld_menu_button("LB_SHADOW_COLOR"), pParent.GetFrameWeld()))
+    , m_xLbShadowColor(new ColorListBox(m_xBuilder->weld_menu_button("LB_SHADOW_COLOR"), pController->getDialog()))
     , m_xMtrTransparent(m_xBuilder->weld_metric_spin_button("MTR_SHADOW_TRANSPARENT", FieldUnit::PERCENT))
     , m_xCtlPosition(new weld::CustomWeld(*m_xBuilder, "CTL_POSITION", m_aCtlPosition))
     , m_xCtlXRectPreview(new weld::CustomWeld(*m_xBuilder, "CTL_COLOR_PREVIEW", m_aCtlXRectPreview))
@@ -412,10 +412,10 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs )
     ModifyShadowHdl_Impl(*m_xMtrTransparent);
 }
 
-std::unique_ptr<SfxTabPage> SvxShadowTabPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxShadowTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
                                              const SfxItemSet* rAttrs )
 {
-    return std::make_unique<SvxShadowTabPage>(pParent, *rAttrs);
+    return std::make_unique<SvxShadowTabPage>(pPage, pController, *rAttrs);
 }
 
 IMPL_LINK_NOARG(SvxShadowTabPage, ClickShadowHdl_Impl, weld::ToggleButton&, void)
diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx
index 495135a60e01..ac950ceb3a2e 100644
--- a/cui/source/tabpages/tptrans.cxx
+++ b/cui/source/tabpages/tptrans.cxx
@@ -191,8 +191,8 @@ void SvxTransparenceTabPage::SetControlState_Impl(css::awt::GradientStyle eXGS)
     }
 }
 
-SvxTransparenceTabPage::SvxTransparenceTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
-    : SfxTabPage(pParent, "cui/ui/transparencytabpage.ui", "TransparencyTabPage", &rInAttrs)
+SvxTransparenceTabPage::SvxTransparenceTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+    : SfxTabPage(pPage, pController, "cui/ui/transparencytabpage.ui", "TransparencyTabPage", &rInAttrs)
     , rOutAttrs(rInAttrs)
     , nPageType(PageType::Area)
     , nDlgType(0)
@@ -244,9 +244,9 @@ SvxTransparenceTabPage::SvxTransparenceTabPage(TabPageParent pParent, const SfxI
     SetExchangeSupport();
 }
 
-std::unique_ptr<SfxTabPage> SvxTransparenceTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrs)
+std::unique_ptr<SfxTabPage> SvxTransparenceTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrs)
 {
-    return std::make_unique<SvxTransparenceTabPage>(pParent, *rAttrs);
+    return std::make_unique<SvxTransparenceTabPage>(pPage, pController, *rAttrs);
 }
 
 bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs)
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 06e9c2ccf201..d47699dc735e 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -166,8 +166,8 @@ void SvxTransformTabDialog::SetValidateFramePosLink(const Link<SvxSwFrameValidat
 |*      angle and the rotation angle of the graphic objects
 |*
 \************************************************************************/
-SvxAngleTabPage::SvxAngleTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
-    : SvxTabPage(pParent, "cui/ui/rotationtabpage.ui", "Rotation", rInAttrs)
+SvxAngleTabPage::SvxAngleTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+    : SvxTabPage(pPage, pController, "cui/ui/rotationtabpage.ui", "Rotation", rInAttrs)
     , rOutAttrs(rInAttrs)
     , pView(nullptr)
     , eDlgUnit(FieldUnit::NONE)
@@ -301,9 +301,9 @@ void SvxAngleTabPage::Reset(const SfxItemSet* rAttrs)
     m_xMtrPosY->save_value();
 }
 
-std::unique_ptr<SfxTabPage> SvxAngleTabPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SvxAngleTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
 {
-    return std::make_unique<SvxAngleTabPage>(pParent, *rSet);
+    return std::make_unique<SvxAngleTabPage>(pPage, pController, *rSet);
 }
 
 void SvxAngleTabPage::ActivatePage(const SfxItemSet& rSet)
@@ -395,8 +395,8 @@ void SvxAngleTabPage::PointChanged(weld::DrawingArea* pDrawingArea, RectPoint eR
 |*      dialog for changing slant and corner radius
 |*
 \************************************************************************/
-SvxSlantTabPage::SvxSlantTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
-    : SfxTabPage(pParent, "cui/ui/slantcornertabpage.ui", "SlantAndCornerRadius", &rInAttrs)
+SvxSlantTabPage::SvxSlantTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+    : SfxTabPage(pPage, pController, "cui/ui/slantcornertabpage.ui", "SlantAndCornerRadius", &rInAttrs)
     , rOutAttrs(rInAttrs)
     , pView(nullptr)
     , eDlgUnit(FieldUnit::NONE)
@@ -700,9 +700,9 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs)
     }
 }
 
-std::unique_ptr<SfxTabPage> SvxSlantTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> SvxSlantTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
 {
-    return std::make_unique<SvxSlantTabPage>(pParent, *rOutAttrs);
+    return std::make_unique<SvxSlantTabPage>(pPage, pController, *rOutAttrs);
 }
 
 void SvxSlantTabPage::ActivatePage( const SfxItemSet& rSet )
@@ -736,8 +736,8 @@ DeactivateRC SvxSlantTabPage::DeactivatePage( SfxItemSet* _pSet )
 |*      Dialog for changing position and size of graphic objects
 |*
 \************************************************************************/
-SvxPositionSizeTabPage::SvxPositionSizeTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
-    : SvxTabPage(pParent, "cui/ui/possizetabpage.ui", "PositionAndSize", rInAttrs)
+SvxPositionSizeTabPage::SvxPositionSizeTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+    : SvxTabPage(pPage, pController, "cui/ui/possizetabpage.ui", "PositionAndSize", rInAttrs)
     , mrOutAttrs(rInAttrs)
     , mpView(nullptr)
     , meDlgUnit(FieldUnit::NONE)
@@ -1116,9 +1116,9 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet*  )
     ChangeSizeProtectHdl(*m_xTsbSizeProtect);
 }
 
-std::unique_ptr<SfxTabPage> SvxPositionSizeTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> SvxPositionSizeTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
 {
-    return std::make_unique<SvxPositionSizeTabPage>(pParent, *rOutAttrs);
+    return std::make_unique<SvxPositionSizeTabPage>(pPage, pController, *rOutAttrs);
 }
 
 void SvxPositionSizeTabPage::ActivatePage( const SfxItemSet& rSet )
author	Caolán McNamara <caolanm@redhat.com>	2019-09-24 14:10:48 +0100
committer	Caolán McNamara <caolanm@redhat.com>	2019-09-26 09:54:49 +0200
commit	deb37c44ecfb8f6aa7c2ceec4771b0505fa7b6bb (patch)
tree	3953ca620e27fed0442272fdabea9735fd6f3dcd /cui
parent	a37e559ed123789f6bc8f7972242d6461ce692ab (diff)