From 60f3e4b843da89678e022eed837ee66e726b1920 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 20 Apr 2018 11:06:07 +0100 Subject: place an intermediate class as parent for SfxTabPages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- chart2/source/controller/dialogs/tp_AxisLabel.cxx | 4 +- chart2/source/controller/dialogs/tp_AxisLabel.hxx | 2 +- .../source/controller/dialogs/tp_AxisPositions.cxx | 4 +- .../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 +- .../controller/dialogs/tp_LegendPosition.cxx | 4 +- .../controller/dialogs/tp_LegendPosition.hxx | 2 +- .../source/controller/dialogs/tp_PointGeometry.cxx | 4 +- .../source/controller/dialogs/tp_PointGeometry.hxx | 2 +- .../source/controller/dialogs/tp_PolarOptions.cxx | 4 +- .../source/controller/dialogs/tp_PolarOptions.hxx | 2 +- chart2/source/controller/dialogs/tp_Scale.cxx | 4 +- chart2/source/controller/dialogs/tp_Scale.hxx | 2 +- .../source/controller/dialogs/tp_SeriesToAxis.cxx | 4 +- .../source/controller/dialogs/tp_SeriesToAxis.hxx | 2 +- .../source/controller/dialogs/tp_TitleRotation.cxx | 8 +- .../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(-) 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 SchAxisLabelTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrs ) +VclPtr SchAxisLabelTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrs ) { - return VclPtr::Create( pParent, *rAttrs ); + return VclPtr::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 Create( vcl::Window* pParent, const SfxItemSet* rInAttrs ); + static VclPtr 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 AxisPositionsTabPage::Create(vcl::Window* pWindow,const SfxItemSet* rOutAttrs) +VclPtr AxisPositionsTabPage::Create(TabPageParent pWindow,const SfxItemSet* rOutAttrs) { - return VclPtr::Create(pWindow, *rOutAttrs); + return VclPtr::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 Create( vcl::Window* pParent, const SfxItemSet* rInAttrs ); + static VclPtr 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 DataLabelsTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rOutAttrs) +VclPtr DataLabelsTabPage::Create(TabPageParent pWindow, const SfxItemSet* rOutAttrs) { - return VclPtr::Create(pWindow, *rOutAttrs); + return VclPtr::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 Create(vcl::Window* pWindow, const SfxItemSet* rInAttrs); + static VclPtr 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 ErrorBarsTabPage::Create( - vcl::Window* pParent, const SfxItemSet* rOutAttrs ) + TabPageParent pParent, const SfxItemSet* rOutAttrs ) { - return VclPtr::Create( pParent, *rOutAttrs ); + return VclPtr::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 Create( vcl::Window* pParent, const SfxItemSet* rInAttrs ); + static VclPtr 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 SchLegendPosTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rOutAttrs) +VclPtr SchLegendPosTabPage::Create(TabPageParent pWindow, const SfxItemSet* rOutAttrs) { - return VclPtr::Create(pWindow, *rOutAttrs); + return VclPtr::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 Create(vcl::Window* pParent, const SfxItemSet* rInAttrs); + static VclPtr 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 SchLayoutTabPage::Create(vcl::Window* pWindow, +VclPtr SchLayoutTabPage::Create(TabPageParent pWindow, const SfxItemSet* rOutAttrs) { - return VclPtr::Create(pWindow, *rOutAttrs); + return VclPtr::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 Create(vcl::Window* pParent, const SfxItemSet* rInAttrs); + static VclPtr 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 PolarOptionsTabPage::Create( vcl::Window* pWindow,const SfxItemSet* rOutAttrs ) +VclPtr PolarOptionsTabPage::Create( TabPageParent pWindow,const SfxItemSet* rOutAttrs ) { - return VclPtr::Create( pWindow, *rOutAttrs ); + return VclPtr::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 Create(vcl::Window* pParent, const SfxItemSet* rInAttrs); + static VclPtr 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 ScaleTabPage::Create(vcl::Window* pWindow,const SfxItemSet* rOutAttrs) +VclPtr ScaleTabPage::Create(TabPageParent pWindow,const SfxItemSet* rOutAttrs) { - return VclPtr::Create(pWindow, *rOutAttrs); + return VclPtr::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 Create( vcl::Window* pParent, const SfxItemSet* rInAttrs ); + static VclPtr 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 SchOptionTabPage::Create(vcl::Window* pWindow, +VclPtr SchOptionTabPage::Create(TabPageParent pWindow, const SfxItemSet* rOutAttrs) { - return VclPtr::Create(pWindow, *rOutAttrs); + return VclPtr::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 Create(vcl::Window* pParent, const SfxItemSet* rInAttrs); + static VclPtr 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 SchAlignmentTabPage::Create(vcl::Window* pParent, +VclPtr SchAlignmentTabPage::Create(TabPageParent pParent, const SfxItemSet* rInAttrs) { - return VclPtr::Create(pParent, *rInAttrs); + return VclPtr::Create(pParent.pParent, *rInAttrs); } -VclPtr SchAlignmentTabPage::CreateWithoutRotation(vcl::Window* pParent, +VclPtr SchAlignmentTabPage::CreateWithoutRotation(TabPageParent pParent, const SfxItemSet* rInAttrs) { - return VclPtr::Create(pParent, *rInAttrs, false); + return VclPtr::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 Create(vcl::Window* pParent, const SfxItemSet* rInAttrs); - static VclPtr CreateWithoutRotation(vcl::Window* pParent, const SfxItemSet* rInAttrs); + static VclPtr Create(TabPageParent pParent, const SfxItemSet* rInAttrs); + static VclPtr 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 TrendlineTabPage::Create( - vcl::Window* pParent, const SfxItemSet* rOutAttrs ) + TabPageParent pParent, const SfxItemSet* rOutAttrs ) { - return VclPtr::Create( pParent, *rOutAttrs ); + return VclPtr::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 Create( vcl::Window* pParent, const SfxItemSet* rInAttrs ); + static VclPtr 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 CreateSvxMenuConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) +VclPtr CreateSvxMenuConfigPage( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::Create( pParent.pParent, *rSet ); } -VclPtr CreateSvxContextMenuConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) +VclPtr CreateSvxContextMenuConfigPage( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr::Create( pParent, *rSet, false ); + return VclPtr::Create( pParent.pParent, *rSet, false ); } -VclPtr CreateKeyboardConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) +VclPtr CreateKeyboardConfigPage( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::Create( pParent.pParent, *rSet ); } -VclPtr CreateSvxToolbarConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) +VclPtr CreateSvxToolbarConfigPage( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::Create( pParent.pParent, *rSet ); } -VclPtr CreateSvxEventConfigPage( vcl::Window *pParent, const SfxItemSet* rSet ) +VclPtr CreateSvxEventConfigPage( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr::Create( pParent, *rSet, SvxEventConfigPage::EarlyInit() ); + return VclPtr::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 TPGalleryThemeGeneral::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr TPGalleryThemeGeneral::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::Create( pParent.pParent, *rSet ); } @@ -796,9 +796,9 @@ void TPGalleryThemeProperties::dispose() } -VclPtr TPGalleryThemeProperties::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr TPGalleryThemeProperties::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::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 Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr 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 Create( vcl::Window* pParent, + static VclPtr 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 Create( vcl::Window* pParent, + static VclPtr 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 Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr 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 Create( vcl::Window* pParent, + static VclPtr 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 Create( vcl::Window* pParent, + static VclPtr 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 Create( vcl::Window* pParent, + static VclPtr 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 Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr 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; static const sal_uInt16 pPageRanges[]; public: - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr 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 Create( vcl::Window*, const SfxItemSet* ); + static VclPtr 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 Create( vcl::Window* pParent, + static VclPtr 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 Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr 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 Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr 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 Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr 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 Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr 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 Create( vcl::Window*, const SfxItemSet* ); + static VclPtr 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 Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rSet ); }; class TPGalleryThemeProperties : public SfxTabPage @@ -296,7 +296,7 @@ public: void StartSearchFiles( const OUString& _rFolderURL, short _nDlgResult ); - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr 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 Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr 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 Create(vcl::Window*, const SfxItemSet*); + static VclPtr 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 Create( vcl::Window*, const SfxItemSet* ); + static VclPtr 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 Create( vcl::Window*, const SfxItemSet* ); + static VclPtr 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 Create( vcl::Window*, const SfxItemSet* ); + static VclPtr Create( TabPageParent, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet * ) override; @@ -473,7 +473,7 @@ public: void Construct(); - static VclPtr Create( vcl::Window*, const SfxItemSet* ); + static VclPtr Create( TabPageParent, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet * ) override; @@ -557,7 +557,7 @@ public: void Construct(); - static VclPtr Create( vcl::Window*, const SfxItemSet* ); + static VclPtr Create( TabPageParent, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet * ) override; @@ -615,7 +615,7 @@ public: void Construct(); - static VclPtr Create( vcl::Window*, const SfxItemSet* ); + static VclPtr Create( TabPageParent, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet * ) override; @@ -734,7 +734,7 @@ public: void Construct(); - static VclPtr Create( vcl::Window*, const SfxItemSet* ); + static VclPtr 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 Create( vcl::Window*, const SfxItemSet* ); + static VclPtr 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 Create( vcl::Window*, const SfxItemSet* ); + static VclPtr Create( TabPageParent, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet * ) override; @@ -365,7 +365,7 @@ public: void Construct(); - static VclPtr Create( vcl::Window*, const SfxItemSet* ); + static VclPtr 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 Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr 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 Create( vcl::Window *pParent, const SfxItemSet *rSet ); + static VclPtr 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 Create( vcl::Window*, const SfxItemSet* ); + static VclPtr 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 Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr 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 Create( vcl::Window*, const SfxItemSet* ); + static VclPtr 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 Create( vcl::Window* pParent, + static VclPtr 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 Create( vcl::Window* pParent, + static VclPtr 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 Create( vcl::Window* pParent, + static VclPtr 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 Create( vcl::Window* pParent, + static VclPtr 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 Create( vcl::Window* pParent, + static VclPtr 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 Create( vcl::Window* pParent, + static VclPtr 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 Create( vcl::Window* pParent, + static VclPtr 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 Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr 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 Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr 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 Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr 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 Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr 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 Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr 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 Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr 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 Create( vcl::Window* pParent, + static VclPtr 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 Create( vcl::Window* pParent, + static VclPtr 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 Create( vcl::Window*, const SfxItemSet* ); + static VclPtr 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 Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr 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 Create( vcl::Window*, const SfxItemSet* ); + static VclPtr 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 Create( vcl::Window*, const SfxItemSet* ); + static VclPtr 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 Create( vcl::Window*, const SfxItemSet* ); + static VclPtr 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 Create( vcl::Window*, const SfxItemSet* ); + static VclPtr 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 Create( vcl::Window*, const SfxItemSet* ); + static VclPtr 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 ConnectionPoolOptionsPage::Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet) + VclPtr ConnectionPoolOptionsPage::Create(TabPageParent _pParent, const SfxItemSet* _rAttrSet) { - return VclPtr::Create(_pParent, *_rAttrSet); + return VclPtr::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 Create(vcl::Window* _pParent, const SfxItemSet* _rAttrSet); + static VclPtr 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 DbRegistrationOptionsPage::Create( vcl::Window* pParent, +VclPtr DbRegistrationOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::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 SvxFontSubstTabPage::Create( vcl::Window* pParent, +VclPtr SvxFontSubstTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::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 Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr 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 SvxAccessibilityOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr SvxAccessibilityOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::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 Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr 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 SvxAsianLayoutPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr SvxAsianLayoutPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::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 SvxBasicIDEOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr SvxBasicIDEOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::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 Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr 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 SvxDefaultColorOptPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrs ) +VclPtr SvxDefaultColorOptPage::Create( TabPageParent pParent, const SfxItemSet* rAttrs ) { - return VclPtr::Create( pParent, *rAttrs ); + return VclPtr::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 Create( vcl::Window* pParent, const SfxItemSet* rInAttrs ); + static VclPtr 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 SvxColorOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr SvxColorOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::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 Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr 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 SvxCTLOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr SvxCTLOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::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 Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr 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 OfaMSFilterTabPage::Create( vcl::Window* pParent, +VclPtr OfaMSFilterTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::Create( pParent.pParent, *rAttrSet ); } bool OfaMSFilterTabPage::FillItemSet( SfxItemSet* ) @@ -188,10 +188,10 @@ void OfaMSFilterTabPage2::dispose() SfxTabPage::dispose(); } -VclPtr OfaMSFilterTabPage2::Create( vcl::Window* pParent, +VclPtr OfaMSFilterTabPage2::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::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 Create( vcl::Window* pParent, + static VclPtr 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 Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr 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 OfaMiscTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr OfaMiscTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::Create( pParent.pParent, *rAttrSet ); } bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet ) @@ -736,9 +736,9 @@ IMPL_LINK_NOARG( OfaViewTabPage, OnAntialiasingToggled, CheckBox&, void ) } #endif -VclPtr OfaViewTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr OfaViewTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::Create(pParent.pParent, *rAttrSet); } bool OfaViewTabPage::FillItemSet( SfxItemSet* ) @@ -1298,9 +1298,9 @@ void OfaLanguagesTabPage::dispose() SfxTabPage::dispose(); } -VclPtr OfaLanguagesTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr OfaLanguagesTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::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 Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr 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 Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr 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 Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr 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 SvxGeneralTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr SvxGeneralTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::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 OfaHtmlTabPage::Create( vcl::Window* pParent, +VclPtr OfaHtmlTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::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 Create( vcl::Window* pParent, + static VclPtr 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 SvxProxyTabPage::Create(vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr SvxProxyTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::Create(pParent.pParent, *rAttrSet); } void SvxProxyTabPage::ReadConfigData_Impl() @@ -870,9 +870,9 @@ void SvxSecurityTabPage::InitControls() } } -VclPtr SvxSecurityTabPage::Create(vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr SvxSecurityTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::Create(pParent.pParent, *rAttrSet); } void SvxSecurityTabPage::ActivatePage( const SfxItemSet& ) @@ -985,9 +985,9 @@ void SvxEMailTabPage::dispose() /* -------------------------------------------------------------------------*/ -VclPtr SvxEMailTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr SvxEMailTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::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 Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr 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 Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr 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 Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr 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 SvxJavaOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr SvxJavaOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::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 Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr 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 SvxJSearchOptionsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr SvxJSearchOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::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 Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr 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 SvxLinguTabPage::Create( vcl::Window* pParent, +VclPtr SvxLinguTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::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 SvxOpenCLTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr SvxOpenCLTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::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 Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr 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 SvxPathTabPage::Create( vcl::Window* pParent, +VclPtr SvxPathTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::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 SvxSaveTabPage::Create( vcl::Window* pParent, +VclPtr SvxSaveTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::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 Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr 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 -SvxOnlineUpdateTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +SvxOnlineUpdateTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::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 Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr 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 SvxPersonalizationTabPage::Create( vcl::Window *pParent, const SfxItemSet *rSet ) +VclPtr SvxPersonalizationTabPage::Create( TabPageParent pParent, const SfxItemSet *rSet ) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::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 Create( vcl::Window *pParent, const SfxItemSet *rSet ); + static VclPtr 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 AlignmentTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr AlignmentTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::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 OfaAutocorrOptionsPage::Create( vcl::Window* pParent, +VclPtr OfaAutocorrOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr::Create(pParent, *rSet); + return VclPtr::Create(pParent.pParent, *rSet); } bool OfaAutocorrOptionsPage::FillItemSet( SfxItemSet* ) @@ -502,10 +502,10 @@ void OfaSwAutoFmtOptionsPage::dispose() SfxTabPage::dispose(); } -VclPtr OfaSwAutoFmtOptionsPage::Create( vcl::Window* pParent, +VclPtr OfaSwAutoFmtOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::Create(pParent.pParent, *rAttrSet); } bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet* ) @@ -927,9 +927,9 @@ void OfaAutocorrReplacePage::dispose() SfxTabPage::dispose(); } -VclPtr OfaAutocorrReplacePage::Create( vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr OfaAutocorrReplacePage::Create( TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr::Create(pParent, *rSet); + return VclPtr::Create(pParent.pParent, *rSet); } void OfaAutocorrReplacePage::ActivatePage( const SfxItemSet& ) @@ -1438,10 +1438,10 @@ void OfaAutocorrExceptPage::dispose() SfxTabPage::dispose(); } -VclPtr OfaAutocorrExceptPage::Create( vcl::Window* pParent, +VclPtr OfaAutocorrExceptPage::Create( TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr::Create(pParent, *rSet); + return VclPtr::Create(pParent.pParent, *rSet); } void OfaAutocorrExceptPage::ActivatePage( const SfxItemSet& ) @@ -1893,10 +1893,10 @@ void OfaQuoteTabPage::dispose() SfxTabPage::dispose(); } -VclPtr OfaQuoteTabPage::Create( vcl::Window* pParent, +VclPtr OfaQuoteTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::Create(pParent.pParent, *rAttrSet); } bool OfaQuoteTabPage::FillItemSet( SfxItemSet* ) @@ -2229,10 +2229,10 @@ void OfaAutoCompleteTabPage::dispose() SfxTabPage::dispose(); } -VclPtr OfaAutoCompleteTabPage::Create( vcl::Window* pParent, +VclPtr OfaAutoCompleteTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::Create( pParent.pParent, *rSet ); } bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet* ) @@ -2481,9 +2481,9 @@ void OfaSmartTagOptionsTabPage::dispose() SfxTabPage::dispose(); } -VclPtr OfaSmartTagOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr OfaSmartTagOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::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 SvxBackgroundTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr SvxBackgroundTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::Create( pParent.pParent, *rAttrSet ); } void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet ) @@ -1549,10 +1549,10 @@ bool SvxBkgTabPage::FillItemSet( SfxItemSet* rCoreSet ) return true; } -VclPtr SvxBkgTabPage::Create( vcl::Window* pWindow, +VclPtr SvxBkgTabPage::Create( TabPageParent pWindow, const SfxItemSet* rAttrs ) { - return VclPtr::Create( pWindow, *rAttrs ); + return VclPtr::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 SvxBorderTabPage::Create( vcl::Window* pParent, +VclPtr SvxBorderTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::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 SvxCharNamePage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr SvxCharNamePage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::Create( pParent.pParent, *rSet ); } @@ -1686,9 +1686,9 @@ DeactivateRC SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet ) } -VclPtr SvxCharEffectsPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr SvxCharEffectsPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::Create( pParent.pParent, *rSet ); } @@ -2742,9 +2742,9 @@ DeactivateRC SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet ) } -VclPtr SvxCharPositionPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr SvxCharPositionPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::Create( pParent.pParent, *rSet ); } @@ -3272,9 +3272,9 @@ DeactivateRC SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet ) } -VclPtr SvxCharTwoLinesPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr SvxCharTwoLinesPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::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 SvxConnectionPage::Create( vcl::Window* pWindow, +VclPtr SvxConnectionPage::Create( TabPageParent pWindow, const SfxItemSet* rAttrs ) { - return VclPtr::Create( pWindow, *rAttrs ); + return VclPtr::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 SvxGrfCropPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) +VclPtr SvxGrfCropPage::Create(TabPageParent pParent, const SfxItemSet *rSet) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::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 SvxCaptionTabPage::Create( vcl::Window* pWindow, +VclPtr SvxCaptionTabPage::Create( TabPageParent pWindow, const SfxItemSet* rOutAttrs ) { - return VclPtr::Create( pWindow, *rOutAttrs ); + return VclPtr::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 SfxMacroTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr 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 SvxMeasurePage::Create( vcl::Window* pWindow, +VclPtr SvxMeasurePage::Create( TabPageParent pWindow, const SfxItemSet* rAttrs ) { - return VclPtr::Create( pWindow, *rAttrs ); + return VclPtr::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 SvxNumberFormatTabPage::Create( vcl::Window* pParent, +VclPtr SvxNumberFormatTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::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 SvxSingleNumPickTabPage::Create( vcl::Window* pParent, +VclPtr SvxSingleNumPickTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::Create(pParent.pParent, *rAttrSet); } bool SvxSingleNumPickTabPage::FillItemSet( SfxItemSet* rSet ) @@ -396,10 +396,10 @@ void SvxBulletPickTabPage::dispose() SfxTabPage::dispose(); } -VclPtr SvxBulletPickTabPage::Create( vcl::Window* pParent, +VclPtr SvxBulletPickTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::Create(pParent.pParent, *rAttrSet); } bool SvxBulletPickTabPage::FillItemSet( SfxItemSet* rSet ) @@ -595,10 +595,10 @@ void SvxNumPickTabPage::dispose() SfxTabPage::dispose(); } -VclPtr SvxNumPickTabPage::Create( vcl::Window* pParent, +VclPtr SvxNumPickTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::Create(pParent.pParent, *rAttrSet); } bool SvxNumPickTabPage::FillItemSet( SfxItemSet* rSet ) @@ -847,10 +847,10 @@ void SvxBitmapPickTabPage::dispose() SfxTabPage::dispose(); } -VclPtr SvxBitmapPickTabPage::Create( vcl::Window* pParent, +VclPtr SvxBitmapPickTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::Create(pParent.pParent, *rAttrSet); } void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet) @@ -1242,10 +1242,10 @@ void SvxNumOptionsTabPage::SetMetric(FieldUnit eMetric) m_pHeightMF->SetUnit( eMetric ); } -VclPtr SvxNumOptionsTabPage::Create( vcl::Window* pParent, +VclPtr SvxNumOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::Create(pParent.pParent, *rAttrSet); }; void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet) @@ -3114,10 +3114,10 @@ void SvxNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode() m_pIndentAtMF->Show( bLabelAlignmentPosAndSpaceModeActive ); } -VclPtr SvxNumPositionTabPage::Create( vcl::Window* pParent, +VclPtr SvxNumPositionTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::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 SvxPageDescPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr SvxPageDescPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::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 SvxStdParagraphTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr SvxStdParagraphTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::Create( pParent.pParent, *rSet ); } bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) @@ -1112,9 +1112,9 @@ DeactivateRC SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet ) return DeactivateRC::LeavePage; } -VclPtr SvxParaAlignTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr SvxParaAlignTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr::Create(pParent, *rSet); + return VclPtr::Create(pParent.pParent, *rSet); } bool SvxParaAlignTabPage::FillItemSet( SfxItemSet* rOutSet ) @@ -1390,10 +1390,10 @@ void SvxParaAlignTabPage::PageCreated (const SfxAllItemSet& aSet) EnableJustifyExt(); } -VclPtr SvxExtParagraphTabPage::Create( vcl::Window* pParent, +VclPtr SvxExtParagraphTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::Create( pParent.pParent, *rSet ); } bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet ) @@ -2267,9 +2267,9 @@ void SvxAsianTabPage::dispose() SfxTabPage::dispose(); } -VclPtr SvxAsianTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr SvxAsianTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr::Create(pParent, *rSet); + return VclPtr::Create(pParent.pParent, *rSet); } const sal_uInt16* SvxAsianTabPage::GetRanges() diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 72d926060c97..d870f8ea77f1 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -730,9 +730,9 @@ void SvxSwPosSizeTabPage::setOptimalRelWidth() m_pHoriLB->Clear(); } -VclPtr SvxSwPosSizeTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr SvxSwPosSizeTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr::Create(pParent, *rSet); + return VclPtr::Create(pParent.pParent, *rSet); } const sal_uInt16* SvxSwPosSizeTabPage::GetRanges() diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 18bb28610461..cc34aaad4d4f 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -259,9 +259,9 @@ bool SvxTabulatorTabPage::FillItemSet(SfxItemSet* rSet) return bModified; } -VclPtr SvxTabulatorTabPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr SvxTabulatorTabPage::Create(TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr::Create(pParent, *rSet); + return VclPtr::Create(pParent.pParent, *rSet); } void SvxTabulatorTabPage::Reset(const SfxItemSet* rSet) diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx index c74c71aabbc0..cb8f10c9afb0 100644 --- a/cui/source/tabpages/textanim.cxx +++ b/cui/source/tabpages/textanim.cxx @@ -470,10 +470,10 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet* rAttrs) |* \************************************************************************/ -VclPtr SvxTextAnimationPage::Create( vcl::Window* pWindow, +VclPtr SvxTextAnimationPage::Create( TabPageParent pWindow, const SfxItemSet* rAttrs ) { - return VclPtr::Create( pWindow, *rAttrs ); + return VclPtr::Create( pWindow.pParent, *rAttrs ); } IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl, ListBox&, void) diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 3c3121bf7e87..1fe363be96ca 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -528,10 +528,10 @@ void SvxTextAttrPage::Construct() m_pTsbWordWrapText->Show( bWordWrapTextEnabled ); } -VclPtr SvxTextAttrPage::Create( vcl::Window* pWindow, +VclPtr SvxTextAttrPage::Create( TabPageParent pWindow, const SfxItemSet* rAttrs ) { - return VclPtr::Create( pWindow, *rAttrs ); + return VclPtr::Create( pWindow.pParent, *rAttrs ); } /** Check whether we have to uncheck the "Full width" check box. diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx index 62e5ccd58594..57492037a1e6 100644 --- a/cui/source/tabpages/tparea.cxx +++ b/cui/source/tabpages/tparea.cxx @@ -131,16 +131,18 @@ SvxAreaTabPage::SvxAreaTabPage( vcl::Window* pParent, const SfxItemSet& rInAttrs SetExchangeSupport(); + TabPageParent aFillTab(m_pFillTab); + // Calculate optimal size of all pages.. - m_pFillTabPage.disposeAndReset(SvxColorTabPage::Create(m_pFillTab, &m_rXFSet)); + m_pFillTabPage.disposeAndReset(SvxColorTabPage::Create(aFillTab, &m_rXFSet)); Size aSize = m_pFillTabPage->GetOptimalSize(); - m_pFillTabPage.disposeAndReset(SvxGradientTabPage::Create(m_pFillTab, &m_rXFSet)); + m_pFillTabPage.disposeAndReset(SvxGradientTabPage::Create(aFillTab, &m_rXFSet)); lclExtendSize(aSize, m_pFillTabPage->GetOptimalSize()); - m_pFillTabPage.disposeAndReset(SvxBitmapTabPage::Create(m_pFillTab, &m_rXFSet)); + m_pFillTabPage.disposeAndReset(SvxBitmapTabPage::Create(aFillTab, &m_rXFSet)); lclExtendSize(aSize, m_pFillTabPage->GetOptimalSize()); - m_pFillTabPage.disposeAndReset(SvxHatchTabPage::Create(m_pFillTab, &m_rXFSet)); + m_pFillTabPage.disposeAndReset(SvxHatchTabPage::Create(aFillTab, &m_rXFSet)); lclExtendSize(aSize, m_pFillTabPage->GetOptimalSize()); - m_pFillTabPage.disposeAndReset(SvxPatternTabPage::Create(m_pFillTab, &m_rXFSet)); + m_pFillTabPage.disposeAndReset(SvxPatternTabPage::Create(aFillTab, &m_rXFSet)); lclExtendSize(aSize, m_pFillTabPage->GetOptimalSize()); m_pFillTabPage.disposeAndClear(); @@ -333,10 +335,10 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs ) } } -VclPtr SvxAreaTabPage::Create( vcl::Window* pWindow, +VclPtr SvxAreaTabPage::Create( TabPageParent pWindow, const SfxItemSet* rAttrs ) { - return VclPtr::Create( pWindow, *rAttrs ); + return VclPtr::Create( pWindow.pParent, *rAttrs ); } namespace { diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 69df65a60225..b6b2d007294f 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -439,10 +439,10 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs ) } -VclPtr SvxBitmapTabPage::Create( vcl::Window* pWindow, +VclPtr SvxBitmapTabPage::Create( TabPageParent pWindow, const SfxItemSet* rAttrs ) { - return VclPtr::Create( pWindow, *rAttrs ); + return VclPtr::Create( pWindow.pParent, *rAttrs ); } diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 0c015d40e92b..0e709f09e0f4 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -308,10 +308,10 @@ void SvxColorTabPage::Reset( const SfxItemSet* rSet ) } -VclPtr SvxColorTabPage::Create( vcl::Window* pWindow, +VclPtr SvxColorTabPage::Create( TabPageParent pWindow, const SfxItemSet* rOutAttrs ) { - return VclPtr::Create( pWindow, *rOutAttrs ); + return VclPtr::Create( pWindow.pParent, *rOutAttrs ); } // is called when the content of the MtrFields is changed for color values diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 3b36e963d6a0..6b5bd18b9202 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -272,10 +272,10 @@ void SvxGradientTabPage::Reset( const SfxItemSet* ) } -VclPtr SvxGradientTabPage::Create( vcl::Window* pWindow, +VclPtr SvxGradientTabPage::Create( TabPageParent pWindow, const SfxItemSet* rOutAttrs ) { - return VclPtr::Create( pWindow, *rOutAttrs ); + return VclPtr::Create( pWindow.pParent, *rOutAttrs ); } IMPL_LINK( SvxGradientTabPage, ModifiedListBoxHdl_Impl, ListBox&, rListBox, void ) diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 7621583f12cd..304a7868ea1b 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -297,10 +297,10 @@ void SvxHatchTabPage::Reset( const SfxItemSet* rSet ) } -VclPtr SvxHatchTabPage::Create( vcl::Window* pWindow, +VclPtr SvxHatchTabPage::Create( TabPageParent pWindow, const SfxItemSet* rSet ) { - return VclPtr::Create( pWindow, *rSet ); + return VclPtr::Create( pWindow.pParent, *rSet ); } IMPL_LINK( SvxHatchTabPage, ModifiedListBoxHdl_Impl, ListBox&, rListBox, void ) diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index 145a30466576..b19981a03ee1 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -1476,10 +1476,10 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs ) } -VclPtr SvxLineTabPage::Create( vcl::Window* pWindow, +VclPtr SvxLineTabPage::Create( TabPageParent pWindow, const SfxItemSet* rAttrs ) { - return VclPtr::Create( pWindow, *rAttrs ); + return VclPtr::Create( pWindow.pParent, *rAttrs ); } IMPL_LINK( SvxLineTabPage, ChangePreviewListBoxHdl_Impl, SvxColorListBox&, rListBox, void ) diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index ab7b9ac74998..4a84e8d52976 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -337,9 +337,9 @@ void SvxLineDefTabPage::Reset( const SfxItemSet* rAttrs ) } -VclPtr SvxLineDefTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) +VclPtr SvxLineDefTabPage::Create( TabPageParent pWindow, const SfxItemSet* rOutAttrs ) { - return VclPtr::Create( pWindow, *rOutAttrs ); + return VclPtr::Create( pWindow.pParent, *rOutAttrs ); } diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 1f1629fbe20f..63bca6e153c7 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -270,9 +270,9 @@ void SvxLineEndDefTabPage::Reset( const SfxItemSet* ) } -VclPtr SvxLineEndDefTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet ) +VclPtr SvxLineEndDefTabPage::Create( TabPageParent pWindow, const SfxItemSet* rSet ) { - return VclPtr::Create( pWindow, *rSet ); + return VclPtr::Create( pWindow.pParent, *rSet ); } diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx index 1e338d04cf11..b312b33c3a1a 100644 --- a/cui/source/tabpages/tppattern.cxx +++ b/cui/source/tabpages/tppattern.cxx @@ -252,10 +252,10 @@ void SvxPatternTabPage::Reset( const SfxItemSet* ) } -VclPtr SvxPatternTabPage::Create( vcl::Window* pWindow, +VclPtr SvxPatternTabPage::Create( TabPageParent pWindow, const SfxItemSet* rSet ) { - return VclPtr::Create( pWindow, *rSet ); + return VclPtr::Create( pWindow.pParent, *rSet ); } diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index ba15f1c4add1..e603ce9f4c1a 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -428,10 +428,10 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs ) } -VclPtr SvxShadowTabPage::Create( vcl::Window* pWindow, +VclPtr SvxShadowTabPage::Create( TabPageParent pWindow, const SfxItemSet* rAttrs ) { - return VclPtr::Create( pWindow, *rAttrs ); + return VclPtr::Create( pWindow.pParent, *rAttrs ); } diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx index a9fc292cd581..c8d99d39c35c 100644 --- a/cui/source/tabpages/tptrans.cxx +++ b/cui/source/tabpages/tptrans.cxx @@ -289,9 +289,9 @@ SvxTransparenceTabPage::SvxTransparenceTabPage(vcl::Window* pParent, const SfxIt SetExchangeSupport(); } -VclPtr SvxTransparenceTabPage::Create(vcl::Window* pWindow, const SfxItemSet* rAttrs) +VclPtr SvxTransparenceTabPage::Create(TabPageParent pWindow, const SfxItemSet* rAttrs) { - return VclPtr::Create(pWindow, *rAttrs); + return VclPtr::Create(pWindow.pParent, *rAttrs); } bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs) diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx index b930cba2804e..b455872dd343 100644 --- a/cui/source/tabpages/transfrm.cxx +++ b/cui/source/tabpages/transfrm.cxx @@ -321,9 +321,9 @@ void SvxAngleTabPage::Reset(const SfxItemSet* rAttrs) } -VclPtr SvxAngleTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rSet) +VclPtr SvxAngleTabPage::Create( TabPageParent pWindow, const SfxItemSet* rSet) { - return VclPtr::Create(pWindow, *rSet); + return VclPtr::Create(pWindow.pParent, *rSet); } @@ -747,9 +747,9 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs) } } -VclPtr SvxSlantTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) +VclPtr SvxSlantTabPage::Create( TabPageParent pWindow, const SfxItemSet* rOutAttrs ) { - return VclPtr::Create( pWindow, *rOutAttrs ); + return VclPtr::Create( pWindow.pParent, *rOutAttrs ); } void SvxSlantTabPage::ActivatePage( const SfxItemSet& rSet ) @@ -1209,9 +1209,9 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet* ) } -VclPtr SvxPositionSizeTabPage::Create( vcl::Window* pWindow, const SfxItemSet* rOutAttrs ) +VclPtr SvxPositionSizeTabPage::Create( TabPageParent pWindow, const SfxItemSet* rOutAttrs ) { - return VclPtr::Create( pWindow, *rOutAttrs ); + return VclPtr::Create( pWindow.pParent, *rOutAttrs ); } diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 670c399fa149..75577db17114 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -77,9 +77,9 @@ namespace dbaui using namespace ::dbtools; using namespace ::svt; - VclPtr OConnectionTabPage::Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) + VclPtr OConnectionTabPage::Create( TabPageParent pParent, const SfxItemSet* _rAttrSet ) { - return VclPtr::Create( pParent, *_rAttrSet ); + return VclPtr::Create( pParent.pParent, *_rAttrSet ); } // OConnectionTabPage diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx index 7b21837dd1ef..089baf330104 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.hxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx @@ -58,7 +58,7 @@ namespace dbaui public: virtual ~OConnectionTabPage() override; virtual void dispose() override; - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* _rAttrSet ); virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) override; virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override; diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx index 8194bfec03a6..4fa30d49b3a4 100644 --- a/dbaccess/source/ui/dlg/DriverSettings.hxx +++ b/dbaccess/source/ui/dlg/DriverSettings.hxx @@ -20,6 +20,7 @@ #define INCLUDED_DBACCESS_SOURCE_UI_DLG_DRIVERSETTINGS_HXX #include +#include #include #include #include @@ -35,49 +36,48 @@ namespace dbaui /** Creates the detail page for ado */ - static VclPtr CreateDbase( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); + static VclPtr CreateDbase( TabPageParent _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for ado */ - static VclPtr CreateAdo( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); + static VclPtr CreateAdo( TabPageParent _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for ODBC */ - static VclPtr CreateODBC( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); + static VclPtr CreateODBC( TabPageParent _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for user */ - static VclPtr CreateUser( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); + static VclPtr CreateUser( TabPageParent _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for MySQLODBC */ - static VclPtr CreateMySQLODBC( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); + static VclPtr CreateMySQLODBC( TabPageParent _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for MySQLJDBC */ - static VclPtr CreateMySQLJDBC( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); + static VclPtr CreateMySQLJDBC( TabPageParent _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for MySQLNATIVE */ - static VclPtr CreateMySQLNATIVE( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); + static VclPtr CreateMySQLNATIVE( TabPageParent _pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for Oracle JDBC */ - static VclPtr CreateOracleJDBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet ); + static VclPtr CreateOracleJDBC( TabPageParent pParent, const SfxItemSet* _rAttrSet ); /** Creates the detail page for LDAP */ - static VclPtr CreateLDAP( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); + static VclPtr CreateLDAP( TabPageParent _pParent, const SfxItemSet* _rAttrSet ); /// Creates the detail page for Text - static VclPtr CreateText( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); - + static VclPtr CreateText( TabPageParent _pParent, const SfxItemSet* _rAttrSet ); /// creates the GeneratedValues page - static VclPtr CreateGeneratedValuesPage( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); + static VclPtr CreateGeneratedValuesPage( TabPageParent _pParent, const SfxItemSet* _rAttrSet ); /// creates the "Special Settings" page of the "Advanced Settings" dialog - static VclPtr CreateSpecialSettingsPage( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ); + static VclPtr CreateSpecialSettingsPage( TabPageParent _pParent, const SfxItemSet* _rAttrSet ); }; } diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index 84869c3f3ee9..0daf9f8f13d9 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -202,9 +202,9 @@ void OUserAdmin::FillUserNames() } -VclPtr OUserAdmin::Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) +VclPtr OUserAdmin::Create( TabPageParent pParent, const SfxItemSet* _rAttrSet ) { - return VclPtr::Create( pParent, *_rAttrSet ); + return VclPtr::Create( pParent.pParent, *_rAttrSet ); } IMPL_LINK( OUserAdmin, UserHdl, Button *, pButton, void ) diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx index 17fa0bdf5454..c7a1cbb96913 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.hxx +++ b/dbaccess/source/ui/dlg/UserAdmin.hxx @@ -60,7 +60,7 @@ class OUserAdmin final : public OGenericAdministrationPage OUserAdmin( vcl::Window* pParent, const SfxItemSet& _rCoreAttrs); public: - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* _rAttrSet ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* _rAttrSet ); virtual ~OUserAdmin() override; virtual void dispose() override; diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index cc3fba28d0ff..67da68cd9834 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -209,9 +209,9 @@ namespace dbaui OCommonBehaviourTabPage::dispose(); } - VclPtr ODriversSettings::CreateDbase( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) + VclPtr ODriversSettings::CreateDbase( TabPageParent pParent, const SfxItemSet* _rAttrSet ) { - return VclPtr::Create( pParent, *_rAttrSet ); + return VclPtr::Create( pParent.pParent, *_rAttrSet ); } void ODbaseDetailsPage::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) @@ -269,9 +269,9 @@ namespace dbaui } - VclPtr ODriversSettings::CreateAdo( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) + VclPtr ODriversSettings::CreateAdo( TabPageParent pParent, const SfxItemSet* _rAttrSet ) { - return VclPtr::Create( pParent, *_rAttrSet ); + return VclPtr::Create( pParent.pParent, *_rAttrSet ); } // OOdbcDetailsPage @@ -293,9 +293,9 @@ namespace dbaui OCommonBehaviourTabPage::dispose(); } - VclPtr ODriversSettings::CreateODBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) + VclPtr ODriversSettings::CreateODBC( TabPageParent pParent, const SfxItemSet* _rAttrSet ) { - return VclPtr::Create( pParent, *_rAttrSet ); + return VclPtr::Create( pParent.pParent, *_rAttrSet ); } bool OOdbcDetailsPage::FillItemSet( SfxItemSet* _rSet ) @@ -346,9 +346,9 @@ namespace dbaui OCommonBehaviourTabPage::dispose(); } - VclPtr ODriversSettings::CreateUser( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) + VclPtr ODriversSettings::CreateUser( TabPageParent pParent, const SfxItemSet* _rAttrSet ) { - return VclPtr::Create( pParent, *_rAttrSet ); + return VclPtr::Create( pParent.pParent, *_rAttrSet ); } bool OUserDriverDetailsPage::FillItemSet( SfxItemSet* _rSet ) @@ -403,9 +403,9 @@ namespace dbaui { } - VclPtr ODriversSettings::CreateMySQLODBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) + VclPtr ODriversSettings::CreateMySQLODBC( TabPageParent pParent, const SfxItemSet* _rAttrSet ) { - return VclPtr::Create( pParent, *_rAttrSet ); + return VclPtr::Create( pParent.pParent, *_rAttrSet ); } // OMySQLJDBCDetailsPage @@ -641,18 +641,19 @@ namespace dbaui OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue); } - VclPtr ODriversSettings::CreateMySQLJDBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) + VclPtr ODriversSettings::CreateMySQLJDBC( TabPageParent pParent, const SfxItemSet* _rAttrSet ) { - return VclPtr::Create( pParent, *_rAttrSet,DSID_MYSQL_PORTNUMBER ); + return VclPtr::Create( pParent.pParent, *_rAttrSet,DSID_MYSQL_PORTNUMBER ); } - VclPtr ODriversSettings::CreateMySQLNATIVE( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) + + VclPtr ODriversSettings::CreateMySQLNATIVE( TabPageParent pParent, const SfxItemSet* _rAttrSet ) { - return VclPtr::Create( pParent, *_rAttrSet ); + return VclPtr::Create( pParent.pParent, *_rAttrSet ); } - VclPtr ODriversSettings::CreateOracleJDBC( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) + VclPtr ODriversSettings::CreateOracleJDBC( TabPageParent pParent, const SfxItemSet* _rAttrSet ) { - return VclPtr::Create( pParent, *_rAttrSet,DSID_ORACLE_PORTNUMBER, false); + return VclPtr::Create( pParent.pParent, *_rAttrSet,DSID_ORACLE_PORTNUMBER, false); } // OLDAPDetailsPage @@ -690,9 +691,9 @@ namespace dbaui OCommonBehaviourTabPage::dispose(); } - VclPtr ODriversSettings::CreateLDAP( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) + VclPtr ODriversSettings::CreateLDAP( TabPageParent pParent, const SfxItemSet* _rAttrSet ) { - return VclPtr::Create( pParent, *_rAttrSet ); + return VclPtr::Create( pParent.pParent, *_rAttrSet ); } bool OLDAPDetailsPage::FillItemSet( SfxItemSet* _rSet ) @@ -764,10 +765,11 @@ namespace dbaui OCommonBehaviourTabPage::dispose(); } - VclPtr ODriversSettings::CreateText( vcl::Window* pParent, const SfxItemSet* _rAttrSet ) + VclPtr ODriversSettings::CreateText( TabPageParent pParent, const SfxItemSet* _rAttrSet ) { - return VclPtr::Create( pParent, *_rAttrSet ); + return VclPtr::Create( pParent.pParent, *_rAttrSet ); } + void OTextDetailsPage::fillControls(std::vector< ISaveValueWrapper* >& _rControlList) { OCommonBehaviourTabPage::fillControls(_rControlList); @@ -802,16 +804,16 @@ namespace dbaui return m_pTextConnectionHelper->prepareLeave(); } - VclPtr ODriversSettings::CreateGeneratedValuesPage( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ) + VclPtr ODriversSettings::CreateGeneratedValuesPage( TabPageParent _pParent, const SfxItemSet* _rAttrSet ) { - return VclPtr::Create( _pParent, *_rAttrSet ); + return VclPtr::Create( _pParent.pParent, *_rAttrSet ); } - VclPtr ODriversSettings::CreateSpecialSettingsPage( vcl::Window* _pParent, const SfxItemSet* _rAttrSet ) + VclPtr ODriversSettings::CreateSpecialSettingsPage( TabPageParent _pParent, const SfxItemSet* _rAttrSet ) { OUString eType = ODbDataSourceAdministrationHelper::getDatasourceType( *_rAttrSet ); DataSourceMetaData aMetaData( eType ); - return VclPtr::Create( _pParent, *_rAttrSet, aMetaData ); + return VclPtr::Create( _pParent.pParent, *_rAttrSet, aMetaData ); } } // namespace dbaui diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx index 90a79968ada6..e3db5f18bc7e 100644 --- a/filter/source/pdf/impdialog.cxx +++ b/filter/source/pdf/impdialog.cxx @@ -739,10 +739,10 @@ void ImpPDFTabGeneralPage::GetFilterConfigItem( ImpPDFTabDialog* paParent ) } -VclPtr ImpPDFTabGeneralPage::Create( vcl::Window* pParent, +VclPtr ImpPDFTabGeneralPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::Create( pParent.pParent, *rAttrSet ); } @@ -935,10 +935,10 @@ void ImpPDFTabOpnFtrPage::dispose() } -VclPtr ImpPDFTabOpnFtrPage::Create( vcl::Window* pParent, +VclPtr ImpPDFTabOpnFtrPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::Create( pParent.pParent, *rAttrSet ); } @@ -1120,10 +1120,10 @@ IMPL_LINK_NOARG( ImpPDFTabViewerPage, ToggleRbBookmarksHdl, RadioButton&, void ) } -VclPtr ImpPDFTabViewerPage::Create( vcl::Window* pParent, +VclPtr ImpPDFTabViewerPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::Create( pParent.pParent, *rAttrSet ); } @@ -1240,10 +1240,10 @@ void ImpPDFTabSecurityPage::dispose() } -VclPtr ImpPDFTabSecurityPage::Create( vcl::Window* pParent, +VclPtr ImpPDFTabSecurityPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::Create( pParent.pParent, *rAttrSet ); } @@ -1471,10 +1471,10 @@ void ImpPDFTabLinksPage::dispose() } -VclPtr ImpPDFTabLinksPage::Create( vcl::Window* pParent, +VclPtr ImpPDFTabLinksPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::Create( pParent.pParent, *rAttrSet ); } @@ -1735,10 +1735,10 @@ IMPL_LINK_NOARG( ImpPDFTabSigningPage, ClickmaPbSignCertClear, Button*, void ) } -VclPtr ImpPDFTabSigningPage::Create( vcl::Window* pParent, +VclPtr ImpPDFTabSigningPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::Create( pParent.pParent, *rAttrSet ); } diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index f65ffafc05e4..bb9e1582e6dd 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -247,7 +247,7 @@ public: virtual ~ImpPDFTabGeneralPage() override; virtual void dispose() override; - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rAttrSet); void GetFilterConfigItem(ImpPDFTabDialog* paParent); void SetFilterConfigItem(ImpPDFTabDialog* paParent); @@ -287,7 +287,7 @@ public: virtual ~ImpPDFTabOpnFtrPage() override; virtual void dispose() override; - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); void GetFilterConfigItem( ImpPDFTabDialog* paParent); void SetFilterConfigItem( const ImpPDFTabDialog* paParent ); @@ -320,7 +320,7 @@ public: virtual ~ImpPDFTabViewerPage() override; virtual void dispose() override; - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); void GetFilterConfigItem( ImpPDFTabDialog* paParent); void SetFilterConfigItem( const ImpPDFTabDialog* paParent ); @@ -374,7 +374,7 @@ public: virtual ~ImpPDFTabSecurityPage() override; virtual void dispose() override; - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); void GetFilterConfigItem( ImpPDFTabDialog* paParent); void SetFilterConfigItem( const ImpPDFTabDialog* paParent ); @@ -405,7 +405,7 @@ public: virtual ~ImpPDFTabLinksPage() override; virtual void dispose() override; - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); void GetFilterConfigItem( ImpPDFTabDialog* paParent); void SetFilterConfigItem( const ImpPDFTabDialog* paParent ); @@ -434,7 +434,7 @@ public: virtual ~ImpPDFTabSigningPage() override; virtual void dispose() override; - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); void GetFilterConfigItem( ImpPDFTabDialog* paParent); void SetFilterConfigItem( const ImpPDFTabDialog* paParent ); diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index c1f003832be6..9516b74868d8 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -214,7 +214,7 @@ protected: public: SfxDocumentPage( vcl::Window* pParent, const SfxItemSet& ); - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* ); void EnableUseUserData(); }; @@ -239,7 +239,7 @@ protected: public: SfxDocumentDescPage( vcl::Window* pParent, const SfxItemSet& ); - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* ); }; // class SfxDocumentInfoDialog ------------------------------------------- @@ -515,7 +515,7 @@ protected: public: SfxCustomPropertiesPage( vcl::Window* pParent, const SfxItemSet& ); - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* ); }; struct CmisValue : public VclBuilderContainer @@ -637,7 +637,7 @@ public: virtual ~SfxCmisPropertiesPage() override; virtual void dispose() override; - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* ); virtual void SetPosSizePixel(const Point& rAllocPos, const Size& rAllocation) override; virtual void SetSizePixel(const Size& rAllocation) override; virtual void SetPosPixel(const Point& rAllocPos) override; diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx index 641af7abff96..2a86859b17cd 100644 --- a/include/sfx2/mgetempl.hxx +++ b/include/sfx2/mgetempl.hxx @@ -81,7 +81,7 @@ friend class SfxStyleDialog; virtual ~SfxManageStyleSheetPage() override; virtual void dispose() override; - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* ); virtual bool FillItemSet(SfxItemSet *) override; virtual void Reset(const SfxItemSet *) override; diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx index 352d1e46ba6f..ef60ed219326 100644 --- a/include/sfx2/module.hxx +++ b/include/sfx2/module.hxx @@ -25,6 +25,7 @@ #include #include #include +#include #include #include #include @@ -78,7 +79,7 @@ public: void RegisterStatusBarControl(const SfxStbCtrlFactory&); virtual VclPtr CreateTabPage( sal_uInt16 nId, - vcl::Window* pParent, + TabPageParent pParent, const SfxItemSet& rSet ); virtual void Invalidate(sal_uInt16 nId = 0) override; diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx index 82a94ed22747..cd8a43c97546 100644 --- a/include/sfx2/printopt.hxx +++ b/include/sfx2/printopt.hxx @@ -98,7 +98,7 @@ public: virtual vcl::Window* GetParentLabeledBy( const vcl::Window* pLabel ) const override; virtual vcl::Window* GetParentLabelFor( const vcl::Window* pLabel ) const override; - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* ); }; #endif // INCLUDED_SFX2_PRINTOPT_HXX diff --git a/include/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx index cfb28f1443b8..67d27d076b84 100644 --- a/include/sfx2/securitypage.hxx +++ b/include/sfx2/securitypage.hxx @@ -36,8 +36,8 @@ protected: virtual void Reset( const SfxItemSet* ) override; public: - SfxSecurityPage( vcl::Window* pParent, const SfxItemSet& ); - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* ); + SfxSecurityPage(vcl::Window* pParent, const SfxItemSet&); + static VclPtr Create(TabPageParent pParent, const SfxItemSet*); }; diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 65eb615fe6f1..72ba2378fcfe 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -39,7 +40,23 @@ class SfxViewFrame; class SfxTabPage; class SfxBindings; -typedef VclPtr (*CreateTabPage)(vcl::Window *pParent, const SfxItemSet *rAttrSet); +struct TabPageParent +{ + TabPageParent(vcl::Window* _pParent) + : pParent(_pParent) + , pPage(nullptr) + { + } + TabPageParent(weld::Window* _pPage) + : pParent(nullptr) + , pPage(_pPage) + { + } + VclPtr pParent; + weld::Widget* pPage; +}; + +typedef VclPtr (*CreateTabPage)(TabPageParent pParent, const SfxItemSet *rAttrSet); typedef const sal_uInt16* (*GetTabPageRanges)(); // provides international Which-value struct TabPageImpl; @@ -234,7 +251,12 @@ private: std::unique_ptr< TabPageImpl > pImpl; protected: - SfxTabPage(vcl::Window *pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *rAttrSet); + std::unique_ptr m_xBuilder; + std::unique_ptr m_xContainer; + +protected: + SfxTabPage(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet *rAttrSet); + SfxTabPage(TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet *rAttrSet); sal_uInt16 GetWhich( sal_uInt16 nSlot, bool bDeep = true ) const { return pSet->GetPool()->GetWhich( nSlot, bDeep ); } diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx index 19356714b329..f29f94c87591 100644 --- a/include/sfx2/viewsh.hxx +++ b/include/sfx2/viewsh.hxx @@ -244,7 +244,7 @@ public: virtual SfxPrinter* GetPrinter( bool bCreate = false ); virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL ); virtual bool HasPrintOptionsPage() const; - virtual VclPtr CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ); + virtual VclPtr CreatePrintOptionsPage( TabPageParent pParent, const SfxItemSet &rOptions ); Printer* GetActivePrinter() const; // Working set diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx index 6ce1508b225a..dbca1f993e38 100644 --- a/include/svx/hdft.hxx +++ b/include/svx/hdft.hxx @@ -105,7 +105,7 @@ private: class SVX_DLLPUBLIC SvxHeaderPage : public SvxHFPage { public: - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rSet ); // returns the Which values to the range static const sal_uInt16* GetRanges() { return pRanges; } SVX_DLLPRIVATE SvxHeaderPage( vcl::Window* pParent, const SfxItemSet& rSet ); @@ -116,7 +116,7 @@ public: class SVX_DLLPUBLIC SvxFooterPage : public SvxHFPage { public: - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return pRanges; } SVX_DLLPRIVATE SvxFooterPage( vcl::Window* pParent, const SfxItemSet& rSet ); }; diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 6d39a6b67efe..e28b774b98c5 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -1396,6 +1396,7 @@ public: static void setDeInitHook(Link const & hook); static weld::Builder* CreateBuilder(weld::Widget* pParent, const OUString &rUIFile); + static weld::Builder* CreateInterimBuilder(vcl::Window* pParent, const OUString &rUIFile); //for the duration of same SfxTabPages in mixed parent types static weld::MessageDialog* CreateMessageDialog(weld::Widget* pParent, VclMessageType eMessageType, VclButtonsType eButtonType, const OUString& rPrimaryMessage); diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index 34cd82b10b6b..b3399439417a 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -232,7 +232,7 @@ public: // virtual methods for the options dialog virtual std::unique_ptr CreateItemSet( sal_uInt16 nId ) override; virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) override; - virtual VclPtr CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) override; + virtual VclPtr CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) override; virtual SfxStyleFamilies* CreateStyleFamilies() override; void SetInSharedDocLoading( bool bNew ) { mbIsInSharedDocLoading = bNew; } diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index f13ea7092623..6e05952509f2 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -2036,7 +2036,7 @@ void ScModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) } } -VclPtr ScModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) +VclPtr ScModule::CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) { VclPtr pRet; ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); @@ -2058,7 +2058,7 @@ VclPtr ScModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent break; } case SID_SC_TP_GRID: - pRet = SvxGridTabPage::Create(pParent, rSet); + pRet = SvxGridTabPage::Create(pParent.pParent, rSet); break; case SID_SC_TP_USERLISTS: { diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx index 16ac977d387b..b260542ab3af 100644 --- a/sc/source/ui/attrdlg/tabpages.cxx +++ b/sc/source/ui/attrdlg/tabpages.cxx @@ -70,9 +70,9 @@ void ScTabPageProtection::dispose() SfxTabPage::dispose(); } -VclPtr ScTabPageProtection::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr ScTabPageProtection::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::Create( pParent.pParent, *rAttrSet ); } void ScTabPageProtection::Reset( const SfxItemSet* rCoreAttrs ) diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 296816f5e253..82621de88e70 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -143,10 +143,10 @@ void ScTabPageSortFields::Init() } } -VclPtr ScTabPageSortFields::Create( vcl::Window* pParent, +VclPtr ScTabPageSortFields::Create( TabPageParent pParent, const SfxItemSet* rArgSet ) { - return VclPtr::Create( pParent, *rArgSet ); + return VclPtr::Create( pParent.pParent, *rArgSet ); } void ScTabPageSortFields::Reset( const SfxItemSet* /* rArgSet */ ) @@ -626,10 +626,10 @@ void ScTabPageSortOptions::Init() m_pLbLanguage->InsertLanguage( LANGUAGE_SYSTEM ); } -VclPtr ScTabPageSortOptions::Create( vcl::Window* pParent, +VclPtr ScTabPageSortOptions::Create( TabPageParent pParent, const SfxItemSet* rArgSet ) { - return VclPtr::Create( pParent, *rArgSet ); + return VclPtr::Create( pParent.pParent, *rArgSet ); } void ScTabPageSortOptions::Reset( const SfxItemSet* /* rArgSet */ ) diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index c333c31306bd..b087c5dd058c 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -392,22 +392,22 @@ IMPL_LINK( ScTpSubTotalGroup, CheckHdl, SvTreeListBox*, pLb, void ) // Derived Group TabPages: -VclPtr ScTpSubTotalGroup1::Create( vcl::Window* pParent, +VclPtr ScTpSubTotalGroup1::Create( TabPageParent pParent, const SfxItemSet* rArgSet ) { - return VclPtr::Create( pParent, *rArgSet ); + return VclPtr::Create( pParent.pParent, *rArgSet ); } -VclPtr ScTpSubTotalGroup2::Create( vcl::Window* pParent, +VclPtr ScTpSubTotalGroup2::Create( TabPageParent pParent, const SfxItemSet* rArgSet ) { - return VclPtr::Create( pParent, *rArgSet ); + return VclPtr::Create( pParent.pParent, *rArgSet ); } -VclPtr ScTpSubTotalGroup3::Create( vcl::Window* pParent, +VclPtr ScTpSubTotalGroup3::Create( TabPageParent pParent, const SfxItemSet* rArgSet ) { - return VclPtr::Create( pParent, *rArgSet ); + return VclPtr::Create( pParent.pParent, *rArgSet ); } ScTpSubTotalGroup1::ScTpSubTotalGroup1( vcl::Window* pParent, const SfxItemSet& rArgSet ) : @@ -497,10 +497,10 @@ void ScTpSubTotalOptions::Init() FillUserSortListBox(); } -VclPtr ScTpSubTotalOptions::Create( vcl::Window* pParent, +VclPtr ScTpSubTotalOptions::Create( TabPageParent pParent, const SfxItemSet* rArgSet ) { - return VclPtr::Create( pParent, *rArgSet ); + return VclPtr::Create( pParent.pParent, *rArgSet ); } void ScTpSubTotalOptions::Reset( const SfxItemSet* /* rArgSet */ ) diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx index 15fee73d70b6..1161b2a90e48 100644 --- a/sc/source/ui/dbgui/validate.cxx +++ b/sc/source/ui/dbgui/validate.cxx @@ -410,9 +410,9 @@ void ScTPValidationValue::Init() CheckHdl( nullptr ); } -VclPtr ScTPValidationValue::Create( vcl::Window* pParent, const SfxItemSet* rArgSet ) +VclPtr ScTPValidationValue::Create( TabPageParent pParent, const SfxItemSet* rArgSet ) { - return VclPtr::Create( pParent, *rArgSet ); + return VclPtr::Create( pParent.pParent, *rArgSet ); } void ScTPValidationValue::Reset( const SfxItemSet* rArgSet ) @@ -705,10 +705,10 @@ void ScTPValidationHelp::Init() pTsbHelp->EnableTriState( false ); } -VclPtr ScTPValidationHelp::Create( vcl::Window* pParent, +VclPtr ScTPValidationHelp::Create( TabPageParent pParent, const SfxItemSet* rArgSet ) { - return VclPtr::Create( pParent, *rArgSet ); + return VclPtr::Create( pParent.pParent, *rArgSet ); } void ScTPValidationHelp::Reset( const SfxItemSet* rArgSet ) @@ -787,10 +787,10 @@ void ScTPValidationError::Init() SelectActionHdl( *m_pLbAction.get() ); } -VclPtr ScTPValidationError::Create( vcl::Window* pParent, +VclPtr ScTPValidationError::Create( TabPageParent pParent, const SfxItemSet* rArgSet ) { - return VclPtr::Create( pParent, *rArgSet ); + return VclPtr::Create( pParent.pParent, *rArgSet ); } void ScTPValidationError::Reset( const SfxItemSet* rArgSet ) diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx index e81bad25910d..d4fcbfddb58e 100644 --- a/sc/source/ui/docshell/tpstat.cxx +++ b/sc/source/ui/docshell/tpstat.cxx @@ -26,9 +26,9 @@ // Dokumentinfo-Tabpage: -VclPtr ScDocStatPage::Create( vcl::Window *pParent, const SfxItemSet* rSet ) +VclPtr ScDocStatPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::Create( pParent.pParent, *rSet ); } ScDocStatPage::ScDocStatPage( vcl::Window *pParent, const SfxItemSet& rSet ) diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx index 69d1bfb31db4..766200cd7cee 100644 --- a/sc/source/ui/inc/opredlin.hxx +++ b/sc/source/ui/inc/opredlin.hxx @@ -46,7 +46,7 @@ public: ScRedlineOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~ScRedlineOptionsTabPage() override; virtual void dispose() override; - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx index 82a4b348f719..179e6b1de882 100644 --- a/sc/source/ui/inc/prevwsh.hxx +++ b/sc/source/ui/inc/prevwsh.hxx @@ -105,7 +105,7 @@ public: virtual SfxPrinter* GetPrinter( bool bCreate = false ) override; virtual sal_uInt16 SetPrinter( SfxPrinter* pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL ) override; virtual bool HasPrintOptionsPage() const override; - virtual VclPtr CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ) override; + virtual VclPtr CreatePrintOptionsPage( TabPageParent pParent, const SfxItemSet &rOptions ) override; void AddAccessibilityObject( SfxListener& rObject ); void RemoveAccessibilityObject( SfxListener& rObject ); diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index 0ac59c31eed1..825bd22b57b6 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -106,7 +106,7 @@ class ScRightHeaderEditPage : public ScHFEditPage { friend class VclPtr; public: - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rCoreSet ); private: ScRightHeaderEditPage( vcl::Window* pParent, const SfxItemSet& rSet ); @@ -116,7 +116,7 @@ class ScLeftHeaderEditPage : public ScHFEditPage { friend class VclPtr; public: - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rCoreSet ); private: ScLeftHeaderEditPage( vcl::Window* pParent, const SfxItemSet& rSet ); @@ -126,7 +126,7 @@ class ScRightFooterEditPage : public ScHFEditPage { friend class VclPtr; public: - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rCoreSet ); private: ScRightFooterEditPage( vcl::Window* pParent, const SfxItemSet& rSet ); @@ -136,7 +136,7 @@ class ScLeftFooterEditPage : public ScHFEditPage { friend class VclPtr; public: - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rCoreSet ); private: ScLeftFooterEditPage( vcl::Window* pParent, const SfxItemSet& rSet ); diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx index 5671f0d4761e..cb5373537438 100644 --- a/sc/source/ui/inc/tabpages.hxx +++ b/sc/source/ui/inc/tabpages.hxx @@ -28,7 +28,7 @@ class ScTabPageProtection : public SfxTabPage friend class VclPtr; static const sal_uInt16 pProtectionRanges[]; public: - static VclPtr Create ( vcl::Window* pParent, + static VclPtr Create ( TabPageParent pParent, const SfxItemSet* rAttrSet ); static const sal_uInt16* GetRanges () { return pProtectionRanges; } virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) override; diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx index 00f883ab4237..17bc4ecf1b76 100644 --- a/sc/source/ui/inc/tabvwsh.hxx +++ b/sc/source/ui/inc/tabvwsh.hxx @@ -318,7 +318,7 @@ public: SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL ) override; virtual bool HasPrintOptionsPage() const override; - virtual VclPtr CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ) override; + virtual VclPtr CreatePrintOptionsPage( TabPageParent pParent, const SfxItemSet &rOptions ) override; void ConnectObject( const SdrOle2Obj* pObj ); void ActivateObject( SdrOle2Obj* pObj, long nVerb ); diff --git a/sc/source/ui/inc/tpcalc.hxx b/sc/source/ui/inc/tpcalc.hxx index 3108604820a9..4e43b776fa62 100644 --- a/sc/source/ui/inc/tpcalc.hxx +++ b/sc/source/ui/inc/tpcalc.hxx @@ -32,7 +32,7 @@ class ScTpCalcOptions : public SfxTabPage { friend class VclPtr; public: - static VclPtr Create ( vcl::Window* pParent, + static VclPtr Create ( TabPageParent pParent, const SfxItemSet* rCoreSet ); virtual bool FillItemSet ( SfxItemSet* rCoreSet ) override; virtual void Reset ( const SfxItemSet* rCoreSet ) override; diff --git a/sc/source/ui/inc/tpcompatibility.hxx b/sc/source/ui/inc/tpcompatibility.hxx index 1b84b0c17ea1..8430b637228e 100644 --- a/sc/source/ui/inc/tpcompatibility.hxx +++ b/sc/source/ui/inc/tpcompatibility.hxx @@ -20,7 +20,7 @@ class ScTpCompatOptions : public SfxTabPage public: using SfxTabPage::DeactivatePage; - static VclPtr Create (vcl::Window* pParent, const SfxItemSet* rCoreAttrs); + static VclPtr Create (TabPageParent pParent, const SfxItemSet* rCoreAttrs); virtual bool FillItemSet(SfxItemSet* rCoreAttrs) override; virtual void Reset(const SfxItemSet* rCoreAttrs) override; diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx index b93fe336c136..7808f31a2556 100644 --- a/sc/source/ui/inc/tpdefaults.hxx +++ b/sc/source/ui/inc/tpdefaults.hxx @@ -20,7 +20,7 @@ class ScTpDefaultsOptions : public SfxTabPage public: using SfxTabPage::DeactivatePage; - static VclPtr Create (vcl::Window* pParent, const SfxItemSet* rCoreSet); + static VclPtr Create (TabPageParent pParent, const SfxItemSet* rCoreSet); virtual bool FillItemSet(SfxItemSet* rCoreSet) override; virtual void Reset(const SfxItemSet* rCoreSet) override; diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index 0848f791c60d..22445b7586ec 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -35,7 +35,7 @@ class ScTpFormulaOptions : public SfxTabPage public: using SfxTabPage::DeactivatePage; - static VclPtr Create (vcl::Window* pParent, const SfxItemSet* rCoreSet); + static VclPtr Create (TabPageParent pParent, const SfxItemSet* rCoreSet); virtual bool FillItemSet(SfxItemSet* rCoreSet) override; virtual void Reset( const SfxItemSet* rCoreSet ) override; diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx index eadfedd9a256..9fd7324a398d 100644 --- a/sc/source/ui/inc/tphf.hxx +++ b/sc/source/ui/inc/tphf.hxx @@ -62,7 +62,7 @@ class ScHeaderPage : public ScHFPage { friend class VclPtr; public: - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); private: @@ -73,7 +73,7 @@ class ScFooterPage : public ScHFPage { friend class VclPtr; public: - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); private: diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx index 9de8060bdfda..fb201a5b852c 100644 --- a/sc/source/ui/inc/tpprint.hxx +++ b/sc/source/ui/inc/tpprint.hxx @@ -34,7 +34,7 @@ class ScTpPrintOptions : public SfxTabPage public: virtual ~ScTpPrintOptions() override; virtual void dispose() override; - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rCoreSet ); virtual bool FillItemSet( SfxItemSet* rCoreSet ) override; virtual void Reset( const SfxItemSet* rCoreSet ) override; using SfxTabPage::DeactivatePage; diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 1438693455ff..660d9eb3141f 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -50,7 +50,7 @@ public: const SfxItemSet& rArgSet ); virtual ~ScTabPageSortFields() override; virtual void dispose() override; - static VclPtr Create ( vcl::Window* pParent, + static VclPtr Create ( TabPageParent pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; virtual void Reset ( const SfxItemSet* rArgSet ) override; @@ -110,7 +110,7 @@ public: #undef SfxTabPage #define SfxTabPage ::SfxTabPage - static VclPtr Create ( vcl::Window* pParent, + static VclPtr Create ( TabPageParent pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; virtual void Reset ( const SfxItemSet* rArgSet ) override; diff --git a/sc/source/ui/inc/tpstat.hxx b/sc/source/ui/inc/tpstat.hxx index 9afc120c3ec4..299b703fcf11 100644 --- a/sc/source/ui/inc/tpstat.hxx +++ b/sc/source/ui/inc/tpstat.hxx @@ -27,7 +27,7 @@ class ScDocStatPage: public SfxTabPage { friend class VclPtr; public: - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rSet ); virtual ~ScDocStatPage() override; virtual void dispose() override; diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx index 0b01d8e4c52e..8b2bfee98e15 100644 --- a/sc/source/ui/inc/tpsubt.hxx +++ b/sc/source/ui/inc/tpsubt.hxx @@ -85,7 +85,7 @@ class ScTpSubTotalGroup1 final : public ScTpSubTotalGroup public: virtual ~ScTpSubTotalGroup1() override; - static VclPtr Create ( vcl::Window* pParent, + static VclPtr Create ( TabPageParent pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; virtual void Reset ( const SfxItemSet* rArgSet ) override; @@ -100,7 +100,7 @@ class ScTpSubTotalGroup2 final : public ScTpSubTotalGroup public: virtual ~ScTpSubTotalGroup2() override; - static VclPtr Create ( vcl::Window* pParent, + static VclPtr Create ( TabPageParent pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; virtual void Reset ( const SfxItemSet* rArgSet ) override; @@ -115,7 +115,7 @@ class ScTpSubTotalGroup3 final : public ScTpSubTotalGroup public: virtual ~ScTpSubTotalGroup3() override; - static VclPtr Create ( vcl::Window* pParent, + static VclPtr Create ( TabPageParent pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; virtual void Reset ( const SfxItemSet* rArgSet ) override; @@ -126,7 +126,7 @@ class ScTpSubTotalOptions final : public SfxTabPage public: virtual ~ScTpSubTotalOptions() override; virtual void dispose() override; - static VclPtr Create ( vcl::Window* pParent, + static VclPtr Create ( TabPageParent pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; virtual void Reset ( const SfxItemSet* rArgSet ) override; diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index 3b01422a68ce..bd952480aafa 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -30,7 +30,7 @@ class ScTablePage : public SfxTabPage friend class VclPtr; static const sal_uInt16 pPageTableRanges[]; public: - static VclPtr Create ( vcl::Window* pParent, + static VclPtr Create ( TabPageParent pParent, const SfxItemSet* rCoreSet ); static const sal_uInt16* GetRanges () { return pPageTableRanges; } virtual bool FillItemSet ( SfxItemSet* rCoreSet ) override; diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx index 8e5af6e49b47..6e84d2e442f8 100644 --- a/sc/source/ui/inc/tpusrlst.hxx +++ b/sc/source/ui/inc/tpusrlst.hxx @@ -34,7 +34,7 @@ class ScTpUserLists : public SfxTabPage { friend class VclPtr; public: - static VclPtr Create ( vcl::Window* pParent, + static VclPtr Create ( TabPageParent pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) override; virtual void Reset ( const SfxItemSet* rCoreAttrs ) override; diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 6ac52a2d1cd6..5453fd6d6020 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -72,7 +72,7 @@ class ScTpContentOptions : public SfxTabPage virtual void dispose() override; public: - static VclPtr Create ( vcl::Window* pParent, + static VclPtr Create ( TabPageParent pParent, const SfxItemSet* rCoreSet ); virtual bool FillItemSet ( SfxItemSet* rCoreSet ) override; virtual void Reset ( const SfxItemSet* rCoreSet ) override; @@ -115,7 +115,7 @@ class ScTpLayoutOptions : public SfxTabPage public: virtual ~ScTpLayoutOptions() override; virtual void dispose() override; - static VclPtr Create ( vcl::Window* pParent, + static VclPtr Create ( TabPageParent pParent, const SfxItemSet* rCoreSet ); virtual bool FillItemSet ( SfxItemSet* rCoreSet ) override; virtual void Reset ( const SfxItemSet* rCoreSet ) override; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 4d67bd6ed0c0..e05e3ec63b21 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -84,7 +84,7 @@ public: explicit ScTPValidationValue( vcl::Window* pParent, const SfxItemSet& rArgSet ); virtual ~ScTPValidationValue() override; virtual void dispose() override; - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rArgSet ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rArgSet ); static const sal_uInt16* GetRanges() { return pValueRanges; } virtual bool FillItemSet( SfxItemSet* rArgSet ) override; @@ -271,7 +271,7 @@ public: virtual ~ScTPValidationHelp() override; virtual void dispose() override; - static VclPtr Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); + static VclPtr Create ( TabPageParent pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; virtual void Reset ( const SfxItemSet* rArgSet ) override; }; @@ -297,7 +297,7 @@ public: virtual ~ScTPValidationError() override; virtual void dispose() override; - static VclPtr Create ( vcl::Window* pParent, const SfxItemSet* rArgSet ); + static VclPtr Create ( TabPageParent pParent, const SfxItemSet* rArgSet ); virtual bool FillItemSet ( SfxItemSet* rArgSet ) override; virtual void Reset ( const SfxItemSet* rArgSet ) override; }; diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index 4cee5bf1a1b6..b64670dce78e 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -65,9 +65,9 @@ void ScRedlineOptionsTabPage::dispose() SfxTabPage::dispose(); } -VclPtr ScRedlineOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr ScRedlineOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::Create( pParent.pParent, *rSet ); } bool ScRedlineOptionsTabPage::FillItemSet( SfxItemSet* /* rSet */ ) diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx index af66b3e3c5f2..1c3900b5ea31 100644 --- a/sc/source/ui/optdlg/tpcalc.cxx +++ b/sc/source/ui/optdlg/tpcalc.cxx @@ -108,9 +108,9 @@ void ScTpCalcOptions::Init() m_pBtnThread->SetClickHdl( LINK( this, ScTpCalcOptions, CheckClickHdl ) ); } -VclPtr ScTpCalcOptions::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr ScTpCalcOptions::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::Create( pParent.pParent, *rAttrSet ); } void ScTpCalcOptions::Reset( const SfxItemSet* /* rCoreAttrs */ ) diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx index 55e171a41265..593ac69610be 100644 --- a/sc/source/ui/optdlg/tpcompatibility.cxx +++ b/sc/source/ui/optdlg/tpcompatibility.cxx @@ -31,9 +31,9 @@ void ScTpCompatOptions::dispose() SfxTabPage::dispose(); } -VclPtr ScTpCompatOptions::Create(vcl::Window *pParent, const SfxItemSet *rCoreAttrs) +VclPtr ScTpCompatOptions::Create(TabPageParent pParent, const SfxItemSet *rCoreAttrs) { - return VclPtr::Create(pParent, *rCoreAttrs); + return VclPtr::Create(pParent.pParent, *rCoreAttrs); } bool ScTpCompatOptions::FillItemSet(SfxItemSet *rCoreAttrs) diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx index 5e6ef5338ac6..c252b96edf9d 100644 --- a/sc/source/ui/optdlg/tpdefaults.cxx +++ b/sc/source/ui/optdlg/tpdefaults.cxx @@ -39,9 +39,9 @@ void ScTpDefaultsOptions::dispose() SfxTabPage::dispose(); } -VclPtr ScTpDefaultsOptions::Create(vcl::Window *pParent, const SfxItemSet *rCoreAttrs) +VclPtr ScTpDefaultsOptions::Create(TabPageParent pParent, const SfxItemSet *rCoreAttrs) { - return VclPtr::Create(pParent, *rCoreAttrs); + return VclPtr::Create(pParent.pParent, *rCoreAttrs); } bool ScTpDefaultsOptions::FillItemSet(SfxItemSet *rCoreSet) diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx index 3d950155c6b9..75b3482fefde 100644 --- a/sc/source/ui/optdlg/tpformula.cxx +++ b/sc/source/ui/optdlg/tpformula.cxx @@ -228,9 +228,9 @@ IMPL_LINK( ScTpFormulaOptions, SepEditOnFocusHdl, Control&, rControl, void ) OnFocusSeparatorInput(static_cast(&rControl)); } -VclPtr ScTpFormulaOptions::Create(vcl::Window* pParent, const SfxItemSet* rCoreSet) +VclPtr ScTpFormulaOptions::Create(TabPageParent pParent, const SfxItemSet* rCoreSet) { - return VclPtr::Create(pParent, *rCoreSet); + return VclPtr::Create(pParent.pParent, *rCoreSet); } bool ScTpFormulaOptions::FillItemSet(SfxItemSet* rCoreSet) diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx index 1b6a7c300f97..9c8dcbc77300 100644 --- a/sc/source/ui/optdlg/tpprint.cxx +++ b/sc/source/ui/optdlg/tpprint.cxx @@ -51,9 +51,9 @@ void ScTpPrintOptions::dispose() SfxTabPage::dispose(); } -VclPtr ScTpPrintOptions::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr ScTpPrintOptions::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::Create( pParent.pParent, *rAttrSet ); } DeactivateRC ScTpPrintOptions::DeactivatePage( SfxItemSet* pSetP ) diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx index 7671b1e65a4d..85f7c0dea701 100644 --- a/sc/source/ui/optdlg/tpusrlst.cxx +++ b/sc/source/ui/optdlg/tpusrlst.cxx @@ -148,9 +148,9 @@ void ScTpUserLists::Init() } -VclPtr ScTpUserLists::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr ScTpUserLists::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::Create( pParent.pParent, *rAttrSet ); } void ScTpUserLists::Reset( const SfxItemSet* rCoreAttrs ) diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index a7151bded5e7..cf7a953795ed 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -126,10 +126,10 @@ void ScTpContentOptions::dispose() SfxTabPage::dispose(); } -VclPtr ScTpContentOptions::Create( vcl::Window* pParent, +VclPtr ScTpContentOptions::Create( TabPageParent pParent, const SfxItemSet* rCoreSet ) { - return VclPtr::Create(pParent, *rCoreSet); + return VclPtr::Create(pParent.pParent, *rCoreSet); } bool ScTpContentOptions::FillItemSet( SfxItemSet* rCoreSet ) @@ -409,10 +409,10 @@ void ScTpLayoutOptions::dispose() } -VclPtr ScTpLayoutOptions::Create( vcl::Window* pParent, +VclPtr ScTpLayoutOptions::Create( TabPageParent pParent, const SfxItemSet* rCoreSet ) { - VclPtrInstance pNew( pParent, *rCoreSet ); + VclPtrInstance pNew( pParent.pParent, *rCoreSet ); ScDocShell* pDocSh = dynamic_cast< ScDocShell *>( SfxObjectShell::Current() ); if(pDocSh!=nullptr) diff --git a/sc/source/ui/pagedlg/scuitphfedit.cxx b/sc/source/ui/pagedlg/scuitphfedit.cxx index 33ec160f79f2..3d1192b7f7fc 100644 --- a/sc/source/ui/pagedlg/scuitphfedit.cxx +++ b/sc/source/ui/pagedlg/scuitphfedit.cxx @@ -831,9 +831,9 @@ ScRightHeaderEditPage::ScRightHeaderEditPage( vcl::Window* pParent, const SfxIte true ) {} -VclPtr ScRightHeaderEditPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) +VclPtr ScRightHeaderEditPage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet ) { - return VclPtr::Create( pParent, *rCoreSet ); + return VclPtr::Create( pParent.pParent, *rCoreSet ); } // class ScLeftHeaderEditPage @@ -845,9 +845,9 @@ ScLeftHeaderEditPage::ScLeftHeaderEditPage( vcl::Window* pParent, const SfxItemS true ) {} -VclPtr ScLeftHeaderEditPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) +VclPtr ScLeftHeaderEditPage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet ) { - return VclPtr::Create( pParent, *rCoreSet ); + return VclPtr::Create( pParent.pParent, *rCoreSet ); } // class ScRightFooterEditPage @@ -859,9 +859,9 @@ ScRightFooterEditPage::ScRightFooterEditPage( vcl::Window* pParent, const SfxIte false ) {} -VclPtr ScRightFooterEditPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) +VclPtr ScRightFooterEditPage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet ) { - return VclPtr::Create( pParent, *rCoreSet ); + return VclPtr::Create( pParent.pParent, *rCoreSet ); } // class ScLeftFooterEditPage @@ -873,9 +873,9 @@ ScLeftFooterEditPage::ScLeftFooterEditPage( vcl::Window* pParent, const SfxItemS false ) {} -VclPtr ScLeftFooterEditPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) +VclPtr ScLeftFooterEditPage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet ) { - return VclPtr::Create( pParent, *rCoreSet ); + return VclPtr::Create( pParent.pParent, *rCoreSet ); }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index ba90213b054a..3d5bcf672304 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -243,9 +243,9 @@ ScHeaderPage::ScHeaderPage( vcl::Window* pParent, const SfxItemSet& rSet ) { } -VclPtr ScHeaderPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) +VclPtr ScHeaderPage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet ) { - return VclPtr::Create( pParent, *rCoreSet ); + return VclPtr::Create( pParent.pParent, *rCoreSet ); } const sal_uInt16* ScHeaderPage::GetRanges() @@ -260,9 +260,9 @@ ScFooterPage::ScFooterPage( vcl::Window* pParent, const SfxItemSet& rSet ) { } -VclPtr ScFooterPage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) +VclPtr ScFooterPage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet ) { - return VclPtr::Create( pParent, *rCoreSet ); + return VclPtr::Create( pParent.pParent, *rCoreSet ); } const sal_uInt16* ScFooterPage::GetRanges() diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index 59f388d486c9..2a47713659f9 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -166,9 +166,9 @@ void ScTablePage::dispose() SfxTabPage::dispose(); } -VclPtr ScTablePage::Create( vcl::Window* pParent, const SfxItemSet* rCoreSet ) +VclPtr ScTablePage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet ) { - return VclPtr::Create( pParent, *rCoreSet ); + return VclPtr::Create( pParent.pParent, *rCoreSet ); } void ScTablePage::Reset( const SfxItemSet* rCoreSet ) diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index f5ddf74e8853..ac3f87758d0a 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -516,7 +516,7 @@ bool ScPreviewShell::HasPrintOptionsPage() const return true; } -VclPtr ScPreviewShell::CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ) +VclPtr ScPreviewShell::CreatePrintOptionsPage( TabPageParent pParent, const SfxItemSet &rOptions ) { ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx index 3eae8487e3c9..f5d0815f1570 100644 --- a/sc/source/ui/view/tabvwsh4.cxx +++ b/sc/source/ui/view/tabvwsh4.cxx @@ -1049,7 +1049,7 @@ bool ScTabViewShell::HasPrintOptionsPage() const return true; } -VclPtr ScTabViewShell::CreatePrintOptionsPage( vcl::Window *pParent, const SfxItemSet &rOptions ) +VclPtr ScTabViewShell::CreatePrintOptionsPage( TabPageParent pParent, const SfxItemSet &rOptions ) { ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); OSL_ENSURE(pFact, "ScAbstractFactory create fail!"); diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index 1c5e3848711a..51085fcc1cf1 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -112,7 +112,7 @@ public: // virtual methods for the option dialog virtual std::unique_ptr CreateItemSet( sal_uInt16 nId ) override; virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) override; - virtual VclPtr CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) override; + virtual VclPtr CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) override; virtual SfxStyleFamilies* CreateStyleFamilies() override; SdExtPropertySetInfoCache gImplImpressPropertySetInfoCache; diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx index 37a862294b29..5429a9b69e1a 100644 --- a/sd/source/ui/app/sdmod2.cxx +++ b/sd/source/ui/app/sdmod2.cxx @@ -740,7 +740,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet ) pViewShell->GetViewFrame()->GetBindings().InvalidateAll( true ); } -VclPtr SdModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) +VclPtr SdModule::CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) { VclPtr pRet; SfxAllItemSet aSet(*(rSet.GetPool())); diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx index 82c6a5f72daf..3b7aa7698cc6 100644 --- a/sd/source/ui/dlg/paragr.cxx +++ b/sd/source/ui/dlg/paragr.cxx @@ -39,7 +39,7 @@ public: virtual ~SdParagraphNumTabPage() override; virtual void dispose() override; - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rSet ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges(); virtual bool FillItemSet( SfxItemSet* rSet ) override; @@ -82,9 +82,9 @@ void SdParagraphNumTabPage::dispose() SfxTabPage::dispose(); } -VclPtr SdParagraphNumTabPage::Create(vcl::Window *pParent, const SfxItemSet * rAttrSet) +VclPtr SdParagraphNumTabPage::Create(TabPageParent pParent, const SfxItemSet * rAttrSet) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::Create( pParent.pParent, *rAttrSet ); } const sal_uInt16* SdParagraphNumTabPage::GetRanges() diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx index 4673c0c25d71..ea553b13be7c 100644 --- a/sd/source/ui/dlg/prntopts.cxx +++ b/sd/source/ui/dlg/prntopts.cxx @@ -202,10 +202,10 @@ void SdPrintOptions::Reset( const SfxItemSet* rAttrs ) ClickBookletHdl( nullptr ); } -VclPtr SdPrintOptions::Create( vcl::Window* pWindow, +VclPtr SdPrintOptions::Create( TabPageParent pWindow, const SfxItemSet* rOutAttrs ) { - return VclPtr::Create( pWindow, *rOutAttrs ); + return VclPtr::Create( pWindow.pParent, *rOutAttrs ); } IMPL_LINK( SdPrintOptions, ClickCheckboxHdl, Button*, pCbx, void ) diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 406062052629..188068ed595c 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -372,10 +372,10 @@ DeactivateRC SdTPAction::DeactivatePage( SfxItemSet* pPageSet ) return DeactivateRC::LeavePage; } -VclPtr SdTPAction::Create( vcl::Window* pWindow, +VclPtr SdTPAction::Create( TabPageParent pWindow, const SfxItemSet& rAttrs ) { - return VclPtr::Create( pWindow, rAttrs ); + return VclPtr::Create( pWindow.pParent, rAttrs ); } void SdTPAction::UpdateTree() diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx index a7381b2abd38..53c4487681fb 100644 --- a/sd/source/ui/dlg/tpoption.cxx +++ b/sd/source/ui/dlg/tpoption.cxx @@ -100,10 +100,10 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs ) pCbxRotate->GetClickHdl().Call(nullptr); } -VclPtr SdTpOptionsSnap::Create( vcl::Window* pWindow, +VclPtr SdTpOptionsSnap::Create( TabPageParent pWindow, const SfxItemSet* rAttrs ) { - return VclPtr::Create( pWindow, *rAttrs ); + return VclPtr::Create( pWindow.pParent, *rAttrs ); } /************************************************************************* @@ -173,10 +173,10 @@ void SdTpOptionsContents::Reset( const SfxItemSet* rAttrs ) m_pCbxHandlesBezier->SaveValue(); } -VclPtr SdTpOptionsContents::Create( vcl::Window* pWindow, +VclPtr SdTpOptionsContents::Create( TabPageParent pWindow, const SfxItemSet* rAttrs ) { - return VclPtr::Create( pWindow, *rAttrs ); + return VclPtr::Create( pWindow.pParent, *rAttrs ); } /************************************************************************* @@ -526,10 +526,10 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs ) UpdateCompatibilityControls (); } -VclPtr SdTpOptionsMisc::Create( vcl::Window* pWindow, +VclPtr SdTpOptionsMisc::Create( TabPageParent pWindow, const SfxItemSet* rAttrs ) { - return VclPtr::Create( pWindow, *rAttrs ); + return VclPtr::Create( pWindow.pParent, *rAttrs ); } IMPL_LINK_NOARG(SdTpOptionsMisc, SelectMetricHdl_Impl, ListBox&, void) diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx index 3b64109e1dc5..bf3074247f16 100644 --- a/sd/source/ui/inc/prntopts.hxx +++ b/sd/source/ui/inc/prntopts.hxx @@ -63,7 +63,7 @@ public: virtual ~SdPrintOptions() override; virtual void dispose() override; - static VclPtr Create( vcl::Window*, const SfxItemSet* ); + static VclPtr Create( TabPageParent, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet * ) override; diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index 8ca9566ab438..fce151ba92a8 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -95,7 +95,7 @@ public: virtual ~SdTPAction() override; virtual void dispose() override; - static VclPtr Create( vcl::Window*, const SfxItemSet& ); + static VclPtr Create( TabPageParent, const SfxItemSet& ); virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet * ) override; diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index 11ecd30a78a5..7970c6c1b331 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -37,7 +37,7 @@ public: SdTpOptionsSnap( vcl::Window* pParent, const SfxItemSet& rInAttrs ); virtual ~SdTpOptionsSnap() override; - static VclPtr Create( vcl::Window*, const SfxItemSet* ); + static VclPtr Create( TabPageParent, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet * ) override; @@ -59,7 +59,7 @@ public: virtual ~SdTpOptionsContents() override; virtual void dispose() override; - static VclPtr Create( vcl::Window*, const SfxItemSet* ); + static VclPtr Create( TabPageParent, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet * ) override; }; @@ -133,7 +133,7 @@ public: virtual ~SdTpOptionsMisc() override; virtual void dispose() override; - static VclPtr Create( vcl::Window*, const SfxItemSet* ); + static VclPtr Create( TabPageParent, const SfxItemSet* ); virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet * ) override; diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index 060cc8b7e68e..39274e31b8c6 100644 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -188,7 +188,7 @@ SfxChildWinFactArr_Impl* SfxModule::GetChildWinFactories_Impl() const return pImpl->pFactArr.get(); } -VclPtr SfxModule::CreateTabPage( sal_uInt16, vcl::Window*, const SfxItemSet& ) +VclPtr SfxModule::CreateTabPage(sal_uInt16, TabPageParent, const SfxItemSet&) { return VclPtr(); } diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 86977473f966..017ca402dd89 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -634,9 +634,9 @@ void SfxDocumentDescPage::dispose() SfxTabPage::dispose(); } -VclPtr SfxDocumentDescPage::Create(vcl::Window *pParent, const SfxItemSet *rItemSet) +VclPtr SfxDocumentDescPage::Create(TabPageParent pParent, const SfxItemSet *rItemSet) { - return VclPtr::Create(pParent, *rItemSet); + return VclPtr::Create(pParent.pParent, *rItemSet); } bool SfxDocumentDescPage::FillItemSet(SfxItemSet *rSet) @@ -930,9 +930,9 @@ void SfxDocumentPage::ImplCheckPasswordState() m_pChangePassBtn->Disable(); } -VclPtr SfxDocumentPage::Create( vcl::Window* pParent, const SfxItemSet* rItemSet ) +VclPtr SfxDocumentPage::Create( TabPageParent pParent, const SfxItemSet* rItemSet ) { - return VclPtr::Create( pParent, *rItemSet ); + return VclPtr::Create( pParent.pParent, *rItemSet ); } void SfxDocumentPage::EnableUseUserData() @@ -2221,9 +2221,9 @@ DeactivateRC SfxCustomPropertiesPage::DeactivatePage( SfxItemSet* /*pSet*/ ) return nRet; } -VclPtr SfxCustomPropertiesPage::Create( vcl::Window* pParent, const SfxItemSet* rItemSet ) +VclPtr SfxCustomPropertiesPage::Create( TabPageParent pParent, const SfxItemSet* rItemSet ) { - return VclPtr::Create( pParent, *rItemSet ); + return VclPtr::Create( pParent.pParent, *rItemSet ); } CmisValue::CmisValue( vcl::Window* pParent, const OUString& aStr ) @@ -2717,9 +2717,9 @@ DeactivateRC SfxCmisPropertiesPage::DeactivatePage( SfxItemSet* /*pSet*/ ) return DeactivateRC::LeavePage; } -VclPtr SfxCmisPropertiesPage::Create( vcl::Window* pParent, const SfxItemSet* rItemSet ) +VclPtr SfxCmisPropertiesPage::Create( TabPageParent pParent, const SfxItemSet* rItemSet ) { - return VclPtr::Create( pParent, *rItemSet ); + return VclPtr::Create( pParent.pParent, *rItemSet ); } void SfxCmisPropertiesPage::SetPosSizePixel(const Point& rAllocPos, const Size& rAllocation) diff --git a/sfx2/source/dialog/documentfontsdialog.cxx b/sfx2/source/dialog/documentfontsdialog.cxx index abf8af73a747..77177c7f3eeb 100644 --- a/sfx2/source/dialog/documentfontsdialog.cxx +++ b/sfx2/source/dialog/documentfontsdialog.cxx @@ -23,9 +23,9 @@ using namespace ::com::sun::star; -VclPtr SfxDocumentFontsPage::Create( vcl::Window* parent, const SfxItemSet* set ) +VclPtr SfxDocumentFontsPage::Create(TabPageParent parent, const SfxItemSet* set) { - return VclPtr::Create( parent, *set ); + return VclPtr::Create( parent.pParent, *set ); } SfxDocumentFontsPage::SfxDocumentFontsPage( vcl::Window* parent, const SfxItemSet& set ) diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index 77eed3e403e7..611a7359b9f9 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -534,10 +534,10 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet* /*rAttrSet*/ ) } -VclPtr SfxManageStyleSheetPage::Create( vcl::Window* pParent, +VclPtr SfxManageStyleSheetPage::Create( TabPageParent pParent, const SfxItemSet *rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::Create( pParent.pParent, *rAttrSet ); } diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index 65f9ea8e1e9a..c50da65acdbc 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -113,9 +113,9 @@ void SfxCommonPrintOptionsTabPage::dispose() SfxTabPage::dispose(); } -VclPtr SfxCommonPrintOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr SfxCommonPrintOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::Create( pParent.pParent, *rAttrSet ); } vcl::Window* SfxCommonPrintOptionsTabPage::GetParentLabeledBy( const vcl::Window* pWindow ) const diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index 8633a5e0eff9..cea3583a98cc 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -415,9 +415,9 @@ IMPL_LINK_NOARG(SfxSecurityPage_Impl, ChangeProtectionPBHdl, Button*, void) } -VclPtr SfxSecurityPage::Create( vcl::Window * pParent, const SfxItemSet * rItemSet ) +VclPtr SfxSecurityPage::Create( TabPageParent pParent, const SfxItemSet * rItemSet ) { - return VclPtr::Create( pParent, *rItemSet ); + return VclPtr::Create( pParent.pParent, *rItemSet ); } diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index d4db8a054e4a..c63a62e3fdc5 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -164,6 +164,17 @@ SfxTabPage::SfxTabPage(vcl::Window *pParent, const OString& rID, const OUString& { } +SfxTabPage::SfxTabPage(TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet *rAttrSet) + : TabPage(Application::GetDefDialogParent()) //just drag this along hidden in this scenario + , pSet ( rAttrSet ) + , bHasExchangeSupport ( false ) + , pImpl ( new TabPageImpl ) + , m_xBuilder(pParent.pPage ? Application::CreateBuilder(pParent.pPage, rUIXMLDescription) + : Application::CreateInterimBuilder(pParent.pParent, rUIXMLDescription)) + , m_xContainer(m_xBuilder->weld_container(rID)) +{ +} + SfxTabPage::~SfxTabPage() { disposeOnce(); @@ -172,6 +183,8 @@ SfxTabPage::~SfxTabPage() void SfxTabPage::dispose() { pImpl.reset(); + m_xContainer.reset(); + m_xBuilder.reset(); TabPage::dispose(); } @@ -1107,7 +1120,7 @@ IMPL_LINK( SfxTabDialog, ActivatePageHdl, TabControl *, pTabCtrl, void ) if ( !pTabPage ) { if ( m_pSet ) - pTabPage = (pDataObject->fnCreatePage)( pTabCtrl, m_pSet ); + pTabPage = (pDataObject->fnCreatePage)( static_cast(pTabCtrl), m_pSet ); else pTabPage = (pDataObject->fnCreatePage) ( pTabCtrl, CreateInputItemSet( nId ) ); diff --git a/sfx2/source/inc/documentfontsdialog.hxx b/sfx2/source/inc/documentfontsdialog.hxx index 4e1b12d6648e..486055954ab1 100644 --- a/sfx2/source/inc/documentfontsdialog.hxx +++ b/sfx2/source/inc/documentfontsdialog.hxx @@ -31,7 +31,7 @@ public: SfxDocumentFontsPage( vcl::Window* parent, const SfxItemSet& set ); virtual ~SfxDocumentFontsPage() override; virtual void dispose() override; - static VclPtr Create( vcl::Window* parent, const SfxItemSet* set ); + static VclPtr Create(TabPageParent parent, const SfxItemSet* set); protected: virtual bool FillItemSet( SfxItemSet* set ) override; virtual void Reset( const SfxItemSet* set ) override; diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 580a4b4295dd..44cc9d509045 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -897,7 +897,7 @@ sal_uInt16 SfxViewShell::SetPrinter( SfxPrinter* /*pNewPrinter*/, SfxPrinterChan VclPtr SfxViewShell::CreatePrintOptionsPage ( - vcl::Window* /*pParent*/, + TabPageParent /*pParent*/, const SfxItemSet& /*rOptions*/ ) { diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index cd860e5649b1..86d1753d974e 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -52,28 +52,27 @@ void SetFontStyle(const OUString &rStyleName, vcl::Font &rFont); class SmPrintOptionsTabPage : public SfxTabPage { - VclPtr m_pTitle; - VclPtr m_pText; - VclPtr m_pFrame; - VclPtr m_pSizeNormal; - VclPtr m_pSizeScaled; - VclPtr m_pSizeZoomed; - VclPtr m_pZoom; - VclPtr m_pNoRightSpaces; - VclPtr m_pSaveOnlyUsedSymbols; - VclPtr m_pAutoCloseBrackets; - - DECL_LINK(SizeButtonClickHdl, Button *, void); + std::unique_ptr m_xTitle; + std::unique_ptr m_xText; + std::unique_ptr m_xFrame; + std::unique_ptr m_xSizeNormal; + std::unique_ptr m_xSizeScaled; + std::unique_ptr m_xSizeZoomed; + std::unique_ptr m_xZoom; + std::unique_ptr m_xNoRightSpaces; + std::unique_ptr m_xSaveOnlyUsedSymbols; + std::unique_ptr m_xAutoCloseBrackets; + + DECL_LINK(SizeButtonClickHdl, weld::ToggleButton&, void); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; public: - static VclPtr Create(vcl::Window *pWindow, const SfxItemSet &rSet); + static VclPtr Create(TabPageParent pWindow, const SfxItemSet &rSet); - SmPrintOptionsTabPage(vcl::Window *pParent, const SfxItemSet &rOptions); + SmPrintOptionsTabPage(TabPageParent pPage, const SfxItemSet &rOptions); virtual ~SmPrintOptionsTabPage() override; - virtual void dispose() override; }; /**************************************************************************/ diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx index 81e21241264b..8080028aa44b 100644 --- a/starmath/inc/smmod.hxx +++ b/starmath/inc/smmod.hxx @@ -99,7 +99,7 @@ public: //virtual methods for options dialog virtual std::unique_ptr CreateItemSet( sal_uInt16 nId ) override; virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) override; - virtual VclPtr CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) override; + virtual VclPtr CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) override; }; #define SM_MOD() ( static_cast(SfxApplication::GetModule(SfxToolsModule::Math)) ) diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index 5950e9e7731e..7b6e741895bb 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -251,7 +251,7 @@ protected: void InsertFrom(SfxMedium &rMedium); virtual bool HasPrintOptionsPage() const override; - virtual VclPtr CreatePrintOptionsPage(vcl::Window *pParent, + virtual VclPtr CreatePrintOptionsPage(TabPageParent pParent, const SfxItemSet &rOptions) override; virtual void Deactivate(bool IsMDIActivate) override; virtual void Activate(bool IsMDIActivate) override; diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index e1f744c053f3..267cdca90009 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -151,99 +151,78 @@ void SetFontStyle(const OUString &rStyleName, vcl::Font &rFont) rFont.SetWeight((nIndex & 0x2) ? WEIGHT_BOLD : WEIGHT_NORMAL); } -IMPL_LINK_NOARG( SmPrintOptionsTabPage, SizeButtonClickHdl, Button *, void ) +IMPL_LINK_NOARG(SmPrintOptionsTabPage, SizeButtonClickHdl, weld::ToggleButton&, void) { - m_pZoom->Enable(m_pSizeZoomed->IsChecked()); + m_xZoom->set_sensitive(m_xSizeZoomed->get_active()); } -SmPrintOptionsTabPage::SmPrintOptionsTabPage(vcl::Window* pParent, const SfxItemSet& rOptions) - : SfxTabPage(pParent, "SmathSettings", "modules/smath/ui/smathsettings.ui", &rOptions) +SmPrintOptionsTabPage::SmPrintOptionsTabPage(TabPageParent pPage, const SfxItemSet& rOptions) + : SfxTabPage(pPage, "modules/smath/ui/smathsettings.ui", "SmathSettings", &rOptions) + , m_xTitle(m_xBuilder->weld_check_button("title")) + , m_xText(m_xBuilder->weld_check_button("text")) + , m_xFrame(m_xBuilder->weld_check_button("frame")) + , m_xSizeNormal(m_xBuilder->weld_radio_button("sizenormal")) + , m_xSizeScaled(m_xBuilder->weld_radio_button("sizescaled")) + , m_xSizeZoomed(m_xBuilder->weld_radio_button("sizezoomed")) + , m_xZoom(m_xBuilder->weld_metric_spin_button("zoom", FUNIT_PERCENT)) + , m_xNoRightSpaces(m_xBuilder->weld_check_button("norightspaces")) + , m_xSaveOnlyUsedSymbols(m_xBuilder->weld_check_button("saveonlyusedsymbols")) + , m_xAutoCloseBrackets(m_xBuilder->weld_check_button("autoclosebrackets")) { - get( m_pTitle, "title"); - get( m_pText, "text"); - get( m_pFrame, "frame"); - get( m_pSizeNormal, "sizenormal"); - get( m_pSizeScaled, "sizescaled"); - get( m_pSizeZoomed, "sizezoomed"); - get( m_pZoom, "zoom"); - get( m_pNoRightSpaces, "norightspaces"); - get( m_pSaveOnlyUsedSymbols, "saveonlyusedsymbols"); - get( m_pAutoCloseBrackets, "autoclosebrackets"); - - m_pSizeNormal->SetClickHdl(LINK(this, SmPrintOptionsTabPage, SizeButtonClickHdl)); - m_pSizeScaled->SetClickHdl(LINK(this, SmPrintOptionsTabPage, SizeButtonClickHdl)); - m_pSizeZoomed->SetClickHdl(LINK(this, SmPrintOptionsTabPage, SizeButtonClickHdl)); + m_xSizeNormal->connect_toggled(LINK(this, SmPrintOptionsTabPage, SizeButtonClickHdl)); + m_xSizeScaled->connect_toggled(LINK(this, SmPrintOptionsTabPage, SizeButtonClickHdl)); + m_xSizeZoomed->connect_toggled(LINK(this, SmPrintOptionsTabPage, SizeButtonClickHdl)); Reset(&rOptions); } SmPrintOptionsTabPage::~SmPrintOptionsTabPage() { - disposeOnce(); } -void SmPrintOptionsTabPage::dispose() -{ - m_pTitle.clear(); - m_pText.clear(); - m_pFrame.clear(); - m_pSizeNormal.clear(); - m_pSizeScaled.clear(); - m_pSizeZoomed.clear(); - m_pZoom.clear(); - m_pNoRightSpaces.clear(); - m_pSaveOnlyUsedSymbols.clear(); - m_pAutoCloseBrackets.clear(); - SfxTabPage::dispose(); -} - - bool SmPrintOptionsTabPage::FillItemSet(SfxItemSet* rSet) { sal_uInt16 nPrintSize; - if (m_pSizeNormal->IsChecked()) + if (m_xSizeNormal->get_active()) nPrintSize = PRINT_SIZE_NORMAL; - else if (m_pSizeScaled->IsChecked()) + else if (m_xSizeScaled->get_active()) nPrintSize = PRINT_SIZE_SCALED; else nPrintSize = PRINT_SIZE_ZOOMED; rSet->Put(SfxUInt16Item(GetWhich(SID_PRINTSIZE), nPrintSize)); - rSet->Put(SfxUInt16Item(GetWhich(SID_PRINTZOOM), sal::static_int_cast(m_pZoom->GetValue()))); - rSet->Put(SfxBoolItem(GetWhich(SID_PRINTTITLE), m_pTitle->IsChecked())); - rSet->Put(SfxBoolItem(GetWhich(SID_PRINTTEXT), m_pText->IsChecked())); - rSet->Put(SfxBoolItem(GetWhich(SID_PRINTFRAME), m_pFrame->IsChecked())); - rSet->Put(SfxBoolItem(GetWhich(SID_NO_RIGHT_SPACES), m_pNoRightSpaces->IsChecked())); - rSet->Put(SfxBoolItem(GetWhich(SID_SAVE_ONLY_USED_SYMBOLS), m_pSaveOnlyUsedSymbols->IsChecked())); - rSet->Put(SfxBoolItem(GetWhich(SID_AUTO_CLOSE_BRACKETS), m_pAutoCloseBrackets->IsChecked())); + rSet->Put(SfxUInt16Item(GetWhich(SID_PRINTZOOM), sal::static_int_cast(m_xZoom->get_value(FUNIT_PERCENT)))); + rSet->Put(SfxBoolItem(GetWhich(SID_PRINTTITLE), m_xTitle->get_active())); + rSet->Put(SfxBoolItem(GetWhich(SID_PRINTTEXT), m_xText->get_active())); + rSet->Put(SfxBoolItem(GetWhich(SID_PRINTFRAME), m_xFrame->get_active())); + rSet->Put(SfxBoolItem(GetWhich(SID_NO_RIGHT_SPACES), m_xNoRightSpaces->get_active())); + rSet->Put(SfxBoolItem(GetWhich(SID_SAVE_ONLY_USED_SYMBOLS), m_xSaveOnlyUsedSymbols->get_active())); + rSet->Put(SfxBoolItem(GetWhich(SID_AUTO_CLOSE_BRACKETS), m_xAutoCloseBrackets->get_active())); return true; } - void SmPrintOptionsTabPage::Reset(const SfxItemSet* rSet) { SmPrintSize ePrintSize = static_cast(static_cast(rSet->Get(GetWhich(SID_PRINTSIZE))).GetValue()); - m_pSizeNormal->Check(ePrintSize == PRINT_SIZE_NORMAL); - m_pSizeScaled->Check(ePrintSize == PRINT_SIZE_SCALED); - m_pSizeZoomed->Check(ePrintSize == PRINT_SIZE_ZOOMED); + m_xSizeNormal->set_active(ePrintSize == PRINT_SIZE_NORMAL); + m_xSizeScaled->set_active(ePrintSize == PRINT_SIZE_SCALED); + m_xSizeZoomed->set_active(ePrintSize == PRINT_SIZE_ZOOMED); - m_pZoom->Enable(m_pSizeZoomed->IsChecked()); + m_xZoom->set_sensitive(m_xSizeZoomed->get_active()); - m_pZoom->SetValue(static_cast(rSet->Get(GetWhich(SID_PRINTZOOM))).GetValue()); + m_xZoom->set_value(static_cast(rSet->Get(GetWhich(SID_PRINTZOOM))).GetValue(), FUNIT_PERCENT); - m_pTitle->Check(static_cast(rSet->Get(GetWhich(SID_PRINTTITLE))).GetValue()); - m_pText->Check(static_cast(rSet->Get(GetWhich(SID_PRINTTEXT))).GetValue()); - m_pFrame->Check(static_cast(rSet->Get(GetWhich(SID_PRINTFRAME))).GetValue()); - m_pNoRightSpaces->Check(static_cast(rSet->Get(GetWhich(SID_NO_RIGHT_SPACES))).GetValue()); - m_pSaveOnlyUsedSymbols->Check(static_cast(rSet->Get(GetWhich(SID_SAVE_ONLY_USED_SYMBOLS))).GetValue()); - m_pAutoCloseBrackets->Check(static_cast(rSet->Get(GetWhich(SID_AUTO_CLOSE_BRACKETS))).GetValue()); + m_xTitle->set_active(static_cast(rSet->Get(GetWhich(SID_PRINTTITLE))).GetValue()); + m_xNoRightSpaces->set_active(static_cast(rSet->Get(GetWhich(SID_NO_RIGHT_SPACES))).GetValue()); + m_xSaveOnlyUsedSymbols->set_active(static_cast(rSet->Get(GetWhich(SID_SAVE_ONLY_USED_SYMBOLS))).GetValue()); + m_xAutoCloseBrackets->set_active(static_cast(rSet->Get(GetWhich(SID_AUTO_CLOSE_BRACKETS))).GetValue()); } -VclPtr SmPrintOptionsTabPage::Create(vcl::Window* pWindow, const SfxItemSet& rSet) +VclPtr SmPrintOptionsTabPage::Create(TabPageParent pParent, const SfxItemSet& rSet) { - return VclPtr::Create(pWindow, rSet).get(); + return VclPtr::Create(pParent, rSet).get(); } void SmShowFont::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index ba52877e6e21..3a4722da4b61 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -234,11 +234,11 @@ void SmModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) } } -VclPtr SmModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) +VclPtr SmModule::CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) { VclPtr pRet; if(nId == SID_SM_TP_PRINTOPTIONS) - pRet = SmPrintOptionsTabPage::Create( pParent, rSet ); + pRet = SmPrintOptionsTabPage::Create( TabPageParent(pParent.pParent), rSet ); return pRet; } diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index d7a52d82caa3..819aaec2da13 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -1260,7 +1260,7 @@ bool SmViewShell::HasPrintOptionsPage() const return true; } -VclPtr SmViewShell::CreatePrintOptionsPage(vcl::Window *pParent, +VclPtr SmViewShell::CreatePrintOptionsPage(TabPageParent pParent, const SfxItemSet &rOptions) { return SmPrintOptionsTabPage::Create(pParent, rOptions); diff --git a/starmath/uiconfig/smath/ui/smathsettings.ui b/starmath/uiconfig/smath/ui/smathsettings.ui index b306831b33d3..f2b989a1e9f3 100644 --- a/starmath/uiconfig/smath/ui/smathsettings.ui +++ b/starmath/uiconfig/smath/ui/smathsettings.ui @@ -1,5 +1,5 @@ - + @@ -132,7 +132,6 @@ 0 True True - sizescaled False @@ -149,7 +148,7 @@ True 0 True - sizezoomed + sizenormal False @@ -180,9 +179,10 @@ - + True True + True adjustment1 diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 50bc3eeb3256..5b6e63c6245e 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -112,18 +112,16 @@ namespace svx { } } -VclPtr SvxHeaderPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr SvxHeaderPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::Create( pParent.pParent, *rSet ); } - -VclPtr SvxFooterPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr SvxFooterPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::Create( pParent.pParent, *rSet ); } - SvxHeaderPage::SvxHeaderPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : SvxHFPage( pParent, rAttr, SID_ATTR_PAGE_HEADERSET ) @@ -131,7 +129,6 @@ SvxHeaderPage::SvxHeaderPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : { } - SvxFooterPage::SvxFooterPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : SvxHFPage( pParent, rAttr, SID_ATTR_PAGE_FOOTERSET ) @@ -139,7 +136,6 @@ SvxFooterPage::SvxFooterPage( vcl::Window* pParent, const SfxItemSet& rAttr ) : { } - SvxHFPage::SvxHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId ) : SfxTabPage(pParent, "HFFormatPage", "svx/ui/headfootformatpage.ui", &rSet), nId(nSetId), diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index e70599f85a21..4a454faa970f 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -222,7 +222,7 @@ public: // Virtual methods for options dialog. virtual std::unique_ptr CreateItemSet( sal_uInt16 nId ) override; virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) override; - virtual VclPtr CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) override; + virtual VclPtr CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) override; virtual SfxStyleFamilies* CreateStyleFamilies() override; // Pool is created here and set at SfxShell. diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index 700ae7511f1e..73a9138455b0 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -618,7 +618,7 @@ public: // methods for printing SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ) override; SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const override; - SAL_DLLPRIVATE virtual VclPtr CreatePrintOptionsPage( vcl::Window* pParent, + SAL_DLLPRIVATE virtual VclPtr CreatePrintOptionsPage( TabPageParent pParent, const SfxItemSet& rSet) override; static SvxSearchItem* GetSearchItem() { return m_pSrchItem; } /// See SfxViewShell::getPart(). @@ -646,7 +646,7 @@ inline const SwDocShell *SwView::GetDocShell() const return const_cast(this)->GetDocShell(); } -VclPtr CreatePrintOptionsPage( vcl::Window *pParent, +VclPtr CreatePrintOptionsPage( TabPageParent pParent, const SfxItemSet &rOptions, bool bPreview); diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index 7f7007d732ab..cb522a9a0825 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -295,10 +295,10 @@ bool SwCharURLPage::FillItemSet(SfxItemSet* rSet) return bModified; } -VclPtr SwCharURLPage::Create( vcl::Window* pParent, +VclPtr SwCharURLPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::Create( pParent.pParent, *rAttrSet ); } IMPL_LINK_NOARG(SwCharURLPage, InsertFileHdl, Button*, void) diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx index 23bc335fd122..589b16e0ff07 100644 --- a/sw/source/ui/chrdlg/drpcps.cxx +++ b/sw/source/ui/chrdlg/drpcps.cxx @@ -617,10 +617,10 @@ DeactivateRC SwDropCapsPage::DeactivatePage(SfxItemSet * _pSet) return DeactivateRC::LeavePage; } -VclPtr SwDropCapsPage::Create(vcl::Window *pParent, +VclPtr SwDropCapsPage::Create(TabPageParent pParent, const SfxItemSet *rSet) { - return VclPtr::Create(pParent, *rSet); + return VclPtr::Create(pParent.pParent, *rSet); } bool SwDropCapsPage::FillItemSet(SfxItemSet *rSet) diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx index 01abf0f586b7..7472c8d04fa0 100644 --- a/sw/source/ui/chrdlg/numpara.cxx +++ b/sw/source/ui/chrdlg/numpara.cxx @@ -122,10 +122,10 @@ void SwParagraphNumTabPage::dispose() SfxTabPage::dispose(); } -VclPtr SwParagraphNumTabPage::Create( vcl::Window* pParent, +VclPtr SwParagraphNumTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr::Create(pParent, *rSet); + return VclPtr::Create(pParent.pParent, *rSet); } bool SwParagraphNumTabPage::FillItemSet( SfxItemSet* rSet ) diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index c3d9eb1535c1..de20be28544d 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -147,9 +147,9 @@ DeactivateRC SwCondCollPage::DeactivatePage(SfxItemSet * _pSet) return DeactivateRC::LeavePage; } -VclPtr SwCondCollPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) +VclPtr SwCondCollPage::Create(TabPageParent pParent, const SfxItemSet *rSet) { - return VclPtr::Create(pParent, *rSet); + return VclPtr::Create(pParent.pParent, *rSet); } bool SwCondCollPage::FillItemSet(SfxItemSet *rSet) diff --git a/sw/source/ui/chrdlg/tblnumfm.cxx b/sw/source/ui/chrdlg/tblnumfm.cxx index 4c254aa884cd..0946178626c3 100644 --- a/sw/source/ui/chrdlg/tblnumfm.cxx +++ b/sw/source/ui/chrdlg/tblnumfm.cxx @@ -38,7 +38,7 @@ SwNumFormatDlg::SwNumFormatDlg(vcl::Window* pParent, const SfxItemSet& rSet) if ( fnCreatePage ) { - VclPtr pNewPage = (*fnCreatePage)( get_content_area(), &rSet ); + VclPtr pNewPage = (*fnCreatePage)( TabPageParent(get_content_area()), &rSet ); SfxAllItemSet aSet(*(rSet.GetPool())); aSet.Put ( SvxNumberInfoItem( pNewPage->GetItemSet().Get( SID_ATTR_NUMBERFORMAT_INFO ) )); pNewPage->PageCreated(aSet); diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 41acaecc53ba..1038a54c6358 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -151,9 +151,9 @@ void SwMailConfigPage::dispose() SfxTabPage::dispose(); } -VclPtr SwMailConfigPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) +VclPtr SwMailConfigPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::Create(pParent.pParent, *rAttrSet); } bool SwMailConfigPage::FillItemSet( SfxItemSet* /*rSet*/ ) diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index c02c74ce3851..0a7a423f484b 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -330,9 +330,9 @@ void SwCompatibilityOptPage::WriteOptions() m_aConfigItem.AppendItem(*pItem); } -VclPtr SwCompatibilityOptPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr SwCompatibilityOptPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::Create( pParent.pParent, *rAttrSet ); } bool SwCompatibilityOptPage::FillItemSet( SfxItemSet* ) diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 15b79ed60001..fc16a924ea11 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -168,10 +168,10 @@ void SwLoadOptPage::dispose() } -VclPtr SwLoadOptPage::Create( vcl::Window* pParent, +VclPtr SwLoadOptPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create(pParent, *rAttrSet ); + return VclPtr::Create(pParent.pParent, *rAttrSet ); } IMPL_LINK_NOARG(SwLoadOptPage, StandardizedPageCountCheckHdl, Button*, void) @@ -584,10 +584,10 @@ void SwCaptionOptPage::dispose() SfxTabPage::dispose(); } -VclPtr SwCaptionOptPage::Create( vcl::Window* pParent, +VclPtr SwCaptionOptPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::Create( pParent.pParent, *rAttrSet ); } bool SwCaptionOptPage::FillItemSet( SfxItemSet* ) diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index e2a9039adf5c..03006daf0728 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -199,10 +199,10 @@ void SwContentOptPage::dispose() } -VclPtr SwContentOptPage::Create( vcl::Window* pParent, +VclPtr SwContentOptPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::Create(pParent.pParent, *rAttrSet); } static void lcl_SelectMetricLB(ListBox* rMetric, sal_uInt16 nSID, const SfxItemSet& rSet) @@ -305,115 +305,83 @@ IMPL_LINK(SwContentOptPage, VertRulerHdl, Button*, pBox, void) } // TabPage Printer additional settings -SwAddPrinterTabPage::SwAddPrinterTabPage(vcl::Window* pParent, +SwAddPrinterTabPage::SwAddPrinterTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet) - : SfxTabPage(pParent, "PrintOptionsPage", - "modules/swriter/ui/printoptionspage.ui", &rCoreSet) + : SfxTabPage(pParent, "modules/swriter/ui/printoptionspage.ui", "PrintOptionsPage", &rCoreSet) , sNone(SwResId(SW_STR_NONE)) , bAttrModified(false) , bPreview(false) -{ - get(m_pGrfCB, "graphics"); - get(m_pCtrlFieldCB, "formcontrols"); - get(m_pBackgroundCB, "background"); - get(m_pBlackFontCB, "inblack"); - get(m_pPrintHiddenTextCB, "hiddentext"); - get(m_pPrintTextPlaceholderCB, "textplaceholder"); - - get(m_pPagesFrame, "pagesframe"); - get(m_pLeftPageCB, "leftpages"); - get(m_pRightPageCB, "rightpages"); - get(m_pProspectCB, "brochure"); - get(m_pProspectCB_RTL, "rtl"); - - get(m_pCommentsFrame, "commentsframe"); - get(m_pNoRB, "none"); - get(m_pOnlyRB, "only"); - get(m_pEndRB, "end"); - get(m_pEndPageRB, "endpage"); - get(m_pInMarginsRB, "inmargins"); - get(m_pPrintEmptyPagesCB, "blankpages"); - get(m_pPaperFromSetupCB, "papertray"); - get(m_pFaxLB, "fax"); - - Link aLk = LINK( this, SwAddPrinterTabPage, AutoClickHdl); - m_pGrfCB->SetClickHdl( aLk ); - m_pRightPageCB->SetClickHdl( aLk ); - m_pLeftPageCB->SetClickHdl( aLk ); - m_pCtrlFieldCB->SetClickHdl( aLk ); - m_pBackgroundCB->SetClickHdl( aLk ); - m_pBlackFontCB->SetClickHdl( aLk ); - m_pPrintHiddenTextCB->SetClickHdl( aLk ); - m_pPrintTextPlaceholderCB->SetClickHdl( aLk ); - m_pProspectCB->SetClickHdl( aLk ); - m_pProspectCB_RTL->SetClickHdl( aLk ); - m_pPaperFromSetupCB->SetClickHdl( aLk ); - m_pPrintEmptyPagesCB->SetClickHdl( aLk ); - m_pEndPageRB->SetClickHdl( aLk ); - m_pInMarginsRB->SetClickHdl( aLk ); - m_pEndRB->SetClickHdl( aLk ); - m_pOnlyRB->SetClickHdl( aLk ); - m_pNoRB->SetClickHdl( aLk ); - m_pFaxLB->SetSelectHdl( LINK( this, SwAddPrinterTabPage, SelectHdl ) ); + , m_xGrfCB(m_xBuilder->weld_check_button("graphics")) + , m_xCtrlFieldCB(m_xBuilder->weld_check_button("formcontrols")) + , m_xBackgroundCB(m_xBuilder->weld_check_button("background")) + , m_xBlackFontCB(m_xBuilder->weld_check_button("inblack")) + , m_xPrintHiddenTextCB(m_xBuilder->weld_check_button("hiddentext")) + , m_xPrintTextPlaceholderCB(m_xBuilder->weld_check_button("textplaceholder")) + , m_xPagesFrame(m_xBuilder->weld_widget("pagesframe")) + , m_xLeftPageCB(m_xBuilder->weld_check_button("leftpages")) + , m_xRightPageCB(m_xBuilder->weld_check_button("rightpages")) + , m_xProspectCB(m_xBuilder->weld_check_button("brochure")) + , m_xProspectCB_RTL(m_xBuilder->weld_check_button("rtl")) + , m_xCommentsFrame(m_xBuilder->weld_widget("commentsframe")) + , m_xNoRB(m_xBuilder->weld_radio_button("none")) + , m_xOnlyRB(m_xBuilder->weld_radio_button("only")) + , m_xEndRB(m_xBuilder->weld_radio_button("end")) + , m_xEndPageRB(m_xBuilder->weld_radio_button("endpage")) + , m_xInMarginsRB(m_xBuilder->weld_radio_button("inmargins")) + , m_xPrintEmptyPagesCB(m_xBuilder->weld_check_button("blankpages")) + , m_xPaperFromSetupCB(m_xBuilder->weld_check_button("papertray")) + , m_xFaxLB(m_xBuilder->weld_combo_box_text("fax")) +{ + Link aLk = LINK( this, SwAddPrinterTabPage, AutoClickHdl); + m_xGrfCB->connect_toggled( aLk ); + m_xRightPageCB->connect_toggled( aLk ); + m_xLeftPageCB->connect_toggled( aLk ); + m_xCtrlFieldCB->connect_toggled( aLk ); + m_xBackgroundCB->connect_toggled( aLk ); + m_xBlackFontCB->connect_toggled( aLk ); + m_xPrintHiddenTextCB->connect_toggled( aLk ); + m_xPrintTextPlaceholderCB->connect_toggled( aLk ); + m_xProspectCB->connect_toggled( aLk ); + m_xProspectCB_RTL->connect_toggled( aLk ); + m_xPaperFromSetupCB->connect_toggled( aLk ); + m_xPrintEmptyPagesCB->connect_toggled( aLk ); + m_xEndPageRB->connect_toggled( aLk ); + m_xInMarginsRB->connect_toggled( aLk ); + m_xEndRB->connect_toggled( aLk ); + m_xOnlyRB->connect_toggled( aLk ); + m_xNoRB->connect_toggled( aLk ); + m_xFaxLB->connect_changed( LINK( this, SwAddPrinterTabPage, SelectHdl ) ); const SfxPoolItem* pItem; if(SfxItemState::SET == rCoreSet.GetItemState(SID_HTML_MODE, false, &pItem ) && static_cast(pItem)->GetValue() & HTMLMODE_ON) { - m_pLeftPageCB->Hide(); - m_pRightPageCB->Hide(); - m_pPrintHiddenTextCB->Hide(); - m_pPrintTextPlaceholderCB->Hide(); - - // hide m_pPrintEmptyPagesCB - m_pPrintEmptyPagesCB->Hide(); + m_xLeftPageCB->hide(); + m_xRightPageCB->hide(); + m_xPrintHiddenTextCB->hide(); + m_xPrintTextPlaceholderCB->hide(); + m_xPrintEmptyPagesCB->hide(); } - m_pProspectCB_RTL->Disable(); + m_xProspectCB_RTL->set_sensitive(false); SvtCTLOptions aCTLOptions; - m_pProspectCB_RTL->Show(aCTLOptions.IsCTLFontEnabled()); + m_xProspectCB_RTL->show(aCTLOptions.IsCTLFontEnabled()); } SwAddPrinterTabPage::~SwAddPrinterTabPage() { - disposeOnce(); -} - -void SwAddPrinterTabPage::dispose() -{ - m_pGrfCB.clear(); - m_pCtrlFieldCB.clear(); - m_pBackgroundCB.clear(); - m_pBlackFontCB.clear(); - m_pPrintHiddenTextCB.clear(); - m_pPrintTextPlaceholderCB.clear(); - m_pPagesFrame.clear(); - m_pLeftPageCB.clear(); - m_pRightPageCB.clear(); - m_pProspectCB.clear(); - m_pProspectCB_RTL.clear(); - m_pCommentsFrame.clear(); - m_pNoRB.clear(); - m_pOnlyRB.clear(); - m_pEndRB.clear(); - m_pEndPageRB.clear(); - m_pInMarginsRB.clear(); - m_pPrintEmptyPagesCB.clear(); - m_pPaperFromSetupCB.clear(); - m_pFaxLB.clear(); - SfxTabPage::dispose(); } void SwAddPrinterTabPage::SetPreview(bool bPrev) { bPreview = bPrev; - m_pCommentsFrame->Enable(!bPreview); - m_pPagesFrame->Enable(!bPreview); + m_xCommentsFrame->set_sensitive(!bPreview); + m_xPagesFrame->set_sensitive(!bPreview); } -VclPtr SwAddPrinterTabPage::Create( vcl::Window* pParent, +VclPtr SwAddPrinterTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::Create(pParent, *rAttrSet); } bool SwAddPrinterTabPage::FillItemSet( SfxItemSet* rCoreSet ) @@ -421,36 +389,36 @@ bool SwAddPrinterTabPage::FillItemSet( SfxItemSet* rCoreSet ) if ( bAttrModified ) { SwAddPrinterItem aAddPrinterAttr; - aAddPrinterAttr.m_bPrintGraphic = m_pGrfCB->IsChecked(); - aAddPrinterAttr.m_bPrintTable = true; // always enabled since CWS printerpullgpages /*aTabCB.IsChecked();*/ - aAddPrinterAttr.m_bPrintDraw = m_pGrfCB->IsChecked(); // UI merged with m_pGrfCB in CWS printerpullgpages - aAddPrinterAttr.m_bPrintControl = m_pCtrlFieldCB->IsChecked(); - aAddPrinterAttr.m_bPrintPageBackground = m_pBackgroundCB->IsChecked(); - aAddPrinterAttr.m_bPrintBlackFont = m_pBlackFontCB->IsChecked(); - aAddPrinterAttr.m_bPrintHiddenText = m_pPrintHiddenTextCB->IsChecked(); - aAddPrinterAttr.m_bPrintTextPlaceholder = m_pPrintTextPlaceholderCB->IsChecked(); - - aAddPrinterAttr.m_bPrintLeftPages = m_pLeftPageCB->IsChecked(); - aAddPrinterAttr.m_bPrintRightPages = m_pRightPageCB->IsChecked(); - aAddPrinterAttr.m_bPrintReverse = false; // handled by vcl itself since CWS printerpullpages /*aReverseCB.IsChecked()*/; - aAddPrinterAttr.m_bPrintProspect = m_pProspectCB->IsChecked(); - aAddPrinterAttr.m_bPrintProspectRTL = m_pProspectCB_RTL->IsChecked(); - aAddPrinterAttr.m_bPaperFromSetup = m_pPaperFromSetupCB->IsChecked(); - aAddPrinterAttr.m_bPrintEmptyPages = m_pPrintEmptyPagesCB->IsChecked(); - aAddPrinterAttr.m_bPrintSingleJobs = true; // handled by vcl in new print dialog since CWS printerpullpages /*aSingleJobsCB.IsChecked()*/; - - if (m_pNoRB->IsChecked()) aAddPrinterAttr.m_nPrintPostIts = + aAddPrinterAttr.m_bPrintGraphic = m_xGrfCB->get_active(); + aAddPrinterAttr.m_bPrintTable = true; // always enabled since CWS printerpullgpages /*m_xTabCB->get_active();*/ + aAddPrinterAttr.m_bPrintDraw = m_xGrfCB->get_active(); // UI merged with m_xGrfCB in CWS printerpullgpages + aAddPrinterAttr.m_bPrintControl = m_xCtrlFieldCB->get_active(); + aAddPrinterAttr.m_bPrintPageBackground = m_xBackgroundCB->get_active(); + aAddPrinterAttr.m_bPrintBlackFont = m_xBlackFontCB->get_active(); + aAddPrinterAttr.m_bPrintHiddenText = m_xPrintHiddenTextCB->get_active(); + aAddPrinterAttr.m_bPrintTextPlaceholder = m_xPrintTextPlaceholderCB->get_active(); + + aAddPrinterAttr.m_bPrintLeftPages = m_xLeftPageCB->get_active(); + aAddPrinterAttr.m_bPrintRightPages = m_xRightPageCB->get_active(); + aAddPrinterAttr.m_bPrintReverse = false; // handled by vcl itself since CWS printerpullpages /*m_xReverseCB->get_active()*/; + aAddPrinterAttr.m_bPrintProspect = m_xProspectCB->get_active(); + aAddPrinterAttr.m_bPrintProspectRTL = m_xProspectCB_RTL->get_active(); + aAddPrinterAttr.m_bPaperFromSetup = m_xPaperFromSetupCB->get_active(); + aAddPrinterAttr.m_bPrintEmptyPages = m_xPrintEmptyPagesCB->get_active(); + aAddPrinterAttr.m_bPrintSingleJobs = true; // handled by vcl in new print dialog since CWS printerpullpages /*m_xSingleJobsCB->get_active()*/; + + if (m_xNoRB->get_active()) aAddPrinterAttr.m_nPrintPostIts = SwPostItMode::NONE; - if (m_pOnlyRB->IsChecked()) aAddPrinterAttr.m_nPrintPostIts = + if (m_xOnlyRB->get_active()) aAddPrinterAttr.m_nPrintPostIts = SwPostItMode::Only; - if (m_pEndRB->IsChecked()) aAddPrinterAttr.m_nPrintPostIts = + if (m_xEndRB->get_active()) aAddPrinterAttr.m_nPrintPostIts = SwPostItMode::EndDoc; - if (m_pEndPageRB->IsChecked()) aAddPrinterAttr.m_nPrintPostIts = + if (m_xEndPageRB->get_active()) aAddPrinterAttr.m_nPrintPostIts = SwPostItMode::EndPage; - if (m_pInMarginsRB->IsChecked()) aAddPrinterAttr.m_nPrintPostIts = + if (m_xInMarginsRB->get_active()) aAddPrinterAttr.m_nPrintPostIts = SwPostItMode::InMargins; - const OUString sFax = m_pFaxLB->GetSelectedEntry(); + const OUString sFax = m_xFaxLB->get_active_text(); aAddPrinterAttr.m_sFaxName = sNone == sFax ? aEmptyOUStr : sFax; rCoreSet->Put(aAddPrinterAttr); } @@ -465,63 +433,63 @@ void SwAddPrinterTabPage::Reset( const SfxItemSet* ) if( SfxItemState::SET == rSet.GetItemState( FN_PARAM_ADDPRINTER , false, reinterpret_cast(&pAddPrinterAttr) )) { - m_pGrfCB->Check(pAddPrinterAttr->m_bPrintGraphic || pAddPrinterAttr->m_bPrintDraw); - m_pCtrlFieldCB->Check( pAddPrinterAttr->m_bPrintControl); - m_pBackgroundCB->Check( pAddPrinterAttr->m_bPrintPageBackground); - m_pBlackFontCB->Check( pAddPrinterAttr->m_bPrintBlackFont); - m_pPrintHiddenTextCB->Check( pAddPrinterAttr->m_bPrintHiddenText); - m_pPrintTextPlaceholderCB->Check(pAddPrinterAttr->m_bPrintTextPlaceholder); - m_pLeftPageCB->Check( pAddPrinterAttr->m_bPrintLeftPages); - m_pRightPageCB->Check( pAddPrinterAttr->m_bPrintRightPages); - m_pPaperFromSetupCB->Check(pAddPrinterAttr->m_bPaperFromSetup); - m_pPrintEmptyPagesCB->Check(pAddPrinterAttr->m_bPrintEmptyPages); - m_pProspectCB->Check( pAddPrinterAttr->m_bPrintProspect); - m_pProspectCB_RTL->Check( pAddPrinterAttr->m_bPrintProspectRTL); - - m_pNoRB->Check (pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::NONE ) ; - m_pOnlyRB->Check (pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::Only ) ; - m_pEndRB->Check (pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::EndDoc ) ; - m_pEndPageRB->Check (pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::EndPage ) ; - m_pInMarginsRB->Check (pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::InMargins ) ; - m_pFaxLB->SelectEntry( pAddPrinterAttr->m_sFaxName ); - } - if (m_pProspectCB->IsChecked()) - { - m_pProspectCB_RTL->Enable(); - m_pNoRB->Enable( false ); - m_pOnlyRB->Enable( false ); - m_pEndRB->Enable( false ); - m_pEndPageRB->Enable( false ); + m_xGrfCB->set_active(pAddPrinterAttr->m_bPrintGraphic || pAddPrinterAttr->m_bPrintDraw); + m_xCtrlFieldCB->set_active( pAddPrinterAttr->m_bPrintControl); + m_xBackgroundCB->set_active( pAddPrinterAttr->m_bPrintPageBackground); + m_xBlackFontCB->set_active( pAddPrinterAttr->m_bPrintBlackFont); + m_xPrintHiddenTextCB->set_active( pAddPrinterAttr->m_bPrintHiddenText); + m_xPrintTextPlaceholderCB->set_active(pAddPrinterAttr->m_bPrintTextPlaceholder); + m_xLeftPageCB->set_active( pAddPrinterAttr->m_bPrintLeftPages); + m_xRightPageCB->set_active( pAddPrinterAttr->m_bPrintRightPages); + m_xPaperFromSetupCB->set_active(pAddPrinterAttr->m_bPaperFromSetup); + m_xPrintEmptyPagesCB->set_active(pAddPrinterAttr->m_bPrintEmptyPages); + m_xProspectCB->set_active( pAddPrinterAttr->m_bPrintProspect); + m_xProspectCB_RTL->set_active( pAddPrinterAttr->m_bPrintProspectRTL); + + m_xNoRB->set_active(pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::NONE ) ; + m_xOnlyRB->set_active(pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::Only ) ; + m_xEndRB->set_active(pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::EndDoc ) ; + m_xEndPageRB->set_active(pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::EndPage ) ; + m_xInMarginsRB->set_active(pAddPrinterAttr->m_nPrintPostIts== SwPostItMode::InMargins ) ; + m_xFaxLB->set_active( pAddPrinterAttr->m_sFaxName ); + } + if (m_xProspectCB->get_active()) + { + m_xProspectCB_RTL->set_sensitive(true); + m_xNoRB->set_sensitive( false ); + m_xOnlyRB->set_sensitive( false ); + m_xEndRB->set_sensitive( false ); + m_xEndPageRB->set_sensitive( false ); } else - m_pProspectCB_RTL->Enable( false ); + m_xProspectCB_RTL->set_sensitive( false ); } -IMPL_LINK_NOARG(SwAddPrinterTabPage, AutoClickHdl, Button*, void) +IMPL_LINK_NOARG(SwAddPrinterTabPage, AutoClickHdl, weld::ToggleButton&, void) { bAttrModified = true; - bool bIsProspect = m_pProspectCB->IsChecked(); + bool bIsProspect = m_xProspectCB->get_active(); if (!bIsProspect) - m_pProspectCB_RTL->Check( false ); - m_pProspectCB_RTL->Enable( bIsProspect ); - m_pNoRB->Enable( !bIsProspect ); - m_pOnlyRB->Enable( !bIsProspect ); - m_pEndRB->Enable( !bIsProspect ); - m_pEndPageRB->Enable( !bIsProspect ); - m_pInMarginsRB->Enable( !bIsProspect ); + m_xProspectCB_RTL->set_active( false ); + m_xProspectCB_RTL->set_sensitive( bIsProspect ); + m_xNoRB->set_sensitive( !bIsProspect ); + m_xOnlyRB->set_sensitive( !bIsProspect ); + m_xEndRB->set_sensitive( !bIsProspect ); + m_xEndPageRB->set_sensitive( !bIsProspect ); + m_xInMarginsRB->set_sensitive( !bIsProspect ); } void SwAddPrinterTabPage::SetFax( const std::vector& rFaxLst ) { - m_pFaxLB->InsertEntry(sNone); + m_xFaxLB->append_text(sNone); for(const auto & i : rFaxLst) { - m_pFaxLB->InsertEntry(i); + m_xFaxLB->append_text(i); } - m_pFaxLB->SelectEntryPos(0); + m_xFaxLB->set_active(0); } -IMPL_LINK_NOARG(SwAddPrinterTabPage, SelectHdl, ListBox&, void) +IMPL_LINK_NOARG(SwAddPrinterTabPage, SelectHdl, weld::ComboBoxText&, void) { bAttrModified=true; } @@ -638,10 +606,10 @@ void SwStdFontTabPage::dispose() SfxTabPage::dispose(); } -VclPtr SwStdFontTabPage::Create( vcl::Window* pParent, +VclPtr SwStdFontTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::Create(pParent.pParent, *rAttrSet); } static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType, @@ -1149,10 +1117,10 @@ void SwTableOptionsTabPage::dispose() SfxTabPage::dispose(); } -VclPtr SwTableOptionsTabPage::Create( vcl::Window* pParent, +VclPtr SwTableOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::Create(pParent.pParent, *rAttrSet); } bool SwTableOptionsTabPage::FillItemSet( SfxItemSet* ) @@ -1415,9 +1383,9 @@ void SwShdwCursorOptionsTabPage::dispose() SfxTabPage::dispose(); } -VclPtr SwShdwCursorOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet ) +VclPtr SwShdwCursorOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet ) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::Create( pParent.pParent, *rSet ); } void SwShdwCursorOptionsTabPage::PageCreated( const SfxAllItemSet& aSet ) @@ -1821,9 +1789,9 @@ void SwRedlineOptionsTabPage::dispose() SfxTabPage::dispose(); } -VclPtr SwRedlineOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr SwRedlineOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::Create( pParent.pParent, *rSet ); } bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet* ) @@ -2225,9 +2193,9 @@ void SwCompareOptionsTabPage::dispose() SfxTabPage::dispose(); } -VclPtr SwCompareOptionsTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ) +VclPtr SwCompareOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::Create( pParent.pParent, *rAttrSet ); } bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet* ) @@ -2375,10 +2343,10 @@ void SwTestTabPage::dispose() SfxTabPage::dispose(); } -VclPtr SwTestTabPage::Create( vcl::Window* pParent, +VclPtr SwTestTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet ) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::Create(pParent.pParent, *rAttrSet); } bool SwTestTabPage::FillItemSet( SfxItemSet* rCoreSet ) diff --git a/sw/source/ui/dialog/addrdlg.cxx b/sw/source/ui/dialog/addrdlg.cxx index d2d43389cafd..fc4e2e37c465 100644 --- a/sw/source/ui/dialog/addrdlg.cxx +++ b/sw/source/ui/dialog/addrdlg.cxx @@ -20,6 +20,7 @@ #include #include #include +#include SwAddrDlg::SwAddrDlg(vcl::Window* pParent, const SfxItemSet& rSet) : SfxSingleTabDialog(pParent, rSet) @@ -29,7 +30,7 @@ SwAddrDlg::SwAddrDlg(vcl::Window* pParent, const SfxItemSet& rSet) ::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SFXPAGE_GENERAL ); if ( fnCreatePage ) { - VclPtr pPage2 = (*fnCreatePage)(get_content_area(), &rSet); + VclPtr pPage2 = (*fnCreatePage)(TabPageParent(get_content_area()), &rSet); SetTabPage(pPage2); } } diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx index 841a08d237c0..5ac763710466 100644 --- a/sw/source/ui/dialog/docstdlg.cxx +++ b/sw/source/ui/dialog/docstdlg.cxx @@ -34,9 +34,9 @@ #include #include -VclPtr SwDocStatPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) +VclPtr SwDocStatPage::Create(TabPageParent pParent, const SfxItemSet *rSet) { - return VclPtr::Create(pParent, *rSet); + return VclPtr::Create(pParent.pParent, *rSet); } SwDocStatPage::SwDocStatPage(vcl::Window *pParent, const SfxItemSet &rSet) diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 81765b9cdd01..025f9b90ecde 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1672,10 +1672,10 @@ void SwInsertSectionTabPage::Reset( const SfxItemSet* ) { } -VclPtr SwInsertSectionTabPage::Create( vcl::Window* pParent, +VclPtr SwInsertSectionTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::Create(pParent.pParent, *rAttrSet); } IMPL_LINK( SwInsertSectionTabPage, ChangeHideHdl, Button *, pBox, void ) @@ -2030,10 +2030,10 @@ void SwSectionFootnoteEndTabPage::Reset( const SfxItemSet* rSet ) ResetState( false, rSet->Get( RES_END_AT_TXTEND, false )); } -VclPtr SwSectionFootnoteEndTabPage::Create( vcl::Window* pParent, +VclPtr SwSectionFootnoteEndTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::Create(pParent.pParent, *rAttrSet); } IMPL_LINK( SwSectionFootnoteEndTabPage, FootEndHdl, Button *, pBox, void ) @@ -2199,9 +2199,9 @@ void SwSectionIndentTabPage::Reset( const SfxItemSet* rSet) IndentModifyHdl(*m_pBeforeMF); } -VclPtr SwSectionIndentTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) +VclPtr SwSectionIndentTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::Create(pParent.pParent, *rAttrSet); } void SwSectionIndentTabPage::SetWrtShell(SwWrtShell const & rSh) diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx index 56c2ddb67984..c8b5cfc9e3f6 100644 --- a/sw/source/ui/envelp/envfmt.cxx +++ b/sw/source/ui/envelp/envfmt.cxx @@ -458,9 +458,9 @@ void SwEnvFormatPage::SetMinMax() m_pSizeHeightField->Reformat(); } -VclPtr SwEnvFormatPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr SwEnvFormatPage::Create(TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr::Create(pParent, *rSet); + return VclPtr::Create(pParent.pParent, *rSet); } void SwEnvFormatPage::ActivatePage(const SfxItemSet& rSet) diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index 294b2ac2eb1a..1d3593e2e91a 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -61,7 +61,7 @@ public: virtual ~SwEnvFormatPage() override; virtual void dispose() override; - static VclPtr Create(vcl::Window* pParent, const SfxItemSet* rSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index f6edd2de9317..002518c47d27 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -314,9 +314,9 @@ void SwEnvPage::InitDatabaseBox() } } -VclPtr SwEnvPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr SwEnvPage::Create(TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr::Create(pParent, *rSet); + return VclPtr::Create(pParent.pParent, *rSet); } void SwEnvPage::ActivatePage(const SfxItemSet& rSet) diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx index 5568e9194f55..0e52ab4a7f98 100644 --- a/sw/source/ui/envelp/envprt.cxx +++ b/sw/source/ui/envelp/envprt.cxx @@ -141,9 +141,9 @@ IMPL_LINK_NOARG(SwEnvPrtPage, AlignHdl, ToolBox *, void) } } -VclPtr SwEnvPrtPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr SwEnvPrtPage::Create(TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr::Create(pParent, *rSet); + return VclPtr::Create(pParent.pParent, *rSet); } void SwEnvPrtPage::ActivatePage(const SfxItemSet&) diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index 91ce62b4a9da..8d70bb97c89b 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -61,7 +61,7 @@ public: virtual ~SwEnvPrtPage() override; virtual void dispose() override; - static VclPtr Create(vcl::Window* pParent, const SfxItemSet* rSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 3f8daf71e599..a6a6f93cc0c8 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -486,9 +486,9 @@ void SwLabPage::InitDatabaseBox() } } -VclPtr SwLabPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr SwLabPage::Create(TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr::Create(pParent, *rSet); + return VclPtr::Create(pParent.pParent, *rSet); } void SwLabPage::ActivatePage(const SfxItemSet& rSet) @@ -631,9 +631,9 @@ void SwVisitingCardPage::dispose() SfxTabPage::dispose(); } -VclPtr SwVisitingCardPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr SwVisitingCardPage::Create(TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr::Create(pParent, *rSet); + return VclPtr::Create(pParent.pParent, *rSet); } void SwVisitingCardPage::ActivatePage(const SfxItemSet& rSet) @@ -793,9 +793,9 @@ void SwPrivateDataPage::dispose() SfxTabPage::dispose(); } -VclPtr SwPrivateDataPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr SwPrivateDataPage::Create(TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr::Create(pParent, *rSet); + return VclPtr::Create(pParent.pParent, *rSet); } void SwPrivateDataPage::ActivatePage(const SfxItemSet& rSet) @@ -906,9 +906,9 @@ void SwBusinessDataPage::dispose() } -VclPtr SwBusinessDataPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr SwBusinessDataPage::Create(TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr::Create(pParent, *rSet); + return VclPtr::Create(pParent.pParent, *rSet); } void SwBusinessDataPage::ActivatePage(const SfxItemSet& rSet) diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx index 90672ac0fd10..97f43d9c0447 100644 --- a/sw/source/ui/envelp/labfmt.cxx +++ b/sw/source/ui/envelp/labfmt.cxx @@ -479,9 +479,9 @@ void SwLabFormatPage::ChangeMinMax() m_pPHeightField->Reformat(); } -VclPtr SwLabFormatPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr SwLabFormatPage::Create(TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr::Create(pParent, *rSet); + return VclPtr::Create(pParent.pParent, *rSet); } void SwLabFormatPage::ActivatePage(const SfxItemSet& rSet) diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index 08007cf05818..ddbb559cbd8b 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -99,7 +99,7 @@ public: virtual ~SwLabFormatPage() override; virtual void dispose() override; - static VclPtr Create(vcl::Window* pParent, const SfxItemSet* rSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; diff --git a/sw/source/ui/envelp/labprt.cxx b/sw/source/ui/envelp/labprt.cxx index 4bc9f9d88a03..c876f2e2eece 100644 --- a/sw/source/ui/envelp/labprt.cxx +++ b/sw/source/ui/envelp/labprt.cxx @@ -106,9 +106,9 @@ IMPL_LINK( SwLabPrtPage, CountHdl, Button *, pButton, void ) } } -VclPtr SwLabPrtPage::Create(vcl::Window* pParent, const SfxItemSet* rSet) +VclPtr SwLabPrtPage::Create(TabPageParent pParent, const SfxItemSet* rSet) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::Create( pParent.pParent, *rSet ); } void SwLabPrtPage::ActivatePage( const SfxItemSet& rSet ) diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx index 08d6583a7ad0..e36ab980e1f4 100644 --- a/sw/source/ui/envelp/labprt.hxx +++ b/sw/source/ui/envelp/labprt.hxx @@ -55,7 +55,7 @@ public: virtual ~SwLabPrtPage() override; virtual void dispose() override; - static VclPtr Create(vcl::Window* pParent, const SfxItemSet* rSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx index 23819efb8211..09e4dcc96b12 100644 --- a/sw/source/ui/envelp/swuilabimp.hxx +++ b/sw/source/ui/envelp/swuilabimp.hxx @@ -64,7 +64,7 @@ public: virtual ~SwLabPage() override; virtual void dispose() override; - static VclPtr Create(vcl::Window* pParent, const SfxItemSet* rSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; @@ -116,7 +116,7 @@ class SwVisitingCardPage : public SfxTabPage public: SwVisitingCardPage(vcl::Window* pParent, const SfxItemSet& rSet); - static VclPtr Create(vcl::Window* pParent, const SfxItemSet* rSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; @@ -155,7 +155,7 @@ public: virtual ~SwPrivateDataPage() override; virtual void dispose() override; - static VclPtr Create(vcl::Window* pParent, const SfxItemSet* rSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; @@ -192,7 +192,7 @@ public: virtual ~SwBusinessDataPage() override; virtual void dispose() override; - static VclPtr Create(vcl::Window* pParent, const SfxItemSet* rSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index 681e6b800086..6da535c89b69 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -263,10 +263,10 @@ bool SwFieldDBPage::FillItemSet(SfxItemSet* ) return false; } -VclPtr SwFieldDBPage::Create( vcl::Window* pParent, +VclPtr SwFieldDBPage::Create( TabPageParent pParent, const SfxItemSet *const pAttrSet ) { - return VclPtr::Create( pParent, pAttrSet ); + return VclPtr::Create( pParent.pParent, pAttrSet ); } sal_uInt16 SwFieldDBPage::GetGroup() diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx index 6dd7fdd738ac..d5bf9cfb9443 100644 --- a/sw/source/ui/fldui/flddb.hxx +++ b/sw/source/ui/fldui/flddb.hxx @@ -74,7 +74,7 @@ public: virtual ~SwFieldDBPage() override; virtual void dispose() override; - static VclPtr Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 439ed8b7366e..d88cd478b5ad 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -458,10 +458,10 @@ bool SwFieldDokInfPage::FillItemSet(SfxItemSet* ) return false; } -VclPtr SwFieldDokInfPage::Create( vcl::Window* pParent, +VclPtr SwFieldDokInfPage::Create( TabPageParent pParent, const SfxItemSet *const pAttrSet) { - return VclPtr::Create( pParent, pAttrSet ); + return VclPtr::Create( pParent.pParent, pAttrSet ); } sal_uInt16 SwFieldDokInfPage::GetGroup() diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index 64ea9701b317..56ba53b4e03a 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -64,7 +64,7 @@ public: virtual ~SwFieldDokInfPage() override; virtual void dispose() override; - static VclPtr Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx index fe827cf1f560..66a6684f8341 100644 --- a/sw/source/ui/fldui/flddok.cxx +++ b/sw/source/ui/fldui/flddok.cxx @@ -646,10 +646,10 @@ bool SwFieldDokPage::FillItemSet(SfxItemSet* ) return false; } -VclPtr SwFieldDokPage::Create( vcl::Window* pParent, +VclPtr SwFieldDokPage::Create( TabPageParent pParent, const SfxItemSet *const pAttrSet) { - return VclPtr::Create( pParent, pAttrSet ); + return VclPtr::Create( pParent.pParent, pAttrSet ); } sal_uInt16 SwFieldDokPage::GetGroup() diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx index ea5b31b5adc1..7b07ee02f7ea 100644 --- a/sw/source/ui/fldui/flddok.hxx +++ b/sw/source/ui/fldui/flddok.hxx @@ -66,7 +66,7 @@ public: virtual ~SwFieldDokPage() override; virtual void dispose() override; - static VclPtr Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 5a7b794aad84..05c17ab172fa 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -610,10 +610,10 @@ bool SwFieldFuncPage::FillItemSet(SfxItemSet* ) return false; } -VclPtr SwFieldFuncPage::Create( vcl::Window* pParent, +VclPtr SwFieldFuncPage::Create( TabPageParent pParent, const SfxItemSet *const pAttrSet) { - return VclPtr::Create( pParent, pAttrSet ); + return VclPtr::Create( pParent.pParent, pAttrSet ); } sal_uInt16 SwFieldFuncPage::GetGroup() diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx index 4315467ec25e..bd4252a7eec3 100644 --- a/sw/source/ui/fldui/fldfunc.hxx +++ b/sw/source/ui/fldui/fldfunc.hxx @@ -90,7 +90,7 @@ public: virtual ~SwFieldFuncPage() override; virtual void dispose() override; - static VclPtr Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 6bafa43029e3..10ace845154d 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -1109,10 +1109,10 @@ bool SwFieldRefPage::FillItemSet(SfxItemSet* ) return false; } -VclPtr SwFieldRefPage::Create( vcl::Window* pParent, +VclPtr SwFieldRefPage::Create( TabPageParent pParent, const SfxItemSet *const pAttrSet) { - return VclPtr::Create( pParent, pAttrSet ); + return VclPtr::Create( pParent.pParent, pAttrSet ); } sal_uInt16 SwFieldRefPage::GetGroup() diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index 486ab9f4ca2a..851452e55c0f 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -87,7 +87,7 @@ public: virtual ~SwFieldRefPage() override; virtual void dispose() override; - static VclPtr Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx index cce918d0da8a..14c47ba94e71 100644 --- a/sw/source/ui/fldui/fldvar.cxx +++ b/sw/source/ui/fldui/fldvar.cxx @@ -1240,10 +1240,10 @@ bool SwFieldVarPage::FillItemSet(SfxItemSet* ) return false; } -VclPtr SwFieldVarPage::Create( vcl::Window* pParent, +VclPtr SwFieldVarPage::Create( TabPageParent pParent, const SfxItemSet *const pAttrSet) { - return VclPtr::Create( pParent, pAttrSet ); + return VclPtr::Create( pParent.pParent, pAttrSet ); } sal_uInt16 SwFieldVarPage::GetGroup() diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx index 4acef8d89de2..5e2ee0b0f029 100644 --- a/sw/source/ui/fldui/fldvar.hxx +++ b/sw/source/ui/fldui/fldvar.hxx @@ -96,7 +96,7 @@ public: virtual ~SwFieldVarPage() override; virtual void dispose() override; - static VclPtr Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 4d8913ee84b4..37736e641ab7 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -630,9 +630,9 @@ void SwColumnPage::Reset(const SfxItemSet *rSet) } // create TabPage -VclPtr SwColumnPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) +VclPtr SwColumnPage::Create(TabPageParent pParent, const SfxItemSet *rSet) { - return VclPtr::Create(pParent, *rSet); + return VclPtr::Create(pParent.pParent, *rSet); } // stuff attributes into the Set when OK diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index a619dbe42386..255bf7eb4260 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -867,9 +867,9 @@ void SwFramePage::setOptimalRelWidth() m_pHoriRelationLB->Clear(); } -VclPtr SwFramePage::Create(vcl::Window *pParent, const SfxItemSet *rSet) +VclPtr SwFramePage::Create(TabPageParent pParent, const SfxItemSet *rSet) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::Create( pParent.pParent, *rSet ); } void SwFramePage::EnableGraficMode() @@ -2425,9 +2425,9 @@ void SwGrfExtPage::dispose() SfxTabPage::dispose(); } -VclPtr SwGrfExtPage::Create( vcl::Window *pParent, const SfxItemSet *rSet ) +VclPtr SwGrfExtPage::Create( TabPageParent pParent, const SfxItemSet *rSet ) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::Create( pParent.pParent, *rSet ); } void SwGrfExtPage::Reset(const SfxItemSet *rSet) @@ -2866,9 +2866,9 @@ bool SwFrameURLPage::FillItemSet(SfxItemSet *rSet) return bModified; } -VclPtr SwFrameURLPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) +VclPtr SwFrameURLPage::Create(TabPageParent pParent, const SfxItemSet *rSet) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::Create( pParent.pParent, *rSet ); } IMPL_LINK_NOARG(SwFrameURLPage, InsertFileHdl, Button*, void) @@ -2965,9 +2965,9 @@ void SwFrameAddPage::dispose() } -VclPtr SwFrameAddPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) +VclPtr SwFrameAddPage::Create(TabPageParent pParent, const SfxItemSet *rSet) { - return VclPtr::Create(pParent, *rSet); + return VclPtr::Create(pParent.pParent, *rSet); } void SwFrameAddPage::Reset(const SfxItemSet *rSet ) diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx index 75039bca767b..363dab1a8a0f 100644 --- a/sw/source/ui/frmdlg/wrap.cxx +++ b/sw/source/ui/frmdlg/wrap.cxx @@ -143,9 +143,9 @@ void SwWrapTabPage::dispose() SfxTabPage::dispose(); } -VclPtr SwWrapTabPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) +VclPtr SwWrapTabPage::Create(TabPageParent pParent, const SfxItemSet *rSet) { - return VclPtr::Create(pParent, *rSet); + return VclPtr::Create(pParent.pParent, *rSet); } void SwWrapTabPage::Reset(const SfxItemSet *rSet) diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 5705042ab855..ed3cb92c6772 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1302,9 +1302,9 @@ DeactivateRC SwTOXSelectTabPage::DeactivatePage( SfxItemSet* _pSet ) return DeactivateRC::LeavePage; } -VclPtr SwTOXSelectTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) +VclPtr SwTOXSelectTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::Create(pParent.pParent, *rAttrSet); } IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, ListBox&, rBox, void) @@ -2247,9 +2247,9 @@ DeactivateRC SwTOXEntryTabPage::DeactivatePage( SfxItemSet* /*pSet*/) return DeactivateRC::LeavePage; } -VclPtr SwTOXEntryTabPage::Create( vcl::Window* pParent, const SfxItemSet* rAttrSet) +VclPtr SwTOXEntryTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::Create(pParent.pParent, *rAttrSet); } IMPL_LINK_NOARG(SwTOXEntryTabPage, EditStyleHdl, Button*, void) @@ -3760,10 +3760,10 @@ DeactivateRC SwTOXStylesTabPage::DeactivatePage( SfxItemSet* /*pSet*/ ) return DeactivateRC::LeavePage; } -VclPtr SwTOXStylesTabPage::Create( vcl::Window* pParent, +VclPtr SwTOXStylesTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::Create(pParent.pParent, *rAttrSet); } IMPL_LINK_NOARG(SwTOXStylesTabPage, EditStyleHdl, Button *, void) diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx index 302de1f7a6be..79e9e6831fa9 100644 --- a/sw/source/ui/misc/docfnote.cxx +++ b/sw/source/ui/misc/docfnote.cxx @@ -239,9 +239,9 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet* ) m_pPageTemplBox->SelectEntry( pInf->GetPageDesc( *pSh->GetDoc() )->GetName()); } -VclPtr SwEndNoteOptionPage::Create( vcl::Window *pParent, const SfxItemSet *rSet ) +VclPtr SwEndNoteOptionPage::Create( TabPageParent pParent, const SfxItemSet *rSet ) { - return VclPtr::Create( pParent, true, *rSet ); + return VclPtr::Create( pParent.pParent, true, *rSet ); } // Different kinds of numbering; because the Listbox has varying numbers of @@ -408,9 +408,9 @@ SwFootNoteOptionPage::~SwFootNoteOptionPage() { } -VclPtr SwFootNoteOptionPage::Create(vcl::Window *pParent, const SfxItemSet *rSet ) +VclPtr SwFootNoteOptionPage::Create(TabPageParent pParent, const SfxItemSet *rSet ) { - return VclPtr::Create( pParent, *rSet ); + return VclPtr::Create( pParent.pParent, *rSet ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index 4cde50dabeb2..386a345a1803 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -73,7 +73,7 @@ public: virtual ~SwEndNoteOptionPage() override; virtual void dispose() override; - static VclPtr Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet *rSet); virtual bool FillItemSet(SfxItemSet *rSet) override; virtual void Reset( const SfxItemSet* ) override; @@ -87,7 +87,7 @@ class SwFootNoteOptionPage : public SwEndNoteOptionPage virtual ~SwFootNoteOptionPage() override; public: - static VclPtr Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet *rSet); }; #endif diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 2bfe5e816ea3..2f7bb7c41fcf 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -542,10 +542,10 @@ void SwNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode() m_pIndentAtMF->Show( bLabelAlignmentPosAndSpaceModeActive ); } -VclPtr SwNumPositionTabPage::Create( vcl::Window* pParent, +VclPtr SwNumPositionTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::Create(pParent.pParent, *rAttrSet); } void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh) diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index f0cdf8b9ee1b..ab00ae40cd09 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -848,10 +848,10 @@ void SwOutlineSettingsTabPage::Reset( const SfxItemSet* rSet ) ActivatePage(*rSet); } -VclPtr SwOutlineSettingsTabPage::Create( vcl::Window* pParent, +VclPtr SwOutlineSettingsTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::Create(pParent.pParent, *rAttrSet); } void SwOutlineSettingsTabPage::CheckForStartValue_Impl(sal_uInt16 nNumberingType) diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index 5959276dd6db..20ba770f1b62 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -146,9 +146,9 @@ void SwFootNotePage::dispose() SfxTabPage::dispose(); } -VclPtr SwFootNotePage::Create(vcl::Window *pParent, const SfxItemSet *rSet) +VclPtr SwFootNotePage::Create(TabPageParent pParent, const SfxItemSet *rSet) { - return VclPtr::Create(pParent, *rSet); + return VclPtr::Create(pParent.pParent, *rSet); } void SwFootNotePage::Reset(const SfxItemSet *rSet) diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index df3717390434..0a1185e45765 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -171,9 +171,9 @@ void SwTextGridPage::dispose() SfxTabPage::dispose(); } -VclPtr SwTextGridPage::Create(vcl::Window *pParent, const SfxItemSet *rSet) +VclPtr SwTextGridPage::Create(TabPageParent pParent, const SfxItemSet *rSet) { - return VclPtr::Create(pParent, *rSet); + return VclPtr::Create(pParent.pParent, *rSet); } bool SwTextGridPage::FillItemSet(SfxItemSet *rSet) diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx index e25d0b12dce5..cfb40108bc27 100644 --- a/sw/source/ui/table/tabledlg.cxx +++ b/sw/source/ui/table/tabledlg.cxx @@ -399,10 +399,10 @@ void SwFormatTablePage::ModifyHdl(const Edit * pEdit) bModified = true; } -VclPtr SwFormatTablePage::Create( vcl::Window* pParent, +VclPtr SwFormatTablePage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::Create( pParent.pParent, *rAttrSet ); } bool SwFormatTablePage::FillItemSet( SfxItemSet* rCoreSet ) @@ -799,10 +799,10 @@ void SwTableColumnPage::dispose() SfxTabPage::dispose(); } -VclPtr SwTableColumnPage::Create( vcl::Window* pParent, +VclPtr SwTableColumnPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create( pParent, *rAttrSet ); + return VclPtr::Create( pParent.pParent, *rAttrSet ); } void SwTableColumnPage::Reset( const SfxItemSet* ) @@ -1363,10 +1363,10 @@ void SwTextFlowPage::dispose() SfxTabPage::dispose(); } -VclPtr SwTextFlowPage::Create( vcl::Window* pParent, +VclPtr SwTextFlowPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet) { - return VclPtr::Create(pParent, *rAttrSet); + return VclPtr::Create(pParent.pParent, *rAttrSet); } bool SwTextFlowPage::FillItemSet( SfxItemSet* rSet ) diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx index 32804af2102e..b5e037b0091f 100644 --- a/sw/source/uibase/app/appopt.cxx +++ b/sw/source/uibase/app/appopt.cxx @@ -412,7 +412,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) ApplyUsrPref( aViewOpt, pAppView, bTextDialog? SvViewOpt::DestText : SvViewOpt::DestWeb); } -VclPtr SwModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent, const SfxItemSet& rSet ) +VclPtr SwModule::CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) { VclPtr pRet; SfxAllItemSet aSet(*(rSet.GetPool())); @@ -428,7 +428,7 @@ VclPtr SwModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent } case RID_SW_TP_HTML_OPTGRID_PAGE: case RID_SVXPAGE_GRID: - pRet = SvxGridTabPage::Create(pParent, rSet); + pRet = SvxGridTabPage::Create(pParent.pParent, rSet); break; case RID_SW_TP_STD_FONT: diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx index 1e89dedeef25..15e86bc789a1 100644 --- a/sw/source/uibase/inc/chrdlg.hxx +++ b/sw/source/uibase/inc/chrdlg.hxx @@ -79,7 +79,7 @@ public: virtual ~SwCharURLPage() override; virtual void dispose() override; - static VclPtr Create( vcl::Window* pParent, + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index 4dcb4c86bfa1..0fc5e983e5b1 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -175,7 +175,7 @@ public: virtual ~SwColumnPage() override; virtual void dispose() override; - static VclPtr Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aPageRg; } virtual bool FillItemSet(SfxItemSet *rSet) override; diff --git a/sw/source/uibase/inc/docstdlg.hxx b/sw/source/uibase/inc/docstdlg.hxx index 4004aeab1ef0..ab36ec6125ed 100644 --- a/sw/source/uibase/inc/docstdlg.hxx +++ b/sw/source/uibase/inc/docstdlg.hxx @@ -33,7 +33,7 @@ public: virtual ~SwDocStatPage() override; virtual void dispose() override; - static VclPtr Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet *rSet); private: virtual bool FillItemSet( SfxItemSet *rSet) override; diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx index c5e698b926f3..1f51535e22c1 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -84,7 +84,7 @@ public: virtual ~SwDropCapsPage() override; virtual void dispose() override; - static VclPtr Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aPageRg; } diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index 2e0c43dec906..3a21cbdfa23b 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -106,7 +106,7 @@ public: virtual ~SwEnvPage() override; virtual void dispose() override; - static VclPtr Create(vcl::Window* pParent, const SfxItemSet* rSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet* rSet); virtual void ActivatePage(const SfxItemSet& rSet) override; virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override; diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index 50ed7200295d..1b191e0e2279 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -187,7 +187,7 @@ public: virtual ~SwFramePage() override; virtual void dispose() override; - static VclPtr Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aPageRg; } virtual bool FillItemSet(SfxItemSet *rSet) override; @@ -240,7 +240,7 @@ class SwGrfExtPage: public SfxTabPage public: SwGrfExtPage(vcl::Window *pParent, const SfxItemSet &rSet); - static VclPtr Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet *rSet); virtual bool FillItemSet(SfxItemSet *rSet) override; virtual void Reset(const SfxItemSet *rSet) override; @@ -269,7 +269,7 @@ public: virtual ~SwFrameURLPage() override; virtual void dispose() override; - static VclPtr Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet *rSet); virtual bool FillItemSet(SfxItemSet *rSet) override; virtual void Reset(const SfxItemSet *rSet) override; @@ -320,7 +320,7 @@ public: virtual ~SwFrameAddPage() override; virtual void dispose() override; - static VclPtr Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aAddPgRg; } virtual bool FillItemSet(SfxItemSet *rSet) override; diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx index 616c4f409987..85466b507282 100644 --- a/sw/source/uibase/inc/mailconfigpage.hxx +++ b/sw/source/uibase/inc/mailconfigpage.hxx @@ -60,7 +60,7 @@ public: virtual ~SwMailConfigPage() override; virtual void dispose() override; - static VclPtr Create( vcl::Window* pParent, + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index 14eb447076a6..d93bd4eefb0a 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -116,7 +116,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; - static VclPtr Create( vcl::Window* pParent, + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rAttrSet); void SetOutlineTabDialog(SwOutlineTabDialog* pDlg){pOutlineDlg = pDlg;} diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx index 5c4785f33b61..8f3fc77f1815 100644 --- a/sw/source/uibase/inc/numpara.hxx +++ b/sw/source/uibase/inc/numpara.hxx @@ -69,7 +69,7 @@ public: virtual ~SwParagraphNumTabPage() override; virtual void dispose() override; - static VclPtr Create( vcl::Window* pParent, + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rSet ); static const sal_uInt16* GetRanges() { return aPageRg; } diff --git a/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx index 85c8b15dfa2b..fe6c3eca0ee1 100644 --- a/sw/source/uibase/inc/optcomp.hxx +++ b/sw/source/uibase/inc/optcomp.hxx @@ -65,7 +65,7 @@ public: virtual ~SwCompatibilityOptPage() override; virtual void dispose() override; - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index 6502a9b6407d..5b98e6508463 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -74,7 +74,7 @@ public: virtual ~SwLoadOptPage() override; virtual void dispose() override; - static VclPtr Create( vcl::Window* pParent, + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; @@ -190,7 +190,7 @@ public: virtual ~SwCaptionOptPage() override; virtual void dispose() override; - static VclPtr Create( vcl::Window* pParent, + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index 7efa595467c4..05b0efb4d671 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -21,14 +21,11 @@ #include #include - #include - #include - #include - #include +#include #include #include #include @@ -70,7 +67,7 @@ public: virtual void dispose() override; - static VclPtr Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; @@ -79,44 +76,42 @@ public: // TabPage printer settings additions class SwAddPrinterTabPage : public SfxTabPage { - VclPtr m_pGrfCB; - VclPtr m_pCtrlFieldCB; - VclPtr m_pBackgroundCB; - VclPtr m_pBlackFontCB; - VclPtr m_pPrintHiddenTextCB; - VclPtr m_pPrintTextPlaceholderCB; - - VclPtr m_pPagesFrame; - VclPtr m_pLeftPageCB; - VclPtr m_pRightPageCB; - VclPtr m_pProspectCB; - VclPtr m_pProspectCB_RTL; - - VclPtr m_pCommentsFrame; - VclPtr m_pNoRB; - VclPtr m_pOnlyRB; - VclPtr m_pEndRB; - VclPtr m_pEndPageRB; - VclPtr m_pInMarginsRB; - - VclPtr m_pPrintEmptyPagesCB; - VclPtr m_pPaperFromSetupCB; - VclPtr m_pFaxLB; - OUString sNone; - bool bAttrModified; bool bPreview; - DECL_LINK(AutoClickHdl, Button*, void); - DECL_LINK(SelectHdl, ListBox&, void); + std::unique_ptr m_xGrfCB; + std::unique_ptr m_xCtrlFieldCB; + std::unique_ptr m_xBackgroundCB; + std::unique_ptr m_xBlackFontCB; + std::unique_ptr m_xPrintHiddenTextCB; + std::unique_ptr m_xPrintTextPlaceholderCB; + + std::unique_ptr m_xPagesFrame; + std::unique_ptr m_xLeftPageCB; + std::unique_ptr m_xRightPageCB; + std::unique_ptr m_xProspectCB; + std::unique_ptr m_xProspectCB_RTL; + + std::unique_ptr m_xCommentsFrame; + std::unique_ptr m_xNoRB; + std::unique_ptr m_xOnlyRB; + std::unique_ptr m_xEndRB; + std::unique_ptr m_xEndPageRB; + std::unique_ptr m_xInMarginsRB; + + std::unique_ptr m_xPrintEmptyPagesCB; + std::unique_ptr m_xPaperFromSetupCB; + std::unique_ptr m_xFaxLB; + + DECL_LINK(AutoClickHdl, weld::ToggleButton&, void); + DECL_LINK(SelectHdl, weld::ComboBoxText&, void); public: - SwAddPrinterTabPage(vcl::Window* pParent, const SfxItemSet& rSet); + SwAddPrinterTabPage(TabPageParent pParent, const SfxItemSet& rSet); virtual ~SwAddPrinterTabPage() override; - virtual void dispose() override; - static VclPtr Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; @@ -185,7 +180,7 @@ class SwStdFontTabPage : public SfxTabPage virtual void dispose() override; public: - static VclPtr Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; @@ -224,7 +219,7 @@ public: virtual ~SwTableOptionsTabPage() override; virtual void dispose() override; - static VclPtr Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet(SfxItemSet* rSet) override; virtual void Reset(const SfxItemSet* rSet) override; @@ -268,7 +263,7 @@ public: virtual ~SwShdwCursorOptionsTabPage() override; virtual void dispose() override; - static VclPtr Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; @@ -343,7 +338,7 @@ public: virtual ~SwRedlineOptionsTabPage() override; virtual void dispose() override; - static VclPtr Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; @@ -360,7 +355,7 @@ public: virtual ~SwTestTabPage() override; virtual void dispose() override; - static VclPtr Create(vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; @@ -403,7 +398,7 @@ public: virtual ~SwCompareOptionsTabPage() override; virtual void dispose() override; - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rAttrSet ); + static VclPtr Create(TabPageParent pParent, const SfxItemSet* rAttrSet ); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index 5824d55945af..14583da1fd3d 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -130,7 +130,7 @@ public: virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; - static VclPtr Create( vcl::Window* pParent, + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rAttrSet); void SetNumRule(SwNumRule *pRule) { diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx index 81a69ab2bc90..79b8c6c45115 100644 --- a/sw/source/uibase/inc/pgfnote.hxx +++ b/sw/source/uibase/inc/pgfnote.hxx @@ -36,7 +36,7 @@ class SwFootNotePage: public SfxTabPage static const sal_uInt16 aPageRg[]; SwFootNotePage(vcl::Window *pParent, const SfxItemSet &rSet); public: - static VclPtr Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return aPageRg; } virtual bool FillItemSet(SfxItemSet *rSet) override; diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx index a5852b74f280..379538525ece 100644 --- a/sw/source/uibase/inc/pggrid.hxx +++ b/sw/source/uibase/inc/pggrid.hxx @@ -91,7 +91,7 @@ public: virtual ~SwTextGridPage() override; virtual void dispose() override; - static VclPtr Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges(); virtual bool FillItemSet(SfxItemSet *rSet) override; diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx index d9a619df7645..5d046f60933e 100644 --- a/sw/source/uibase/inc/pview.hxx +++ b/sw/source/uibase/inc/pview.hxx @@ -201,7 +201,7 @@ class SW_DLLPUBLIC SwPagePreview: public SfxViewShell SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ) override; SAL_DLLPRIVATE virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL ) override; SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const override; - SAL_DLLPRIVATE virtual VclPtr CreatePrintOptionsPage(vcl::Window *pParent, const SfxItemSet &rOptions ) override; + SAL_DLLPRIVATE virtual VclPtr CreatePrintOptionsPage(TabPageParent pParent, const SfxItemSet &rOptions) override; SAL_DLLPRIVATE void CalcAndSetBorderPixel( SvBorder &rToFill ); diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx index 7d24a2b54452..83480447d891 100644 --- a/sw/source/uibase/inc/regionsw.hxx +++ b/sw/source/uibase/inc/regionsw.hxx @@ -185,7 +185,7 @@ public: virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet* ) override; - static VclPtr Create( vcl::Window* pParent, + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rAttrSet); }; @@ -228,7 +228,7 @@ public: virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet* ) override; - static VclPtr Create( vcl::Window* pParent, + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rAttrSet); }; @@ -247,7 +247,7 @@ public: virtual bool FillItemSet( SfxItemSet* ) override; virtual void Reset( const SfxItemSet* ) override; - static VclPtr Create( vcl::Window* pParent, + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rAttrSet); void SetWrtShell(SwWrtShell const & rSh); diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index 2fd75bb89c36..e355c321cd5f 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -70,7 +70,7 @@ class SwCondCollPage : public SfxTabPage public: SwCondCollPage(vcl::Window *pParent, const SfxItemSet &rSet); - static VclPtr Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet *rSet); static const sal_uInt16* GetRanges() { return m_aPageRg; } virtual bool FillItemSet( SfxItemSet *rSet) override; diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index f26bb92a6a21..8d377ae64ed6 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -227,7 +227,7 @@ public: virtual void ActivatePage( const SfxItemSet& ) override; virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; - static VclPtr Create( vcl::Window* pParent, + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rAttrSet); void SelectType(TOXTypes eSet); //preset TOXType, GlobalDoc @@ -436,7 +436,7 @@ public: virtual void ActivatePage( const SfxItemSet& ) override; virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; - static VclPtr Create( vcl::Window* pParent, + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rAttrSet); void SetWrtShell(SwWrtShell& rSh); @@ -484,7 +484,7 @@ public: virtual void ActivatePage( const SfxItemSet& ) override; virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override; - static VclPtr Create( vcl::Window* pParent, + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rAttrSet); }; diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx index a2807b1e7bed..1ab9564207dd 100644 --- a/sw/source/uibase/inc/wrap.hxx +++ b/sw/source/uibase/inc/wrap.hxx @@ -92,7 +92,7 @@ class SwWrapTabPage: public SfxTabPage public: SwWrapTabPage(vcl::Window *pParent, const SfxItemSet &rSet); - static VclPtr Create(vcl::Window *pParent, const SfxItemSet *rSet); + static VclPtr Create(TabPageParent pParent, const SfxItemSet *rSet); virtual bool FillItemSet(SfxItemSet *rSet) override; virtual void Reset(const SfxItemSet *rSet) override; diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx index 8ee2fba972f6..4e7319d405ae 100644 --- a/sw/source/uibase/table/tablepg.hxx +++ b/sw/source/uibase/table/tablepg.hxx @@ -85,7 +85,7 @@ public: virtual ~SwFormatTablePage() override; virtual void dispose() override; - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; virtual void ActivatePage( const SfxItemSet& rSet ) override; @@ -136,7 +136,7 @@ public: virtual ~SwTableColumnPage() override; virtual void dispose() override; - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; virtual void ActivatePage( const SfxItemSet& rSet ) override; @@ -186,7 +186,7 @@ public: SwTextFlowPage( vcl::Window* pParent, const SfxItemSet& rSet ); virtual ~SwTextFlowPage() override; virtual void dispose() override; - static VclPtr Create( vcl::Window* pParent, const SfxItemSet* rAttrSet); + static VclPtr Create( TabPageParent pParent, const SfxItemSet* rAttrSet); virtual bool FillItemSet( SfxItemSet* rSet ) override; virtual void Reset( const SfxItemSet* rSet ) override; diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx index dbcef1d013f0..cd2248684316 100644 --- a/sw/source/uibase/uiview/pview.cxx +++ b/sw/source/uibase/uiview/pview.cxx @@ -1706,10 +1706,10 @@ bool SwPagePreview::HasPrintOptionsPage() const return true; } -VclPtr SwPagePreview::CreatePrintOptionsPage( vcl::Window *pParent, +VclPtr SwPagePreview::CreatePrintOptionsPage( TabPageParent pParent, const SfxItemSet &rOptions ) { - return ::CreatePrintOptionsPage( pParent, rOptions, !m_bNormalPrint ); + return ::CreatePrintOptionsPage( TabPageParent(pParent.pParent), rOptions, !m_bNormalPrint ); } void SwPagePreviewWin::SetViewShell( SwViewShell* pShell ) diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx index cb52705363cb..f840dc3a4160 100644 --- a/sw/source/uibase/uiview/viewprt.cxx +++ b/sw/source/uibase/uiview/viewprt.cxx @@ -170,7 +170,7 @@ namespace // TabPage for application-specific print options -VclPtr SwView::CreatePrintOptionsPage(vcl::Window* pParent, +VclPtr SwView::CreatePrintOptionsPage(TabPageParent pParent, const SfxItemSet& rSet) { return ::CreatePrintOptionsPage( pParent, rSet, false ); @@ -303,7 +303,7 @@ void SwView::NotifyCursor(SfxViewShell* pViewShell) const // Create page printer/additions for SwView and SwPagePreview -VclPtr CreatePrintOptionsPage( vcl::Window *pParent, +VclPtr CreatePrintOptionsPage( TabPageParent pParent, const SfxItemSet &rOptions, bool bPreview ) { diff --git a/sw/uiconfig/swriter/ui/printoptionspage.ui b/sw/uiconfig/swriter/ui/printoptionspage.ui index f5a166a131b0..507df01782b0 100644 --- a/sw/uiconfig/swriter/ui/printoptionspage.ui +++ b/sw/uiconfig/swriter/ui/printoptionspage.ui @@ -1,5 +1,5 @@ - + @@ -45,8 +45,6 @@ 0 0 - 1 - 1 @@ -62,8 +60,6 @@ 0 1 - 1 - 1 @@ -79,8 +75,6 @@ 0 2 - 1 - 1 @@ -96,8 +90,6 @@ 0 3 - 1 - 1 @@ -113,8 +105,6 @@ 0 4 - 1 - 1 @@ -130,8 +120,6 @@ 0 5 - 1 - 1 @@ -152,8 +140,6 @@ 0 0 - 1 - 1 @@ -187,8 +173,6 @@ 0 0 - 1 - 1 @@ -204,8 +188,6 @@ 0 1 - 1 - 1 @@ -221,8 +203,6 @@ 0 2 - 1 - 1 @@ -239,8 +219,6 @@ 0 3 - 1 - 1 @@ -261,8 +239,6 @@ 1 0 - 1 - 1 @@ -290,14 +266,12 @@ False True 0 + True True - only 0 0 - 1 - 1 @@ -309,13 +283,11 @@ True 0 True - end + none 0 1 - 1 - 1 @@ -327,13 +299,11 @@ True 0 True - endpage + none 0 2 - 1 - 1 @@ -345,13 +315,11 @@ True 0 True - inmargins + none 0 3 - 1 - 1 @@ -368,8 +336,6 @@ 0 4 - 1 - 1 @@ -390,8 +356,6 @@ 2 0 - 1 - 1 @@ -434,28 +398,22 @@ 0 0 - 1 - 1 - + True False 1 0 - 1 - 1 0 2 - 1 - 1 @@ -471,8 +429,6 @@ 0 0 - 1 - 1 @@ -488,8 +444,6 @@ 0 1 - 1 - 1 diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx index 49091b6f577c..30bf126361e8 100644 --- a/vcl/inc/salinst.hxx +++ b/vcl/inc/salinst.hxx @@ -163,6 +163,7 @@ public: virtual OpenGLContext* CreateOpenGLContext() = 0; virtual weld::Builder* CreateBuilder(weld::Widget* pParent, const OUString& rUIRoot, const OUString& rUIFile); + virtual weld::Builder* CreateInterimBuilder(vcl::Window* pParent, const OUString& rUIRoot, const OUString& rUIFile); virtual weld::MessageDialog* CreateMessageDialog(weld::Widget* pParent, VclMessageType eMessageType, VclButtonsType eButtonType, const OUString& rPrimaryMessage); virtual weld::Window* GetFrameWeld(const css::uno::Reference& rWindow); diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx index fcfcdd90618c..1379984faa54 100644 --- a/vcl/source/app/salvtables.cxx +++ b/vcl/source/app/salvtables.cxx @@ -2043,6 +2043,11 @@ weld::Builder* SalInstance::CreateBuilder(weld::Widget* pParent, const OUString& return new SalInstanceBuilder(pParentWidget, rUIRoot, rUIFile); } +weld::Builder* SalInstance::CreateInterimBuilder(vcl::Window* pParent, const OUString& rUIRoot, const OUString& rUIFile) +{ + return new SalInstanceBuilder(pParent, rUIRoot, rUIFile); +} + weld::MessageDialog* SalInstance::CreateMessageDialog(weld::Widget* pParent, VclMessageType eMessageType, VclButtonsType eButtonsType, const OUString& rPrimaryMessage) { SalInstanceWidget* pParentInstance = dynamic_cast(pParent); diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 167094a3abe1..0cd56a7cd58c 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -130,6 +130,11 @@ weld::Builder* Application::CreateBuilder(weld::Widget* pParent, const OUString return ImplGetSVData()->mpDefInst->CreateBuilder(pParent, VclBuilderContainer::getUIRootDir(), rUIFile); } +weld::Builder* Application::CreateInterimBuilder(vcl::Window* pParent, const OUString &rUIFile) +{ + return ImplGetSVData()->mpDefInst->CreateInterimBuilder(pParent, VclBuilderContainer::getUIRootDir(), rUIFile); +} + weld::MessageDialog* Application::CreateMessageDialog(weld::Widget* pParent, VclMessageType eMessageType, VclButtonsType eButtonType, const OUString& rPrimaryMessage) { -- cgit