[Libreoffice-commits] core.git: chart2/source cui/source dbaccess/source filter/source include/sfx2 include/svx include/vcl sc/inc sc/source sd/inc sd/source sfx2/source starmath/inc starmath/source starmath/uiconfig svx/source sw/inc sw/source sw/uiconfig vcl/inc vcl/source

Caolán McNamara caolanm at redhat.com
Sun Apr 22 19:30:31 UTC 2018


 chart2/source/controller/dialogs/tp_AxisLabel.cxx      |    4 
 chart2/source/controller/dialogs/tp_AxisLabel.hxx      |    2 
 chart2/source/controller/dialogs/tp_AxisPositions.cxx  |    4 
 chart2/source/controller/dialogs/tp_AxisPositions.hxx  |    2 
 chart2/source/controller/dialogs/tp_DataLabel.cxx      |    4 
 chart2/source/controller/dialogs/tp_DataLabel.hxx      |    2 
 chart2/source/controller/dialogs/tp_ErrorBars.cxx      |    4 
 chart2/source/controller/dialogs/tp_ErrorBars.hxx      |    2 
 chart2/source/controller/dialogs/tp_LegendPosition.cxx |    4 
 chart2/source/controller/dialogs/tp_LegendPosition.hxx |    2 
 chart2/source/controller/dialogs/tp_PointGeometry.cxx  |    4 
 chart2/source/controller/dialogs/tp_PointGeometry.hxx  |    2 
 chart2/source/controller/dialogs/tp_PolarOptions.cxx   |    4 
 chart2/source/controller/dialogs/tp_PolarOptions.hxx   |    2 
 chart2/source/controller/dialogs/tp_Scale.cxx          |    4 
 chart2/source/controller/dialogs/tp_Scale.hxx          |    2 
 chart2/source/controller/dialogs/tp_SeriesToAxis.cxx   |    4 
 chart2/source/controller/dialogs/tp_SeriesToAxis.hxx   |    2 
 chart2/source/controller/dialogs/tp_TitleRotation.cxx  |    8 
 chart2/source/controller/dialogs/tp_TitleRotation.hxx  |    4 
 chart2/source/controller/dialogs/tp_Trendline.cxx      |    4 
 chart2/source/controller/dialogs/tp_Trendline.hxx      |    2 
 cui/source/customize/cfg.cxx                           |   20 -
 cui/source/dialogs/cuigaldlg.cxx                       |    8 
 cui/source/inc/align.hxx                               |    2 
 cui/source/inc/autocdlg.hxx                            |   14 
 cui/source/inc/backgrnd.hxx                            |    4 
 cui/source/inc/border.hxx                              |    2 
 cui/source/inc/chardlg.hxx                             |    8 
 cui/source/inc/connect.hxx                             |    2 
 cui/source/inc/cuigaldlg.hxx                           |    4 
 cui/source/inc/cuioptgenrl.hxx                         |    2 
 cui/source/inc/cuitabarea.hxx                          |   16 
 cui/source/inc/cuitabline.hxx                          |    6 
 cui/source/inc/dbregister.hxx                          |    2 
 cui/source/inc/grfpage.hxx                             |    2 
 cui/source/inc/labdlg.hxx                              |    2 
 cui/source/inc/macroass.hxx                            |    2 
 cui/source/inc/measure.hxx                             |    2 
 cui/source/inc/numfmt.hxx                              |    2 
 cui/source/inc/numpages.hxx                            |   12 
 cui/source/inc/optasian.hxx                            |    2 
 cui/source/inc/optlingu.hxx                            |    2 
 cui/source/inc/optpath.hxx                             |    2 
 cui/source/inc/page.hxx                                |    2 
 cui/source/inc/paragrph.hxx                            |    8 
 cui/source/inc/swpossizetabpage.hxx                    |    2 
 cui/source/inc/tabstpge.hxx                            |    2 
 cui/source/inc/textanim.hxx                            |    2 
 cui/source/inc/textattr.hxx                            |    2 
 cui/source/inc/transfrm.hxx                            |    6 
 cui/source/options/connpooloptions.cxx                 |    4 
 cui/source/options/connpooloptions.hxx                 |    2 
 cui/source/options/dbregister.cxx                      |    4 
 cui/source/options/fontsubs.cxx                        |    4 
 cui/source/options/fontsubs.hxx                        |    2 
 cui/source/options/optaccessibility.cxx                |    4 
 cui/source/options/optaccessibility.hxx                |    2 
 cui/source/options/optasian.cxx                        |    4 
 cui/source/options/optbasic.cxx                        |    4 
 cui/source/options/optbasic.hxx                        |    2 
 cui/source/options/optchart.cxx                        |    4 
 cui/source/options/optchart.hxx                        |    2 
 cui/source/options/optcolor.cxx                        |    4 
 cui/source/options/optcolor.hxx                        |    2 
 cui/source/options/optctl.cxx                          |    4 
 cui/source/options/optctl.hxx                          |    2 
 cui/source/options/optfltr.cxx                         |    8 
 cui/source/options/optfltr.hxx                         |    4 
 cui/source/options/optgdlg.cxx                         |   12 
 cui/source/options/optgdlg.hxx                         |    6 
 cui/source/options/optgenrl.cxx                        |    4 
 cui/source/options/opthtml.cxx                         |    4 
 cui/source/options/opthtml.hxx                         |    2 
 cui/source/options/optinet2.cxx                        |   12 
 cui/source/options/optinet2.hxx                        |    6 
 cui/source/options/optjava.cxx                         |    4 
 cui/source/options/optjava.hxx                         |    2 
 cui/source/options/optjsearch.cxx                      |    5 
 cui/source/options/optjsearch.hxx                      |    2 
 cui/source/options/optlingu.cxx                        |    4 
 cui/source/options/optopencl.cxx                       |    4 
 cui/source/options/optopencl.hxx                       |    2 
 cui/source/options/optpath.cxx                         |    4 
 cui/source/options/optsave.cxx                         |    4 
 cui/source/options/optsave.hxx                         |    2 
 cui/source/options/optupdt.cxx                         |    4 
 cui/source/options/optupdt.hxx                         |    2 
 cui/source/options/personalization.cxx                 |    4 
 cui/source/options/personalization.hxx                 |    2 
 cui/source/options/treeopt.cxx                         |    2 
 cui/source/tabpages/align.cxx                          |    4 
 cui/source/tabpages/autocdlg.cxx                       |   28 -
 cui/source/tabpages/backgrnd.cxx                       |    8 
 cui/source/tabpages/border.cxx                         |    4 
 cui/source/tabpages/chardlg.cxx                        |   16 
 cui/source/tabpages/connect.cxx                        |    4 
 cui/source/tabpages/grfpage.cxx                        |    4 
 cui/source/tabpages/labdlg.cxx                         |    4 
 cui/source/tabpages/macroass.cxx                       |    4 
 cui/source/tabpages/measure.cxx                        |    4 
 cui/source/tabpages/numfmt.cxx                         |    4 
 cui/source/tabpages/numpages.cxx                       |   24 -
 cui/source/tabpages/page.cxx                           |    4 
 cui/source/tabpages/paragrph.cxx                       |   16 
 cui/source/tabpages/swpossizetabpage.cxx               |    4 
 cui/source/tabpages/tabstpge.cxx                       |    4 
 cui/source/tabpages/textanim.cxx                       |    4 
 cui/source/tabpages/textattr.cxx                       |    4 
 cui/source/tabpages/tparea.cxx                         |   16 
 cui/source/tabpages/tpbitmap.cxx                       |    4 
 cui/source/tabpages/tpcolor.cxx                        |    4 
 cui/source/tabpages/tpgradnt.cxx                       |    4 
 cui/source/tabpages/tphatch.cxx                        |    4 
 cui/source/tabpages/tpline.cxx                         |    4 
 cui/source/tabpages/tplnedef.cxx                       |    4 
 cui/source/tabpages/tplneend.cxx                       |    4 
 cui/source/tabpages/tppattern.cxx                      |    4 
 cui/source/tabpages/tpshadow.cxx                       |    4 
 cui/source/tabpages/tptrans.cxx                        |    4 
 cui/source/tabpages/transfrm.cxx                       |   12 
 dbaccess/source/ui/dlg/ConnectionPage.cxx              |    4 
 dbaccess/source/ui/dlg/ConnectionPage.hxx              |    2 
 dbaccess/source/ui/dlg/DriverSettings.hxx              |   26 -
 dbaccess/source/ui/dlg/UserAdmin.cxx                   |    4 
 dbaccess/source/ui/dlg/UserAdmin.hxx                   |    2 
 dbaccess/source/ui/dlg/detailpages.cxx                 |   50 +-
 filter/source/pdf/impdialog.cxx                        |   24 -
 filter/source/pdf/impdialog.hxx                        |   12 
 include/sfx2/dinfdlg.hxx                               |    8 
 include/sfx2/mgetempl.hxx                              |    2 
 include/sfx2/module.hxx                                |    3 
 include/sfx2/printopt.hxx                              |    2 
 include/sfx2/securitypage.hxx                          |    4 
 include/sfx2/tabdlg.hxx                                |   26 +
 include/sfx2/viewsh.hxx                                |    2 
 include/svx/hdft.hxx                                   |    4 
 include/vcl/svapp.hxx                                  |    1 
 sc/inc/scmod.hxx                                       |    2 
 sc/source/ui/app/scmod.cxx                             |    4 
 sc/source/ui/attrdlg/tabpages.cxx                      |    4 
 sc/source/ui/dbgui/tpsort.cxx                          |    8 
 sc/source/ui/dbgui/tpsubt.cxx                          |   16 
 sc/source/ui/dbgui/validate.cxx                        |   12 
 sc/source/ui/docshell/tpstat.cxx                       |    4 
 sc/source/ui/inc/opredlin.hxx                          |    2 
 sc/source/ui/inc/prevwsh.hxx                           |    2 
 sc/source/ui/inc/scuitphfedit.hxx                      |    8 
 sc/source/ui/inc/tabpages.hxx                          |    2 
 sc/source/ui/inc/tabvwsh.hxx                           |    2 
 sc/source/ui/inc/tpcalc.hxx                            |    2 
 sc/source/ui/inc/tpcompatibility.hxx                   |    2 
 sc/source/ui/inc/tpdefaults.hxx                        |    2 
 sc/source/ui/inc/tpformula.hxx                         |    2 
 sc/source/ui/inc/tphf.hxx                              |    4 
 sc/source/ui/inc/tpprint.hxx                           |    2 
 sc/source/ui/inc/tpsort.hxx                            |    4 
 sc/source/ui/inc/tpstat.hxx                            |    2 
 sc/source/ui/inc/tpsubt.hxx                            |    8 
 sc/source/ui/inc/tptable.hxx                           |    2 
 sc/source/ui/inc/tpusrlst.hxx                          |    2 
 sc/source/ui/inc/tpview.hxx                            |    4 
 sc/source/ui/inc/validate.hxx                          |    6 
 sc/source/ui/optdlg/opredlin.cxx                       |    4 
 sc/source/ui/optdlg/tpcalc.cxx                         |    4 
 sc/source/ui/optdlg/tpcompatibility.cxx                |    4 
 sc/source/ui/optdlg/tpdefaults.cxx                     |    4 
 sc/source/ui/optdlg/tpformula.cxx                      |    4 
 sc/source/ui/optdlg/tpprint.cxx                        |    4 
 sc/source/ui/optdlg/tpusrlst.cxx                       |    4 
 sc/source/ui/optdlg/tpview.cxx                         |    8 
 sc/source/ui/pagedlg/scuitphfedit.cxx                  |   16 
 sc/source/ui/pagedlg/tphf.cxx                          |    8 
 sc/source/ui/pagedlg/tptable.cxx                       |    4 
 sc/source/ui/view/prevwsh.cxx                          |    2 
 sc/source/ui/view/tabvwsh4.cxx                         |    2 
 sd/inc/sdmod.hxx                                       |    2 
 sd/source/ui/app/sdmod2.cxx                            |    2 
 sd/source/ui/dlg/paragr.cxx                            |    6 
 sd/source/ui/dlg/prntopts.cxx                          |    4 
 sd/source/ui/dlg/tpaction.cxx                          |    4 
 sd/source/ui/dlg/tpoption.cxx                          |   12 
 sd/source/ui/inc/prntopts.hxx                          |    2 
 sd/source/ui/inc/tpaction.hxx                          |    2 
 sd/source/ui/inc/tpoption.hxx                          |    6 
 sfx2/source/appl/module.cxx                            |    2 
 sfx2/source/dialog/dinfdlg.cxx                         |   16 
 sfx2/source/dialog/documentfontsdialog.cxx             |    4 
 sfx2/source/dialog/mgetempl.cxx                        |    4 
 sfx2/source/dialog/printopt.cxx                        |    4 
 sfx2/source/dialog/securitypage.cxx                    |    4 
 sfx2/source/dialog/tabdlg.cxx                          |   15 
 sfx2/source/inc/documentfontsdialog.hxx                |    2 
 sfx2/source/view/viewprn.cxx                           |    2 
 starmath/inc/dialog.hxx                                |   29 -
 starmath/inc/smmod.hxx                                 |    2 
 starmath/inc/view.hxx                                  |    2 
 starmath/source/dialog.cxx                             |   95 ++---
 starmath/source/smmod.cxx                              |    4 
 starmath/source/view.cxx                               |    2 
 starmath/uiconfig/smath/ui/smathsettings.ui            |    8 
 svx/source/dialog/hdft.cxx                             |   12 
 sw/inc/swmodule.hxx                                    |    2 
 sw/inc/view.hxx                                        |    4 
 sw/source/ui/chrdlg/chardlg.cxx                        |    4 
 sw/source/ui/chrdlg/drpcps.cxx                         |    4 
 sw/source/ui/chrdlg/numpara.cxx                        |    4 
 sw/source/ui/chrdlg/swuiccoll.cxx                      |    4 
 sw/source/ui/chrdlg/tblnumfm.cxx                       |    2 
 sw/source/ui/config/mailconfigpage.cxx                 |    4 
 sw/source/ui/config/optcomp.cxx                        |    4 
 sw/source/ui/config/optload.cxx                        |    8 
 sw/source/ui/config/optpage.cxx                        |  296 +++++++----------
 sw/source/ui/dialog/addrdlg.cxx                        |    3 
 sw/source/ui/dialog/docstdlg.cxx                       |    4 
 sw/source/ui/dialog/uiregionsw.cxx                     |   12 
 sw/source/ui/envelp/envfmt.cxx                         |    4 
 sw/source/ui/envelp/envfmt.hxx                         |    2 
 sw/source/ui/envelp/envlop1.cxx                        |    4 
 sw/source/ui/envelp/envprt.cxx                         |    4 
 sw/source/ui/envelp/envprt.hxx                         |    2 
 sw/source/ui/envelp/label1.cxx                         |   16 
 sw/source/ui/envelp/labfmt.cxx                         |    4 
 sw/source/ui/envelp/labfmt.hxx                         |    2 
 sw/source/ui/envelp/labprt.cxx                         |    4 
 sw/source/ui/envelp/labprt.hxx                         |    2 
 sw/source/ui/envelp/swuilabimp.hxx                     |    8 
 sw/source/ui/fldui/flddb.cxx                           |    4 
 sw/source/ui/fldui/flddb.hxx                           |    2 
 sw/source/ui/fldui/flddinf.cxx                         |    4 
 sw/source/ui/fldui/flddinf.hxx                         |    2 
 sw/source/ui/fldui/flddok.cxx                          |    4 
 sw/source/ui/fldui/flddok.hxx                          |    2 
 sw/source/ui/fldui/fldfunc.cxx                         |    4 
 sw/source/ui/fldui/fldfunc.hxx                         |    2 
 sw/source/ui/fldui/fldref.cxx                          |    4 
 sw/source/ui/fldui/fldref.hxx                          |    2 
 sw/source/ui/fldui/fldvar.cxx                          |    4 
 sw/source/ui/fldui/fldvar.hxx                          |    2 
 sw/source/ui/frmdlg/column.cxx                         |    4 
 sw/source/ui/frmdlg/frmpage.cxx                        |   16 
 sw/source/ui/frmdlg/wrap.cxx                           |    4 
 sw/source/ui/index/cnttab.cxx                          |   12 
 sw/source/ui/misc/docfnote.cxx                         |    8 
 sw/source/ui/misc/impfnote.hxx                         |    4 
 sw/source/ui/misc/num.cxx                              |    4 
 sw/source/ui/misc/outline.cxx                          |    4 
 sw/source/ui/misc/pgfnote.cxx                          |    4 
 sw/source/ui/misc/pggrid.cxx                           |    4 
 sw/source/ui/table/tabledlg.cxx                        |   12 
 sw/source/uibase/app/appopt.cxx                        |    4 
 sw/source/uibase/inc/chrdlg.hxx                        |    2 
 sw/source/uibase/inc/column.hxx                        |    2 
 sw/source/uibase/inc/docstdlg.hxx                      |    2 
 sw/source/uibase/inc/drpcps.hxx                        |    2 
 sw/source/uibase/inc/envlop.hxx                        |    2 
 sw/source/uibase/inc/frmpage.hxx                       |    8 
 sw/source/uibase/inc/mailconfigpage.hxx                |    2 
 sw/source/uibase/inc/num.hxx                           |    2 
 sw/source/uibase/inc/numpara.hxx                       |    2 
 sw/source/uibase/inc/optcomp.hxx                       |    2 
 sw/source/uibase/inc/optload.hxx                       |    4 
 sw/source/uibase/inc/optpage.hxx                       |   77 ++--
 sw/source/uibase/inc/outline.hxx                       |    2 
 sw/source/uibase/inc/pgfnote.hxx                       |    2 
 sw/source/uibase/inc/pggrid.hxx                        |    2 
 sw/source/uibase/inc/pview.hxx                         |    2 
 sw/source/uibase/inc/regionsw.hxx                      |    6 
 sw/source/uibase/inc/swuiccoll.hxx                     |    2 
 sw/source/uibase/inc/swuicnttab.hxx                    |    6 
 sw/source/uibase/inc/wrap.hxx                          |    2 
 sw/source/uibase/table/tablepg.hxx                     |    6 
 sw/source/uibase/uiview/pview.cxx                      |    4 
 sw/source/uibase/uiview/viewprt.cxx                    |    4 
 sw/uiconfig/swriter/ui/printoptionspage.ui             |   58 ---
 vcl/inc/salinst.hxx                                    |    1 
 vcl/source/app/salvtables.cxx                          |    5 
 vcl/source/window/builder.cxx                          |    5 
 278 files changed, 930 insertions(+), 987 deletions(-)

