place an intermediate class as parent for SfxTabPages

so a SfxTabPage can be parented by a vcl::Window or a welded native notebook tabpage.

That ways the same SfxTabPage can be used at the same time in both a native dialog
or a vcl dialog. The impl can be changed to the weld api, and when hosted in a native
dialog the vcl impl of that will be instantiated, while native otherwise. e.g.
print options appearing in print options dialog and general options.

This allows incremental changeover.

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

46 files changed, 241 insertions, 272 deletions

diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 7f7007d732ab..cb522a9a0825 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -295,10 +295,10 @@ bool SwCharURLPage::FillItemSet(SfxItemSet* rSet)
     return bModified;
 }
 
-VclPtr<SfxTabPage> SwCharURLPage::Create(  vcl::Window* pParent,
+VclPtr<SfxTabPage> SwCharURLPage::Create(  TabPageParent pParent,
                                            const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SwCharURLPage>::Create( pParent, *rAttrSet );
+    return VclPtr<SwCharURLPage>::Create( pParent.pParent, *rAttrSet );
 }
 
 IMPL_LINK_NOARG(SwCharURLPage, InsertFileHdl, Button*, void)
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 23bc335fd122..589b16e0ff07 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -617,10 +617,10 @@ DeactivateRC SwDropCapsPage::DeactivatePage(SfxItemSet * _pSet)
     return DeactivateRC::LeavePage;
 }
 
-VclPtr<SfxTabPage> SwDropCapsPage::Create(vcl::Window *pParent,
+VclPtr<SfxTabPage> SwDropCapsPage::Create(TabPageParent pParent,
                                           const SfxItemSet *rSet)
 {
-    return VclPtr<SwDropCapsPage>::Create(pParent, *rSet);
+    return VclPtr<SwDropCapsPage>::Create(pParent.pParent, *rSet);
 }
 
 bool  SwDropCapsPage::FillItemSet(SfxItemSet *rSet)
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index 01abf0f586b7..7472c8d04fa0 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -122,10 +122,10 @@ void SwParagraphNumTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SwParagraphNumTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwParagraphNumTabPage::Create( TabPageParent pParent,
                                                   const SfxItemSet* rSet )
 {
-    return VclPtr<SwParagraphNumTabPage>::Create(pParent, *rSet);
+    return VclPtr<SwParagraphNumTabPage>::Create(pParent.pParent, *rSet);
 }
 
 bool SwParagraphNumTabPage::FillItemSet( SfxItemSet* rSet )
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx
index c3d9eb1535c1..de20be28544d 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -147,9 +147,9 @@ DeactivateRC SwCondCollPage::DeactivatePage(SfxItemSet * _pSet)
     return DeactivateRC::LeavePage;
 }
 
-VclPtr<SfxTabPage> SwCondCollPage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
+VclPtr<SfxTabPage> SwCondCollPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
 {
-    return VclPtr<SwCondCollPage>::Create(pParent, *rSet);
+    return VclPtr<SwCondCollPage>::Create(pParent.pParent, *rSet);
 }
 
 bool SwCondCollPage::FillItemSet(SfxItemSet *rSet)
diff --git a/sw/source/ui/chrdlg/tblnumfm.cxx b/sw/source/ui/chrdlg/tblnumfm.cxx
index 4c254aa884cd..0946178626c3 100644
--- a/sw/source/ui/chrdlg/tblnumfm.cxx
+++ b/sw/source/ui/chrdlg/tblnumfm.cxx
@@ -38,7 +38,7 @@ SwNumFormatDlg::SwNumFormatDlg(vcl::Window* pParent, const SfxItemSet& rSet)
 
     if ( fnCreatePage )
     {
-        VclPtr<SfxTabPage> pNewPage = (*fnCreatePage)( get_content_area(), &rSet );
+        VclPtr<SfxTabPage> pNewPage = (*fnCreatePage)( TabPageParent(get_content_area()), &rSet );
         SfxAllItemSet aSet(*(rSet.GetPool()));
         aSet.Put ( SvxNumberInfoItem( pNewPage->GetItemSet().Get( SID_ATTR_NUMBERFORMAT_INFO ) ));
         pNewPage->PageCreated(aSet);
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index 41acaecc53ba..1038a54c6358 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -151,9 +151,9 @@ void SwMailConfigPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SwMailConfigPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet)
+VclPtr<SfxTabPage> SwMailConfigPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet)
 {
-    return VclPtr<SwMailConfigPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SwMailConfigPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 bool SwMailConfigPage::FillItemSet( SfxItemSet* /*rSet*/ )
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index c02c74ce3851..0a7a423f484b 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -330,9 +330,9 @@ void SwCompatibilityOptPage::WriteOptions()
         m_aConfigItem.AppendItem(*pItem);
 }
 
-VclPtr<SfxTabPage> SwCompatibilityOptPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
+VclPtr<SfxTabPage> SwCompatibilityOptPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SwCompatibilityOptPage>::Create( pParent, *rAttrSet );
+    return VclPtr<SwCompatibilityOptPage>::Create( pParent.pParent, *rAttrSet );
 }
 
 bool SwCompatibilityOptPage::FillItemSet( SfxItemSet*  )
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 15b79ed60001..fc16a924ea11 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -168,10 +168,10 @@ void SwLoadOptPage::dispose()
 }
 
 
-VclPtr<SfxTabPage> SwLoadOptPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwLoadOptPage::Create( TabPageParent pParent,
                                           const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SwLoadOptPage>::Create(pParent, *rAttrSet );
+    return VclPtr<SwLoadOptPage>::Create(pParent.pParent, *rAttrSet );
 }
 
 IMPL_LINK_NOARG(SwLoadOptPage, StandardizedPageCountCheckHdl, Button*, void)
@@ -584,10 +584,10 @@ void SwCaptionOptPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SwCaptionOptPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwCaptionOptPage::Create( TabPageParent pParent,
                                              const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SwCaptionOptPage>::Create( pParent, *rAttrSet );
+    return VclPtr<SwCaptionOptPage>::Create( pParent.pParent, *rAttrSet );
 }
 
 bool SwCaptionOptPage::FillItemSet( SfxItemSet* )
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index e2a9039adf5c..03006daf0728 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -199,10 +199,10 @@ void SwContentOptPage::dispose()
 }
 
 
-VclPtr<SfxTabPage> SwContentOptPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwContentOptPage::Create( TabPageParent pParent,
                                              const SfxItemSet* rAttrSet)
 {
-    return VclPtr<SwContentOptPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SwContentOptPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 static void lcl_SelectMetricLB(ListBox* rMetric, sal_uInt16 nSID, const SfxItemSet& rSet)
@@ -305,115 +305,83 @@ IMPL_LINK(SwContentOptPage, VertRulerHdl, Button*, pBox, void)
 }
 
 // TabPage Printer additional settings
