/smoketest/data/

/cib/libreoffice-5-3 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-04-20 11:06:07 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-04-22 21:29:36 +0200
commit60f3e4b843da89678e022eed837ee66e726b1920 (patch)
tree4cffea5d364e3ed9bd3e68c7b471f313c237a98e
parent4a7ebfea57094b914c4b1c3e46936dbf67dec499 (diff)
place an intermediate class as parent for SfxTabPages
so a SfxTabPage can be parented by a vcl::Window or a welded native notebook tabpage. That ways the same SfxTabPage can be used at the same time in both a native dialog or a vcl dialog. The impl can be changed to the weld api, and when hosted in a native dialog the vcl impl of that will be instantiated, while native otherwise. e.g. print options appearing in print options dialog and general options. This allows incremental changeover. Change-Id: I6f1fed1e8d0898b01853bb878757bad41cbf9bba Reviewed-on: https://gerrit.libreoffice.org/53193 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat
-rw-r--r--chart2/source/controller/dialogs/tp_AxisLabel.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_AxisLabel.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_AxisPositions.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_AxisPositions.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_DataLabel.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_DataLabel.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_ErrorBars.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_ErrorBars.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_LegendPosition.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_LegendPosition.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_PointGeometry.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_PointGeometry.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_PolarOptions.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_PolarOptions.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_Scale.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_Scale.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_SeriesToAxis.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_SeriesToAxis.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_TitleRotation.cxx8
-rw-r--r--chart2/source/controller/dialogs/tp_TitleRotation.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_Trendline.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_Trendline.hxx2
-rw-r--r--cui/source/customize/cfg.cxx20
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx8
-rw-r--r--cui/source/inc/align.hxx2
-rw-r--r--cui/source/inc/autocdlg.hxx14
-rw-r--r--cui/source/inc/backgrnd.hxx4
-rw-r--r--cui/source/inc/border.hxx2
-rw-r--r--cui/source/inc/chardlg.hxx8
-rw-r--r--cui/source/inc/connect.hxx2
-rw-r--r--cui/source/inc/cuigaldlg.hxx4
-rw-r--r--cui/source/inc/cuioptgenrl.hxx2
-rw-r--r--cui/source/inc/cuitabarea.hxx16
-rw-r--r--cui/source/inc/cuitabline.hxx6
-rw-r--r--cui/source/inc/dbregister.hxx2
-rw-r--r--cui/source/inc/grfpage.hxx2
-rw-r--r--cui/source/inc/labdlg.hxx2
-rw-r--r--cui/source/inc/macroass.hxx2
-rw-r--r--cui/source/inc/measure.hxx2
-rw-r--r--cui/source/inc/numfmt.hxx2
-rw-r--r--cui/source/inc/numpages.hxx12
-rw-r--r--cui/source/inc/optasian.hxx2
-rw-r--r--cui/source/inc/optlingu.hxx2
-rw-r--r--cui/source/inc/optpath.hxx2
-rw-r--r--cui/source/inc/page.hxx2
-rw-r--r--cui/source/inc/paragrph.hxx8
-rw-r--r--cui/source/inc/swpossizetabpage.hxx2
-rw-r--r--cui/source/inc/tabstpge.hxx2
-rw-r--r--cui/source/inc/textanim.hxx2
-rw-r--r--cui/source/inc/textattr.hxx2
-rw-r--r--cui/source/inc/transfrm.hxx6
-rw-r--r--cui/source/options/connpooloptions.cxx4
-rw-r--r--cui/source/options/connpooloptions.hxx2
-rw-r--r--cui/source/options/dbregister.cxx4
-rw-r--r--cui/source/options/fontsubs.cxx4
-rw-r--r--cui/source/options/fontsubs.hxx2
-rw-r--r--cui/source/options/optaccessibility.cxx4
-rw-r--r--cui/source/options/optaccessibility.hxx2
-rw-r--r--cui/source/options/optasian.cxx4
-rw-r--r--cui/source/options/optbasic.cxx4
-rw-r--r--cui/source/options/optbasic.hxx2
-rw-r--r--cui/source/options/optchart.cxx4
-rw-r--r--cui/source/options/optchart.hxx2
-rw-r--r--cui/source/options/optcolor.cxx4
-rw-r--r--cui/source/options/optcolor.hxx2
-rw-r--r--cui/source/options/optctl.cxx4
-rw-r--r--cui/source/options/optctl.hxx2
-rw-r--r--cui/source/options/optfltr.cxx8
-rw-r--r--cui/source/options/optfltr.hxx4
-rw-r--r--cui/source/options/optgdlg.cxx12
-rw-r--r--cui/source/options/optgdlg.hxx6
-rw-r--r--cui/source/options/optgenrl.cxx4
-rw-r--r--cui/source/options/opthtml.cxx4
-rw-r--r--cui/source/options/opthtml.hxx2
-rw-r--r--cui/source/options/optinet2.cxx12
-rw-r--r--cui/source/options/optinet2.hxx6
-rw-r--r--cui/source/options/optjava.cxx4
-rw-r--r--cui/source/options/optjava.hxx2
-rw-r--r--cui/source/options/optjsearch.cxx5
-rw-r--r--cui/source/options/optjsearch.hxx2
-rw-r--r--cui/source/options/optlingu.cxx4
-rw-r--r--cui/source/options/optopencl.cxx4
-rw-r--r--cui/source/options/optopencl.hxx2
-rw-r--r--cui/source/options/optpath.cxx4
-rw-r--r--cui/source/options/optsave.cxx4
-rw-r--r--cui/source/options/optsave.hxx2
-rw-r--r--cui/source/options/optupdt.cxx4
-rw-r--r--cui/source/options/optupdt.hxx2
-rw-r--r--cui/source/options/personalization.cxx4
-rw-r--r--cui/source/options/personalization.hxx2
-rw-r--r--cui/source/options/treeopt.cxx2
-rw-r--r--cui/source/tabpages/align.cxx4
-rw-r--r--cui/source/tabpages/autocdlg.cxx28
-rw-r--r--cui/source/tabpages/backgrnd.cxx8
-rw-r--r--cui/source/tabpages/border.cxx4
-rw-r--r--cui/source/tabpages/chardlg.cxx16
-rw-r--r--cui/source/tabpages/connect.cxx4
-rw-r--r--cui/source/tabpages/grfpage.cxx4
-rw-r--r--cui/source/tabpages/labdlg.cxx4
-rw-r--r--cui/source/tabpages/macroass.cxx4
-rw-r--r--cui/source/tabpages/measure.cxx4
-rw-r--r--cui/source/tabpages/numfmt.cxx4
-rw-r--r--cui/source/tabpages/numpages.cxx24
-rw-r--r--cui/source/tabpages/page.cxx4
-rw-r--r--cui/source/tabpages/paragrph.cxx16
-rw-r--r--cui/source/tabpages/swpossizetabpage.cxx4
-rw-r--r--cui/source/tabpages/tabstpge.cxx4
-rw-r--r--cui/source/tabpages/textanim.cxx4
-rw-r--r--cui/source/tabpages/textattr.cxx4
-rw-r--r--cui/source/tabpages/tparea.cxx16
-rw-r--r--cui/source/tabpages/tpbitmap.cxx4
-rw-r--r--cui/source/tabpages/tpcolor.cxx4
-rw-r--r--cui/source/tabpages/tpgradnt.cxx4
-rw-r--r--cui/source/tabpages/tphatch.cxx4
-rw-r--r--cui/source/tabpages/tpline.cxx4
-rw-r--r--cui/source/tabpages/tplnedef.cxx4
-rw-r--r--cui/source/tabpages/tplneend.cxx4
-rw-r--r--cui/source/tabpages/tppattern.cxx4
-rw-r--r--cui/source/tabpages/tpshadow.cxx4
-rw-r--r--cui/source/tabpages/tptrans.cxx4
-rw-r--r--cui/source/tabpages/transfrm.cxx12
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPage.cxx4
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPage.hxx2
-rw-r--r--dbaccess/source/ui/dlg/DriverSettings.hxx26
-rw-r--r--dbaccess/source/ui/dlg/UserAdmin.cxx4
-rw-r--r--dbaccess/source/ui/dlg/UserAdmin.hxx2
-rw-r--r--dbaccess/source/ui/dlg/detailpages.cxx50
-rw-r--r--filter/source/pdf/impdialog.cxx24
-rw-r--r--filter/source/pdf/impdialog.hxx12
-rw-r--r--include/sfx2/dinfdlg.hxx8
-rw-r--r--include/sfx2/mgetempl.hxx2
-rw-r--r--include/sfx2/module.hxx3
-rw-r--r--include/sfx2/printopt.hxx2
-rw-r--r--include/sfx2/securitypage.hxx4
-rw-r--r--include/sfx2/tabdlg.hxx26
-rw-r--r--include/sfx2/viewsh.hxx2
-rw-r--r--include/svx/hdft.hxx4
-rw-r--r--include/vcl/svapp.hxx1
-rw-r--r--sc/inc/scmod.hxx2
-rw-r--r--sc/source/ui/app/scmod.cxx4
-rw-r--r--sc/source/ui/attrdlg/tabpages.cxx4
-rw-r--r--sc/source/ui/dbgui/tpsort.cxx8
-rw-r--r--sc/source/ui/dbgui/tpsubt.cxx16
-rw-r--r--sc/source/ui/dbgui/validate.cxx12
-rw-r--r--sc/source/ui/docshell/tpstat.cxx4
-rw-r--r--sc/source/ui/inc/opredlin.hxx2
-rw-r--r--sc/source/ui/inc/prevwsh.hxx2
-rw-r--r--sc/source/ui/inc/scuitphfedit.hxx8
-rw-r--r--sc/source/ui/inc/tabpages.hxx2
-rw-r--r--sc/source/ui/inc/tabvwsh.hxx2
-rw-r--r--sc/source/ui/inc/tpcalc.hxx2
-rw-r--r--sc/source/ui/inc/tpcompatibility.hxx2
-rw-r--r--sc/source/ui/inc/tpdefaults.hxx2
-rw-r--r--sc/source/ui/inc/tpformula.hxx2
-rw-r--r--sc/source/ui/inc/tphf.hxx4
-rw-r--r--sc/source/ui/inc/tpprint.hxx2
-rw-r--r--sc/source/ui/inc/tpsort.hxx4
-rw-r--r--sc/source/ui/inc/tpstat.hxx2
-rw-r--r--sc/source/ui/inc/tpsubt.hxx8
-rw-r--r--sc/source/ui/inc/tptable.hxx2
-rw-r--r--sc/source/ui/inc/tpusrlst.hxx2
-rw-r--r--sc/source/ui/inc/tpview.hxx4
-rw-r--r--sc/source/ui/inc/validate.hxx6
-rw-r--r--sc/source/ui/optdlg/opredlin.cxx4
-rw-r--r--sc/source/ui/optdlg/tpcalc.cxx4
-rw-r--r--sc/source/ui/optdlg/tpcompatibility.cxx4
-rw-r--r--sc/source/ui/optdlg/tpdefaults.cxx4
-rw-r--r--sc/source/ui/optdlg/tpformula.cxx4
-rw-r--r--sc/source/ui/optdlg/tpprint.cxx4
-rw-r--r--sc/source/ui/optdlg/tpusrlst.cxx4
-rw-r--r--sc/source/ui/optdlg/tpview.cxx8
-rw-r--r--sc/source/ui/pagedlg/scuitphfedit.cxx16
-rw-r--r--sc/source/ui/pagedlg/tphf.cxx8
-rw-r--r--sc/source/ui/pagedlg/tptable.cxx4
-rw-r--r--sc/source/ui/view/prevwsh.cxx2
-rw-r--r--sc/source/ui/view/tabvwsh4.cxx2
-rw-r--r--sd/inc/sdmod.hxx2
-rw-r--r--sd/source/ui/app/sdmod2.cxx2
-rw-r--r--sd/source/ui/dlg/paragr.cxx6
-rw-r--r--sd/source/ui/dlg/prntopts.cxx4
-rw-r--r--sd/source/ui/dlg/tpaction.cxx4
-rw-r--r--sd/source/ui/dlg/tpoption.cxx12
-rw-r--r--sd/source/ui/inc/prntopts.hxx2
-rw-r--r--sd/source/ui/inc/tpaction.hxx2
-rw-r--r--sd/source/ui/inc/tpoption.hxx6
-rw-r--r--sfx2/source/appl/module.cxx2
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx16
-rw-r--r--sfx2/source/dialog/documentfontsdialog.cxx4
-rw-r--r--sfx2/source/dialog/mgetempl.cxx4
-rw-r--r--sfx2/source/dialog/printopt.cxx4
-rw-r--r--sfx2/source/dialog/securitypage.cxx4
-rw-r--r--sfx2/source/dialog/tabdlg.cxx15
-rw-r--r--sfx2/source/inc/documentfontsdialog.hxx2
-rw-r--r--sfx2/source/view/viewprn.cxx2
-rw-r--r--starmath/inc/dialog.hxx29
-rw-r--r--starmath/inc/smmod.hxx2
-rw-r--r--starmath/inc/view.hxx2
-rw-r--r--starmath/source/dialog.cxx95
-rw-r--r--starmath/source/smmod.cxx4
-rw-r--r--starmath/source/view.cxx2
-rw-r--r--starmath/uiconfig/smath/ui/smathsettings.ui8
-rw-r--r--svx/source/dialog/hdft.cxx12
-rw-r--r--sw/inc/swmodule.hxx2
-rw-r--r--sw/inc/view.hxx4
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx4
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx4
-rw-r--r--sw/source/ui/chrdlg/numpara.cxx4
-rw-r--r--sw/source/ui/chrdlg/swuiccoll.cxx4
-rw-r--r--sw/source/ui/chrdlg/tblnumfm.cxx2
-rw-r--r--sw/source/ui/config/mailconfigpage.cxx4
-rw-r--r--sw/source/ui/config/optcomp.cxx4
-rw-r--r--sw/source/ui/config/optload.cxx8
-rw-r--r--sw/source/ui/config/optpage.cxx296
-rw-r--r--sw/source/ui/dialog/addrdlg.cxx3
-rw-r--r--sw/source/ui/dialog/docstdlg.cxx4
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx12
-rw-r--r--sw/source/ui/envelp/envfmt.cxx4
-rw-r--r--sw/source/ui/envelp/envfmt.hxx2
-rw-r--r--sw/source/ui/envelp/envlop1.cxx4
-rw-r--r--sw/source/ui/envelp/envprt.cxx4
-rw-r--r--sw/source/ui/envelp/envprt.hxx2
-rw-r--r--sw/source/ui/envelp/label1.cxx16
-rw-r--r--sw/source/ui/envelp/labfmt.cxx4
-rw-r--r--sw/source/ui/envelp/labfmt.hxx2
-rw-r--r--sw/source/ui/envelp/labprt.cxx4
-rw-r--r--sw/source/ui/envelp/labprt.hxx2
-rw-r--r--sw/source/ui/envelp/swuilabimp.hxx8
-rw-r--r--sw/source/ui/fldui/flddb.cxx4
-rw-r--r--sw/source/ui/fldui/flddb.hxx2
-rw-r--r--sw/source/ui/fldui/flddinf.cxx4
-rw-r--r--sw/source/ui/fldui/flddinf.hxx2
-rw-r--r--sw/source/ui/fldui/flddok.cxx4
-rw-r--r--sw/source/ui/fldui/flddok.hxx2
-rw-r--r--sw/source/ui/fldui/fldfunc.cxx4
-rw-r--r--sw/source/ui/fldui/fldfunc.hxx2
-rw-r--r--sw/source/ui/fldui/fldref.cxx4
-rw-r--r--sw/source/ui/fldui/fldref.hxx2
-rw-r--r--sw/source/ui/fldui/fldvar.cxx4
-rw-r--r--sw/source/ui/fldui/fldvar.hxx2
-rw-r--r--sw/source/ui/frmdlg/column.cxx4
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx16
-rw-r--r--sw/source/ui/frmdlg/wrap.cxx4
-rw-r--r--sw/source/ui/index/cnttab.cxx12
-rw-r--r--sw/source/ui/misc/docfnote.cxx8
-rw-r--r--sw/source/ui/misc/impfnote.hxx4
-rw-r--r--sw/source/ui/misc/num.cxx4
-rw-r--r--sw/source/ui/misc/outline.cxx4
-rw-r--r--sw/source/ui/misc/pgfnote.cxx4
-rw-r--r--sw/source/ui/misc/pggrid.cxx4
-rw-r--r--sw/source/ui/table/tabledlg.cxx12
-rw-r--r--sw/source/uibase/app/appopt.cxx4
-rw-r--r--sw/source/uibase/inc/chrdlg.hxx2
-rw-r--r--sw/source/uibase/inc/column.hxx2
-rw-r--r--sw/source/uibase/inc/docstdlg.hxx2
-rw-r--r--sw/source/uibase/inc/drpcps.hxx2
-rw-r--r--sw/source/uibase/inc/envlop.hxx2
-rw-r--r--sw/source/uibase/inc/frmpage.hxx8
-rw-r--r--sw/source/uibase/inc/mailconfigpage.hxx2
-rw-r--r--sw/source/uibase/inc/num.hxx2
-rw-r--r--sw/source/uibase/inc/numpara.hxx2
-rw-r--r--sw/source/uibase/inc/optcomp.hxx2
-rw-r--r--sw/source/uibase/inc/optload.hxx4
-rw-r--r--sw/source/uibase/inc/optpage.hxx77
-rw-r--r--sw/source/uibase/inc/outline.hxx2
-rw-r--r--sw/source/uibase/inc/pgfnote.hxx2
-rw-r--r--sw/source/uibase/inc/pggrid.hxx2
-rw-r--r--sw/source/uibase/inc/pview.hxx2
-rw-r--r--sw/source/uibase/inc/regionsw.hxx6
-rw-r--r--sw/source/uibase/inc/swuiccoll.hxx2
-rw-r--r--sw/source/uibase/inc/swuicnttab.hxx6
-rw-r--r--sw/source/uibase/inc/wrap.hxx2
-rw-r--r--sw/source/uibase/table/tablepg.hxx6
-rw-r--r--sw/source/uibase/uiview/pview.cxx4
-rw-r--r--sw/source/uibase/uiview/viewprt.cxx4
-rw-r--r--sw/uiconfig/swriter/ui/printoptionspage.ui58
-rw-r--r--vcl/inc/salinst.hxx1
-rw-r--r--vcl/source/app/salvtables.cxx5
-rw-r--r--vcl/source/window/builder.cxx5
278 files changed, 930 insertions, 987 deletions
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<