New commits:
commit 60f3e4b843da89678e022eed837ee66e726b1920
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Apr 20 11:06:07 2018 +0100

    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 at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index bd37fc0e5dca..ae0006c53c2c 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -98,9 +98,9 @@ void SchAxisLabelTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SchAxisLabelTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrs )
+VclPtr<SfxTabPage> SchAxisLabelTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrs )
 {
-    return VclPtr<SchAxisLabelTabPage>::Create( pParent, *rAttrs );
+    return VclPtr<SchAxisLabelTabPage>::Create( pParent.pParent, *rAttrs );
 }
 
 bool SchAxisLabelTabPage::FillItemSet( SfxItemSet* rOutAttrs )
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
index 7eda50a72346..b260f6dba922 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
@@ -69,7 +69,7 @@ public:
     virtual ~SchAxisLabelTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rInAttrs );
+    static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
     virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
     virtual void Reset( const SfxItemSet* rInAttrs ) override;
 
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 2739f24e95e3..fc4fbe121299 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -105,9 +105,9 @@ void AxisPositionsTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> AxisPositionsTabPage::Create(vcl::Window* pWindow,const SfxItemSet* rOutAttrs)
+VclPtr<SfxTabPage> AxisPositionsTabPage::Create(TabPageParent pWindow,const SfxItemSet* rOutAttrs)
 {
-    return VclPtr<AxisPositionsTabPage>::Create(pWindow, *rOutAttrs);
+    return VclPtr<AxisPositionsTabPage>::Create(pWindow.pParent, *rOutAttrs);
 }
 
 bool AxisPositionsTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
index e5bacafbc00e..5359e3490ea8 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
@@ -36,7 +36,7 @@ public:
     virtual ~AxisPositionsTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rInAttrs );
+    static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
     virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
     virtual void Reset( const SfxItemSet* rInAttrs ) override;
     using TabPage::DeactivatePage;
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx b/chart2/source/controller/dialogs/tp_DataLabel.cxx
index 8d979841af65..9d92ffa834cc 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx
@@ -33,9 +33,9 @@ DataLabelsTabPage::DataLabelsTabPage(vcl::Window* pWindow, const SfxItemSet& rIn
 {
 }
 
-VclPtr<SfxTabPage> DataLabelsTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rOutAttrs)
+VclPtr<SfxTabPage> DataLabelsTabPage::Create(TabPageParent pWindow, const SfxItemSet* rOutAttrs)
 {
-    return VclPtr<DataLabelsTabPage>::Create(pWindow, *rOutAttrs);
+    return VclPtr<DataLabelsTabPage>::Create(pWindow.pParent, *rOutAttrs);
 }
 
 bool DataLabelsTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.hxx b/chart2/source/controller/dialogs/tp_DataLabel.hxx
index 3b8836ee7629..3abb43900c4d 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.hxx
@@ -32,7 +32,7 @@ class DataLabelsTabPage : public SfxTabPage
 public:
     DataLabelsTabPage(vcl::Window* pWindow, const SfxItemSet& rInAttrs);
 