-SwAddPrinterTabPage::SwAddPrinterTabPage(vcl::Window* pParent,
+SwAddPrinterTabPage::SwAddPrinterTabPage(TabPageParent pParent,
     const SfxItemSet& rCoreSet)
-    : SfxTabPage(pParent, "PrintOptionsPage",
-        "modules/swriter/ui/printoptionspage.ui", &rCoreSet)
+    : SfxTabPage(pParent, "modules/swriter/ui/printoptionspage.ui", "PrintOptionsPage", &rCoreSet)
     , sNone(SwResId(SW_STR_NONE))
     , bAttrModified(false)
     , bPreview(false)
-{
-    get(m_pGrfCB, "graphics");
-    get(m_pCtrlFieldCB, "formcontrols");
-    get(m_pBackgroundCB, "background");
-    get(m_pBlackFontCB, "inblack");
-    get(m_pPrintHiddenTextCB, "hiddentext");
-    get(m_pPrintTextPlaceholderCB, "textplaceholder");
-
-    get(m_pPagesFrame, "pagesframe");
-    get(m_pLeftPageCB, "leftpages");
-    get(m_pRightPageCB, "rightpages");
-    get(m_pProspectCB, "brochure");
-    get(m_pProspectCB_RTL, "rtl");
-
-    get(m_pCommentsFrame, "commentsframe");
-    get(m_pNoRB, "none");
-    get(m_pOnlyRB, "only");
-    get(m_pEndRB, "end");
-    get(m_pEndPageRB, "endpage");
-    get(m_pInMarginsRB, "inmargins");
-    get(m_pPrintEmptyPagesCB, "blankpages");
-    get(m_pPaperFromSetupCB, "papertray");
-    get(m_pFaxLB, "fax");
-
-    Link<Button*,void> aLk = LINK( this, SwAddPrinterTabPage, AutoClickHdl);
-    m_pGrfCB->SetClickHdl( aLk );
-    m_pRightPageCB->SetClickHdl( aLk );
-    m_pLeftPageCB->SetClickHdl( aLk );
-    m_pCtrlFieldCB->SetClickHdl( aLk );
-    m_pBackgroundCB->SetClickHdl( aLk );
-    m_pBlackFontCB->SetClickHdl( aLk );
-    m_pPrintHiddenTextCB->SetClickHdl( aLk );
-    m_pPrintTextPlaceholderCB->SetClickHdl( aLk );
-    m_pProspectCB->SetClickHdl( aLk );
-    m_pProspectCB_RTL->SetClickHdl( aLk );
-    m_pPaperFromSetupCB->SetClickHdl( aLk );
-    m_pPrintEmptyPagesCB->SetClickHdl( aLk );
-    m_pEndPageRB->SetClickHdl( aLk );
-    m_pInMarginsRB->SetClickHdl( aLk );
-    m_pEndRB->SetClickHdl( aLk );
-    m_pOnlyRB->SetClickHdl( aLk );
-    m_pNoRB->SetClickHdl( aLk );
-    m_pFaxLB->SetSelectHdl( LINK( this, SwAddPrinterTabPage, SelectHdl ) );
+    , m_xGrfCB(m_xBuilder->weld_check_button("graphics"))
+    , m_xCtrlFieldCB(m_xBuilder->weld_check_button("formcontrols"))
+    , m_xBackgroundCB(m_xBuilder->weld_check_button("background"))
+    , m_xBlackFontCB(m_xBuilder->weld_check_button("inblack"))
+    , m_xPrintHiddenTextCB(m_xBuilder->weld_check_button("hiddentext"))
+    , m_xPrintTextPlaceholderCB(m_xBuilder->weld_check_button("textplaceholder"))
+    , m_xPagesFrame(m_xBuilder->weld_widget("pagesframe"))
+    , m_xLeftPageCB(m_xBuilder->weld_check_button("leftpages"))
+    , m_xRightPageCB(m_xBuilder->weld_check_button("rightpages"))
+    , m_xProspectCB(m_xBuilder->weld_check_button("brochure"))
+    , m_xProspectCB_RTL(m_xBuilder->weld_check_button("rtl"))
+    , m_xCommentsFrame(m_xBuilder->weld_widget("commentsframe"))
+    , m_xNoRB(m_xBuilder->weld_radio_button("none"))
+    , m_xOnlyRB(m_xBuilder->weld_radio_button("only"))
+    , m_xEndRB(m_xBuilder->weld_radio_button("end"))
+    , m_xEndPageRB(m_xBuilder->weld_radio_button("endpage"))
+    , m_xInMarginsRB(m_xBuilder->weld_radio_button("inmargins"))
+    , m_xPrintEmptyPagesCB(m_xBuilder->weld_check_button("blankpages"))
+    , m_xPaperFromSetupCB(m_xBuilder->weld_check_button("papertray"))
+    , m_xFaxLB(m_xBuilder->weld_combo_box_text("fax"))
+{
+    Link<weld::ToggleButton&,void> aLk = LINK( this, SwAddPrinterTabPage, AutoClickHdl);
+    m_xGrfCB->connect_toggled( aLk );
+    m_xRightPageCB->connect_toggled( aLk );
+    m_xLeftPageCB->connect_toggled( aLk );
+    m_xCtrlFieldCB->connect_toggled( aLk );
+    m_xBackgroundCB->connect_toggled( aLk );
+    m_xBlackFontCB->connect_toggled( aLk );
+    m_xPrintHiddenTextCB->connect_toggled( aLk );
+    m_xPrintTextPlaceholderCB->connect_toggled( aLk );
+    m_xProspectCB->connect_toggled( aLk );
+    m_xProspectCB_RTL->connect_toggled( aLk );
+    m_xPaperFromSetupCB->connect_toggled( aLk );
+    m_xPrintEmptyPagesCB->connect_toggled( aLk );
+    m_xEndPageRB->connect_toggled( aLk );
+    m_xInMarginsRB->connect_toggled( aLk );
+    m_xEndRB->connect_toggled( aLk );
+    m_xOnlyRB->connect_toggled( aLk );
+    m_xNoRB->connect_toggled( aLk );
+    m_xFaxLB->connect_changed( LINK( this, SwAddPrinterTabPage, SelectHdl ) );
 
     const SfxPoolItem* pItem;
     if(SfxItemState::SET == rCoreSet.GetItemState(SID_HTML_MODE, false, &pItem )
         && static_cast<const SfxUInt16Item*>(pItem)->GetValue() & HTMLMODE_ON)
     {
-        m_pLeftPageCB->Hide();
-        m_pRightPageCB->Hide();
-        m_pPrintHiddenTextCB->Hide();
-        m_pPrintTextPlaceholderCB->Hide();
-
-        // hide m_pPrintEmptyPagesCB
-        m_pPrintEmptyPagesCB->Hide();
+        m_xLeftPageCB->hide();
+        m_xRightPageCB->hide();
+        m_xPrintHiddenTextCB->hide();
+        m_xPrintTextPlaceholderCB->hide();
+        m_xPrintEmptyPagesCB->hide();
     }
-    m_pProspectCB_RTL->Disable();
+    m_xProspectCB_RTL->set_sensitive(false);
     SvtCTLOptions aCTLOptions;
-    m_pProspectCB_RTL->Show(aCTLOptions.IsCTLFontEnabled());
+    m_xProspectCB_RTL->show(aCTLOptions.IsCTLFontEnabled());
 }
 
 SwAddPrinterTabPage::~SwAddPrinterTabPage()
 {
-    disposeOnce();
-}
-
-void SwAddPrinterTabPage::dispose()
-{
-    m_pGrfCB.clear();
-    m_pCtrlFieldCB.clear();
-    m_pBackgroundCB.clear();
-    m_pBlackFontCB.clear();
-    m_pPrintHiddenTextCB.clear();
-    m_pPrintTextPlaceholderCB.clear();
-    m_pPagesFrame.clear();
-    m_pLeftPageCB.clear();
-    m_pRightPageCB.clear();
-    m_pProspectCB.clear();
-    m_pProspectCB_RTL.clear();
-    m_pCommentsFrame.clear();
-    m_pNoRB.clear();
-    m_pOnlyRB.clear();
-    m_pEndRB.clear();
-    m_pEndPageRB.clear();
-    m_pInMarginsRB.clear();
-    m_pPrintEmptyPagesCB.clear();
-    m_pPaperFromSetupCB.clear();
-    m_pFaxLB.clear();
-    SfxTabPage::dispose();
 }
 
 void SwAddPrinterTabPage::SetPreview(bool bPrev)
 {
     bPreview = bPrev;
-    m_pCommentsFrame->Enable(!bPreview);
-    m_pPagesFrame->Enable(!bPreview);
+    m_xCommentsFrame->set_sensitive(!bPreview);
+    m_xPagesFrame->set_sensitive(!bPreview);
 }
 
-VclPtr<SfxTabPage> SwAddPrinterTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwAddPrinterTabPage::Create( TabPageParent pParent,
                                                 const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SwAddPrinterTabPage>::Create( pParent, *rAttrSet );
+    return VclPtr<SwAddPrinterTabPage>::Create(pParent, *rAttrSet);
 }
 
 bool    SwAddPrinterTabPage::FillItemSet( SfxItemSet* rCoreSet )
@@ -421,36 +389,36 @@ bool    SwAddPrinterTabPage::FillItemSet( SfxItemSet* rCoreSet )
     if ( bAttrModified )
     {
         SwAddPrinterItem aAddPrinterAttr;
-        aAddPrinterAttr.m_bPrintGraphic   = m_pGrfCB->IsChecked();
-        aAddPrinterAttr.m_bPrintTable     = true; // always enabled since CWS printerpullgpages /*aTabCB.IsChecked();*/
-        aAddPrinterAttr.m_bPrintDraw      = m_pGrfCB->IsChecked(); // UI merged with m_pGrfCB in CWS printerpullgpages
-        aAddPrinterAttr.m_bPrintControl   = m_pCtrlFieldCB->IsChecked();
-        aAddPrinterAttr.m_bPrintPageBackground = m_pBackgroundCB->IsChecked();
-        aAddPrinterAttr.m_bPrintBlackFont = m_pBlackFontCB->IsChecked();
-        aAddPrinterAttr.m_bPrintHiddenText = m_pPrintHiddenTextCB->IsChecked();
-        aAddPrinterAttr.m_bPrintTextPlaceholder = m_pPrintTextPlaceholderCB->IsChecked();
-
-        aAddPrinterAttr.m_bPrintLeftPages     = m_pLeftPageCB->IsChecked();
-        aAddPrinterAttr.m_bPrintRightPages    = m_pRightPageCB->IsChecked();
-        aAddPrinterAttr.m_bPrintReverse       = false; // handled by vcl itself since CWS printerpullpages /*aReverseCB.IsChecked()*/;
-        aAddPrinterAttr.m_bPrintProspect      = m_pProspectCB->IsChecked();
-        aAddPrinterAttr.m_bPrintProspectRTL   = m_pProspectCB_RTL->IsChecked();
-        aAddPrinterAttr.m_bPaperFromSetup     = m_pPaperFromSetupCB->IsChecked();
-        aAddPrinterAttr.m_bPrintEmptyPages    = m_pPrintEmptyPagesCB->IsChecked();
-        aAddPrinterAttr.m_bPrintSingleJobs    = true; // handled by vcl in new print dialog since CWS printerpullpages /*aSingleJobsCB.IsChecked()*/;
-
-        if (m_pNoRB->IsChecked())  aAddPrinterAttr.m_nPrintPostIts =
+        aAddPrinterAttr.m_bPrintGraphic   = m_xGrfCB->get_active();
+        aAddPrinterAttr.m_bPrintTable     = true; // always enabled since CWS printerpullgpages /*m_xTabCB->get_active();*/
+        aAddPrinterAttr.m_bPrintDraw      = m_xGrfCB->get_active(); // UI merged with m_xGrfCB in CWS printerpullgpages
+        aAddPrinterAttr.m_bPrintControl   = m_xCtrlFieldCB->get_active();
+        aAddPrinterAttr.m_bPrintPageBackground = m_xBackgroundCB->get_active();
+        aAddPrinterAttr.m_bPrintBlackFont = m_xBlackFontCB->get_active();
+        aAddPrinterAttr.m_bPrintHiddenText = m_xPrintHiddenTextCB->get_active();
+        aAddPrinterAttr.m_bPrintTextPlaceholder = m_xPrintTextPlaceholderCB->get_active();
+
+        aAddPrinterAttr.m_bPrintLeftPages     = m_xLeftPageCB->get_active();
+        aAddPrinterAttr.m_bPrintRightPages    = m_xRightPageCB->get_active();
+        aAddPrinterAttr.m_bPrintReverse       = false; // handled by vcl itself since CWS printerpullpages /*m_xReverseCB->get_active()*/;
+        aAddPrinterAttr.m_bPrintProspect      = m_xProspectCB->get_active();
+        aAddPrinterAttr.m_bPrintProspectRTL   = m_xProspectCB_RTL->get_active();
+        aAddPrinterAttr.m_bPaperFromSetup     = m_xPaperFromSetupCB->get_active();
+        aAddPrinterAttr.m_bPrintEmptyPages    = m_xPrintEmptyPagesCB->get_active();
+        aAddPrinterAttr.m_bPrintSingleJobs    = true; // handled by vcl in new print dialog since CWS printerpullpages /*m_xSingleJobsCB->get_active()*/;
+
+        if (m_xNoRB->get_active())  aAddPrinterAttr.m_nPrintPostIts =
                                                         SwPostItMode::NONE;
-        if (m_pOnlyRB->IsChecked()) aAddPrinterAttr.m_nPrintPostIts =
+        if (m_xOnlyRB->get_active()) aAddPrinterAttr.m_nPrintPostIts =
                                                         SwPostItMode::Only;
-        if (m_pEndRB->IsChecked()) aAddPrinterAttr.m_nPrintPostIts =
+        if (m_xEndRB->get_active()) aAddPrinterAttr.m_nPrintPostIts =
                                                         SwPostItMode::EndDoc;
-        if (m_pEndPageRB->IsChecked()) aAddPrinterAttr.m_nPrintPostIts =
+        if (m_xEndPageRB->get_active()) aAddPrinterAttr.m_nPrintPostIts =
                                                         SwPostItMode::EndPage;
-        if (m_pInMarginsRB->IsChecked()) aAddPrinterAttr.m_nPrintPostIts =
+        if (m_xInMarginsRB->get_active()) aAddPrinterAttr.m_nPrintPostIts =
                                                         SwPostItMode::InMargins;
 
-        const OUString sFax = m_pFaxLB->GetSelectedEntry();
+        const OUString sFax = m_xFaxLB->get_active_text();
         aAddPrinterAttr.m_sFaxName = sNone == sFax ? aEmptyOUStr : sFax;
         rCoreSet->Put(aAddPrinterAttr);
     }
@@ -465,63 +433,63 @@ void    SwAddPrinterTabPage::Reset( const SfxItemSet*  )
     if( SfxItemState::SET == rSet.GetItemState( FN_PARAM_ADDPRINTER , false,
                                     reinterpret_cast<const SfxPoolItem**>(&pAddPrinterAttr) ))
     {
-        m_pGrfCB->Check(pAddPrinterAttr->m_bPrintGraphic || pAddPrinterAttr->m_bPrintDraw);
-        m_pCtrlFieldCB->Check(       pAddPrinterAttr->m_bPrintControl);
-        m_pBackgroundCB->Check(    pAddPrinterAttr->m_bPrintPageBackground);
-        m_pBlackFontCB->Check(     pAddPrinterAttr->m_bPrintBlackFont);
-        m_pPrintHiddenTextCB->Check( pAddPrinterAttr->m_bPrintHiddenText);
-        m_pPrintTextPlaceholderCB->Check(pAddPrinterAttr->m_bPrintTextPlaceholder);
-        m_pLeftPageCB->Check(      pAddPrinterAttr->m_bPrintLeftPages);
-        m_pRightPageCB->Check(     pAddPrinterAttr->m_bPrintRightPages);
-        m_pPaperFromSetupCB->Check(pAddPrinterAttr->m_bPaperFromSetup);
-        m_pPrintEmptyPagesCB->Check(pAddPrinterAttr->m_bPrintEmptyPages);
-        m_pProspectCB->Check(      pAddPrinterAttr->m_bPrintProspect);
-        m_pProspectCB_RTL->Check(      pAddPrinterAttr->m_bPrintProspectRTL);
-
-        m_pNoRB->Check (pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::NONE ) ;
-        m_pOnlyRB->Check (pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::Only ) ;
-        m_pEndRB->Check (pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::EndDoc ) ;
-        m_pEndPageRB->Check (pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::EndPage ) ;
-        m_pInMarginsRB->Check (pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::InMargins ) ;
-        m_pFaxLB->SelectEntry( pAddPrinterAttr->m_sFaxName );
-    }
-    if (m_pProspectCB->IsChecked())
-    {
-        m_pProspectCB_RTL->Enable();
-        m_pNoRB->Enable( false );
-        m_pOnlyRB->Enable( false );
-        m_pEndRB->Enable( false );
-        m_pEndPageRB->Enable( false );
+        m_xGrfCB->set_active(pAddPrinterAttr->m_bPrintGraphic || pAddPrinterAttr->m_bPrintDraw);
+        m_xCtrlFieldCB->set_active(       pAddPrinterAttr->m_bPrintControl);
+        m_xBackgroundCB->set_active(    pAddPrinterAttr->m_bPrintPageBackground);
+        m_xBlackFontCB->set_active(     pAddPrinterAttr->m_bPrintBlackFont);
+        m_xPrintHiddenTextCB->set_active( pAddPrinterAttr->m_bPrintHiddenText);
+        m_xPrintTextPlaceholderCB->set_active(pAddPrinterAttr->m_bPrintTextPlaceholder);
+        m_xLeftPageCB->set_active(      pAddPrinterAttr->m_bPrintLeftPages);
+        m_xRightPageCB->set_active(     pAddPrinterAttr->m_bPrintRightPages);
+        m_xPaperFromSetupCB->set_active(pAddPrinterAttr->m_bPaperFromSetup);
+        m_xPrintEmptyPagesCB->set_active(pAddPrinterAttr->m_bPrintEmptyPages);
+        m_xProspectCB->set_active(      pAddPrinterAttr->m_bPrintProspect);
+        m_xProspectCB_RTL->set_active(      pAddPrinterAttr->m_bPrintProspectRTL);
+
+        m_xNoRB->set_active(pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::NONE ) ;
+        m_xOnlyRB->set_active(pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::Only ) ;
+        m_xEndRB->set_active(pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::EndDoc ) ;
+        m_xEndPageRB->set_active(pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::EndPage ) ;
+        m_xInMarginsRB->set_active(pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::InMargins ) ;
+        m_xFaxLB->set_active( pAddPrinterAttr->m_sFaxName );
+    }
+    if (m_xProspectCB->get_active())
+    {
+        m_xProspectCB_RTL->set_sensitive(true);
+        m_xNoRB->set_sensitive( false );
+        m_xOnlyRB->set_sensitive( false );
+        m_xEndRB->set_sensitive( false );
+        m_xEndPageRB->set_sensitive( false );
     }
     else
-        m_pProspectCB_RTL->Enable( false );
+        m_xProspectCB_RTL->set_sensitive( false );
 }
 
-IMPL_LINK_NOARG(SwAddPrinterTabPage, AutoClickHdl, Button*, void)
+IMPL_LINK_NOARG(SwAddPrinterTabPage, AutoClickHdl, weld::ToggleButton&, void)
 {
     bAttrModified = true;
-    bool bIsProspect = m_pProspectCB->IsChecked();
+    bool bIsProspect = m_xProspectCB->get_active();
     if (!bIsProspect)
-        m_pProspectCB_RTL->Check( false );
-    m_pProspectCB_RTL->Enable( bIsProspect );
-    m_pNoRB->Enable( !bIsProspect );
-    m_pOnlyRB->Enable( !bIsProspect );
-    m_pEndRB->Enable( !bIsProspect );
-    m_pEndPageRB->Enable( !bIsProspect );
-    m_pInMarginsRB->Enable( !bIsProspect );
+        m_xProspectCB_RTL->set_active( false );
+    m_xProspectCB_RTL->set_sensitive( bIsProspect );
+    m_xNoRB->set_sensitive( !bIsProspect );
+    m_xOnlyRB->set_sensitive( !bIsProspect );
+    m_xEndRB->set_sensitive( !bIsProspect );
+    m_xEndPageRB->set_sensitive( !bIsProspect );
+    m_xInMarginsRB->set_sensitive( !bIsProspect );
 }
 
 void  SwAddPrinterTabPage::SetFax( const std::vector<OUString>& rFaxLst )
 {
-    m_pFaxLB->InsertEntry(sNone);
+    m_xFaxLB->append_text(sNone);
     for(const auto & i : rFaxLst)
     {
-        m_pFaxLB->InsertEntry(i);
+        m_xFaxLB->append_text(i);
     }
-    m_pFaxLB->SelectEntryPos(0);
+    m_xFaxLB->set_active(0);
 }
 
-IMPL_LINK_NOARG(SwAddPrinterTabPage, SelectHdl, ListBox&, void)
+IMPL_LINK_NOARG(SwAddPrinterTabPage, SelectHdl, weld::ComboBoxText&, void)
 {
     bAttrModified=true;
 }
@@ -638,10 +606,10 @@ void SwStdFontTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SwStdFontTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwStdFontTabPage::Create( TabPageParent pParent,
                                              const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SwStdFontTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SwStdFontTabPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType,
@@ -1149,10 +1117,10 @@ void SwTableOptionsTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SwTableOptionsTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwTableOptionsTabPage::Create( TabPageParent pParent,
                                                   const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SwTableOptionsTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SwTableOptionsTabPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 bool SwTableOptionsTabPage::FillItemSet( SfxItemSet* )
@@ -1415,9 +1383,9 @@ void SwShdwCursorOptionsTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SwShdwCursorOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
+VclPtr<SfxTabPage> SwShdwCursorOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
 {
-    return VclPtr<SwShdwCursorOptionsTabPage>::Create( pParent, *rSet );
+    return VclPtr<SwShdwCursorOptionsTabPage>::Create( pParent.pParent, *rSet );
 }
 
 void SwShdwCursorOptionsTabPage::PageCreated( const SfxAllItemSet& aSet )
@@ -1821,9 +1789,9 @@ void SwRedlineOptionsTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SwRedlineOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet)
+VclPtr<SfxTabPage> SwRedlineOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet)
 {
-    return VclPtr<SwRedlineOptionsTabPage>::Create( pParent, *rSet );
+    return VclPtr<SwRedlineOptionsTabPage>::Create( pParent.pParent, *rSet );
 }
 
 bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet* )