-    static VclPtr<SfxTabPage> Create(vcl::Window* pWindow, const SfxItemSet* rInAttrs);
+    static VclPtr<SfxTabPage> Create(TabPageParent pWindow, const SfxItemSet* rInAttrs);
 
     void SetNumberFormatter( SvNumberFormatter* pFormatter );
 
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
index e2f6a0babfaf..f2a8084e4711 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
@@ -41,9 +41,9 @@ ErrorBarsTabPage::ErrorBarsTabPage( vcl::Window* pParent, const SfxItemSet& rInA
 }
 
 VclPtr<SfxTabPage> ErrorBarsTabPage::Create(
-    vcl::Window* pParent, const SfxItemSet* rOutAttrs )
+    TabPageParent pParent, const SfxItemSet* rOutAttrs )
 {
-    return VclPtr<ErrorBarsTabPage>::Create( pParent, *rOutAttrs );
+    return VclPtr<ErrorBarsTabPage>::Create( pParent.pParent, *rOutAttrs );
 }
 
 bool ErrorBarsTabPage::FillItemSet( SfxItemSet* rOutAttrs )
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.hxx b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
index eb53cdcaf4d5..9c065f7550f7 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.hxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
@@ -36,7 +36,7 @@ public:
     void SetChartDocumentForRangeChoosing(
         const css::uno::Reference< css::chart2::XChartDocument > & xChartDocument );
 
-    static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rInAttrs );
+    static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
     virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
     virtual void Reset( const SfxItemSet* rInAttrs ) override;
 
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index 836aa0aa6873..e572d8076816 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -52,9 +52,9 @@ void SchLegendPosTabPage::dispose()
 }
 
 
-VclPtr<SfxTabPage> SchLegendPosTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rOutAttrs)
+VclPtr<SfxTabPage> SchLegendPosTabPage::Create(TabPageParent pWindow, const SfxItemSet* rOutAttrs)
 {
-    return VclPtr<SchLegendPosTabPage>::Create(pWindow, *rOutAttrs);
+    return VclPtr<SchLegendPosTabPage>::Create(pWindow.pParent, *rOutAttrs);
 }
 
 bool SchLegendPosTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.hxx b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
index 3150f7248b95..7fd77f9c877c 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
@@ -40,7 +40,7 @@ public:
     virtual ~SchLegendPosTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rInAttrs);
+    static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
     virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
     virtual void Reset(const SfxItemSet* rInAttrs) override;
 };
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index 926941305976..2350c3eb3e5d 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -48,10 +48,10 @@ void SchLayoutTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SchLayoutTabPage::Create(vcl::Window* pWindow,
+VclPtr<SfxTabPage> SchLayoutTabPage::Create(TabPageParent pWindow,
                                             const SfxItemSet* rOutAttrs)
 {
-    return VclPtr<SchLayoutTabPage>::Create(pWindow, *rOutAttrs);
+    return VclPtr<SchLayoutTabPage>::Create(pWindow.pParent, *rOutAttrs);
 }
 
 bool SchLayoutTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.hxx b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
index d2cb91525981..f095435bf7a9 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
@@ -32,7 +32,7 @@ public:
     virtual ~SchLayoutTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rInAttrs);
+    static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
     virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
     virtual void Reset(const SfxItemSet* rInAttrs) override;
 
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index b5b0b0b42ef6..e756d7a2edc1 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -61,9 +61,9 @@ void PolarOptionsTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> PolarOptionsTabPage::Create( vcl::Window* pWindow,const SfxItemSet* rOutAttrs )
+VclPtr<SfxTabPage> PolarOptionsTabPage::Create( TabPageParent pWindow,const SfxItemSet* rOutAttrs )
 {
-    return VclPtr<PolarOptionsTabPage>::Create( pWindow, *rOutAttrs );
+    return VclPtr<PolarOptionsTabPage>::Create( pWindow.pParent, *rOutAttrs );
 }
 
 bool PolarOptionsTabPage::FillItemSet( SfxItemSet* rOutAttrs )
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hxx b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
index 363cf159aacb..7e7907c8fb8e 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.hxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
@@ -36,7 +36,7 @@ public:
     virtual ~PolarOptionsTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rInAttrs);
+    static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
     virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
     virtual void Reset(const SfxItemSet* rInAttrs) override;
 
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 868dc2812a2b..b785414e7a7f 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -265,9 +265,9 @@ IMPL_LINK_NOARG(ScaleTabPage, SelectAxisTypeHdl, ListBox&, void)
     SetNumFormat();
 }
 
-VclPtr<SfxTabPage> ScaleTabPage::Create(vcl::Window* pWindow,const SfxItemSet* rOutAttrs)
+VclPtr<SfxTabPage> ScaleTabPage::Create(TabPageParent pWindow,const SfxItemSet* rOutAttrs)
 {
-    return VclPtr<ScaleTabPage>::Create(pWindow, *rOutAttrs);
+    return VclPtr<ScaleTabPage>::Create(pWindow.pParent, *rOutAttrs);
 }
 
 bool ScaleTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx
index 75c869d23141..ec89fb4fc475 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hxx
+++ b/chart2/source/controller/dialogs/tp_Scale.hxx
@@ -36,7 +36,7 @@ public:
     virtual ~ScaleTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rInAttrs );
+    static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
     virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
     virtual void Reset( const SfxItemSet* rInAttrs ) override;
     using TabPage::DeactivatePage;
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index 9e110cd2de8d..9690c47ec91b 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -96,10 +96,10 @@ IMPL_LINK_NOARG(SchOptionTabPage, EnableHdl, Button*, void)
         m_pCBAxisSideBySide->Enable( m_pRbtAxis1->IsChecked());
 }
 
-VclPtr<SfxTabPage> SchOptionTabPage::Create(vcl::Window* pWindow,
+VclPtr<SfxTabPage> SchOptionTabPage::Create(TabPageParent pWindow,
                                             const SfxItemSet* rOutAttrs)
 {
-    return VclPtr<SchOptionTabPage>::Create(pWindow, *rOutAttrs);
+    return VclPtr<SchOptionTabPage>::Create(pWindow.pParent, *rOutAttrs);
 }
 
 bool SchOptionTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
index 5051d7c2f7da..d2d671109d4b 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
@@ -34,7 +34,7 @@ public:
     virtual ~SchOptionTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rInAttrs);
+    static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
     virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
     virtual void Reset(const SfxItemSet* rInAttrs) override;
 
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index 369f8a7c71eb..d4521676529b 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -72,16 +72,16 @@ void SchAlignmentTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SchAlignmentTabPage::Create(vcl::Window* pParent,
+VclPtr<SfxTabPage> SchAlignmentTabPage::Create(TabPageParent pParent,
                                                const SfxItemSet* rInAttrs)
 {
-    return VclPtr<SchAlignmentTabPage>::Create(pParent, *rInAttrs);
+    return VclPtr<SchAlignmentTabPage>::Create(pParent.pParent, *rInAttrs);
 }
 
-VclPtr<SfxTabPage> SchAlignmentTabPage::CreateWithoutRotation(vcl::Window* pParent,
+VclPtr<SfxTabPage> SchAlignmentTabPage::CreateWithoutRotation(TabPageParent pParent,
                                                               const SfxItemSet* rInAttrs)
 {
-    return VclPtr<SchAlignmentTabPage>::Create(pParent, *rInAttrs, false);
+    return VclPtr<SchAlignmentTabPage>::Create(pParent.pParent, *rInAttrs, false);
 }
 
 bool SchAlignmentTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
index f747179c63eb..aa49e4ff5407 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
@@ -45,8 +45,8 @@ public:
     virtual ~SchAlignmentTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage> Create(vcl::Window* pParent, const SfxItemSet* rInAttrs);
-    static VclPtr<SfxTabPage> CreateWithoutRotation(vcl::Window* pParent, const SfxItemSet* rInAttrs);
+    static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
+    static VclPtr<SfxTabPage> CreateWithoutRotation(TabPageParent pParent, const SfxItemSet* rInAttrs);
     virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
     virtual void Reset(const SfxItemSet* rInAttrs) override;
 };
diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx
index 176ba723684e..8909c11257c2 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.cxx
+++ b/chart2/source/controller/dialogs/tp_Trendline.cxx
@@ -31,9 +31,9 @@ TrendlineTabPage::TrendlineTabPage( vcl::Window* pParent, const SfxItemSet& rInA
 }
 
 VclPtr<SfxTabPage> TrendlineTabPage::Create(
-    vcl::Window* pParent, const SfxItemSet* rOutAttrs )
+    TabPageParent pParent, const SfxItemSet* rOutAttrs )
 {
-    return VclPtr<TrendlineTabPage>::Create( pParent, *rOutAttrs );
+    return VclPtr<TrendlineTabPage>::Create( pParent.pParent, *rOutAttrs );
 }
 
 bool TrendlineTabPage::FillItemSet( SfxItemSet* rOutAttrs )
diff --git a/chart2/source/controller/dialogs/tp_Trendline.hxx b/chart2/source/controller/dialogs/tp_Trendline.hxx
index 5f991cf06b52..8981939b5009 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.hxx
+++ b/chart2/source/controller/dialogs/tp_Trendline.hxx
@@ -31,7 +31,7 @@ class TrendlineTabPage : public SfxTabPage
 public:
     TrendlineTabPage ( vcl::Window* pParent, const SfxItemSet& rInAttrs );
 
-    static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rInAttrs );
+    static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
     virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
     virtual void Reset( const SfxItemSet* rInAttrs ) override;
 
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 762570f5a3d3..fb1195c73b39 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -175,29 +175,29 @@ SvxConfigPage::CanConfig( const OUString& aModuleId )
     return !(aModuleId == "com.sun.star.script.BasicIDE" || aModuleId == "com.sun.star.frame.Bibliography");
 }
 
-VclPtr<SfxTabPage> CreateSvxMenuConfigPage( vcl::Window *pParent, const SfxItemSet* rSet )
+VclPtr<SfxTabPage> CreateSvxMenuConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
 {
-    return VclPtr<SvxMenuConfigPage>::Create( pParent, *rSet );
+    return VclPtr<SvxMenuConfigPage>::Create( pParent.pParent, *rSet );
 }
 
-VclPtr<SfxTabPage> CreateSvxContextMenuConfigPage( vcl::Window *pParent, const SfxItemSet* rSet )
+VclPtr<SfxTabPage> CreateSvxContextMenuConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
 {
-    return VclPtr<SvxMenuConfigPage>::Create( pParent, *rSet, false );
+    return VclPtr<SvxMenuConfigPage>::Create( pParent.pParent, *rSet, false );
 }
 
-VclPtr<SfxTabPage> CreateKeyboardConfigPage( vcl::Window *pParent, const SfxItemSet* rSet )
+VclPtr<SfxTabPage> CreateKeyboardConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
 {
-       return VclPtr<SfxAcceleratorConfigPage>::Create( pParent, *rSet );
+       return VclPtr<SfxAcceleratorConfigPage>::Create( pParent.pParent, *rSet );
 }
 