@@ -2225,9 +2193,9 @@ void SwCompareOptionsTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SwCompareOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
+VclPtr<SfxTabPage> SwCompareOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SwCompareOptionsTabPage>::Create( pParent, *rAttrSet );
+    return VclPtr<SwCompareOptionsTabPage>::Create( pParent.pParent, *rAttrSet );
 }
 
 bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet* )
@@ -2375,10 +2343,10 @@ void SwTestTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SwTestTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwTestTabPage::Create( TabPageParent pParent,
                                           const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SwTestTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SwTestTabPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 bool    SwTestTabPage::FillItemSet( SfxItemSet* rCoreSet )
diff --git a/sw/source/ui/dialog/addrdlg.cxx b/sw/source/ui/dialog/addrdlg.cxx
index d2d43389cafd..fc4e2e37c465 100644
--- a/sw/source/ui/dialog/addrdlg.cxx
+++ b/sw/source/ui/dialog/addrdlg.cxx
@@ -20,6 +20,7 @@
 #include <addrdlg.hxx>
 #include <svx/svxdlg.hxx>
 #include <sfx2/pageids.hxx>
+#include <vcl/layout.hxx>
 
 SwAddrDlg::SwAddrDlg(vcl::Window* pParent, const SfxItemSet& rSet)
     : SfxSingleTabDialog(pParent, rSet)
@@ -29,7 +30,7 @@ SwAddrDlg::SwAddrDlg(vcl::Window* pParent, const SfxItemSet& rSet)
     ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SFXPAGE_GENERAL );
     if ( fnCreatePage )
     {
-        VclPtr<SfxTabPage> pPage2 = (*fnCreatePage)(get_content_area(), &rSet);
+        VclPtr<SfxTabPage> pPage2 = (*fnCreatePage)(TabPageParent(get_content_area()), &rSet);
         SetTabPage(pPage2);
     }
 }
diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx
index 841a08d237c0..5ac763710466 100644
--- a/sw/source/ui/dialog/docstdlg.cxx
+++ b/sw/source/ui/dialog/docstdlg.cxx
@@ -34,9 +34,9 @@
 #include <unotools/localedatawrapper.hxx>
 #include <vcl/settings.hxx>
 
-VclPtr<SfxTabPage> SwDocStatPage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
+VclPtr<SfxTabPage> SwDocStatPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
 {
-    return VclPtr<SwDocStatPage>::Create(pParent, *rSet);
+    return VclPtr<SwDocStatPage>::Create(pParent.pParent, *rSet);
 }
 
 SwDocStatPage::SwDocStatPage(vcl::Window *pParent, const SfxItemSet &rSet)
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 81765b9cdd01..025f9b90ecde 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -1672,10 +1672,10 @@ void SwInsertSectionTabPage::Reset( const SfxItemSet* )
 {
 }
 
-VclPtr<SfxTabPage> SwInsertSectionTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwInsertSectionTabPage::Create( TabPageParent pParent,
                                                    const SfxItemSet* rAttrSet)
 {
-    return VclPtr<SwInsertSectionTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SwInsertSectionTabPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 IMPL_LINK( SwInsertSectionTabPage, ChangeHideHdl, Button *, pBox, void )
@@ -2030,10 +2030,10 @@ void SwSectionFootnoteEndTabPage::Reset( const SfxItemSet* rSet )
     ResetState( false, rSet->Get( RES_END_AT_TXTEND, false ));
 }
 