-VclPtr<SfxTabPage> CreateSvxToolbarConfigPage( vcl::Window *pParent, const SfxItemSet* rSet )
+VclPtr<SfxTabPage> CreateSvxToolbarConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
 {
-    return VclPtr<SvxToolbarConfigPage>::Create( pParent, *rSet );
+    return VclPtr<SvxToolbarConfigPage>::Create( pParent.pParent, *rSet );
 }
 
-VclPtr<SfxTabPage> CreateSvxEventConfigPage( vcl::Window *pParent, const SfxItemSet* rSet )
+VclPtr<SfxTabPage> CreateSvxEventConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
 {
-    return VclPtr<SvxEventConfigPage>::Create( pParent, *rSet, SvxEventConfigPage::EarlyInit() );
+    return VclPtr<SvxEventConfigPage>::Create( pParent.pParent, *rSet, SvxEventConfigPage::EarlyInit() );
 }
 
 /******************************************************************************
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 9ed4eca36c27..972dbc0f5399 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -701,9 +701,9 @@ bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet* /*rSet*/ )
     return true;
 }
 
-VclPtr<SfxTabPage> TPGalleryThemeGeneral::Create( vcl::Window* pParent, const SfxItemSet* rSet )
+VclPtr<SfxTabPage> TPGalleryThemeGeneral::Create( TabPageParent pParent, const SfxItemSet* rSet )
 {
-    return VclPtr<TPGalleryThemeGeneral>::Create( pParent, *rSet );
+    return VclPtr<TPGalleryThemeGeneral>::Create( pParent.pParent, *rSet );
 }
 
 
@@ -796,9 +796,9 @@ void TPGalleryThemeProperties::dispose()
 }
 
 
-VclPtr<SfxTabPage> TPGalleryThemeProperties::Create( vcl::Window* pParent, const SfxItemSet* rSet )
+VclPtr<SfxTabPage> TPGalleryThemeProperties::Create( TabPageParent pParent, const SfxItemSet* rSet )
 {
-    return VclPtr<TPGalleryThemeProperties>::Create( pParent, *rSet );
+    return VclPtr<TPGalleryThemeProperties>::Create( pParent.pParent, *rSet );
 }
 
 
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index 1a90d4a21542..6edfd8b8ba44 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -60,7 +60,7 @@ public:
     virtual             ~AlignmentTabPage() override;
     virtual void        dispose() override;
 
-    static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
+    static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
     static const sal_uInt16*  GetRanges() { return s_pRanges; }
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 14915f691c2f..ecef0e81a0be 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -112,7 +112,7 @@ public:
     virtual ~OfaAutocorrOptionsPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent,
+    static VclPtr<SfxTabPage>  Create( TabPageParent pParent,
                                 const SfxItemSet* rAttrSet);
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
@@ -172,7 +172,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
     virtual void dispose() override;
 
 public:
-    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent,
+    static VclPtr<SfxTabPage>  Create( TabPageParent pParent,
                             const SfxItemSet* rAttrSet);
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
     virtual void        Reset( const SfxItemSet* rSet ) override;
@@ -278,7 +278,7 @@ public:
                         virtual ~OfaAutocorrReplacePage() 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;
@@ -337,7 +337,7 @@ public:
                         virtual ~OfaAutocorrExceptPage() override;
     virtual void        dispose() override;
 
-    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent,
+    static VclPtr<SfxTabPage>  Create( TabPageParent pParent,
                                 const SfxItemSet* rAttrSet);
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
@@ -402,7 +402,7 @@ public:
                         virtual ~OfaQuoteTabPage() override;
     virtual void        dispose() override;
 
-    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent,
+    static VclPtr<SfxTabPage>  Create( TabPageParent pParent,
                                 const SfxItemSet* rAttrSet);
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
@@ -455,7 +455,7 @@ private:
 public:
     virtual ~OfaAutoCompleteTabPage() override;
     virtual void dispose() override;
-    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent,
+    static VclPtr<SfxTabPage>  Create( TabPageParent pParent,
                                 const SfxItemSet* rAttrSet);
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
@@ -521,7 +521,7 @@ public:
     virtual ~OfaSmartTagOptionsTabPage() 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/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index e25b2043cbc5..8f5a9c96ff2a 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -49,7 +49,7 @@ class SvxBackgroundTabPage : public SvxTabPage
     friend class VclPtr<SvxBackgroundTabPage>;
     static const sal_uInt16 pPageRanges[];
 public:
-    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
+    static VclPtr<SfxTabPage>  Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
     // returns the area of the which-values
     static const sal_uInt16* GetRanges() { return pPageRanges; }
 
@@ -152,7 +152,7 @@ public:
     virtual ~SvxBkgTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
+    static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
     virtual bool FillItemSet( SfxItemSet* ) override;
     virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
     virtual void PageCreated( const SfxAllItemSet& aSet ) override;
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index b8fb44b4021e..e59638036e7d 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -49,7 +49,7 @@ class SvxBorderTabPage : public SfxTabPage
 public:
     virtual ~SvxBorderTabPage() override;
     virtual void dispose() override;
-    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent,
+    static VclPtr<SfxTabPage>  Create( TabPageParent pParent,
                                 const SfxItemSet* rAttrSet);
     static const sal_uInt16*      GetRanges() { return pRanges; }
 
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 383431046ec4..144b13e94513 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -150,7 +150,7 @@ public:
                         virtual ~SvxCharNamePage() override;
     virtual void        dispose() override;
 
-    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent, const SfxItemSet* rSet );
+    static VclPtr<SfxTabPage>  Create( TabPageParent pParent, const SfxItemSet* rSet );
     static const sal_uInt16* GetRanges() { return pNameRanges; }
 
     virtual void        Reset( const SfxItemSet* rSet ) override;
@@ -238,7 +238,7 @@ public:
     virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
 
 public:
-    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent, const SfxItemSet* rSet );
+    static VclPtr<SfxTabPage>  Create( TabPageParent pParent, const SfxItemSet* rSet );
     static const sal_uInt16* GetRanges() { return pEffectsRanges; }
 
     virtual void        Reset( const SfxItemSet* rSet ) override;
@@ -315,7 +315,7 @@ public:
     virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
 
 public:
-    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent, const SfxItemSet* rSet );
+    static VclPtr<SfxTabPage>  Create( TabPageParent pParent, const SfxItemSet* rSet );
     static const sal_uInt16*      GetRanges() { return pPositionRanges; }
 
     virtual void        Reset( const SfxItemSet* rSet ) override;
@@ -360,7 +360,7 @@ public:
     virtual void        ActivatePage( const SfxItemSet& rSet ) override;
     virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
 
-    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent, const SfxItemSet* rSet );
+    static VclPtr<SfxTabPage>  Create( TabPageParent pParent, const SfxItemSet* rSet );
     static const sal_uInt16*  GetRanges() { return pTwoLinesRanges; }
 
     virtual void        Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx
index 7bacaac3ad16..5c034d2104af 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -67,7 +67,7 @@ public:
     virtual ~SvxConnectionPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage>  Create( vcl::Window*, const SfxItemSet* );
+    static VclPtr<SfxTabPage>  Create( TabPageParent, 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 1aeaa2e6be6d..e9c96b561b0a 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -231,7 +231,7 @@ public:
 
     void                SetXChgData( ExchangeData* pData );
 
-    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent, const SfxItemSet* rSet );
+    static VclPtr<SfxTabPage>  Create( TabPageParent pParent, const SfxItemSet* rSet );
 };
 
 class TPGalleryThemeProperties : public SfxTabPage
@@ -296,7 +296,7 @@ public:
 
     void                StartSearchFiles( const OUString& _rFolderURL, short _nDlgResult );
 