-VclPtr<SfxTabPage> SwSectionFootnoteEndTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwSectionFootnoteEndTabPage::Create( TabPageParent pParent,
                                                    const SfxItemSet* rAttrSet)
 {
-    return VclPtr<SwSectionFootnoteEndTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SwSectionFootnoteEndTabPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 IMPL_LINK( SwSectionFootnoteEndTabPage, FootEndHdl, Button *, pBox, void )
@@ -2199,9 +2199,9 @@ void SwSectionIndentTabPage::Reset( const SfxItemSet* rSet)
     IndentModifyHdl(*m_pBeforeMF);
 }
 
-VclPtr<SfxTabPage> SwSectionIndentTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet)
+VclPtr<SfxTabPage> SwSectionIndentTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet)
 {
-    return VclPtr<SwSectionIndentTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SwSectionIndentTabPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 void SwSectionIndentTabPage::SetWrtShell(SwWrtShell const & rSh)
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 56c2ddb67984..c8b5cfc9e3f6 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -458,9 +458,9 @@ void SwEnvFormatPage::SetMinMax()
     m_pSizeHeightField->Reformat();
 }
 
-VclPtr<SfxTabPage> SwEnvFormatPage::Create(vcl::Window* pParent, const SfxItemSet* rSet)
+VclPtr<SfxTabPage> SwEnvFormatPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
 {
-    return VclPtr<SwEnvFormatPage>::Create(pParent, *rSet);
+    return VclPtr<SwEnvFormatPage>::Create(pParent.pParent, *rSet);
 }
 
 void SwEnvFormatPage::ActivatePage(const SfxItemSet& rSet)
diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx
index 294b2ac2eb1a..1d3593e2e91a 100644
--- a/sw/source/ui/envelp/envfmt.hxx
+++ b/sw/source/ui/envelp/envfmt.hxx
@@ -61,7 +61,7 @@ public:
     virtual ~SwEnvFormatPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
+    static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
 
     virtual void ActivatePage(const SfxItemSet& rSet) override;
     virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override;
diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx
index f6edd2de9317..002518c47d27 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -314,9 +314,9 @@ void SwEnvPage::InitDatabaseBox()
     }
 }
 
-VclPtr<SfxTabPage> SwEnvPage::Create(vcl::Window* pParent, const SfxItemSet* rSet)
+VclPtr<SfxTabPage> SwEnvPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
 {
-    return VclPtr<SwEnvPage>::Create(pParent, *rSet);
+    return VclPtr<SwEnvPage>::Create(pParent.pParent, *rSet);
 }
 
 void SwEnvPage::ActivatePage(const SfxItemSet& rSet)
diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index 5568e9194f55..0e52ab4a7f98 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -141,9 +141,9 @@ IMPL_LINK_NOARG(SwEnvPrtPage, AlignHdl, ToolBox *, void)
     }
 }
 
-VclPtr<SfxTabPage> SwEnvPrtPage::Create(vcl::Window* pParent, const SfxItemSet* rSet)
+VclPtr<SfxTabPage> SwEnvPrtPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
 {
-    return VclPtr<SwEnvPrtPage>::Create(pParent, *rSet);
+    return VclPtr<SwEnvPrtPage>::Create(pParent.pParent, *rSet);
 }
 
 void SwEnvPrtPage::ActivatePage(const SfxItemSet&)
diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx
index 91ce62b4a9da..8d70bb97c89b 100644
--- a/sw/source/ui/envelp/envprt.hxx
+++ b/sw/source/ui/envelp/envprt.hxx
@@ -61,7 +61,7 @@ public:
     virtual ~SwEnvPrtPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
+    static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
 
     virtual void ActivatePage(const SfxItemSet& rSet) override;
     virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override;
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 3f8daf71e599..a6a6f93cc0c8 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -486,9 +486,9 @@ void SwLabPage::InitDatabaseBox()
     }
 }
 
-VclPtr<SfxTabPage> SwLabPage::Create(vcl::Window* pParent, const SfxItemSet* rSet)
+VclPtr<SfxTabPage> SwLabPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
 {
-    return VclPtr<SwLabPage>::Create(pParent, *rSet);
+    return VclPtr<SwLabPage>::Create(pParent.pParent, *rSet);
 }
 
 void SwLabPage::ActivatePage(const SfxItemSet& rSet)
@@ -631,9 +631,9 @@ void SwVisitingCardPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SwVisitingCardPage::Create(vcl::Window* pParent, const SfxItemSet* rSet)
+VclPtr<SfxTabPage> SwVisitingCardPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
 {
-    return VclPtr<SwVisitingCardPage>::Create(pParent, *rSet);
+    return VclPtr<SwVisitingCardPage>::Create(pParent.pParent, *rSet);
 }
 
 void SwVisitingCardPage::ActivatePage(const SfxItemSet& rSet)
@@ -793,9 +793,9 @@ void SwPrivateDataPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SwPrivateDataPage::Create(vcl::Window* pParent, const SfxItemSet* rSet)
+VclPtr<SfxTabPage> SwPrivateDataPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
 {
-    return VclPtr<SwPrivateDataPage>::Create(pParent, *rSet);
+    return VclPtr<SwPrivateDataPage>::Create(pParent.pParent, *rSet);
 }
 
 void SwPrivateDataPage::ActivatePage(const SfxItemSet& rSet)
@@ -906,9 +906,9 @@ void SwBusinessDataPage::dispose()
 }
 
 
-VclPtr<SfxTabPage> SwBusinessDataPage::Create(vcl::Window* pParent, const SfxItemSet* rSet)
+VclPtr<SfxTabPage> SwBusinessDataPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
 {
-    return VclPtr<SwBusinessDataPage>::Create(pParent, *rSet);
+    return VclPtr<SwBusinessDataPage>::Create(pParent.pParent, *rSet);
 }
 
 void SwBusinessDataPage::ActivatePage(const SfxItemSet& rSet)
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 90672ac0fd10..97f43d9c0447 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -479,9 +479,9 @@ void SwLabFormatPage::ChangeMinMax()
     m_pPHeightField->Reformat();
 }
 
-VclPtr<SfxTabPage> SwLabFormatPage::Create(vcl::Window* pParent, const SfxItemSet* rSet)
+VclPtr<SfxTabPage> SwLabFormatPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
 {
-    return VclPtr<SwLabFormatPage>::Create(pParent, *rSet);
+    return VclPtr<SwLabFormatPage>::Create(pParent.pParent, *rSet);
 }
 
 void SwLabFormatPage::ActivatePage(const SfxItemSet& rSet)
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index 08007cf05818..ddbb559cbd8b 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -99,7 +99,7 @@ public:
     virtual ~SwLabFormatPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
+    static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
 
     virtual void ActivatePage(const SfxItemSet& rSet) override;
     virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override;
diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx
index 4bc9f9d88a03..c876f2e2eece 100644
--- a/sw/source/ui/envelp/labprt.cxx
+++ b/sw/source/ui/envelp/labprt.cxx
@@ -106,9 +106,9 @@ IMPL_LINK( SwLabPrtPage, CountHdl, Button *, pButton, void )
     }
 }
 
-VclPtr<SfxTabPage> SwLabPrtPage::Create(vcl::Window* pParent, const SfxItemSet* rSet)
+VclPtr<SfxTabPage> SwLabPrtPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
 {
-    return VclPtr<SwLabPrtPage>::Create( pParent, *rSet );
+    return VclPtr<SwLabPrtPage>::Create( pParent.pParent, *rSet );
 }
 
 void SwLabPrtPage::ActivatePage( const SfxItemSet& rSet )
diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx
index 08d6583a7ad0..e36ab980e1f4 100644
--- a/sw/source/ui/envelp/labprt.hxx
+++ b/sw/source/ui/envelp/labprt.hxx
@@ -55,7 +55,7 @@ public:
     virtual ~SwLabPrtPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
+    static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
 
     virtual void ActivatePage(const SfxItemSet& rSet) override;
     virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override;
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index 23819efb8211..09e4dcc96b12 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -64,7 +64,7 @@ public:
     virtual ~SwLabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
+    static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
 
     virtual void ActivatePage(const SfxItemSet& rSet) override;
     virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override;
@@ -116,7 +116,7 @@ class SwVisitingCardPage : public SfxTabPage
 public:
     SwVisitingCardPage(vcl::Window* pParent, const SfxItemSet& rSet);
 
-    static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
+    static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
 
     virtual void ActivatePage(const SfxItemSet& rSet) override;
     virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override;
@@ -155,7 +155,7 @@ public:
     virtual ~SwPrivateDataPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
+    static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
 
     virtual void ActivatePage(const SfxItemSet& rSet) override;
     virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override;
@@ -192,7 +192,7 @@ public:
     virtual ~SwBusinessDataPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rSet);
+    static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
 
     virtual void ActivatePage(const SfxItemSet& rSet) override;
     virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override;
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 681e6b800086..6da535c89b69 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -263,10 +263,10 @@ bool SwFieldDBPage::FillItemSet(SfxItemSet* )
     return false;
 }
 
-VclPtr<SfxTabPage> SwFieldDBPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwFieldDBPage::Create( TabPageParent pParent,
                                         const SfxItemSet *const pAttrSet )
 {
-    return VclPtr<SwFieldDBPage>::Create( pParent, pAttrSet );
+    return VclPtr<SwFieldDBPage>::Create( pParent.pParent, pAttrSet );
 }
 
 sal_uInt16 SwFieldDBPage::GetGroup()
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index 6dd7fdd738ac..d5bf9cfb9443 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -74,7 +74,7 @@ public:
                         virtual ~SwFieldDBPage() override;
     virtual void        dispose() override;
 
-    static VclPtr<SfxTabPage>  Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
+    static VclPtr<SfxTabPage>  Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
     virtual void        Reset( const SfxItemSet* rSet ) override;
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 439ed8b7366e..d88cd478b5ad 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -458,10 +458,10 @@ bool SwFieldDokInfPage::FillItemSet(SfxItemSet* )
     return false;
 }
 
-VclPtr<SfxTabPage> SwFieldDokInfPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwFieldDokInfPage::Create( TabPageParent pParent,
                                             const SfxItemSet *const pAttrSet)
 {
-    return VclPtr<SwFieldDokInfPage>::Create( pParent, pAttrSet );
+    return VclPtr<SwFieldDokInfPage>::Create( pParent.pParent, pAttrSet );
 }
 
 sal_uInt16 SwFieldDokInfPage::GetGroup()
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index 64ea9701b317..56ba53b4e03a 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -64,7 +64,7 @@ public:
                         virtual ~SwFieldDokInfPage() override;
     virtual void        dispose() override;
 
-    static VclPtr<SfxTabPage>  Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
+    static VclPtr<SfxTabPage>  Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
     virtual void        Reset( const SfxItemSet* rSet ) override;
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index fe827cf1f560..66a6684f8341 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -646,10 +646,10 @@ bool SwFieldDokPage::FillItemSet(SfxItemSet* )
     return false;
 }
 