-    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent, const SfxItemSet* rSet );
+    static VclPtr<SfxTabPage>  Create( TabPageParent pParent, 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 b612ccf687ff..7e2c753d3b59 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -72,7 +72,7 @@ public:
     virtual ~SvxGeneralTabPage() 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/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 6d6997e0df13..ce7fea8d96e8 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -195,7 +195,7 @@ public:
     virtual ~SvxTransparenceTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage> Create(vcl::Window*, const SfxItemSet*);
+    static VclPtr<SfxTabPage> Create(TabPageParent, const SfxItemSet*);
     static const sal_uInt16* GetRanges() { return pTransparenceRanges; }
 
     virtual bool FillItemSet(SfxItemSet*) override;
@@ -263,7 +263,7 @@ public:
     virtual ~SvxAreaTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
+    static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
     static const sal_uInt16* GetRanges() { return pAreaRanges; }
 
     virtual bool FillItemSet( SfxItemSet* ) override;
@@ -324,7 +324,7 @@ public:
     virtual ~SvxShadowTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
+    static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
     static const sal_uInt16* GetRanges() { return pShadowRanges; }
 
     virtual bool FillItemSet( SfxItemSet* ) override;
@@ -402,7 +402,7 @@ public:
 
     void    Construct();
 
-    static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
+    static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
     virtual bool FillItemSet( SfxItemSet* ) override;
     virtual void Reset( const SfxItemSet * ) override;
 
@@ -473,7 +473,7 @@ public:
 
     void    Construct();
 
-    static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
+    static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
     virtual bool FillItemSet( SfxItemSet* ) override;
     virtual void Reset( const SfxItemSet * ) override;
 
@@ -557,7 +557,7 @@ public:
 
     void    Construct();
 
-    static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
+    static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
 
     virtual bool FillItemSet( SfxItemSet* ) override;
     virtual void Reset( const SfxItemSet * ) override;
@@ -615,7 +615,7 @@ public:
 
     void    Construct();
 
-    static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
+    static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
     virtual bool FillItemSet( SfxItemSet* ) override;
     virtual void Reset( const SfxItemSet * ) override;
 
@@ -734,7 +734,7 @@ public:
 
     void    Construct();
 
-    static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
+    static VclPtr<SfxTabPage> Create( TabPageParent, 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 aaefe353bfb9..eadb4e038f69 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -202,7 +202,7 @@ public:
 
     void    Construct();
 
-    static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
+    static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
     static const sal_uInt16* GetRanges() { return pLineRanges; }
 
     virtual bool FillItemSet( SfxItemSet* ) override;
@@ -300,7 +300,7 @@ public:
 
     void    Construct();
 
-    static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
+    static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
     virtual bool FillItemSet( SfxItemSet* ) override;
     virtual void Reset( const SfxItemSet * ) override;
 
@@ -365,7 +365,7 @@ public:
 
     void    Construct();
 
-    static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
+    static VclPtr<SfxTabPage> Create( TabPageParent, 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 3d3b2591a6cd..8204dec674ae 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -86,7 +86,7 @@ namespace svx
         virtual ~DbRegistrationOptionsPage() 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* rSet ) override;
diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index 87096615db68..887a93789eb6 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -109,7 +109,7 @@ class SvxGrfCropPage : public SfxTabPage
 
     Size            GetGrfOrigSize( const Graphic& ) const;
 public:
-    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 *rSet ) override;
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 3fa0179d91d7..631b662b7206 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -83,7 +83,7 @@ public:
     virtual ~SvxCaptionTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage>  Create( vcl::Window*, const SfxItemSet* );
+    static VclPtr<SfxTabPage>  Create( TabPageParent, 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 dd34296043d5..1ed414b37182 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -76,7 +76,7 @@ public:
     bool                        IsReadOnly() const override;
 
     // --------- inherit from the base -------------
-    static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
+    static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
 };
 
 class SfxMacroAssignDlg : public SfxSingleTabDialog
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index bebb57ee1857..721f7d4f8244 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -72,7 +72,7 @@ public:
     virtual ~SvxMeasurePage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage>  Create( vcl::Window*, const SfxItemSet* );
+    static VclPtr<SfxTabPage>  Create( TabPageParent, 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 8e8d85784d63..56e0fb8b8c92 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -69,7 +69,7 @@ public:
     virtual ~SvxNumberFormatTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage>      Create( vcl::Window* pParent,
+    static VclPtr<SfxTabPage>      Create( TabPageParent pParent,
                                     const SfxItemSet* rAttrSet );
     // Returns area information.
     static const sal_uInt16* GetRanges() { return pRanges; }
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 8732edb2b8d4..d5e92dc13be8 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -106,7 +106,7 @@ public:
     virtual ~SvxSingleNumPickTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent,
+    static VclPtr<SfxTabPage>  Create( TabPageParent pParent,
                                 const SfxItemSet* rAttrSet);
 
     virtual void        ActivatePage(const SfxItemSet& rSet) override;
@@ -139,7 +139,7 @@ public:
     virtual ~SvxBulletPickTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent,
+    static VclPtr<SfxTabPage>  Create( TabPageParent pParent,
                                 const SfxItemSet* rAttrSet);
 
     virtual void        ActivatePage(const SfxItemSet& rSet) override;
@@ -181,7 +181,7 @@ public:
     virtual ~SvxNumPickTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent,
+    static VclPtr<SfxTabPage>  Create( TabPageParent pParent,
                                 const SfxItemSet* rAttrSet);
 
     virtual void        ActivatePage(const SfxItemSet& rSet) override;
@@ -226,7 +226,7 @@ public:
         virtual ~SvxBitmapPickTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent,
+    static VclPtr<SfxTabPage>  Create( TabPageParent pParent,
                                 const SfxItemSet* rAttrSet);
 
     virtual void        ActivatePage(const SfxItemSet& rSet) override;
@@ -335,7 +335,7 @@ public:
         virtual ~SvxNumOptionsTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent,
+    static VclPtr<SfxTabPage>  Create( TabPageParent pParent,
                                 const SfxItemSet* rAttrSet);
 
     virtual void        ActivatePage(const SfxItemSet& rSet) override;
@@ -434,7 +434,7 @@ public:
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
     virtual void        Reset( const SfxItemSet* rSet ) override;
 
-    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent,
+    static VclPtr<SfxTabPage>  Create( TabPageParent pParent,
                                 const SfxItemSet* rAttrSet);
 
     void                SetMetric(FieldUnit eSet);
diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx
index bdf05750b371..d46fdd1862e9 100644
--- a/cui/source/inc/optasian.hxx
+++ b/cui/source/inc/optasian.hxx
@@ -58,7 +58,7 @@ public:
     virtual ~SvxAsianLayoutPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent, const SfxItemSet* rAttrSet );
+    static VclPtr<SfxTabPage>  Create( TabPageParent pParent, 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 d53844661ee5..04ca33441cde 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -149,7 +149,7 @@ private:
 public:
     virtual             ~SvxLinguTabPage() 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* rSet ) override;
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index d37571e64a97..a9d72a5176af 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -74,7 +74,7 @@ public:
     virtual ~SvxPathTabPage() 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* rSet ) override;
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index 72838e5d481f..7f24edc49514 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -181,7 +181,7 @@ protected:
     virtual DeactivateRC   DeactivatePage( SfxItemSet* pSet ) override;
 
 public:
-    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent, const SfxItemSet* rSet );
+    static VclPtr<SfxTabPage>  Create( TabPageParent pParent, const SfxItemSet* rSet );
     // returns the range of the Which values
     static const sal_uInt16* GetRanges() { return pRanges; }
 
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index bc79add8c31c..e46168ddf192 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -105,7 +105,7 @@ public:
 
     DECL_LINK(ELRLoseFocusHdl, Control&, void);
 
-    static VclPtr<SfxTabPage>      Create( vcl::Window* pParent, const SfxItemSet* rSet );
+    static VclPtr<SfxTabPage>      Create( TabPageParent pParent, const SfxItemSet* rSet );
     static const sal_uInt16* GetRanges() { return pStdRanges; }
 
     virtual bool            FillItemSet( SfxItemSet* rSet ) override;
@@ -169,7 +169,7 @@ public:
     virtual ~SvxParaAlignTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage>      Create( vcl::Window* pParent, const SfxItemSet* rSet );
+    static VclPtr<SfxTabPage>      Create( TabPageParent pParent, const SfxItemSet* rSet );
     static const sal_uInt16* GetRanges() { return pAlignRanges; }
 
     virtual bool            FillItemSet( SfxItemSet* rSet ) override;
@@ -204,7 +204,7 @@ public:
     virtual ~SvxExtParagraphTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent,
+    static VclPtr<SfxTabPage>  Create( TabPageParent pParent,
                                 const SfxItemSet* rSet );
     static const sal_uInt16* GetRanges() { return pExtRanges; }
 
@@ -287,7 +287,7 @@ public:
     virtual ~SvxAsianTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent,
+    static VclPtr<SfxTabPage>  Create( TabPageParent pParent,
                                 const SfxItemSet* rSet );
     static const sal_uInt16*      GetRanges();
 
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx
index 0f8924a9d7fd..b10e2ca7617f 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -124,7 +124,7 @@ public:
     virtual ~SvxSwPosSizeTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
+    static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
     static const sal_uInt16*     GetRanges();
 
     virtual bool FillItemSet( SfxItemSet* ) override;
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index e5e1f7d17ef9..289de2b346cc 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -52,7 +52,7 @@ class SvxTabulatorTabPage : public SfxTabPage
 public:
     virtual ~SvxTabulatorTabPage() override;
     virtual void dispose() override;
-    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent, const SfxItemSet* rSet );
+    static VclPtr<SfxTabPage>  Create( TabPageParent pParent, const SfxItemSet* rSet );
     static const sal_uInt16* GetRanges() { return pRanges; }
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index 37ff6561b9e3..0d568d7dd1f6 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -84,7 +84,7 @@ public:
     virtual ~SvxTextAnimationPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage>  Create( vcl::Window*, const SfxItemSet* );
+    static VclPtr<SfxTabPage>  Create( TabPageParent, 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 88b77845d134..5c96c71ab329 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -84,7 +84,7 @@ public:
     virtual ~SvxTextAttrPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage>  Create( vcl::Window*, const SfxItemSet* );
+    static VclPtr<SfxTabPage>  Create( TabPageParent, 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 7222f09f92b4..8a24987a8842 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -140,7 +140,7 @@ public:
     virtual ~SvxPositionSizeTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
+    static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
     static const sal_uInt16* GetRanges() {  return pPosSizeRanges; }
 
     virtual bool FillItemSet( SfxItemSet* ) override;
@@ -198,7 +198,7 @@ public:
     virtual ~SvxAngleTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
+    static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
     static const sal_uInt16*  GetRanges() { return pAngleRanges; }
 
     virtual bool FillItemSet( SfxItemSet* ) override;
@@ -251,7 +251,7 @@ public:
     virtual ~SvxSlantTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage> Create( vcl::Window*, const SfxItemSet* );
+    static VclPtr<SfxTabPage> Create( TabPageParent, 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 3a542707997c..89a052ef95c4 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -331,9 +331,9 @@ namespace offapp
         SfxTabPage::dispose();
     }
 
-    VclPtr<SfxTabPage> ConnectionPoolOptionsPage::Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet)
+    VclPtr<SfxTabPage> ConnectionPoolOptionsPage::Create(TabPageParent _pParent, const SfxItemSet* _rAttrSet)
     {
-        return VclPtr<ConnectionPoolOptionsPage>::Create(_pParent, *_rAttrSet);
+        return VclPtr<ConnectionPoolOptionsPage>::Create(_pParent.pParent, *_rAttrSet);
     }
 
     void ConnectionPoolOptionsPage::implInitControls(const SfxItemSet& _rSet)
diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx
index 36f06b7eaf39..cfbd148a364c 100644
--- a/cui/source/options/connpooloptions.hxx
+++ b/cui/source/options/connpooloptions.hxx
@@ -50,7 +50,7 @@ namespace offapp
         ConnectionPoolOptionsPage(vcl::Window* _pParent, const SfxItemSet& _rAttrSet);
         virtual ~ConnectionPoolOptionsPage() override;
         virtual void dispose() override;
-        static VclPtr<SfxTabPage>  Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet);
+        static VclPtr<SfxTabPage>  Create(TabPageParent _pParent, const SfxItemSet* _rAttrSet);
 
     private:
         virtual bool        EventNotify( NotifyEvent& _rNEvt ) override;
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 672617a4ee64..200436cf5e10 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -177,10 +177,10 @@ void DbRegistrationOptionsPage::dispose()
 }
 
 
-VclPtr<SfxTabPage> DbRegistrationOptionsPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> DbRegistrationOptionsPage::Create( TabPageParent pParent,
                                     const SfxItemSet* rAttrSet )
 {
-    return VclPtr<DbRegistrationOptionsPage>::Create( pParent, *rAttrSet );
+    return VclPtr<DbRegistrationOptionsPage>::Create( pParent.pParent, *rAttrSet );
 }
 
 
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index d62712633d26..b500f0107632 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -154,10 +154,10 @@ void SvxFontSubstTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SvxFontSubstTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SvxFontSubstTabPage::Create( TabPageParent pParent,
                                                 const SfxItemSet* rAttrSet)
 {
-    return VclPtr<SvxFontSubstTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SvxFontSubstTabPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 bool  SvxFontSubstTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index e016bf880188..3c7e30ca338e 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -97,7 +97,7 @@ class SvxFontSubstTabPage : public SfxTabPage
 
 public:
     SvxFontSubstTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
-    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/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index 65d142343a33..5d4bd2e4522f 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -59,9 +59,9 @@ void SvxAccessibilityOptionsTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SvxAccessibilityOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
+VclPtr<SfxTabPage> SvxAccessibilityOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SvxAccessibilityOptionsTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SvxAccessibilityOptionsTabPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx
index f5e161bcf2f1..d451d1969875 100644
--- a/cui/source/options/optaccessibility.hxx
+++ b/cui/source/options/optaccessibility.hxx
@@ -37,7 +37,7 @@ public:
     virtual ~SvxAccessibilityOptionsTabPage() 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/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index caccaaf1e200..c2a5030b54d0 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -163,9 +163,9 @@ void SvxAsianLayoutPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SvxAsianLayoutPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
+VclPtr<SfxTabPage> SvxAsianLayoutPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SvxAsianLayoutPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SvxAsianLayoutPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 bool SvxAsianLayoutPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx
index 9795c1d9dd4f..688b4e7e4f83 100644
--- a/cui/source/options/optbasic.cxx
+++ b/cui/source/options/optbasic.cxx
@@ -137,9 +137,9 @@ void SvxBasicIDEOptionsPage::Reset( const SfxItemSet* /*rSet*/ )
     pUseExtendedTypesChk->SaveValue();
 }
 
-VclPtr<SfxTabPage> SvxBasicIDEOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
+VclPtr<SfxTabPage> SvxBasicIDEOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SvxBasicIDEOptionsPage>::Create( pParent, *rAttrSet );
+    return VclPtr<SvxBasicIDEOptionsPage>::Create( pParent.pParent, *rAttrSet );
 }
 
 void SvxBasicIDEOptionsPage::FillUserData()
diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx
index fe63db80201d..9e2774643da0 100644
--- a/cui/source/options/optbasic.hxx
+++ b/cui/source/options/optbasic.hxx
@@ -41,7 +41,7 @@ public:
     virtual ~SvxBasicIDEOptionsPage() 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* rSet ) override;
     virtual void FillUserData() override;
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 2a212bdce0a9..feba29eb1a7e 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -190,9 +190,9 @@ void SvxDefaultColorOptPage::Construct()
 }
 
 
-VclPtr<SfxTabPage> SvxDefaultColorOptPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrs )
+VclPtr<SfxTabPage> SvxDefaultColorOptPage::Create( TabPageParent pParent, const SfxItemSet* rAttrs )
 {
-    return VclPtr<SvxDefaultColorOptPage>::Create( pParent, *rAttrs );
+    return VclPtr<SvxDefaultColorOptPage>::Create( pParent.pParent, *rAttrs );
 }
 
 bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet* rOutAttrs )
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index 79af3c1dd8b8..97ae4b2ed509 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -70,7 +70,7 @@ public:
 
     void    Construct();
 
-    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent, const SfxItemSet* rInAttrs );
+    static VclPtr<SfxTabPage>  Create( TabPageParent pParent, 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 a273888772c6..a6538fd26d46 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -1031,9 +1031,9 @@ void SvxColorOptionsTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SvxColorOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
+VclPtr<SfxTabPage> SvxColorOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SvxColorOptionsTabPage>::Create( pParent, *rAttrSet );
+    return VclPtr<SvxColorOptionsTabPage>::Create( pParent.pParent, *rAttrSet );
 }
 
 bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet*  )
diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx
index f91a2312be5b..36e1063f35b5 100644
--- a/cui/source/options/optcolor.hxx
+++ b/cui/source/options/optcolor.hxx
@@ -51,7 +51,7 @@ public:
     virtual ~SvxColorOptionsTabPage(  ) 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/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index ffdffcd1cff6..a6bf4d835a2e 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -70,9 +70,9 @@ void SvxCTLOptionsPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SvxCTLOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
+VclPtr<SfxTabPage> SvxCTLOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SvxCTLOptionsPage>::Create( pParent, *rAttrSet );
+    return VclPtr<SvxCTLOptionsPage>::Create( pParent.pParent, *rAttrSet );
 }
 
 bool SvxCTLOptionsPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx
index b377fda219be..05106a3c2350 100644
--- a/cui/source/options/optctl.hxx
+++ b/cui/source/options/optctl.hxx
@@ -45,7 +45,7 @@ public:
     SvxCTLOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet );
     virtual ~SvxCTLOptionsPage() 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/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 39073bcd1033..86d4cc437151 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -82,10 +82,10 @@ IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, Button*, void)
     aEBasicExectblCB->Enable( aEBasicCodeCB->IsChecked() );
 }
 
-VclPtr<SfxTabPage> OfaMSFilterTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> OfaMSFilterTabPage::Create( TabPageParent pParent,
                                                const SfxItemSet* rAttrSet )
 {
-    return VclPtr<OfaMSFilterTabPage>::Create( pParent, *rAttrSet );
+    return VclPtr<OfaMSFilterTabPage>::Create( pParent.pParent, *rAttrSet );
 }
 
 bool OfaMSFilterTabPage::FillItemSet( SfxItemSet* )
@@ -188,10 +188,10 @@ void OfaMSFilterTabPage2::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> OfaMSFilterTabPage2::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> OfaMSFilterTabPage2::Create( TabPageParent pParent,
                                                 const SfxItemSet* rAttrSet )
 {
-    return VclPtr<OfaMSFilterTabPage2>::Create( pParent, *rAttrSet );
+    return VclPtr<OfaMSFilterTabPage2>::Create( pParent.pParent, *rAttrSet );
 }
 
 bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index 4ef6cf3a63c0..0547ca30b510 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -44,7 +44,7 @@ public:
     virtual ~OfaMSFilterTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent,
+    static VclPtr<SfxTabPage>  Create( TabPageParent pParent,
                                 const SfxItemSet* rAttrSet );
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
@@ -97,7 +97,7 @@ class OfaMSFilterTabPage2 : public SfxTabPage
 
 public:
     OfaMSFilterTabPage2( vcl::Window* pParent, const SfxItemSet& rSet );
-    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/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 4dcb91416e8c..eca23fb512c9 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -327,9 +327,9 @@ void OfaMiscTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> OfaMiscTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
+VclPtr<SfxTabPage> OfaMiscTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
 {
-    return VclPtr<OfaMiscTabPage>::Create( pParent, *rAttrSet );
+    return VclPtr<OfaMiscTabPage>::Create( pParent.pParent, *rAttrSet );
 }
 
 bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
@@ -736,9 +736,9 @@ IMPL_LINK_NOARG( OfaViewTabPage, OnAntialiasingToggled, CheckBox&, void )
 }
 #endif
 
-VclPtr<SfxTabPage> OfaViewTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
+VclPtr<SfxTabPage> OfaViewTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
 {
-    return VclPtr<OfaViewTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<OfaViewTabPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 bool OfaViewTabPage::FillItemSet( SfxItemSet* )
@@ -1298,9 +1298,9 @@ void OfaLanguagesTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> OfaLanguagesTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
+VclPtr<SfxTabPage> OfaLanguagesTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
 {
-    return VclPtr<OfaLanguagesTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<OfaLanguagesTabPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 static void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBoolItems[], sal_uInt16 nCount)
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index ceba711ede24..852b8472476e 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -70,7 +70,7 @@ public:
     virtual ~OfaMiscTabPage() 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;
@@ -128,7 +128,7 @@ public:
     virtual ~OfaViewTabPage() 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;
@@ -174,7 +174,7 @@ public:
     virtual ~OfaLanguagesTabPage() 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/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index f5c216775075..988bdc28031a 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -349,9 +349,9 @@ void SvxGeneralTabPage::SetLinks ()
 }
 
 
-VclPtr<SfxTabPage> SvxGeneralTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
+VclPtr<SfxTabPage> SvxGeneralTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SvxGeneralTabPage>::Create( pParent, *rAttrSet );
+    return VclPtr<SvxGeneralTabPage>::Create( pParent.pParent, *rAttrSet );
 }
 
 bool SvxGeneralTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 824c4a1f4ecb..23a628c3231c 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -88,10 +88,10 @@ void OfaHtmlTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> OfaHtmlTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> OfaHtmlTabPage::Create( TabPageParent pParent,
                                            const SfxItemSet* rAttrSet )
 {
-    return VclPtr<OfaHtmlTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<OfaHtmlTabPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 bool OfaHtmlTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx
index 55b7281cab60..a54590b135ea 100644
--- a/cui/source/options/opthtml.hxx
+++ b/cui/source/options/opthtml.hxx
@@ -54,7 +54,7 @@ public:
     virtual void dispose() override;
 
     OfaHtmlTabPage(vcl::Window* pParent, const SfxItemSet& rSet);
-    static VclPtr<SfxTabPage>  Create( vcl::Window* pParent,
+    static VclPtr<SfxTabPage>  Create( TabPageParent pParent,
                                        const SfxItemSet* rAttrSet );
 
     virtual bool        FillItemSet( SfxItemSet* rSet ) override;
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index e2e3ef807b8c..779f0a107c6f 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -253,9 +253,9 @@ void SvxProxyTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SvxProxyTabPage::Create(vcl::Window* pParent, const SfxItemSet* rAttrSet )
+VclPtr<SfxTabPage> SvxProxyTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SvxProxyTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SvxProxyTabPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 void SvxProxyTabPage::ReadConfigData_Impl()
@@ -870,9 +870,9 @@ void SvxSecurityTabPage::InitControls()
     }
 }
 
-VclPtr<SfxTabPage> SvxSecurityTabPage::Create(vcl::Window* pParent, const SfxItemSet* rAttrSet )
+VclPtr<SfxTabPage> SvxSecurityTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SvxSecurityTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SvxSecurityTabPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 void SvxSecurityTabPage::ActivatePage( const SfxItemSet& )
@@ -985,9 +985,9 @@ void SvxEMailTabPage::dispose()
 
 /* -------------------------------------------------------------------------*/
 
-VclPtr<SfxTabPage>  SvxEMailTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
+VclPtr<SfxTabPage>  SvxEMailTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SvxEMailTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SvxEMailTabPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 /* -------------------------------------------------------------------------*/
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index b0d8f7884dc8..d504f514fc4a 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -93,7 +93,7 @@ public:
     SvxProxyTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
     virtual ~SvxProxyTabPage() 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;
 };
@@ -153,7 +153,7 @@ protected:
     virtual DeactivateRC   DeactivatePage( SfxItemSet* pSet ) override;
 
 public:
-    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;
 };
@@ -180,7 +180,7 @@ public:
     virtual ~SvxEMailTabPage() 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/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 2534247494aa..0ffe56682abe 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -570,9 +570,9 @@ void SvxJavaOptionsPage::RequestRestart( svtools::RestartReason eReason )
 }
 
 
-VclPtr<SfxTabPage> SvxJavaOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
+VclPtr<SfxTabPage> SvxJavaOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SvxJavaOptionsPage>::Create( pParent, *rAttrSet );
+    return VclPtr<SvxJavaOptionsPage>::Create( pParent.pParent, *rAttrSet );
 }
 
 
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index c533369f6a47..6caaeeb4cfc3 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -112,7 +112,7 @@ public:
     virtual ~SvxJavaOptionsPage() 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* rSet ) override;
diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx
index 95d8183abbcc..b4f224177c82 100644
--- a/cui/source/options/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -81,12 +81,11 @@ void SvxJSearchOptionsPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SvxJSearchOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
+VclPtr<SfxTabPage> SvxJSearchOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
 {
-    return VclPtr<SvxJSearchOptionsPage>::Create( pParent, *rSet );
+    return VclPtr<SvxJSearchOptionsPage>::Create( pParent.pParent, *rSet );
 }
 