-VclPtr<SfxTabPage> SwFieldDokPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwFieldDokPage::Create( TabPageParent pParent,
                                          const SfxItemSet *const pAttrSet)
 {
-    return VclPtr<SwFieldDokPage>::Create( pParent, pAttrSet );
+    return VclPtr<SwFieldDokPage>::Create( pParent.pParent, pAttrSet );
 }
 
 sal_uInt16 SwFieldDokPage::GetGroup()
diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx
index ea5b31b5adc1..7b07ee02f7ea 100644
--- a/sw/source/ui/fldui/flddok.hxx
+++ b/sw/source/ui/fldui/flddok.hxx
@@ -66,7 +66,7 @@ public:
                         virtual ~SwFieldDokPage() override;
     virtual void        dispose() override;
 
-    static VclPtr<SfxTabPage>  Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
+    static VclPtr<SfxTabPage>  Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
     virtual void        Reset( const SfxItemSet* rSet ) override;
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 5a7b794aad84..05c17ab172fa 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -610,10 +610,10 @@ bool SwFieldFuncPage::FillItemSet(SfxItemSet* )
     return false;
 }
 
-VclPtr<SfxTabPage> SwFieldFuncPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwFieldFuncPage::Create( TabPageParent pParent,
                                           const SfxItemSet *const pAttrSet)
 {
-    return VclPtr<SwFieldFuncPage>::Create( pParent, pAttrSet );
+    return VclPtr<SwFieldFuncPage>::Create( pParent.pParent, pAttrSet );
 }
 
 sal_uInt16 SwFieldFuncPage::GetGroup()
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index 4315467ec25e..bd4252a7eec3 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -90,7 +90,7 @@ public:
                         virtual ~SwFieldFuncPage() override;
     virtual void        dispose() override;
 
-    static VclPtr<SfxTabPage>  Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
+    static VclPtr<SfxTabPage>  Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
     virtual void        Reset( const SfxItemSet* rSet ) override;
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index 6bafa43029e3..10ace845154d 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -1109,10 +1109,10 @@ bool SwFieldRefPage::FillItemSet(SfxItemSet* )
     return false;
 }
 
-VclPtr<SfxTabPage> SwFieldRefPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwFieldRefPage::Create( TabPageParent pParent,
                                          const SfxItemSet *const pAttrSet)
 {
-    return VclPtr<SwFieldRefPage>::Create( pParent, pAttrSet );
+    return VclPtr<SwFieldRefPage>::Create( pParent.pParent, pAttrSet );
 }
 
 sal_uInt16 SwFieldRefPage::GetGroup()
diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx
index 486ab9f4ca2a..851452e55c0f 100644
--- a/sw/source/ui/fldui/fldref.hxx
+++ b/sw/source/ui/fldui/fldref.hxx
@@ -87,7 +87,7 @@ public:
                         virtual ~SwFieldRefPage() override;
     virtual void        dispose() override;
 
-    static VclPtr<SfxTabPage>  Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
+    static VclPtr<SfxTabPage>  Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
     virtual void        Reset( const SfxItemSet* rSet ) override;
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index cce918d0da8a..14c47ba94e71 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -1240,10 +1240,10 @@ bool SwFieldVarPage::FillItemSet(SfxItemSet* )
     return false;
 }
 
-VclPtr<SfxTabPage> SwFieldVarPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwFieldVarPage::Create( TabPageParent pParent,
                                          const SfxItemSet *const pAttrSet)
 {
-    return VclPtr<SwFieldVarPage>::Create( pParent, pAttrSet );
+    return VclPtr<SwFieldVarPage>::Create( pParent.pParent, pAttrSet );
 }
 
 sal_uInt16 SwFieldVarPage::GetGroup()
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index 4acef8d89de2..5e2ee0b0f029 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.hxx
@@ -96,7 +96,7 @@ public:
                         virtual ~SwFieldVarPage() override;
     virtual void        dispose() override;
 
-    static VclPtr<SfxTabPage>  Create(vcl::Window* pParent, const SfxItemSet* rAttrSet);
+    static VclPtr<SfxTabPage>  Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
     virtual void        Reset( const SfxItemSet* rSet ) override;
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 4d8913ee84b4..37736e641ab7 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -630,9 +630,9 @@ void SwColumnPage::Reset(const SfxItemSet *rSet)
 }
 
 // create TabPage
-VclPtr<SfxTabPage> SwColumnPage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
+VclPtr<SfxTabPage> SwColumnPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
 {
-    return VclPtr<SwColumnPage>::Create(pParent, *rSet);
+    return VclPtr<SwColumnPage>::Create(pParent.pParent, *rSet);
 }
 
 // stuff attributes into the Set when OK
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index a619dbe42386..255bf7eb4260 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -867,9 +867,9 @@ void SwFramePage::setOptimalRelWidth()
     m_pHoriRelationLB->Clear();
 }
 
-VclPtr<SfxTabPage> SwFramePage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
+VclPtr<SfxTabPage> SwFramePage::Create(TabPageParent pParent, const SfxItemSet *rSet)
 {
-    return VclPtr<SwFramePage>::Create( pParent, *rSet );
+    return VclPtr<SwFramePage>::Create( pParent.pParent, *rSet );
 }
 
 void SwFramePage::EnableGraficMode()
@@ -2425,9 +2425,9 @@ void SwGrfExtPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SwGrfExtPage::Create( vcl::Window *pParent, const SfxItemSet *rSet )
+VclPtr<SfxTabPage> SwGrfExtPage::Create( TabPageParent pParent, const SfxItemSet *rSet )
 {
-    return VclPtr<SwGrfExtPage>::Create( pParent, *rSet );
+    return VclPtr<SwGrfExtPage>::Create( pParent.pParent, *rSet );
 }
 
 void SwGrfExtPage::Reset(const SfxItemSet *rSet)
@@ -2866,9 +2866,9 @@ bool SwFrameURLPage::FillItemSet(SfxItemSet *rSet)
     return bModified;
 }
 
-VclPtr<SfxTabPage> SwFrameURLPage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
+VclPtr<SfxTabPage> SwFrameURLPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
 {
-    return VclPtr<SwFrameURLPage>::Create( pParent, *rSet );
+    return VclPtr<SwFrameURLPage>::Create( pParent.pParent, *rSet );
 }
 
 IMPL_LINK_NOARG(SwFrameURLPage, InsertFileHdl, Button*, void)
@@ -2965,9 +2965,9 @@ void SwFrameAddPage::dispose()
 }
 
 
-VclPtr<SfxTabPage> SwFrameAddPage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
+VclPtr<SfxTabPage> SwFrameAddPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
 {
-    return VclPtr<SwFrameAddPage>::Create(pParent, *rSet);
+    return VclPtr<SwFrameAddPage>::Create(pParent.pParent, *rSet);
 }
 
 void SwFrameAddPage::Reset(const SfxItemSet *rSet )
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 75039bca767b..363dab1a8a0f 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -143,9 +143,9 @@ void SwWrapTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SwWrapTabPage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
+VclPtr<SfxTabPage> SwWrapTabPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
 {
-    return VclPtr<SwWrapTabPage>::Create(pParent, *rSet);
+    return VclPtr<SwWrapTabPage>::Create(pParent.pParent, *rSet);
 }
 
 void SwWrapTabPage::Reset(const SfxItemSet *rSet)
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 5705042ab855..ed3cb92c6772 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -1302,9 +1302,9 @@ DeactivateRC SwTOXSelectTabPage::DeactivatePage( SfxItemSet* _pSet )
     return DeactivateRC::LeavePage;
 }
 