-
 void SvxJSearchOptionsPage::SetTransliterationFlags( TransliterationFlags nSettings )
 {
     bool  bVal(nSettings & TransliterationFlags::IGNORE_CASE);
diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx
index b6d768044da7..686f3914cefd 100644
--- a/cui/source/options/optjsearch.hxx
+++ b/cui/source/options/optjsearch.hxx
@@ -63,7 +63,7 @@ public:
                         SvxJSearchOptionsPage( vcl::Window* pParent, const SfxItemSet& rSet );
     virtual ~SvxJSearchOptionsPage() 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        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 239546732acf..1155d2792992 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1045,10 +1045,10 @@ void SvxLinguTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SvxLinguTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SvxLinguTabPage::Create( TabPageParent pParent,
                                             const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SvxLinguTabPage>::Create( pParent, *rAttrSet );
+    return VclPtr<SvxLinguTabPage>::Create( pParent.pParent, *rAttrSet );
 }
 
 bool SvxLinguTabPage::FillItemSet( SfxItemSet* rCoreSet )
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index e757231a0c33..cefd3b2cd71c 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -75,9 +75,9 @@ void SvxOpenCLTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SvxOpenCLTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
+VclPtr<SfxTabPage> SvxOpenCLTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SvxOpenCLTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SvxOpenCLTabPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 bool SvxOpenCLTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optopencl.hxx b/cui/source/options/optopencl.hxx
index 4609b1b07d67..cb7878f80646 100644
--- a/cui/source/options/optopencl.hxx
+++ b/cui/source/options/optopencl.hxx
@@ -42,7 +42,7 @@ public:
     virtual ~SvxOpenCLTabPage() 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* rSet ) override;
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index cfd41c1b40c4..90388aa1522b 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -257,10 +257,10 @@ void SvxPathTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SvxPathTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SvxPathTabPage::Create( TabPageParent pParent,
                                            const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SvxPathTabPage>::Create( pParent, *rAttrSet );
+    return VclPtr<SvxPathTabPage>::Create( pParent.pParent, *rAttrSet );
 }
 
 bool SvxPathTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 528262cacfc6..ae321e6a8fd2 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -211,10 +211,10 @@ void SvxSaveTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SvxSaveTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SvxSaveTabPage::Create( TabPageParent pParent,
                                            const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SvxSaveTabPage>::Create( pParent, *rAttrSet );
+    return VclPtr<SvxSaveTabPage>::Create( pParent.pParent, *rAttrSet );
 }
 
 void SvxSaveTabPage::DetectHiddenControls()
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index f6957eede0c9..49281718c1b2 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -80,7 +80,7 @@ public:
     virtual ~SvxSaveTabPage() 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/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 577b0e7988b4..889c743b31b7 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -198,9 +198,9 @@ void SvxOnlineUpdateTabPage::UpdateUserAgent()
 }
 
 VclPtr<SfxTabPage>
-SvxOnlineUpdateTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
+SvxOnlineUpdateTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SvxOnlineUpdateTabPage>::Create( pParent, *rAttrSet );
+    return VclPtr<SvxOnlineUpdateTabPage>::Create( pParent.pParent, *rAttrSet );
 }
 
 bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx
index 788ae988f92e..5e09143ca61a 100644
--- a/cui/source/options/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
@@ -61,7 +61,7 @@ public:
     virtual ~SvxOnlineUpdateTabPage() 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* rSet ) override;
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index 6e14757e2858..3ff422289f37 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -317,9 +317,9 @@ void SvxPersonalizationTabPage::dispose()
 }
 
 
-VclPtr<SfxTabPage> SvxPersonalizationTabPage::Create( vcl::Window *pParent, const SfxItemSet *rSet )
+VclPtr<SfxTabPage> SvxPersonalizationTabPage::Create( TabPageParent pParent, const SfxItemSet *rSet )
 {
-    return VclPtr<SvxPersonalizationTabPage>::Create( pParent, *rSet );
+    return VclPtr<SvxPersonalizationTabPage>::Create( pParent.pParent, *rSet );
 }
 
 bool SvxPersonalizationTabPage::FillItemSet( SfxItemSet * )
diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx
index 9d5e057c8c34..1f1e1f1e77ca 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -46,7 +46,7 @@ public:
     virtual ~SvxPersonalizationTabPage() override;
     virtual void dispose() override;
 
-    static VclPtr<SfxTabPage> Create( vcl::Window *pParent, const SfxItemSet *rSet );
+    static VclPtr<SfxTabPage> Create( TabPageParent pParent, 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 3c44cd6089af..7a177f2733ad 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1033,7 +1033,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
         pPageInfo->m_pPage.disposeAndReset( ::CreateGeneralTabPage(pPageInfo->m_nPageId, pTabBox, *pGroupInfo->m_pInItemSet ) );
 
         if(!pPageInfo->m_pPage && pGroupInfo->m_pModule)
-            pPageInfo->m_pPage.disposeAndReset( pGroupInfo->m_pModule->CreateTabPage(pPageInfo->m_nPageId, pTabBox, *pGroupInfo->m_pInItemSet) );
+            pPageInfo->m_pPage.disposeAndReset( pGroupInfo->m_pModule->CreateTabPage(pPageInfo->m_nPageId, TabPageParent(pTabBox), *pGroupInfo->m_pInItemSet) );
 
         DBG_ASSERT( pPageInfo->m_pPage, "tabpage could not created");
         if ( pPageInfo->m_pPage )
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 7d82dd94aae5..85671f3bf31f 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -275,9 +275,9 @@ void AlignmentTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> AlignmentTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
+VclPtr<SfxTabPage> AlignmentTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
 {
-    return VclPtr<AlignmentTabPage>::Create( pParent, *rAttrSet );
+    return VclPtr<AlignmentTabPage>::Create( pParent.pParent, *rAttrSet );
 }
 
 bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet )
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 299a2c3789d6..4c50310887cc 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -214,10 +214,10 @@ void OfaAutocorrOptionsPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> OfaAutocorrOptionsPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> OfaAutocorrOptionsPage::Create( TabPageParent pParent,
                                                    const SfxItemSet* rSet)
 {
-    return VclPtr<OfaAutocorrOptionsPage>::Create(pParent, *rSet);
+    return VclPtr<OfaAutocorrOptionsPage>::Create(pParent.pParent, *rSet);
 }
 
 bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet* )
@@ -502,10 +502,10 @@ void OfaSwAutoFmtOptionsPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> OfaSwAutoFmtOptionsPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> OfaSwAutoFmtOptionsPage::Create( TabPageParent pParent,
                                                     const SfxItemSet* rAttrSet)
 {
-    return VclPtr<OfaSwAutoFmtOptionsPage>::Create(pParent, *rAttrSet);
+    return VclPtr<OfaSwAutoFmtOptionsPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet*  )
@@ -927,9 +927,9 @@ void OfaAutocorrReplacePage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> OfaAutocorrReplacePage::Create( vcl::Window* pParent, const SfxItemSet* rSet)
+VclPtr<SfxTabPage> OfaAutocorrReplacePage::Create( TabPageParent pParent, const SfxItemSet* rSet)
 {
-    return VclPtr<OfaAutocorrReplacePage>::Create(pParent, *rSet);
+    return VclPtr<OfaAutocorrReplacePage>::Create(pParent.pParent, *rSet);
 }
 
 void OfaAutocorrReplacePage::ActivatePage( const SfxItemSet& )
@@ -1438,10 +1438,10 @@ void OfaAutocorrExceptPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> OfaAutocorrExceptPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> OfaAutocorrExceptPage::Create( TabPageParent pParent,
                                                   const SfxItemSet* rSet)
 {
-    return VclPtr<OfaAutocorrExceptPage>::Create(pParent, *rSet);
+    return VclPtr<OfaAutocorrExceptPage>::Create(pParent.pParent, *rSet);
 }
 
 void    OfaAutocorrExceptPage::ActivatePage( const SfxItemSet& )
@@ -1893,10 +1893,10 @@ void OfaQuoteTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> OfaQuoteTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> OfaQuoteTabPage::Create( TabPageParent pParent,
                                             const SfxItemSet* rAttrSet)
 {
-    return VclPtr<OfaQuoteTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<OfaQuoteTabPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 bool OfaQuoteTabPage::FillItemSet( SfxItemSet*  )
@@ -2229,10 +2229,10 @@ void OfaAutoCompleteTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> OfaAutoCompleteTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> OfaAutoCompleteTabPage::Create( TabPageParent pParent,
                                                    const SfxItemSet* rSet)
 {
-    return VclPtr<OfaAutoCompleteTabPage>::Create( pParent, *rSet );
+    return VclPtr<OfaAutoCompleteTabPage>::Create( pParent.pParent, *rSet );
 }
 
 bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet* )
@@ -2481,9 +2481,9 @@ void OfaSmartTagOptionsTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> OfaSmartTagOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet)
+VclPtr<SfxTabPage> OfaSmartTagOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet)
 {
-    return VclPtr<OfaSmartTagOptionsTabPage>::Create( pParent, *rSet );
+    return VclPtr<OfaSmartTagOptionsTabPage>::Create( pParent.pParent, *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 78cbbf63ca70..722b4a84624b 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -427,9 +427,9 @@ void SvxBackgroundTabPage::dispose()
     SvxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SvxBackgroundTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
+VclPtr<SfxTabPage> SvxBackgroundTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SvxBackgroundTabPage>::Create( pParent, *rAttrSet );
+    return VclPtr<SvxBackgroundTabPage>::Create( pParent.pParent, *rAttrSet );
 }
 
 void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
@@ -1549,10 +1549,10 @@ bool SvxBkgTabPage::FillItemSet( SfxItemSet* rCoreSet )
     return true;
 }
 
-VclPtr<SfxTabPage> SvxBkgTabPage::Create( vcl::Window* pWindow,
+VclPtr<SfxTabPage> SvxBkgTabPage::Create( TabPageParent pWindow,
                                            const SfxItemSet* rAttrs )
 {
-    return VclPtr<SvxBkgTabPage>::Create( pWindow, *rAttrs );
+    return VclPtr<SvxBkgTabPage>::Create( pWindow.pParent, *rAttrs );
 }
 
 void SvxBkgTabPage::PageCreated(const SfxAllItemSet& aSet)
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 96ffc5c5658c..6107c30a4ebc 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -411,10 +411,10 @@ void SvxBorderTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SvxBorderTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SvxBorderTabPage::Create( TabPageParent pParent,
                                              const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SvxBorderTabPage>::Create( pParent, *rAttrSet );
+    return VclPtr<SvxBorderTabPage>::Create( pParent.pParent, *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 1d06dae5cb04..edb3d8496126 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1173,9 +1173,9 @@ DeactivateRC SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet )
 }
 
 
-VclPtr<SfxTabPage> SvxCharNamePage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
+VclPtr<SfxTabPage> SvxCharNamePage::Create( TabPageParent pParent, const SfxItemSet* rSet )
 {
-    return VclPtr<SvxCharNamePage>::Create( pParent, *rSet );
+    return VclPtr<SvxCharNamePage>::Create( pParent.pParent, *rSet );
 }
 
 
@@ -1686,9 +1686,9 @@ DeactivateRC SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet )
 }
 
 