-VclPtr<SfxTabPage> SwTOXSelectTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet)
+VclPtr<SfxTabPage> SwTOXSelectTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet)
 {
-    return VclPtr<SwTOXSelectTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SwTOXSelectTabPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox&, rBox, void)
@@ -2247,9 +2247,9 @@ DeactivateRC SwTOXEntryTabPage::DeactivatePage( SfxItemSet* /*pSet*/)
     return DeactivateRC::LeavePage;
 }
 
-VclPtr<SfxTabPage> SwTOXEntryTabPage::Create( vcl::Window* pParent,     const SfxItemSet* rAttrSet)
+VclPtr<SfxTabPage> SwTOXEntryTabPage::Create( TabPageParent pParent,     const SfxItemSet* rAttrSet)
 {
-    return VclPtr<SwTOXEntryTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SwTOXEntryTabPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 IMPL_LINK_NOARG(SwTOXEntryTabPage, EditStyleHdl, Button*, void)
@@ -3760,10 +3760,10 @@ DeactivateRC SwTOXStylesTabPage::DeactivatePage( SfxItemSet* /*pSet*/  )
     return DeactivateRC::LeavePage;
 }
 
-VclPtr<SfxTabPage> SwTOXStylesTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwTOXStylesTabPage::Create( TabPageParent pParent,
                                                const SfxItemSet* rAttrSet)
 {
-    return VclPtr<SwTOXStylesTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SwTOXStylesTabPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 IMPL_LINK_NOARG(SwTOXStylesTabPage, EditStyleHdl, Button *, void)
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 302de1f7a6be..79e9e6831fa9 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -239,9 +239,9 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet* )
     m_pPageTemplBox->SelectEntry( pInf->GetPageDesc( *pSh->GetDoc() )->GetName());
 }
 
-VclPtr<SfxTabPage> SwEndNoteOptionPage::Create( vcl::Window *pParent, const SfxItemSet *rSet )
+VclPtr<SfxTabPage> SwEndNoteOptionPage::Create( TabPageParent pParent, const SfxItemSet *rSet )
 {
-    return VclPtr<SwEndNoteOptionPage>::Create( pParent, true, *rSet );
+    return VclPtr<SwEndNoteOptionPage>::Create( pParent.pParent, true, *rSet );
 }
 
 // Different kinds of numbering; because the Listbox has varying numbers of
@@ -408,9 +408,9 @@ SwFootNoteOptionPage::~SwFootNoteOptionPage()
 {
 }
 
-VclPtr<SfxTabPage> SwFootNoteOptionPage::Create(vcl::Window *pParent, const SfxItemSet *rSet )
+VclPtr<SfxTabPage> SwFootNoteOptionPage::Create(TabPageParent pParent, const SfxItemSet *rSet )
 {
-    return VclPtr<SwFootNoteOptionPage>::Create( pParent, *rSet );
+    return VclPtr<SwFootNoteOptionPage>::Create( pParent.pParent, *rSet );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx
index 4cde50dabeb2..386a345a1803 100644
--- a/sw/source/ui/misc/impfnote.hxx
+++ b/sw/source/ui/misc/impfnote.hxx
@@ -73,7 +73,7 @@ public:
     virtual ~SwEndNoteOptionPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet);
+    static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
     virtual bool FillItemSet(SfxItemSet *rSet) override;
     virtual void Reset( const SfxItemSet* ) override;
 
@@ -87,7 +87,7 @@ class SwFootNoteOptionPage : public SwEndNoteOptionPage
     virtual ~SwFootNoteOptionPage() override;
 
 public:
-    static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet);
+    static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
 };
 
 #endif
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 2bfe5e816ea3..2f7bb7c41fcf 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -542,10 +542,10 @@ void SwNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode()
     m_pIndentAtMF->Show( bLabelAlignmentPosAndSpaceModeActive );
 }
 
-VclPtr<SfxTabPage> SwNumPositionTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwNumPositionTabPage::Create( TabPageParent pParent,
                                                  const SfxItemSet* rAttrSet)
 {
-    return VclPtr<SwNumPositionTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SwNumPositionTabPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh)
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index f0cdf8b9ee1b..ab00ae40cd09 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -848,10 +848,10 @@ void SwOutlineSettingsTabPage::Reset( const SfxItemSet* rSet )
     ActivatePage(*rSet);
 }
 
-VclPtr<SfxTabPage> SwOutlineSettingsTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwOutlineSettingsTabPage::Create( TabPageParent pParent,
                                                      const SfxItemSet* rAttrSet)
 {
-    return VclPtr<SwOutlineSettingsTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SwOutlineSettingsTabPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 void SwOutlineSettingsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType)
diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx
index 5959276dd6db..20ba770f1b62 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -146,9 +146,9 @@ void SwFootNotePage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SwFootNotePage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
+VclPtr<SfxTabPage> SwFootNotePage::Create(TabPageParent pParent, const SfxItemSet *rSet)
 {
-    return VclPtr<SwFootNotePage>::Create(pParent, *rSet);
+    return VclPtr<SwFootNotePage>::Create(pParent.pParent, *rSet);
 }
 
 void SwFootNotePage::Reset(const SfxItemSet *rSet)
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index df3717390434..0a1185e45765 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -171,9 +171,9 @@ void SwTextGridPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SwTextGridPage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
+VclPtr<SfxTabPage> SwTextGridPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
 {
-    return VclPtr<SwTextGridPage>::Create(pParent, *rSet);
+    return VclPtr<SwTextGridPage>::Create(pParent.pParent, *rSet);
 }
 
 bool SwTextGridPage::FillItemSet(SfxItemSet *rSet)
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index e25d0b12dce5..cfb40108bc27 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -399,10 +399,10 @@ void  SwFormatTablePage::ModifyHdl(const Edit * pEdit)
     bModified = true;
 }
 
-VclPtr<SfxTabPage> SwFormatTablePage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwFormatTablePage::Create( TabPageParent pParent,
                                               const SfxItemSet* rAttrSet)
 {
-    return VclPtr<SwFormatTablePage>::Create( pParent, *rAttrSet );
+    return VclPtr<SwFormatTablePage>::Create( pParent.pParent, *rAttrSet );
 }
 
 bool  SwFormatTablePage::FillItemSet( SfxItemSet* rCoreSet )
@@ -799,10 +799,10 @@ void SwTableColumnPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SwTableColumnPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwTableColumnPage::Create( TabPageParent pParent,
                                               const SfxItemSet* rAttrSet)
 {
-    return VclPtr<SwTableColumnPage>::Create( pParent, *rAttrSet );
+    return VclPtr<SwTableColumnPage>::Create( pParent.pParent, *rAttrSet );
 }
 
 void  SwTableColumnPage::Reset( const SfxItemSet* )
@@ -1363,10 +1363,10 @@ void SwTextFlowPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SwTextFlowPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwTextFlowPage::Create( TabPageParent pParent,
                                            const SfxItemSet* rAttrSet)
 {
-    return VclPtr<SwTextFlowPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SwTextFlowPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 bool  SwTextFlowPage::FillItemSet( SfxItemSet* rSet )