-VclPtr<SfxTabPage> SvxCharEffectsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
+VclPtr<SfxTabPage> SvxCharEffectsPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
 {
-    return VclPtr<SvxCharEffectsPage>::Create( pParent, *rSet );
+    return VclPtr<SvxCharEffectsPage>::Create( pParent.pParent, *rSet );
 }
 
 
@@ -2742,9 +2742,9 @@ DeactivateRC SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet )
 }
 
 
-VclPtr<SfxTabPage> SvxCharPositionPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
+VclPtr<SfxTabPage> SvxCharPositionPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
 {
-    return VclPtr<SvxCharPositionPage>::Create( pParent, *rSet );
+    return VclPtr<SvxCharPositionPage>::Create( pParent.pParent, *rSet );
 }
 
 
@@ -3272,9 +3272,9 @@ DeactivateRC SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet )
 }
 
 
-VclPtr<SfxTabPage> SvxCharTwoLinesPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
+VclPtr<SfxTabPage> SvxCharTwoLinesPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
 {
-    return VclPtr<SvxCharTwoLinesPage>::Create( pParent, *rSet );
+    return VclPtr<SvxCharTwoLinesPage>::Create( pParent.pParent, *rSet );
 }
 
 void SvxCharTwoLinesPage::Reset( const SfxItemSet* rSet )
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index ebfe9a008e2e..2820e383434c 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -389,10 +389,10 @@ void SvxConnectionPage::Construct()
 |*
 \************************************************************************/
 
-VclPtr<SfxTabPage> SvxConnectionPage::Create( vcl::Window* pWindow,
+VclPtr<SfxTabPage> SvxConnectionPage::Create( TabPageParent pWindow,
                                               const SfxItemSet* rAttrs )
 {
-    return VclPtr<SvxConnectionPage>::Create( pWindow, *rAttrs );
+    return VclPtr<SvxConnectionPage>::Create( pWindow.pParent, *rAttrs );
 }
 
 IMPL_LINK( SvxConnectionPage, ChangeAttrListBoxHdl_Impl, ListBox&, r, void )
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 1546ed77e5f9..51a393db83a4 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -152,9 +152,9 @@ void SvxGrfCropPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SvxGrfCropPage::Create(vcl::Window *pParent, const SfxItemSet *rSet)
+VclPtr<SfxTabPage> SvxGrfCropPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
 {
-    return VclPtr<SvxGrfCropPage>::Create( pParent, *rSet );
+    return VclPtr<SvxGrfCropPage>::Create( pParent.pParent, *rSet );
 }
 
 void SvxGrfCropPage::Reset( const SfxItemSet *rSet )
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 0671a1691cb3..796b2976df8f 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -353,10 +353,10 @@ void SvxCaptionTabPage::Reset( const SfxItemSet*  )
 }
 
 
-VclPtr<SfxTabPage> SvxCaptionTabPage::Create( vcl::Window* pWindow,
+VclPtr<SfxTabPage> SvxCaptionTabPage::Create( TabPageParent pWindow,
                                               const SfxItemSet* rOutAttrs )
 {
-    return VclPtr<SvxCaptionTabPage>::Create( pWindow, *rOutAttrs );
+    return VclPtr<SvxCaptionTabPage>::Create( pWindow.pParent, *rOutAttrs );
 }
 
 
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index e86d51d8b9be..a3e37471bd9b 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -448,9 +448,9 @@ namespace
     }
 }
 
-VclPtr<SfxTabPage> SfxMacroTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet )
+VclPtr<SfxTabPage> SfxMacroTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
 {
-    return CreateSfxMacroTabPage(pParent, *rAttrSet);
+    return CreateSfxMacroTabPage(pParent.pParent, *rAttrSet);
 }
 
 SfxMacroAssignDlg::SfxMacroAssignDlg(vcl::Window* pParent,
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 58ae066ae39b..c9e5c2aad024 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -609,10 +609,10 @@ void SvxMeasurePage::Construct()
     m_pCtlPreview->Invalidate();
 }
 
-VclPtr<SfxTabPage> SvxMeasurePage::Create( vcl::Window* pWindow,
+VclPtr<SfxTabPage> SvxMeasurePage::Create( TabPageParent pWindow,
                                            const SfxItemSet* rAttrs )
 {
-    return VclPtr<SvxMeasurePage>::Create( pWindow, *rAttrs );
+    return VclPtr<SvxMeasurePage>::Create( pWindow.pParent, *rAttrs );
 }
 
 void SvxMeasurePage::PointChanged( vcl::Window* pWindow, RectPoint /*eRP*/ )
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 7735ee8ac036..ecfa8ff6f7ab 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -372,10 +372,10 @@ void SvxNumberFormatTabPage::Init_Impl()
     m_pLbLanguage->InsertLanguage( LANGUAGE_SYSTEM );
 }
 
-VclPtr<SfxTabPage> SvxNumberFormatTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SvxNumberFormatTabPage::Create( TabPageParent pParent,
                                                    const SfxItemSet* rAttrSet )
 {
-    return VclPtr<SvxNumberFormatTabPage>::Create( pParent, *rAttrSet );
+    return VclPtr<SvxNumberFormatTabPage>::Create( pParent.pParent, *rAttrSet );
 }
 
 
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index eb9fea50f28f..652dbdbddf78 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -230,10 +230,10 @@ void SvxSingleNumPickTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SvxSingleNumPickTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SvxSingleNumPickTabPage::Create( TabPageParent pParent,
                                                     const SfxItemSet* rAttrSet)
 {
-    return VclPtr<SvxSingleNumPickTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SvxSingleNumPickTabPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 bool  SvxSingleNumPickTabPage::FillItemSet( SfxItemSet* rSet )
@@ -396,10 +396,10 @@ void SvxBulletPickTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SvxBulletPickTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SvxBulletPickTabPage::Create( TabPageParent pParent,
                                                  const SfxItemSet* rAttrSet)
 {
-    return VclPtr<SvxBulletPickTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SvxBulletPickTabPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 bool  SvxBulletPickTabPage::FillItemSet( SfxItemSet* rSet )
@@ -595,10 +595,10 @@ void SvxNumPickTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SvxNumPickTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SvxNumPickTabPage::Create( TabPageParent pParent,
                                               const SfxItemSet* rAttrSet)
 {
-    return VclPtr<SvxNumPickTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SvxNumPickTabPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 bool  SvxNumPickTabPage::FillItemSet( SfxItemSet* rSet )
@@ -847,10 +847,10 @@ void SvxBitmapPickTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SvxBitmapPickTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SvxBitmapPickTabPage::Create( TabPageParent pParent,
                                                  const SfxItemSet* rAttrSet)
 {
-    return VclPtr<SvxBitmapPickTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SvxBitmapPickTabPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 void  SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet)
@@ -1242,10 +1242,10 @@ void SvxNumOptionsTabPage::SetMetric(FieldUnit eMetric)
     m_pHeightMF->SetUnit( eMetric );
 }
 
-VclPtr<SfxTabPage> SvxNumOptionsTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SvxNumOptionsTabPage::Create( TabPageParent pParent,
                                                  const SfxItemSet* rAttrSet)
 {
-    return VclPtr<SvxNumOptionsTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SvxNumOptionsTabPage>::Create(pParent.pParent, *rAttrSet);
 };
 
 void    SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet)
@@ -3114,10 +3114,10 @@ void SvxNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode()
     m_pIndentAtMF->Show( bLabelAlignmentPosAndSpaceModeActive );
 }
 
-VclPtr<SfxTabPage> SvxNumPositionTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SvxNumPositionTabPage::Create( TabPageParent pParent,
                                                   const SfxItemSet* rAttrSet)
 {
-    return VclPtr<SvxNumPositionTabPage>::Create(pParent, *rAttrSet);
+    return VclPtr<SvxNumPositionTabPage>::Create(pParent.pParent, *rAttrSet);
 }
 
 void    SvxNumPositionTabPage::SetMetric(FieldUnit eMetric)
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 7dbbf1761645..fea2604e4ed2 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -138,9 +138,9 @@ bool IsEqualSize_Impl( const SvxSizeItem* pSize, const Size& rSize )
 
 // class SvxPageDescPage --------------------------------------------------
 
-VclPtr<SfxTabPage> SvxPageDescPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
+VclPtr<SfxTabPage> SvxPageDescPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
 {
-    return VclPtr<SvxPageDescPage>::Create( pParent, *rSet );
+    return VclPtr<SvxPageDescPage>::Create( pParent.pParent, *rSet );
 }
 
 SvxPageDescPage::SvxPageDescPage( vcl::Window* pParent, const SfxItemSet& rAttr ) :
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index ad36ba0a686e..f17c35b3129b 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -196,9 +196,9 @@ IMPL_LINK_NOARG(SvxStdParagraphTabPage, ELRLoseFocusHdl, Control&, void)
         m_pRightIndent->SetEmptyFieldValue();
 }
 
-VclPtr<SfxTabPage> SvxStdParagraphTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet)
+VclPtr<SfxTabPage> SvxStdParagraphTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet)
 {
-    return VclPtr<SvxStdParagraphTabPage>::Create( pParent, *rSet );
+    return VclPtr<SvxStdParagraphTabPage>::Create( pParent.pParent, *rSet );
 }
 
 bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
@@ -1112,9 +1112,9 @@ DeactivateRC SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet )
     return DeactivateRC::LeavePage;
 }
 
-VclPtr<SfxTabPage> SvxParaAlignTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
+VclPtr<SfxTabPage> SvxParaAlignTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
 {
-    return VclPtr<SvxParaAlignTabPage>::Create(pParent, *rSet);
+    return VclPtr<SvxParaAlignTabPage>::Create(pParent.pParent, *rSet);
 }
 
 bool SvxParaAlignTabPage::FillItemSet( SfxItemSet* rOutSet )
@@ -1390,10 +1390,10 @@ void SvxParaAlignTabPage::PageCreated (const SfxAllItemSet& aSet)
             EnableJustifyExt();
 }
 
-VclPtr<SfxTabPage> SvxExtParagraphTabPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SvxExtParagraphTabPage::Create( TabPageParent pParent,
                                             const SfxItemSet* rSet )
 {
-    return VclPtr<SvxExtParagraphTabPage>::Create( pParent, *rSet );
+    return VclPtr<SvxExtParagraphTabPage>::Create( pParent.pParent, *rSet );
 }
 
 bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
@@ -2267,9 +2267,9 @@ void SvxAsianTabPage::dispose()
     SfxTabPage::dispose();
 }
 
-VclPtr<SfxTabPage> SvxAsianTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet )
+VclPtr<SfxTabPage> SvxAsianTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
 {
-    return VclPtr<SvxAsianTabPage>::Create(pParent, *rSet);
+    return VclPtr<SvxAsianTabPage>::Create(pParent.pParent, *rSet);
 }
 

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list