summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--chart2/source/controller/dialogs/dlg_ChartType.cxx3
-rw-r--r--chart2/source/controller/dialogs/dlg_CreationWizard.cxx10
-rw-r--r--chart2/source/controller/dialogs/dlg_DataSource.cxx8
-rw-r--r--chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx2
-rw-r--r--chart2/source/controller/dialogs/dlg_NumberFormat.cxx3
-rw-r--r--chart2/source/controller/dialogs/res_ErrorBar.cxx26
-rw-r--r--chart2/source/controller/dialogs/tp_AxisLabel.cxx8
-rw-r--r--chart2/source/controller/dialogs/tp_AxisLabel.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_AxisPositions.cxx8
-rw-r--r--chart2/source/controller/dialogs/tp_AxisPositions.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_ChartType.cxx16
-rw-r--r--chart2/source/controller/dialogs/tp_ChartType.hxx2
-rw-r--r--chart2/source/controller/dialogs/tp_DataLabel.cxx10
-rw-r--r--chart2/source/controller/dialogs/tp_DataLabel.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.cxx14
-rw-r--r--chart2/source/controller/dialogs/tp_DataSource.hxx3
-rw-r--r--chart2/source/controller/dialogs/tp_ErrorBars.cxx10
-rw-r--r--chart2/source/controller/dialogs/tp_ErrorBars.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_LegendPosition.cxx8
-rw-r--r--chart2/source/controller/dialogs/tp_LegendPosition.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_PointGeometry.cxx8
-rw-r--r--chart2/source/controller/dialogs/tp_PointGeometry.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_PolarOptions.cxx8
-rw-r--r--chart2/source/controller/dialogs/tp_PolarOptions.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_RangeChooser.cxx11
-rw-r--r--chart2/source/controller/dialogs/tp_RangeChooser.hxx3
-rw-r--r--chart2/source/controller/dialogs/tp_Scale.cxx8
-rw-r--r--chart2/source/controller/dialogs/tp_Scale.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_SeriesToAxis.cxx8
-rw-r--r--chart2/source/controller/dialogs/tp_SeriesToAxis.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_TitleRotation.cxx12
-rw-r--r--chart2/source/controller/dialogs/tp_TitleRotation.hxx6
-rw-r--r--chart2/source/controller/dialogs/tp_Trendline.cxx8
-rw-r--r--chart2/source/controller/dialogs/tp_Trendline.hxx4
-rw-r--r--chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx4
-rw-r--r--chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx2
-rw-r--r--chart2/source/controller/inc/res_ErrorBar.hxx5
-rw-r--r--cui/source/customize/SvxMenuConfigPage.cxx4
-rw-r--r--cui/source/customize/SvxNotebookbarConfigPage.cxx6
-rw-r--r--cui/source/customize/SvxToolbarConfigPage.cxx4
-rw-r--r--cui/source/customize/acccfg.cxx4
-rw-r--r--cui/source/customize/cfg.cxx28
-rw-r--r--cui/source/customize/eventdlg.cxx4
-rw-r--r--cui/source/customize/eventdlg.hxx2
-rw-r--r--cui/source/customize/macropg.cxx11
-rw-r--r--cui/source/dialogs/SpellDialog.cxx3
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx16
-rw-r--r--cui/source/inc/SvxMenuConfigPage.hxx2
-rw-r--r--cui/source/inc/SvxNotebookbarConfigPage.hxx3
-rw-r--r--cui/source/inc/SvxToolbarConfigPage.hxx2
-rw-r--r--cui/source/inc/acccfg.hxx2
-rw-r--r--cui/source/inc/align.hxx4
-rw-r--r--cui/source/inc/autocdlg.hxx28
-rw-r--r--cui/source/inc/backgrnd.hxx8
-rw-r--r--cui/source/inc/border.hxx4
-rw-r--r--cui/source/inc/cfg.hxx2
-rw-r--r--cui/source/inc/chardlg.hxx18
-rw-r--r--cui/source/inc/connect.hxx4
-rw-r--r--cui/source/inc/cuigaldlg.hxx8
-rw-r--r--cui/source/inc/cuioptgenrl.hxx4
-rw-r--r--cui/source/inc/cuitabarea.hxx32
-rw-r--r--cui/source/inc/cuitabline.hxx12
-rw-r--r--cui/source/inc/dbregister.hxx4
-rw-r--r--cui/source/inc/dstribut.hxx2
-rw-r--r--cui/source/inc/grfpage.hxx4
-rw-r--r--cui/source/inc/labdlg.hxx4
-rw-r--r--cui/source/inc/macroass.hxx4
-rw-r--r--cui/source/inc/macropg.hxx4
-rw-r--r--cui/source/inc/measure.hxx4
-rw-r--r--cui/source/inc/numfmt.hxx4
-rw-r--r--cui/source/inc/numpages.hxx24
-rw-r--r--cui/source/inc/optasian.hxx4
-rw-r--r--cui/source/inc/optlingu.hxx4
-rw-r--r--cui/source/inc/optpath.hxx4
-rw-r--r--cui/source/inc/page.hxx4
-rw-r--r--cui/source/inc/paragrph.hxx16
-rw-r--r--cui/source/inc/swpossizetabpage.hxx4
-rw-r--r--cui/source/inc/tabstpge.hxx4
-rw-r--r--cui/source/inc/textanim.hxx4
-rw-r--r--cui/source/inc/textattr.hxx4
-rw-r--r--cui/source/inc/transfrm.hxx12
-rw-r--r--cui/source/options/connpooloptions.cxx8
-rw-r--r--cui/source/options/connpooloptions.hxx4
-rw-r--r--cui/source/options/cuisrchdlg.cxx3
-rw-r--r--cui/source/options/dbregister.cxx11
-rw-r--r--cui/source/options/fontsubs.cxx8
-rw-r--r--cui/source/options/fontsubs.hxx4
-rw-r--r--cui/source/options/optaccessibility.cxx8
-rw-r--r--cui/source/options/optaccessibility.hxx4
-rw-r--r--cui/source/options/optasian.cxx8
-rw-r--r--cui/source/options/optbasic.cxx8
-rw-r--r--cui/source/options/optbasic.hxx4
-rw-r--r--cui/source/options/optchart.cxx8
-rw-r--r--cui/source/options/optchart.hxx4
-rw-r--r--cui/source/options/optcolor.cxx10
-rw-r--r--cui/source/options/optcolor.hxx4
-rw-r--r--cui/source/options/optctl.cxx8
-rw-r--r--cui/source/options/optctl.hxx4
-rw-r--r--cui/source/options/optfltr.cxx16
-rw-r--r--cui/source/options/optfltr.hxx8
-rw-r--r--cui/source/options/optgdlg.cxx24
-rw-r--r--cui/source/options/optgdlg.hxx12
-rw-r--r--cui/source/options/optgenrl.cxx9
-rw-r--r--cui/source/options/opthtml.cxx8
-rw-r--r--cui/source/options/opthtml.hxx4
-rw-r--r--cui/source/options/optinet2.cxx24
-rw-r--r--cui/source/options/optinet2.hxx12
-rw-r--r--cui/source/options/optjava.cxx8
-rw-r--r--cui/source/options/optjava.hxx4
-rw-r--r--cui/source/options/optjsearch.cxx8
-rw-r--r--cui/source/options/optjsearch.hxx4
-rw-r--r--cui/source/options/optlingu.cxx8
-rw-r--r--cui/source/options/optopencl.cxx8
-rw-r--r--cui/source/options/optopencl.hxx4
-rw-r--r--cui/source/options/optpath.cxx8
-rw-r--r--cui/source/options/optsave.cxx8
-rw-r--r--cui/source/options/optsave.hxx4
-rw-r--r--cui/source/options/optupdt.cxx8
-rw-r--r--cui/source/options/optupdt.hxx4
-rw-r--r--cui/source/options/personalization.cxx12
-rw-r--r--cui/source/options/personalization.hxx6
-rw-r--r--cui/source/options/treeopt.cxx12
-rw-r--r--cui/source/tabpages/align.cxx8
-rw-r--r--cui/source/tabpages/autocdlg.cxx56
-rw-r--r--cui/source/tabpages/backgrnd.cxx18
-rw-r--r--cui/source/tabpages/border.cxx12
-rw-r--r--cui/source/tabpages/chardlg.cxx42
-rw-r--r--cui/source/tabpages/connect.cxx11
-rw-r--r--cui/source/tabpages/dstribut.cxx7
-rw-r--r--cui/source/tabpages/grfpage.cxx8
-rw-r--r--cui/source/tabpages/labdlg.cxx8
-rw-r--r--cui/source/tabpages/macroass.cxx15
-rw-r--r--cui/source/tabpages/measure.cxx11
-rw-r--r--cui/source/tabpages/numfmt.cxx8
-rw-r--r--cui/source/tabpages/numpages.cxx50
-rw-r--r--cui/source/tabpages/page.cxx8
-rw-r--r--cui/source/tabpages/paragrph.cxx32
-rw-r--r--cui/source/tabpages/swpossizetabpage.cxx8
-rw-r--r--cui/source/tabpages/tabstpge.cxx8
-rw-r--r--cui/source/tabpages/textanim.cxx10
-rw-r--r--cui/source/tabpages/textattr.cxx8
-rw-r--r--cui/source/tabpages/tparea.cxx29
-rw-r--r--cui/source/tabpages/tpbitmap.cxx8
-rw-r--r--cui/source/tabpages/tpcolor.cxx8
-rw-r--r--cui/source/tabpages/tpgradnt.cxx12
-rw-r--r--cui/source/tabpages/tphatch.cxx12
-rw-r--r--cui/source/tabpages/tpline.cxx10
-rw-r--r--cui/source/tabpages/tplnedef.cxx8
-rw-r--r--cui/source/tabpages/tplneend.cxx8
-rw-r--r--cui/source/tabpages/tppattern.cxx12
-rw-r--r--cui/source/tabpages/tpshadow.cxx10
-rw-r--r--cui/source/tabpages/tptrans.cxx8
-rw-r--r--cui/source/tabpages/transfrm.cxx24
-rw-r--r--dbaccess/source/ui/control/ColumnControlWindow.cxx2
-rw-r--r--dbaccess/source/ui/control/FieldDescControl.cxx8
-rw-r--r--dbaccess/source/ui/dlg/ConnectionHelper.cxx4
-rw-r--r--dbaccess/source/ui/dlg/ConnectionHelper.hxx2
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPage.cxx8
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPage.hxx4
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPageSetup.cxx24
-rw-r--r--dbaccess/source/ui/dlg/ConnectionPageSetup.hxx12
-rw-r--r--dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx76
-rw-r--r--dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx38
-rw-r--r--dbaccess/source/ui/dlg/DriverSettings.hxx24
-rw-r--r--dbaccess/source/ui/dlg/TablesSingleDlg.cxx3
-rw-r--r--dbaccess/source/ui/dlg/UserAdmin.cxx8
-rw-r--r--dbaccess/source/ui/dlg/UserAdmin.hxx4
-rw-r--r--dbaccess/source/ui/dlg/adminpages.cxx4
-rw-r--r--dbaccess/source/ui/dlg/adminpages.hxx2
-rw-r--r--dbaccess/source/ui/dlg/advancedsettings.cxx8
-rw-r--r--dbaccess/source/ui/dlg/advancedsettings.hxx4
-rw-r--r--dbaccess/source/ui/dlg/dbwiz.cxx26
-rw-r--r--dbaccess/source/ui/dlg/dbwizsetup.cxx36
-rw-r--r--dbaccess/source/ui/dlg/detailpages.cxx88
-rw-r--r--dbaccess/source/ui/dlg/detailpages.hxx20
-rw-r--r--dbaccess/source/ui/dlg/generalpage.cxx12
-rw-r--r--dbaccess/source/ui/dlg/generalpage.hxx6
-rw-r--r--dbaccess/source/ui/dlg/tablespage.cxx7
-rw-r--r--dbaccess/source/ui/dlg/tablespage.hxx2
-rw-r--r--dbaccess/source/ui/inc/FieldDescControl.hxx2
-rw-r--r--dbaccess/source/ui/inc/WCPage.hxx2
-rw-r--r--dbaccess/source/ui/inc/WColumnSelect.hxx2
-rw-r--r--dbaccess/source/ui/inc/WCopyTable.hxx2
-rw-r--r--dbaccess/source/ui/inc/WExtendPages.hxx16
-rw-r--r--dbaccess/source/ui/inc/WNameMatch.hxx2
-rw-r--r--dbaccess/source/ui/inc/WTabPage.hxx2
-rw-r--r--dbaccess/source/ui/inc/WTypeSelect.hxx6
-rw-r--r--dbaccess/source/ui/misc/WCPage.cxx4
-rw-r--r--dbaccess/source/ui/misc/WColumnSelect.cxx8
-rw-r--r--dbaccess/source/ui/misc/WCopyTable.cxx20
-rw-r--r--dbaccess/source/ui/misc/WNameMatch.cxx4
-rw-r--r--dbaccess/source/ui/misc/WTypeSelect.cxx10
-rw-r--r--dbaccess/source/ui/tabledesign/TableFieldControl.cxx3
-rw-r--r--extensions/source/abpilot/abpfinalpage.cxx8
-rw-r--r--extensions/source/abpilot/abpfinalpage.hxx2
-rw-r--r--extensions/source/abpilot/abspage.cxx9
-rw-r--r--extensions/source/abpilot/abspage.hxx2
-rw-r--r--extensions/source/abpilot/abspilot.cxx12
-rw-r--r--extensions/source/abpilot/admininvokationpage.cxx4
-rw-r--r--extensions/source/abpilot/admininvokationpage.hxx2
-rw-r--r--extensions/source/abpilot/fieldmappingpage.cxx4
-rw-r--r--extensions/source/abpilot/fieldmappingpage.hxx2
-rw-r--r--extensions/source/abpilot/tableselectionpage.cxx4
-rw-r--r--extensions/source/abpilot/tableselectionpage.hxx2
-rw-r--r--extensions/source/abpilot/typeselectionpage.cxx4
-rw-r--r--extensions/source/abpilot/typeselectionpage.hxx2
-rw-r--r--extensions/source/bibliography/datman.cxx2
-rw-r--r--extensions/source/bibliography/framectr.cxx2
-rw-r--r--extensions/source/bibliography/framectr.hxx2
-rw-r--r--extensions/source/dbpilots/commonpagesdbp.cxx12
-rw-r--r--extensions/source/dbpilots/commonpagesdbp.hxx6
-rw-r--r--extensions/source/dbpilots/controlwizard.cxx6
-rw-r--r--extensions/source/dbpilots/controlwizard.hxx2
-rw-r--r--extensions/source/dbpilots/gridwizard.cxx10
-rw-r--r--extensions/source/dbpilots/gridwizard.hxx6
-rw-r--r--extensions/source/dbpilots/groupboxwiz.cxx32
-rw-r--r--extensions/source/dbpilots/groupboxwiz.hxx14
-rw-r--r--extensions/source/dbpilots/listcombowizard.cxx28
-rw-r--r--extensions/source/dbpilots/listcombowizard.hxx14
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx3
-rw-r--r--filter/source/pdf/impdialog.cxx48
-rw-r--r--filter/source/pdf/impdialog.hxx24
-rw-r--r--include/sfx2/dinfdlg.hxx16
-rw-r--r--include/sfx2/mgetempl.hxx4
-rw-r--r--include/sfx2/module.hxx6
-rw-r--r--include/sfx2/printopt.hxx4
-rw-r--r--include/sfx2/securitypage.hxx4
-rw-r--r--include/sfx2/tabdlg.hxx4
-rw-r--r--include/sfx2/viewsh.hxx8
-rw-r--r--include/svx/dlgctrl.hxx4
-rw-r--r--include/svx/hdft.hxx10
-rw-r--r--include/svx/optgrid.hxx4
-rw-r--r--include/vcl/tabpage.hxx26
-rw-r--r--include/vcl/wizardmachine.hxx2
-rw-r--r--sc/inc/scmod.hxx2
-rw-r--r--sc/source/ui/app/scmod.cxx22
-rw-r--r--sc/source/ui/attrdlg/tabpages.cxx8
-rw-r--r--sc/source/ui/dbgui/tpsort.cxx16
-rw-r--r--sc/source/ui/dbgui/tpsubt.cxx36
-rw-r--r--sc/source/ui/dbgui/validate.cxx24
-rw-r--r--sc/source/ui/docshell/tpstat.cxx8
-rw-r--r--sc/source/ui/inc/opredlin.hxx4
-rw-r--r--sc/source/ui/inc/prevwsh.hxx2
-rw-r--r--sc/source/ui/inc/scuitphfedit.hxx18
-rw-r--r--sc/source/ui/inc/tabpages.hxx4
-rw-r--r--sc/source/ui/inc/tabvwsh.hxx2
-rw-r--r--sc/source/ui/inc/tpcalc.hxx4
-rw-r--r--sc/source/ui/inc/tpcompatibility.hxx4
-rw-r--r--sc/source/ui/inc/tpdefaults.hxx4
-rw-r--r--sc/source/ui/inc/tpformula.hxx4
-rw-r--r--sc/source/ui/inc/tphf.hxx10
-rw-r--r--sc/source/ui/inc/tpprint.hxx4
-rw-r--r--sc/source/ui/inc/tpsort.hxx8
-rw-r--r--sc/source/ui/inc/tpstat.hxx4
-rw-r--r--sc/source/ui/inc/tpsubt.hxx18
-rw-r--r--sc/source/ui/inc/tptable.hxx4
-rw-r--r--sc/source/ui/inc/tpusrlst.hxx4
-rw-r--r--sc/source/ui/inc/tpview.hxx8
-rw-r--r--sc/source/ui/inc/validate.hxx12
-rw-r--r--sc/source/ui/optdlg/opredlin.cxx16
-rw-r--r--sc/source/ui/optdlg/tpcalc.cxx8
-rw-r--r--sc/source/ui/optdlg/tpcompatibility.cxx8
-rw-r--r--sc/source/ui/optdlg/tpdefaults.cxx8
-rw-r--r--sc/source/ui/optdlg/tpformula.cxx8
-rw-r--r--sc/source/ui/optdlg/tpprint.cxx8
-rw-r--r--sc/source/ui/optdlg/tpusrlst.cxx8
-rw-r--r--sc/source/ui/optdlg/tpview.cxx18
-rw-r--r--sc/source/ui/pagedlg/scuitphfedit.cxx42
-rw-r--r--sc/source/ui/pagedlg/tphf.cxx29
-rw-r--r--sc/source/ui/pagedlg/tptable.cxx8
-rw-r--r--sc/source/ui/view/prevwsh.cxx4
-rw-r--r--sc/source/ui/view/tabvwsh4.cxx4
-rw-r--r--sd/inc/sdmod.hxx2
-rw-r--r--sd/source/ui/app/sdmod2.cxx12
-rw-r--r--sd/source/ui/dlg/paragr.cxx12
-rw-r--r--sd/source/ui/dlg/prntopts.cxx8
-rw-r--r--sd/source/ui/dlg/tpaction.cxx11
-rw-r--r--sd/source/ui/dlg/tpoption.cxx24
-rw-r--r--sd/source/ui/inc/prntopts.hxx4
-rw-r--r--sd/source/ui/inc/tpaction.hxx4
-rw-r--r--sd/source/ui/inc/tpoption.hxx12
-rw-r--r--sd/source/ui/view/FormShellManager.cxx1
-rw-r--r--sd/source/ui/view/ViewShellManager.cxx2
-rw-r--r--sd/source/ui/view/tabcontr.cxx1
-rw-r--r--sfx2/source/appl/module.cxx2
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx35
-rw-r--r--sfx2/source/dialog/documentfontsdialog.cxx8
-rw-r--r--sfx2/source/dialog/mgetempl.cxx10
-rw-r--r--sfx2/source/dialog/printopt.cxx8
-rw-r--r--sfx2/source/dialog/securitypage.cxx8
-rw-r--r--sfx2/source/dialog/tabdlg.cxx11
-rw-r--r--sfx2/source/inc/documentfontsdialog.hxx4
-rw-r--r--sfx2/source/view/printer.cxx2
-rw-r--r--sfx2/source/view/viewprn.cxx2
-rw-r--r--starmath/inc/dialog.hxx4
-rw-r--r--starmath/inc/smmod.hxx2
-rw-r--r--starmath/inc/view.hxx2
-rw-r--r--starmath/source/dialog.cxx8
-rw-r--r--starmath/source/smmod.cxx4
-rw-r--r--starmath/source/view.cxx4
-rw-r--r--svx/source/dialog/hdft.cxx20
-rw-r--r--svx/source/dialog/optgrid.cxx8
-rw-r--r--svx/source/tbxctrls/grafctrl.cxx3
-rw-r--r--sw/inc/swmodule.hxx2
-rw-r--r--sw/inc/view.hxx4
-rw-r--r--sw/source/ui/chrdlg/chardlg.cxx8
-rw-r--r--sw/source/ui/chrdlg/drpcps.cxx11
-rw-r--r--sw/source/ui/chrdlg/numpara.cxx8
-rw-r--r--sw/source/ui/chrdlg/swuiccoll.cxx8
-rw-r--r--sw/source/ui/chrdlg/tblnumfm.cxx3
-rw-r--r--sw/source/ui/config/mailconfigpage.cxx11
-rw-r--r--sw/source/ui/config/optcomp.cxx8
-rw-r--r--sw/source/ui/config/optload.cxx19
-rw-r--r--sw/source/ui/config/optpage.cxx72
-rw-r--r--sw/source/ui/dbui/mailmergewizard.cxx12
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx4
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.hxx2
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.cxx4
-rw-r--r--sw/source/ui/dbui/mmdocselectpage.hxx2
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.cxx4
-rw-r--r--sw/source/ui/dbui/mmgreetingspage.hxx2
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.cxx4
-rw-r--r--sw/source/ui/dbui/mmlayoutpage.hxx2
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.cxx4
-rw-r--r--sw/source/ui/dbui/mmoutputtypepage.hxx2
-rw-r--r--sw/source/ui/dialog/addrdlg.cxx3
-rw-r--r--sw/source/ui/dialog/docstdlg.cxx8
-rw-r--r--sw/source/ui/dialog/uiregionsw.cxx24
-rw-r--r--sw/source/ui/envelp/envfmt.cxx8
-rw-r--r--sw/source/ui/envelp/envfmt.hxx4
-rw-r--r--sw/source/ui/envelp/envlop1.cxx8
-rw-r--r--sw/source/ui/envelp/envprt.cxx8
-rw-r--r--sw/source/ui/envelp/envprt.hxx4
-rw-r--r--sw/source/ui/envelp/label1.cxx26
-rw-r--r--sw/source/ui/envelp/labfmt.cxx8
-rw-r--r--sw/source/ui/envelp/labfmt.hxx4
-rw-r--r--sw/source/ui/envelp/labprt.cxx8
-rw-r--r--sw/source/ui/envelp/labprt.hxx4
-rw-r--r--sw/source/ui/envelp/swuilabimp.hxx12
-rw-r--r--sw/source/ui/fldui/flddb.cxx8
-rw-r--r--sw/source/ui/fldui/flddb.hxx4
-rw-r--r--sw/source/ui/fldui/flddinf.cxx8
-rw-r--r--sw/source/ui/fldui/flddinf.hxx4
-rw-r--r--sw/source/ui/fldui/flddok.cxx8
-rw-r--r--sw/source/ui/fldui/flddok.hxx4
-rw-r--r--sw/source/ui/fldui/fldedt.cxx14
-rw-r--r--sw/source/ui/fldui/fldfunc.cxx8
-rw-r--r--sw/source/ui/fldui/fldfunc.hxx4
-rw-r--r--sw/source/ui/fldui/fldpage.cxx4
-rw-r--r--sw/source/ui/fldui/fldpage.hxx2
-rw-r--r--sw/source/ui/fldui/fldref.cxx8
-rw-r--r--sw/source/ui/fldui/fldref.hxx4
-rw-r--r--sw/source/ui/fldui/fldvar.cxx8
-rw-r--r--sw/source/ui/fldui/fldvar.hxx4
-rw-r--r--sw/source/ui/frmdlg/column.cxx12
-rw-r--r--sw/source/ui/frmdlg/frmpage.cxx32
-rw-r--r--sw/source/ui/frmdlg/pattern.cxx5
-rw-r--r--sw/source/ui/frmdlg/uiborder.cxx3
-rw-r--r--sw/source/ui/frmdlg/wrap.cxx11
-rw-r--r--sw/source/ui/index/cnttab.cxx24
-rw-r--r--sw/source/ui/misc/docfnote.cxx16
-rw-r--r--sw/source/ui/misc/impfnote.hxx8
-rw-r--r--sw/source/ui/misc/num.cxx8
-rw-r--r--sw/source/ui/misc/outline.cxx8
-rw-r--r--sw/source/ui/misc/pgfnote.cxx10
-rw-r--r--sw/source/ui/misc/pggrid.cxx10
-rw-r--r--sw/source/ui/table/tabledlg.cxx24
-rw-r--r--sw/source/uibase/app/appopt.cxx20
-rw-r--r--sw/source/uibase/inc/chrdlg.hxx4
-rw-r--r--sw/source/uibase/inc/column.hxx4
-rw-r--r--sw/source/uibase/inc/docstdlg.hxx4
-rw-r--r--sw/source/uibase/inc/drpcps.hxx4
-rw-r--r--sw/source/uibase/inc/envlop.hxx4
-rw-r--r--sw/source/uibase/inc/frmpage.hxx16
-rw-r--r--sw/source/uibase/inc/mailconfigpage.hxx4
-rw-r--r--sw/source/uibase/inc/num.hxx4
-rw-r--r--sw/source/uibase/inc/numpara.hxx4
-rw-r--r--sw/source/uibase/inc/optcomp.hxx4
-rw-r--r--sw/source/uibase/inc/optload.hxx8
-rw-r--r--sw/source/uibase/inc/optpage.hxx32
-rw-r--r--sw/source/uibase/inc/outline.hxx4
-rw-r--r--sw/source/uibase/inc/pgfnote.hxx4
-rw-r--r--sw/source/uibase/inc/pggrid.hxx4
-rw-r--r--sw/source/uibase/inc/pview.hxx2
-rw-r--r--sw/source/uibase/inc/regionsw.hxx12
-rw-r--r--sw/source/uibase/inc/swuiccoll.hxx4
-rw-r--r--sw/source/uibase/inc/swuicnttab.hxx12
-rw-r--r--sw/source/uibase/inc/wrap.hxx4
-rw-r--r--sw/source/uibase/table/tablepg.hxx12
-rw-r--r--sw/source/uibase/uiview/pview.cxx4
-rw-r--r--sw/source/uibase/uiview/viewprt.cxx8
-rw-r--r--vcl/source/control/wizardmachine.cxx4
-rw-r--r--vcl/source/edit/vclmedit.cxx1
-rw-r--r--vcl/source/window/dialog.cxx1
-rw-r--r--vcl/source/window/window.cxx1
395 files changed, 1809 insertions, 1875 deletions
diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx
index cde483390e73..d1c2acc3c14d 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx
@@ -33,9 +33,8 @@ ChartTypeDialog::ChartTypeDialog(weld::Window* pParent,
, m_xChartModel(xChartModel)
, m_xContentArea(m_xDialog->weld_content_area())
{
- TabPageParent aParent(m_xContentArea.get(), this);
m_xChartTypeTabPage = std::make_unique<ChartTypeTabPage>(
- aParent,
+ m_xContentArea.get(), this,
uno::Reference<XChartDocument>::query(m_xChartModel),
false/*don't show title description*/);
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index 228bcdbadba6..ef67bf7fe568 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -90,15 +90,13 @@ std::unique_ptr<BuilderPage> CreationWizard::createPage(WizardState nState)
OString sIdent(OString::number(nState));
weld::Container* pPageContainer = m_xAssistant->append_page(sIdent);
- // TODO eventually pass DialogController as distinct argument instead of bundling into TabPageParent
- TabPageParent aParent(pPageContainer, this);
switch( nState )
{
case STATE_CHARTTYPE:
{
m_aTimerTriggeredControllerLock.startTimer();
- xRet = std::make_unique<ChartTypeTabPage>(aParent, m_xChartModel);
+ xRet = std::make_unique<ChartTypeTabPage>(pPageContainer, this, m_xChartModel);
m_pTemplateProvider = static_cast<ChartTypeTabPage*>(xRet.get());
if (m_pDialogModel)
m_pDialogModel->setTemplate( m_pTemplateProvider->getCurrentTemplate());
@@ -107,18 +105,18 @@ std::unique_ptr<BuilderPage> CreationWizard::createPage(WizardState nState)
case STATE_SIMPLE_RANGE:
{
m_aTimerTriggeredControllerLock.startTimer();
- xRet = std::make_unique<RangeChooserTabPage>(aParent, *m_pDialogModel, m_pTemplateProvider, this);
+ xRet = std::make_unique<RangeChooserTabPage>(pPageContainer, this, *m_pDialogModel, m_pTemplateProvider);
break;
}
case STATE_DATA_SERIES:
{
m_aTimerTriggeredControllerLock.startTimer();
- xRet = std::make_unique<DataSourceTabPage>(aParent, *m_pDialogModel, m_pTemplateProvider, this);
+ xRet = std::make_unique<DataSourceTabPage>(pPageContainer, this, *m_pDialogModel, m_pTemplateProvider);
break;
}
case STATE_OBJECTS:
{
- xRet = std::make_unique<TitlesAndObjectsTabPage>(aParent, m_xChartModel, m_xComponentContext);
+ xRet = std::make_unique<TitlesAndObjectsTabPage>(pPageContainer, this, m_xChartModel, m_xComponentContext);
m_aTimerTriggeredControllerLock.startTimer();
break;
}
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index bb377bdbaa11..cb0b31b7a986 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -88,11 +88,11 @@ DataSourceDialog::DataSourceDialog(weld::Window * pParent,
, m_xTabControl(m_xBuilder->weld_notebook("notebook"))
, m_xBtnOK(m_xBuilder->weld_button("ok"))
{
- TabPageParent aRangeParent(m_xTabControl->get_page("range"), this);
- m_xRangeChooserTabPage = std::make_unique<RangeChooserTabPage>(aRangeParent, *(m_apDialogModel.get()),
+ m_xRangeChooserTabPage = std::make_unique<RangeChooserTabPage>(m_xTabControl->get_page("range"), this,
+ *(m_apDialogModel.get()),
m_apDocTemplateProvider.get(), true /* bHideDescription */ );
- TabPageParent aSeriesParent(m_xTabControl->get_page("series"), this);
- m_xDataSourceTabPage = std::make_unique<DataSourceTabPage>(aSeriesParent, *(m_apDialogModel.get()),
+ m_xDataSourceTabPage = std::make_unique<DataSourceTabPage>(m_xTabControl->get_page("series"), this,
+ *(m_apDialogModel.get()),
m_apDocTemplateProvider.get(), true /* bHideDescription */ );
m_xTabControl->connect_enter_page(LINK(this, DataSourceDialog, ActivatePageHdl));
m_xTabControl->connect_leave_page(LINK(this, DataSourceDialog, DeactivatePageHdl));
diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
index 634840e367b6..7acd590c6ed1 100644
--- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
@@ -42,7 +42,7 @@ InsertErrorBarsDialog::InsertErrorBarsDialog(
ErrorBarResources::tErrorBarType eType /* = ErrorBarResources::ERROR_BAR_Y */ )
: GenericDialogController(pParent, "modules/schart/ui/dlg_InsertErrorBars.ui", "dlg_InsertErrorBars")
, m_apErrorBarResources( new ErrorBarResources(
- m_xBuilder.get(), TabPageParent(m_xDialog.get(), nullptr), rMyAttrs,
+ m_xBuilder.get(), this, rMyAttrs,
/* bNoneAvailable = */ true, eType ))
{
ObjectType objType = eType == ErrorBarResources::ERROR_BAR_Y ? OBJECTTYPE_DATA_ERRORS_Y : OBJECTTYPE_DATA_ERRORS_X;
diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
index 9be881594068..d91b545cd027 100644
--- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
+++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
@@ -36,8 +36,7 @@ NumberFormatDialog::NumberFormatDialog(weld::Window* pParent, SfxItemSet& rSet)
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT );
if (fnCreatePage)
{
- TabPageParent pPageParent(get_content_area(), this);
- std::unique_ptr<SfxTabPage> xTabPage = (*fnCreatePage)(pPageParent, &rSet);
+ std::unique_ptr<SfxTabPage> xTabPage = (*fnCreatePage)(get_content_area(), this, &rSet);
xTabPage->PageCreated(rSet);
SetTabPage(std::move(xTabPage));
}
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index bb9f78f85134..46407f7cc732 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -23,7 +23,7 @@
#include <helpids.h>
#include <chartview/ChartSfxItemIds.hxx>
#include <com/sun/star/chart2/XChartDocument.hpp>
-#include <vcl/dialog.hxx>
+#include <vcl/weld.hxx>
#include <rtl/math.hxx>
#include <sal/log.hxx>
@@ -40,19 +40,11 @@ using namespace ::com::sun::star;
namespace
{
-void lcl_enableRangeChoosing(bool bEnable, TabPageParent pParent)
+void lcl_enableRangeChoosing(bool bEnable, weld::DialogController* pController)
{
- if (weld::DialogController* pController = pParent.pController)
- {
- weld::Window* pWeldDialog = pController->getDialog();
- pWeldDialog->set_modal(!bEnable);
- pWeldDialog->set_visible(!bEnable);
- }
- else if (::Dialog* pVCLDialog = pParent.pParent ? pParent.pParent->GetParentDialog() : nullptr)
- {
- pVCLDialog->Show(!bEnable);
- pVCLDialog->SetModalInputMode(!bEnable);
- }
+ weld::Window* pWeldDialog = pController->getDialog();
+ pWeldDialog->set_modal(!bEnable);
+ pWeldDialog->set_visible(!bEnable);
}
sal_uInt16 lcl_getLbEntryPosByErrorKind( SvxChartKindError eErrorKind )
@@ -87,7 +79,7 @@ sal_uInt16 lcl_getLbEntryPosByErrorKind( SvxChartKindError eErrorKind )
namespace chart
{
-ErrorBarResources::ErrorBarResources(weld::Builder* pParent, TabPageParent pParentDialog,
+ErrorBarResources::ErrorBarResources(weld::Builder* pParent, weld::DialogController* pController,
const SfxItemSet& rInAttrs, bool bNoneAvailable,
tErrorBarType eType /* = ERROR_BAR_Y */ )
: m_eErrorKind( SvxChartKindError::NONE )
@@ -101,7 +93,7 @@ ErrorBarResources::ErrorBarResources(weld::Builder* pParent, TabPageParent pPare
, m_nConstSpinSize( 1 )
, m_fPlusValue(0.0)
, m_fMinusValue(0.0)
- , m_pParentDialog( pParentDialog )
+ , m_pController(pController)
, m_pCurrentRangeChoosingField( nullptr )
, m_bHasInternalDataProvider( true )
, m_bEnableDataTableDialog( true )
@@ -456,7 +448,7 @@ IMPL_LINK(ErrorBarResources, ChooseRange, weld::Button&, rButton, void)
aUIString = m_xUIStringNeg->get_label();
}
- lcl_enableRangeChoosing( true, m_pParentDialog );
+ lcl_enableRangeChoosing(true, m_pController);
m_apRangeSelectionHelper->chooseRange(
m_pCurrentRangeChoosingField->get_text(),
aUIString, *this );
@@ -695,7 +687,7 @@ void ErrorBarResources::listeningFinished(
m_pCurrentRangeChoosingField = nullptr;
UpdateControlStates();
- lcl_enableRangeChoosing( false, m_pParentDialog );
+ lcl_enableRangeChoosing(false, m_pController);
}
void ErrorBarResources::disposingRangeSelection()
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 2edb5a56e447..dfc6bf887878 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -30,8 +30,8 @@
namespace chart
{
-SchAxisLabelTabPage::SchAxisLabelTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage(pParent, "modules/schart/ui/tp_axisLabel.ui", "AxisLabelTabPage", &rInAttrs)
+SchAxisLabelTabPage::SchAxisLabelTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "modules/schart/ui/tp_axisLabel.ui", "AxisLabelTabPage", &rInAttrs)
, m_bShowStaggeringControls( true )
, m_nInitialDegrees( 0 )
, m_bHasInitialDegrees( true )
@@ -73,9 +73,9 @@ SchAxisLabelTabPage::~SchAxisLabelTabPage()
m_xLbTextDirection.reset();
}
-std::unique_ptr<SfxTabPage> SchAxisLabelTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrs)
+std::unique_ptr<SfxTabPage> SchAxisLabelTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrs)
{
- return std::make_unique<SchAxisLabelTabPage>(pParent, *rAttrs);
+ return std::make_unique<SchAxisLabelTabPage>(pPage, pController, *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 1cfc7db169c6..3816d1ba81f7 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
@@ -69,10 +69,10 @@ private:
DECL_LINK(ToggleShowLabel, weld::ToggleButton&, void);
public:
- SchAxisLabelTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ SchAxisLabelTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SchAxisLabelTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
virtual void Reset( const SfxItemSet* rInAttrs ) override;
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 7dd6bebcb108..b3b49fa02df8 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -31,8 +31,8 @@ using namespace ::com::sun::star;
namespace chart
{
-AxisPositionsTabPage::AxisPositionsTabPage(TabPageParent pWindow,const SfxItemSet& rInAttrs)
- : SfxTabPage(pWindow ,"modules/schart/ui/tp_AxisPositions.ui" ,"tp_AxisPositions" , &rInAttrs)
+AxisPositionsTabPage::AxisPositionsTabPage(weld::Container* pPage, weld::DialogController* pController,const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "modules/schart/ui/tp_AxisPositions.ui", "tp_AxisPositions", &rInAttrs)
, m_pNumFormatter(nullptr)
, m_bCrossingAxisIsCategoryAxis(false)
, m_aCategories()
@@ -65,9 +65,9 @@ AxisPositionsTabPage::~AxisPositionsTabPage()
{
}
-std::unique_ptr<SfxTabPage> AxisPositionsTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> AxisPositionsTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
{
- return std::make_unique<AxisPositionsTabPage>(pParent, *rOutAttrs);
+ return std::make_unique<AxisPositionsTabPage>(pPage, pController, *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 3e20edcb6e67..fc5164b895cc 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
@@ -27,10 +27,10 @@ namespace chart
class AxisPositionsTabPage : public SfxTabPage
{
public:
- AxisPositionsTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ AxisPositionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~AxisPositionsTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
virtual void Reset( const SfxItemSet* rInAttrs ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pItemSet ) override;
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 2decb778dac5..1391230ad55f 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -398,7 +398,7 @@ void SteppedPropertiesDialog::fillParameter( ChartTypeParameter& rParameter, boo
class SplineResourceGroup : public ChangingResource
{
public:
- explicit SplineResourceGroup(weld::Builder* pBuilder, TabPageParent pParent);
+ explicit SplineResourceGroup(weld::Builder* pBuilder, weld::Window* pParent);
void showControls( bool bShow );
@@ -413,7 +413,7 @@ private:
SteppedPropertiesDialog& getSteppedPropertiesDialog();
private:
- TabPageParent m_pParent;
+ weld::Window* m_pParent;
std::unique_ptr<weld::Label> m_xFT_LineType;
std::unique_ptr<weld::ComboBox> m_xLB_LineType;
std::unique_ptr<weld::Button> m_xPB_DetailsDialog;
@@ -421,7 +421,7 @@ private:
std::unique_ptr<SteppedPropertiesDialog> m_xSteppedPropertiesDialog;
};
-SplineResourceGroup::SplineResourceGroup(weld::Builder* pBuilder, TabPageParent pParent)
+SplineResourceGroup::SplineResourceGroup(weld::Builder* pBuilder, weld::Window* pParent)
: ChangingResource()
, m_pParent(pParent)
, m_xFT_LineType(pBuilder->weld_label("linetypeft"))
@@ -435,7 +435,7 @@ SplinePropertiesDialog& SplineResourceGroup::getSplinePropertiesDialog()
{
if (!m_xSplinePropertiesDialog)
{
- m_xSplinePropertiesDialog.reset(new SplinePropertiesDialog(m_pParent.GetFrameWeld()));
+ m_xSplinePropertiesDialog.reset(new SplinePropertiesDialog(m_pParent));
}
return *m_xSplinePropertiesDialog;
}
@@ -444,7 +444,7 @@ SteppedPropertiesDialog& SplineResourceGroup::getSteppedPropertiesDialog()
{
if (!m_xSteppedPropertiesDialog)
{
- m_xSteppedPropertiesDialog.reset(new SteppedPropertiesDialog(m_pParent.GetFrameWeld()));
+ m_xSteppedPropertiesDialog.reset(new SteppedPropertiesDialog(m_pParent));
}
return *m_xSteppedPropertiesDialog;
}
@@ -601,12 +601,12 @@ IMPL_LINK_NOARG(GeometryResourceGroup, GeometryChangeHdl, weld::TreeView&, void)
m_pChangeListener->stateChanged(this);
}
-ChartTypeTabPage::ChartTypeTabPage(TabPageParent pParent , const uno::Reference< XChartDocument >& xChartModel,
+ChartTypeTabPage::ChartTypeTabPage(weld::Container* pPage, weld::DialogController* pController, const uno::Reference< XChartDocument >& xChartModel,
bool bShowDescription)
- : OWizardPage(pParent, "modules/schart/ui/tp_ChartType.ui", "tp_ChartType")
+ : OWizardPage(pPage, pController, "modules/schart/ui/tp_ChartType.ui", "tp_ChartType")
, m_pDim3DLookResourceGroup( new Dim3DLookResourceGroup(m_xBuilder.get()) )
, m_pStackingResourceGroup( new StackingResourceGroup(m_xBuilder.get()) )
- , m_pSplineResourceGroup( new SplineResourceGroup(m_xBuilder.get(), pParent) )
+ , m_pSplineResourceGroup( new SplineResourceGroup(m_xBuilder.get(), pController->getDialog()) )
, m_pGeometryResourceGroup( new GeometryResourceGroup(m_xBuilder.get()) )
, m_pSortByXValuesResourceGroup( new SortByXValuesResourceGroup(m_xBuilder.get()) )
, m_xChartModel( xChartModel )
diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx
index 8035cf7a0b54..fadeee06e5a8 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.hxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.hxx
@@ -45,7 +45,7 @@ class SortByXValuesResourceGroup;
class ChartTypeTabPage final : public ResourceChangeListener, public vcl::OWizardPage, public ChartTypeTemplateProvider
{
public:
- ChartTypeTabPage( TabPageParent pParent
+ ChartTypeTabPage( weld::Container* pPage, weld::DialogController* pController
, const css::uno::Reference< css::chart2::XChartDocument >& xChartModel
, bool bShowDescription = true );
virtual ~ChartTypeTabPage() override;
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx b/chart2/source/controller/dialogs/tp_DataLabel.cxx
index 6a611a8af5cf..3594e3e8ffeb 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx
@@ -22,15 +22,15 @@
namespace chart
{
-DataLabelsTabPage::DataLabelsTabPage(TabPageParent pWindow, const SfxItemSet& rInAttrs)
- : SfxTabPage(pWindow , "modules/schart/ui/tp_DataLabel.ui", "tp_DataLabel", &rInAttrs)
- , m_aDataLabelResources(m_xBuilder.get(), pWindow.GetFrameWeld(), rInAttrs)
+DataLabelsTabPage::DataLabelsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "modules/schart/ui/tp_DataLabel.ui", "tp_DataLabel", &rInAttrs)
+ , m_aDataLabelResources(m_xBuilder.get(), pController->getDialog(), rInAttrs)
{
}
-std::unique_ptr<SfxTabPage> DataLabelsTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> DataLabelsTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
{
- return std::make_unique<DataLabelsTabPage>(pParent, *rOutAttrs);
+ return std::make_unique<DataLabelsTabPage>(pPage, pController, *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 d5be8a13641f..e7d052728b4b 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.hxx
@@ -30,9 +30,9 @@ namespace chart
class DataLabelsTabPage : public SfxTabPage
{
public:
- DataLabelsTabPage(TabPageParent pWindow, const SfxItemSet& rInAttrs);
+ DataLabelsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pWindow, const SfxItemSet* rInAttrs);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs);
void SetNumberFormatter( SvNumberFormatter* pFormatter );
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index fdb8147f438a..4c1285a81163 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -158,16 +158,16 @@ Reference< chart2::data::XLabeledDataSequence > lcl_findLSequenceWithOnlyLabel(
namespace chart
{
-DataSourceTabPage::DataSourceTabPage(TabPageParent pParent, DialogModel & rDialogModel,
+DataSourceTabPage::DataSourceTabPage(weld::Container* pPage, weld::DialogController* pController,
+ DialogModel & rDialogModel,
ChartTypeTemplateProvider* pTemplateProvider,
bool bHideDescription /* = false */)
- : ::vcl::OWizardPage(pParent, "modules/schart/ui/tp_DataSource.ui", "tp_DataSource")
+ : ::vcl::OWizardPage(pPage, pController, "modules/schart/ui/tp_DataSource.ui", "tp_DataSource")
, m_pTemplateProvider(pTemplateProvider)
, m_rDialogModel(rDialogModel)
, m_pCurrentRangeChoosingField( nullptr )
, m_bIsDirty( false )
- , m_pParentController(pParent.pController)
- , m_pTabPageNotifiable(dynamic_cast<TabPageNotifiable*>(m_pParentController))
+ , m_pTabPageNotifiable(dynamic_cast<TabPageNotifiable*>(pController))
, m_xFT_CAPTION(m_xBuilder->weld_label("FT_CAPTION_FOR_WIZARD"))
, m_xFT_SERIES(m_xBuilder->weld_label("FT_SERIES"))
, m_xLB_SERIES(m_xBuilder->weld_tree_view("LB_SERIES"))
@@ -529,7 +529,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl, weld::Button&, voi
m_xLB_SERIES->get_text(nEntry));
}
- lcl_enableRangeChoosing( true, m_pParentController );
+ lcl_enableRangeChoosing(true, m_pDialogController);
m_rDialogModel.getRangeSelectionHelper()->chooseRange( aSelectedRolesRange, aUIStr, *this );
}
else
@@ -545,7 +545,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, CategoriesRangeButtonClickedHdl, weld::Button
return;
OUString aStr(SchResId(m_xFT_CATEGORIES->get_visible() ? STR_DATA_SELECT_RANGE_FOR_CATEGORIES : STR_DATA_SELECT_RANGE_FOR_DATALABELS));
- lcl_enableRangeChoosing(true, m_pParentController);
+ lcl_enableRangeChoosing(true, m_pDialogController);
m_rDialogModel.getRangeSelectionHelper()->chooseRange(
m_rDialogModel.getCategoriesRange(), aStr, *this );
}
@@ -723,7 +723,7 @@ void DataSourceTabPage::listeningFinished(
m_pCurrentRangeChoosingField = nullptr;
updateControlState();
- lcl_enableRangeChoosing(false, m_pParentController);
+ lcl_enableRangeChoosing(false, m_pDialogController);
}
void DataSourceTabPage::disposingRangeSelection()
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx
index d899f76eab80..4c3ecf300cc7 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.hxx
@@ -51,7 +51,7 @@ class DataSourceTabPage final :
public RangeSelectionListenerParent
{
public:
- explicit DataSourceTabPage(TabPageParent pParent,
+ explicit DataSourceTabPage(weld::Container* pPage, weld::DialogController* pController,
DialogModel & rDialogModel,
ChartTypeTemplateProvider* pTemplateProvider,
bool bHideDescription = false);
@@ -121,7 +121,6 @@ private:
weld::Entry* m_pCurrentRangeChoosingField;
bool m_bIsDirty;
- weld::DialogController* m_pParentController;
TabPageNotifiable * m_pTabPageNotifiable;
std::unique_ptr<weld::Label> m_xFT_CAPTION;
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
index 1b7800b09fea..addaf99281ce 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
@@ -26,15 +26,15 @@ using namespace ::com::sun::star;
namespace chart
{
-ErrorBarsTabPage::ErrorBarsTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage(pParent, "modules/schart/ui/tp_ErrorBars.ui", "tp_ErrorBars", &rInAttrs)
- , m_aErrorBarResources(m_xBuilder.get(), pParent, rInAttrs, /* bNoneAvailable = */ false)
+ErrorBarsTabPage::ErrorBarsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "modules/schart/ui/tp_ErrorBars.ui", "tp_ErrorBars", &rInAttrs)
+ , m_aErrorBarResources(m_xBuilder.get(), pController, rInAttrs, /* bNoneAvailable = */ false)
{
}
-std::unique_ptr<SfxTabPage> ErrorBarsTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> ErrorBarsTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
{
- return std::make_unique<ErrorBarsTabPage>(pParent, *rOutAttrs);
+ return std::make_unique<ErrorBarsTabPage>(pPage, pController, *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 e74aac0a2d5b..2ce941a1d5b9 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.hxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
@@ -29,14 +29,14 @@ namespace chart
class ErrorBarsTabPage : public SfxTabPage
{
public:
- ErrorBarsTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ ErrorBarsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
void SetAxisMinorStepWidthForErrorBarDecimals( double fMinorStepWidth );
void SetErrorBarType( ErrorBarResources::tErrorBarType eNewType );
void SetChartDocumentForRangeChoosing(
const css::uno::Reference< css::chart2::XChartDocument > & xChartDocument );
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
virtual void Reset( const SfxItemSet* rInAttrs ) override;
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index e7a855c1258f..87275ce999ce 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -26,8 +26,8 @@
namespace chart
{
-SchLegendPosTabPage::SchLegendPosTabPage(TabPageParent pWindow, const SfxItemSet& rInAttrs)
- : SfxTabPage(pWindow, "modules/schart/ui/tp_LegendPosition.ui", "tp_LegendPosition", &rInAttrs)
+SchLegendPosTabPage::SchLegendPosTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "modules/schart/ui/tp_LegendPosition.ui", "tp_LegendPosition", &rInAttrs)
, m_aLegendPositionResources(*m_xBuilder)
, m_xLbTextDirection(new TextDirectionListBox(m_xBuilder->weld_combo_box("LB_LEGEND_TEXTDIR")))
{
@@ -38,9 +38,9 @@ SchLegendPosTabPage::~SchLegendPosTabPage()
m_xLbTextDirection.reset();
}
-std::unique_ptr<SfxTabPage> SchLegendPosTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> SchLegendPosTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
{
- return std::make_unique<SchLegendPosTabPage>(pParent, *rOutAttrs);
+ return std::make_unique<SchLegendPosTabPage>(pPage, pController, *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 4414be65bed4..178c91ddf717 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
@@ -36,10 +36,10 @@ private:
std::unique_ptr<TextDirectionListBox> m_xLbTextDirection;
public:
- SchLegendPosTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ SchLegendPosTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SchLegendPosTabPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
virtual void Reset(const SfxItemSet* rInAttrs) override;
};
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index 6e667b9c89b8..8dd7584a2745 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -28,8 +28,8 @@
namespace chart
{
-SchLayoutTabPage::SchLayoutTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage(pParent, "modules/schart/ui/tp_ChartType.ui", "tp_ChartType", &rInAttrs)
+SchLayoutTabPage::SchLayoutTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "modules/schart/ui/tp_ChartType.ui", "tp_ChartType", &rInAttrs)
{
m_pGeometryResources.reset(new BarGeometryResources(m_xBuilder.get()));
}
@@ -39,9 +39,9 @@ SchLayoutTabPage::~SchLayoutTabPage()
m_pGeometryResources.reset();
}
-std::unique_ptr<SfxTabPage> SchLayoutTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> SchLayoutTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
{
- return std::make_unique<SchLayoutTabPage>(pParent, *rOutAttrs);
+ return std::make_unique<SchLayoutTabPage>(pPage, pController, *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 680f330b6a9b..2438ce898b8b 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
@@ -28,10 +28,10 @@ class BarGeometryResources;
class SchLayoutTabPage : public SfxTabPage
{
public:
- SchLayoutTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ SchLayoutTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SchLayoutTabPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
virtual void Reset(const SfxItemSet* rInAttrs) override;
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index f98fc072e54a..74f8d12d14a5 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -26,8 +26,8 @@
namespace chart
{
-PolarOptionsTabPage::PolarOptionsTabPage(TabPageParent pWindow, const SfxItemSet& rInAttrs)
- : SfxTabPage(pWindow, "modules/schart/ui/tp_PolarOptions.ui", "tp_PolarOptions", &rInAttrs)
+PolarOptionsTabPage::PolarOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "modules/schart/ui/tp_PolarOptions.ui", "tp_PolarOptions", &rInAttrs)
, m_xCB_Clockwise(m_xBuilder->weld_check_button("CB_CLOCKWISE"))
, m_xFL_StartingAngle(m_xBuilder->weld_frame("frameANGLE"))
, m_xNF_StartingAngle(m_xBuilder->weld_spin_button("NF_STARTING_ANGLE"))
@@ -43,9 +43,9 @@ PolarOptionsTabPage::~PolarOptionsTabPage()
m_xAngleDial.reset();
}
-std::unique_ptr<SfxTabPage> PolarOptionsTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> PolarOptionsTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
{
- return std::make_unique<PolarOptionsTabPage>(pParent, *rOutAttrs);
+ return std::make_unique<PolarOptionsTabPage>(pPage, pController, *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 f962f94694f2..c1a5add984fe 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.hxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
@@ -36,10 +36,10 @@ class PolarOptionsTabPage : public SfxTabPage
{
public:
- PolarOptionsTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ PolarOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~PolarOptionsTabPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
virtual void Reset(const SfxItemSet* rInAttrs) override;
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index ecbc658cdf28..77dc2145178f 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -58,17 +58,16 @@ using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Sequence;
-RangeChooserTabPage::RangeChooserTabPage(TabPageParent pParent, DialogModel & rDialogModel,
+RangeChooserTabPage::RangeChooserTabPage(weld::Container* pPage, weld::DialogController* pController, DialogModel & rDialogModel,
ChartTypeTemplateProvider* pTemplateProvider,
bool bHideDescription /* = false */)
- : OWizardPage(pParent, "modules/schart/ui/tp_RangeChooser.ui", "tp_RangeChooser")
+ : OWizardPage(pPage, pController, "modules/schart/ui/tp_RangeChooser.ui", "tp_RangeChooser")
, m_nChangingControlCalls(0)
, m_bIsDirty(false)
, m_aLastValidRangeString()
, m_pTemplateProvider(pTemplateProvider)
, m_rDialogModel( rDialogModel )
- , m_pParentController(pParent.pController)
- , m_pTabPageNotifiable(dynamic_cast<TabPageNotifiable*>(m_pParentController))
+ , m_pTabPageNotifiable(dynamic_cast<TabPageNotifiable*>(pController))
, m_xFT_Caption(m_xBuilder->weld_label("FT_CAPTION_FOR_WIZARD"))
, m_xFT_Range(m_xBuilder->weld_label("FT_RANGE"))
, m_xED_Range(m_xBuilder->weld_entry("ED_RANGE"))
@@ -340,7 +339,7 @@ IMPL_LINK_NOARG(RangeChooserTabPage, ChooseRangeHdl, weld::Button&, void)
OUString aRange = m_xED_Range->get_text();
OUString aTitle = m_xFTTitle->get_label();
- lcl_enableRangeChoosing( true, m_pParentController );
+ lcl_enableRangeChoosing(true, m_pDialogController);
m_rDialogModel.getRangeSelectionHelper()->chooseRange( aRange, aTitle, *this );
}
@@ -364,7 +363,7 @@ void RangeChooserTabPage::listeningFinished( const OUString & rNewRange )
if( isValid())
changeDialogModelAccordingToControls();
- lcl_enableRangeChoosing( false, m_pParentController );
+ lcl_enableRangeChoosing(false, m_pDialogController);
}
void RangeChooserTabPage::disposingRangeSelection()
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
index 41ae6f19e460..c3883e837951 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
@@ -37,7 +37,7 @@ class RangeChooserTabPage final : public vcl::OWizardPage, public RangeSelection
{
public:
- RangeChooserTabPage(TabPageParent pParent, DialogModel & rDialogModel,
+ RangeChooserTabPage(weld::Container* pPage, weld::DialogController* pController, DialogModel & rDialogModel,
ChartTypeTemplateProvider* pTemplateProvider,
bool bHideDescription = false);
virtual ~RangeChooserTabPage() override;
@@ -77,7 +77,6 @@ private:
ChartTypeTemplateProvider* m_pTemplateProvider;
DialogModel & m_rDialogModel;
- weld::DialogController* m_pParentController;
TabPageNotifiable * m_pTabPageNotifiable;
std::unique_ptr<weld::Label> m_xFT_Caption;
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index e7f5837fb9d5..b33a9eb3f3f3 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -50,8 +50,8 @@ void lcl_setValue(weld::FormattedSpinButton& rFmtField, double fValue)
}
-ScaleTabPage::ScaleTabPage(TabPageParent pWindow,const SfxItemSet& rInAttrs)
- : SfxTabPage(pWindow, "modules/schart/ui/tp_Scale.ui", "tp_Scale", &rInAttrs)
+ScaleTabPage::ScaleTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "modules/schart/ui/tp_Scale.ui", "tp_Scale", &rInAttrs)
, fMin(0.0)
, fMax(0.0)
, fStepMain(0.0)
@@ -213,9 +213,9 @@ IMPL_LINK_NOARG(ScaleTabPage, SelectAxisTypeHdl, weld::ComboBox&, void)
SetNumFormat();
}
-std::unique_ptr<SfxTabPage> ScaleTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> ScaleTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
{
- return std::make_unique<ScaleTabPage>(pParent, *rOutAttrs);
+ return std::make_unique<ScaleTabPage>(pPage, pController, *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 09c47af57d57..b0e308845bc4 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hxx
+++ b/chart2/source/controller/dialogs/tp_Scale.hxx
@@ -27,10 +27,10 @@ namespace chart
class ScaleTabPage : public SfxTabPage
{
public:
- ScaleTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ ScaleTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~ScaleTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
virtual void Reset( const SfxItemSet* rInAttrs ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pItemSet ) override;
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index db5a0cf5241f..82bd80ab6542 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -30,8 +30,8 @@
namespace chart
{
-SchOptionTabPage::SchOptionTabPage(TabPageParent pWindow,const SfxItemSet& rInAttrs)
- : SfxTabPage(pWindow, "modules/schart/ui/tp_SeriesToAxis.ui", "TP_OPTIONS", &rInAttrs)
+SchOptionTabPage::SchOptionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "modules/schart/ui/tp_SeriesToAxis.ui", "TP_OPTIONS", &rInAttrs)
, m_nAllSeriesAxisIndex(0)
, m_bProvidesSecondaryYAxis(true)
, m_bProvidesOverlapAndGapWidth(false)
@@ -68,10 +68,10 @@ IMPL_LINK_NOARG(SchOptionTabPage, EnableHdl, weld::ToggleButton&, void)
m_xCBAxisSideBySide->set_sensitive( m_xRbtAxis1->get_active());
}
-std::unique_ptr<SfxTabPage> SchOptionTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SchOptionTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rOutAttrs)
{
- return std::make_unique<SchOptionTabPage>(pParent, *rOutAttrs);
+ return std::make_unique<SchOptionTabPage>(pPage, pController, *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 2538a6b8071d..8580e5722996 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
@@ -35,10 +35,10 @@ namespace chart
class SchOptionTabPage : public SfxTabPage
{
public:
- SchOptionTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ SchOptionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SchOptionTabPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
virtual void Reset(const SfxItemSet* rInAttrs) override;
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index f8748a087b2c..1cd5ecdf6558 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -29,9 +29,9 @@
namespace chart
{
-SchAlignmentTabPage::SchAlignmentTabPage(TabPageParent pParent,
+SchAlignmentTabPage::SchAlignmentTabPage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rInAttrs, bool bWithRotation)
- : SfxTabPage(pParent, "modules/schart/ui/titlerotationtabpage.ui", "TitleRotationTabPage", &rInAttrs)
+ : SfxTabPage(pPage, pController, "modules/schart/ui/titlerotationtabpage.ui", "TitleRotationTabPage", &rInAttrs)
, m_xFtRotate(m_xBuilder->weld_label("degreeL"))
, m_xNfRotate(m_xBuilder->weld_spin_button("OrientDegree"))
, m_xCbStacked(m_xBuilder->weld_check_button("stackedCB"))
@@ -73,16 +73,16 @@ SchAlignmentTabPage::~SchAlignmentTabPage()
m_xLbTextDirection.reset();
}
-std::unique_ptr<SfxTabPage> SchAlignmentTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SchAlignmentTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rInAttrs)
{
- return std::make_unique<SchAlignmentTabPage>(pParent, *rInAttrs);
+ return std::make_unique<SchAlignmentTabPage>(pPage, pController, *rInAttrs);
}
-std::unique_ptr<SfxTabPage> SchAlignmentTabPage::CreateWithoutRotation(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SchAlignmentTabPage::CreateWithoutRotation(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rInAttrs)
{
- return std::make_unique<SchAlignmentTabPage>(pParent, *rInAttrs, false);
+ return std::make_unique<SchAlignmentTabPage>(pPage, pController, *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 ae1e398fd5e4..616006fa27c2 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
@@ -49,11 +49,11 @@ private:
DECL_LINK(StackedToggleHdl, weld::ToggleButton&, void);
public:
- SchAlignmentTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs, bool bWithRotation = true);
+ SchAlignmentTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs, bool bWithRotation = true);
virtual ~SchAlignmentTabPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
- static std::unique_ptr<SfxTabPage> CreateWithoutRotation(TabPageParent pParent, const SfxItemSet* rInAttrs);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs);
+ static std::unique_ptr<SfxTabPage> CreateWithoutRotation(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
virtual void Reset(const SfxItemSet* rInAttrs) override;
};
diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx
index f21ca365b810..6a91ebf30e17 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.cxx
+++ b/chart2/source/controller/dialogs/tp_Trendline.cxx
@@ -24,15 +24,15 @@
namespace chart
{
-TrendlineTabPage::TrendlineTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage(pParent, "modules/schart/ui/tp_Trendline.ui", "TP_TRENDLINE", &rInAttrs)
+TrendlineTabPage::TrendlineTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "modules/schart/ui/tp_Trendline.ui", "TP_TRENDLINE", &rInAttrs)
, m_aTrendlineResources(*m_xBuilder, rInAttrs)
{
}
-std::unique_ptr<SfxTabPage> TrendlineTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> TrendlineTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
{
- return std::make_unique<TrendlineTabPage>(pParent, *rOutAttrs);
+ return std::make_unique<TrendlineTabPage>(pPage, pController, *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 2d825be32f51..596ff339b17a 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.hxx
+++ b/chart2/source/controller/dialogs/tp_Trendline.hxx
@@ -29,9 +29,9 @@ namespace chart
class TrendlineTabPage : public SfxTabPage
{
public:
- TrendlineTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ TrendlineTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
virtual void Reset( const SfxItemSet* rInAttrs ) override;
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index c8a2ee1ff3db..b2042a6468b9 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -30,10 +30,10 @@ namespace chart
using namespace ::com::sun::star;
using namespace ::com::sun::star::chart2;
-TitlesAndObjectsTabPage::TitlesAndObjectsTabPage(TabPageParent pParent,
+TitlesAndObjectsTabPage::TitlesAndObjectsTabPage(weld::Container* pPage, weld::DialogController* pController,
const uno::Reference< XChartDocument >& xChartModel,
const uno::Reference< uno::XComponentContext >& xContext )
- : OWizardPage(pParent, "modules/schart/ui/wizelementspage.ui", "WizElementsPage")
+ : OWizardPage(pPage, pController, "modules/schart/ui/wizelementspage.ui", "WizElementsPage")
, m_xTitleResources(new TitleResources(*m_xBuilder, false))
, m_xLegendPositionResources(new LegendPositionResources(*m_xBuilder, xContext))
, m_xChartModel(xChartModel)
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
index 7b82898d60f5..f8cfffdbc619 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx
@@ -37,7 +37,7 @@ namespace chart
class TitlesAndObjectsTabPage final : public vcl::OWizardPage
{
public:
- TitlesAndObjectsTabPage(TabPageParent pParent,
+ TitlesAndObjectsTabPage(weld::Container* pPage, weld::DialogController* pController,
const css::uno::Reference< css::chart2::XChartDocument >& xChartModel,
const css::uno::Reference< css::uno::XComponentContext >& xContext);
virtual ~TitlesAndObjectsTabPage() override;
diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx
index 7ed5f2d50fc9..3204b35ef11b 100644
--- a/chart2/source/controller/inc/res_ErrorBar.hxx
+++ b/chart2/source/controller/inc/res_ErrorBar.hxx
@@ -31,6 +31,7 @@ namespace weld { class Builder; }
namespace weld { class Button; }
namespace weld { class CheckButton; }
namespace weld { class ComboBox; }
+namespace weld { class DialogController; }
namespace weld { class Entry; }
namespace weld { class Frame; }
namespace weld { class Image; }
@@ -55,7 +56,7 @@ public:
};
ErrorBarResources(
- weld::Builder* pParent, TabPageParent pParentDialog, const SfxItemSet& rInAttrs, bool bNoneAvailable, chart::ErrorBarResources::tErrorBarType eType = ERROR_BAR_Y );
+ weld::Builder* pParent, weld::DialogController* pControllerDialog, const SfxItemSet& rInAttrs, bool bNoneAvailable, chart::ErrorBarResources::tErrorBarType eType = ERROR_BAR_Y);
virtual ~ErrorBarResources();
void SetAxisMinorStepWidthForErrorBarDecimals( double fMinorStepWidth );
@@ -86,7 +87,7 @@ private:
double m_fPlusValue;
double m_fMinusValue;
- TabPageParent m_pParentDialog;
+ weld::DialogController* m_pController;
std::unique_ptr< RangeSelectionHelper > m_apRangeSelectionHelper;
weld::Entry* m_pCurrentRangeChoosingField;
bool m_bHasInternalDataProvider;
diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx
index 08fb276030be..6f0da7cd834c 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -38,8 +38,8 @@
#include <dlgname.hxx>
-SvxMenuConfigPage::SvxMenuConfigPage(TabPageParent pParent, const SfxItemSet& rSet, bool bIsMenuBar)
- : SvxConfigPage(pParent, rSet)
+SvxMenuConfigPage::SvxMenuConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet, bool bIsMenuBar)
+ : SvxConfigPage(pPage, pController, rSet)
, m_bIsMenuBar(bIsMenuBar)
{
m_xGearBtn = m_xBuilder->weld_menu_button("menugearbtn");
diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx b/cui/source/customize/SvxNotebookbarConfigPage.cxx
index 5c439ab8182b..26c0de69a21a 100644
--- a/cui/source/customize/SvxNotebookbarConfigPage.cxx
+++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx
@@ -99,8 +99,10 @@ static OUString getModuleId(const OUString& sModuleName)
return "None";
}
-SvxNotebookbarConfigPage::SvxNotebookbarConfigPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SvxConfigPage(pParent, rSet)
+SvxNotebookbarConfigPage::SvxNotebookbarConfigPage(weld::Container* pPage,
+ weld::DialogController* pController,
+ const SfxItemSet& rSet)
+ : SvxConfigPage(pPage, pController, rSet)
{
m_xDescriptionFieldLb->set_visible(false);
m_xSearchEdit->set_visible(false);
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx
index 39de9ba9f08d..60dffd4e0c4f 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -43,8 +43,8 @@
#include <dlgname.hxx>
-SvxToolbarConfigPage::SvxToolbarConfigPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SvxConfigPage(pParent, rSet)
+SvxToolbarConfigPage::SvxToolbarConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SvxConfigPage(pPage, pController, rSet)
{
m_xGearBtn = m_xBuilder->weld_menu_button("toolbargearbtn");
m_xGearBtn->show();
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 2cdca489eb75..ca0bfbf574c1 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -814,8 +814,8 @@ IMPL_LINK(SfxAcceleratorConfigPage, KeyInputHdl, const KeyEvent&, rKey, bool)
return false;
}
-SfxAcceleratorConfigPage::SfxAcceleratorConfigPage(TabPageParent pParent, const SfxItemSet& aSet )
- : SfxTabPage(pParent, "cui/ui/accelconfigpage.ui", "AccelConfigPage", &aSet)
+SfxAcceleratorConfigPage::SfxAcceleratorConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& aSet )
+ : SfxTabPage(pPage, pController, "cui/ui/accelconfigpage.ui", "AccelConfigPage", &aSet)
, m_pMacroInfoItem()
, aLoadAccelConfigStr(CuiResId(RID_SVXSTR_LOADACCELCONFIG))
, aSaveAccelConfigStr(CuiResId(RID_SVXSTR_SAVEACCELCONFIG))
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 0246f66d82a8..4200f2e8238b 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -161,35 +161,35 @@ SvxConfigPage::CanConfig( const OUString& aModuleId )
return !(aModuleId == "com.sun.star.script.BasicIDE" || aModuleId == "com.sun.star.frame.Bibliography");
}
-static std::unique_ptr<SfxTabPage> CreateSvxMenuConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
+static std::unique_ptr<SfxTabPage> CreateSvxMenuConfigPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet )
{
- return std::make_unique<SvxMenuConfigPage>(pParent, *rSet);
+ return std::make_unique<SvxMenuConfigPage>(pPage, pController, *rSet);
}
-static std::unique_ptr<SfxTabPage> CreateSvxContextMenuConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
+static std::unique_ptr<SfxTabPage> CreateSvxContextMenuConfigPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet )
{
- return std::make_unique<SvxMenuConfigPage>(pParent, *rSet, false);
+ return std::make_unique<SvxMenuConfigPage>(pPage, pController, *rSet, false);
}
-static std::unique_ptr<SfxTabPage> CreateKeyboardConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
+static std::unique_ptr<SfxTabPage> CreateKeyboardConfigPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet )
{
- return std::make_unique<SfxAcceleratorConfigPage>(pParent, *rSet);
+ return std::make_unique<SfxAcceleratorConfigPage>(pPage, pController, *rSet);
}
-static std::unique_ptr<SfxTabPage> CreateSvxNotebookbarConfigPage(TabPageParent pParent,
+static std::unique_ptr<SfxTabPage> CreateSvxNotebookbarConfigPage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rSet)
{
- return std::make_unique<SvxNotebookbarConfigPage>(pParent, *rSet);
+ return std::make_unique<SvxNotebookbarConfigPage>(pPage, pController, *rSet);
}
-static std::unique_ptr<SfxTabPage> CreateSvxToolbarConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
+static std::unique_ptr<SfxTabPage> CreateSvxToolbarConfigPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet )
{
- return std::make_unique<SvxToolbarConfigPage>(pParent, *rSet);
+ return std::make_unique<SvxToolbarConfigPage>(pPage, pController, *rSet);
}
-static std::unique_ptr<SfxTabPage> CreateSvxEventConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
+static std::unique_ptr<SfxTabPage> CreateSvxEventConfigPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet )
{
- return std::make_unique<SvxEventConfigPage>(pParent, *rSet, SvxEventConfigPage::EarlyInit());
+ return std::make_unique<SvxEventConfigPage>(pPage, pController, *rSet, SvxEventConfigPage::EarlyInit());
}
/******************************************************************************
@@ -969,8 +969,8 @@ IMPL_LINK(SvxMenuEntriesListBox, KeyInputHdl, const KeyEvent&, rKeyEvent, bool)
* both tabpages to add, delete, move and rename items etc.
*
*****************************************************************************/
-SvxConfigPage::SvxConfigPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/menuassignpage.ui", "MenuAssignPage", &rSet)
+SvxConfigPage::SvxConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/menuassignpage.ui", "MenuAssignPage", &rSet)
, m_aUpdateDataTimer("UpdateDataTimer")
, bInitialised(false)
, pCurrentSaveInData(nullptr)
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index 155708aba3ce..72cd08b168fa 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -36,9 +36,9 @@
using namespace ::com::sun::star;
-SvxEventConfigPage::SvxEventConfigPage(TabPageParent pParent, const SfxItemSet& rSet,
+SvxEventConfigPage::SvxEventConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet,
SvxEventConfigPage::EarlyInit)
- : SvxMacroTabPage_(pParent, "cui/ui/eventsconfigpage.ui", "EventsConfigPage", rSet)
+ : SvxMacroTabPage_(pPage, pController, "cui/ui/eventsconfigpage.ui", "EventsConfigPage", rSet)
, m_xSaveInListBox(m_xBuilder->weld_combo_box("savein"))
{
mpImpl->xEventLB = m_xBuilder->weld_tree_view("events");
diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx
index 869ada7ebef4..8db1fdaff7c8 100644
--- a/cui/source/customize/eventdlg.hxx
+++ b/cui/source/customize/eventdlg.hxx
@@ -41,7 +41,7 @@ public:
/// this is only to let callers know that there is a LateInit which *must* be called
struct EarlyInit { };
- SvxEventConfigPage(TabPageParent pParent, const SfxItemSet& rSet, EarlyInit);
+ SvxEventConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet, EarlyInit);
virtual ~SvxEventConfigPage() override;
void LateInit( const css::uno::Reference< css::frame::XFrame >& _rxFrame );
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index d7d005487832..00478e2f7bf1 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -72,9 +72,9 @@ void SvxMacroTabPage_::EnableButtons()
}
}
-SvxMacroTabPage_::SvxMacroTabPage_(TabPageParent pParent, const OUString& rUIXMLDescription,
+SvxMacroTabPage_::SvxMacroTabPage_(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription,
const OString& rID, const SfxItemSet& rAttrSet)
- : SfxTabPage(pParent, rUIXMLDescription, rID, &rAttrSet)
+ : SfxTabPage(pPage, pController, rUIXMLDescription, rID, &rAttrSet)
, bDocModified(false)
, bAppEvents(false)
, bInitialized(false)
@@ -582,12 +582,12 @@ std::pair< OUString, OUString > SvxMacroTabPage_::GetPairFromAny( const Any& aA
return std::make_pair( type, url );
}
-SvxMacroTabPage::SvxMacroTabPage(TabPageParent pParent,
+SvxMacroTabPage::SvxMacroTabPage(weld::Container* pPage, weld::DialogController* pController,
const Reference< frame::XFrame >& _rxDocumentFrame,
const SfxItemSet& rSet,
Reference< container::XNameReplace > const & xNameReplace,
sal_uInt16 nSelectedIndex)
- : SvxMacroTabPage_(pParent, "cui/ui/macroassignpage.ui", "MacroAssignPage", rSet)
+ : SvxMacroTabPage_(pPage, pController, "cui/ui/macroassignpage.ui", "MacroAssignPage", rSet)
{
mpImpl->xEventLB = m_xBuilder->weld_tree_view("assignments");
mpImpl->xEventLB->set_size_request(mpImpl->xEventLB->get_approximate_digit_width() * 70,
@@ -615,8 +615,7 @@ SvxMacroAssignDlg::SvxMacroAssignDlg(weld::Window* pParent, const Reference< fra
const Reference< container::XNameReplace >& xNameReplace, sal_uInt16 nSelectedIndex)
: SvxMacroAssignSingleTabDialog(pParent, rSet)
{
- TabPageParent pPageParent(get_content_area(), this);
- SetTabPage(std::make_unique<SvxMacroTabPage>(pPageParent, _rxDocumentFrame, rSet, xNameReplace, nSelectedIndex));
+ SetTabPage(std::make_unique<SvxMacroTabPage>(get_content_area(), this, _rxDocumentFrame, rSet, xNameReplace, nSelectedIndex));
}
IMPL_LINK_NOARG(AssignComponentDialog, ButtonHandler, weld::Button&, void)
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 360effa6dc5f..caa9b92291c1 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -454,8 +454,7 @@ void SpellDialog::StartSpellOptDlg_Impl()
SfxItemSet aSet( SfxGetpApp()->GetPool(), svl::Items<SID_AUTOSPELL_CHECK,SID_AUTOSPELL_CHECK>{});
SfxSingleTabDialogController aDlg(m_xDialog.get(), &aSet, "cui/ui/spelloptionsdialog.ui", "SpellOptionsDialog");
- TabPageParent aParent(aDlg.get_content_area(), &aDlg);
- std::unique_ptr<SfxTabPage> xPage = SvxLinguTabPage::Create(aParent, &aSet);
+ std::unique_ptr<SfxTabPage> xPage = SvxLinguTabPage::Create(aDlg.get_content_area(), &aDlg, &aSet);
static_cast<SvxLinguTabPage*>(xPage.get())->HideGroups( GROUP_MODULES );
aDlg.SetTabPage(std::move(xPage));
if (RET_OK == aDlg.run())
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index b7fdc641da19..7b197b3967e9 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -504,8 +504,8 @@ void GalleryThemeProperties::PageCreated(const OString& rId, SfxTabPage &rPage)
static_cast<TPGalleryThemeProperties&>( rPage ).SetXChgData( pData );
}
-TPGalleryThemeGeneral::TPGalleryThemeGeneral(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/gallerygeneralpage.ui", "GalleryGeneralPage", &rSet)
+TPGalleryThemeGeneral::TPGalleryThemeGeneral(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/gallerygeneralpage.ui", "GalleryGeneralPage", &rSet)
, pData(nullptr)
, m_xFiMSImage(m_xBuilder->weld_image("image"))
, m_xEdtMSName(m_xBuilder->weld_entry("name"))
@@ -574,13 +574,13 @@ bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet* /*rSet*/ )
return true;
}
-std::unique_ptr<SfxTabPage> TPGalleryThemeGeneral::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> TPGalleryThemeGeneral::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
- return std::make_unique<TPGalleryThemeGeneral>(pParent, *rSet);
+ return std::make_unique<TPGalleryThemeGeneral>(pPage, pController, *rSet);
}
-TPGalleryThemeProperties::TPGalleryThemeProperties(TabPageParent pWindow, const SfxItemSet& rSet)
- : SfxTabPage(pWindow, "cui/ui/galleryfilespage.ui", "GalleryFilesPage", &rSet)
+TPGalleryThemeProperties::TPGalleryThemeProperties(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/galleryfilespage.ui", "GalleryFilesPage", &rSet)
, pData(nullptr)
, bEntriesFound(false)
, bInputAllowed(true)
@@ -641,9 +641,9 @@ TPGalleryThemeProperties::~TPGalleryThemeProperties()
aFilterEntryList.clear();
}
-std::unique_ptr<SfxTabPage> TPGalleryThemeProperties::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> TPGalleryThemeProperties::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
- return std::make_unique<TPGalleryThemeProperties>(pParent, *rSet);
+ return std::make_unique<TPGalleryThemeProperties>(pPage, pController, *rSet);
}
OUString TPGalleryThemeProperties::addExtension( const OUString& _rDisplayText, const OUString& _rExtension )
diff --git a/cui/source/inc/SvxMenuConfigPage.hxx b/cui/source/inc/SvxMenuConfigPage.hxx
index 78061d9fd562..881f805fe097 100644
--- a/cui/source/inc/SvxMenuConfigPage.hxx
+++ b/cui/source/inc/SvxMenuConfigPage.hxx
@@ -56,7 +56,7 @@ private:
virtual void SelectElement() override;
public:
- SvxMenuConfigPage(TabPageParent pParent, const SfxItemSet& rItemSet, bool bIsMenuBar = true);
+ SvxMenuConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rItemSet, bool bIsMenuBar = true);
virtual ~SvxMenuConfigPage() override;
SaveInData* CreateSaveInData(
diff --git a/cui/source/inc/SvxNotebookbarConfigPage.hxx b/cui/source/inc/SvxNotebookbarConfigPage.hxx
index a945c4b47a86..7793d6e6415b 100644
--- a/cui/source/inc/SvxNotebookbarConfigPage.hxx
+++ b/cui/source/inc/SvxNotebookbarConfigPage.hxx
@@ -54,7 +54,8 @@ public:
OUString sUIItemId;
OUString sClassType;
};
- SvxNotebookbarConfigPage(TabPageParent pParent, const SfxItemSet& rItemSet);
+ SvxNotebookbarConfigPage(weld::Container* pPage, weld::DialogController* pController,
+ const SfxItemSet& rItemSet);
virtual ~SvxNotebookbarConfigPage() override;
SaveInData* CreateSaveInData(const css::uno::Reference<css::ui::XUIConfigurationManager>&,
const css::uno::Reference<css::ui::XUIConfigurationManager>&,
diff --git a/cui/source/inc/SvxToolbarConfigPage.hxx b/cui/source/inc/SvxToolbarConfigPage.hxx
index a4998e9862d6..54204676456c 100644
--- a/cui/source/inc/SvxToolbarConfigPage.hxx
+++ b/cui/source/inc/SvxToolbarConfigPage.hxx
@@ -55,7 +55,7 @@ private:
virtual void SelectElement() override;
public:
- SvxToolbarConfigPage(TabPageParent pParent, const SfxItemSet& rItemSet);
+ SvxToolbarConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rItemSet);
virtual ~SvxToolbarConfigPage() override;
void AddFunction(int nTarget = -1);
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index c351274dc281..41df1d05896f 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -139,7 +139,7 @@ private:
void ResetConfig();
public:
- SfxAcceleratorConfigPage(TabPageParent pParent, const SfxItemSet& rItemSet);
+ SfxAcceleratorConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rItemSet);
virtual ~SfxAcceleratorConfigPage() override;
virtual bool FillItemSet( SfxItemSet* ) override;
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index 69ae8ead2e82..b571601c61bd 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -50,8 +50,8 @@ class AlignmentTabPage : public SfxTabPage
public:
virtual ~AlignmentTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
- explicit AlignmentTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
+ explicit AlignmentTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet);
static const sal_uInt16* GetRanges() { return s_pRanges; }
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 61a239b968bf..3def561b87d0 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -66,10 +66,10 @@ private:
void InsertEntry(const OUString& rTxt);
public:
- OfaAutocorrOptionsPage(TabPageParent pParent, const SfxItemSet& rSet);
+ OfaAutocorrOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~OfaAutocorrOptionsPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
@@ -119,8 +119,8 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
void CreateEntry(const OUString& rTxt, sal_uInt16 nCol);
public:
- OfaSwAutoFmtOptionsPage(TabPageParent pParent, const SfxItemSet& rSet);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
+ OfaSwAutoFmtOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
virtual ~OfaSwAutoFmtOptionsPage() override;
@@ -190,10 +190,10 @@ private:
LanguageType eNewLanguage);
public:
- OfaAutocorrReplacePage(TabPageParent pParent, const SfxItemSet& rSet);
+ OfaAutocorrReplacePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~OfaAutocorrReplacePage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
@@ -245,10 +245,10 @@ private:
LanguageType eOldLanguage,
LanguageType eNewLanguage);
public:
- OfaAutocorrExceptPage(TabPageParent pParent, const SfxItemSet& rSet);
+ OfaAutocorrExceptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~OfaAutocorrExceptPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
@@ -301,8 +301,8 @@ private:
sal_uInt16 nCol, sal_uInt16 nTextCol);
public:
- OfaQuoteTabPage(TabPageParent pParent, const SfxItemSet& rSet);
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent,
+ OfaQuoteTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
virtual ~OfaQuoteTabPage() override;
@@ -336,8 +336,8 @@ private:
DECL_LINK(KeyReleaseHdl, const KeyEvent&, bool);
public:
- OfaAutoCompleteTabPage(TabPageParent pParent, const SfxItemSet& rSet);
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent,
+ OfaAutoCompleteTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
virtual ~OfaAutoCompleteTabPage() override;
@@ -398,10 +398,10 @@ private:
public:
/// construction via Create()
- OfaSmartTagOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ OfaSmartTagOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~OfaSmartTagOptionsTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 86d52da29511..782e56d9f811 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -44,8 +44,8 @@ class SvxBackgroundTabPage : public SvxTabPage
{
static const sal_uInt16 pPageRanges[];
public:
- SvxBackgroundTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+ SvxBackgroundTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
virtual ~SvxBackgroundTabPage() override;
// returns the area of the which-values
@@ -163,10 +163,10 @@ class SvxBkgTabPage : public SvxAreaTabPage
DECL_LINK(TblDestinationHdl_Impl, weld::ComboBox&, void);
public:
- SvxBkgTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ SvxBkgTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxBkgTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void ActivatePage( const SfxItemSet& ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 30e2ad5318df..a138620017e1 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -79,9 +79,9 @@ class SvxBorderTabPage : public SfxTabPage
static const sal_uInt16 pRanges[];
public:
- SvxBorderTabPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
+ SvxBorderTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs);
virtual ~SvxBorderTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
static const sal_uInt16* GetRanges() { return pRanges; }
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index eeb7644049b8..e360d79f096e 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -404,7 +404,7 @@ protected:
std::unique_ptr<weld::Button> m_xRemoveCommandButton;
- SvxConfigPage(TabPageParent, const SfxItemSet&);
+ SvxConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet&);
DECL_LINK(MoveHdl, weld::Button&, void);
DECL_LINK(SelectFunctionHdl, weld::TreeView&, void);
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 8d98176d3bfc..15906a085657 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -40,7 +40,7 @@ protected:
bool m_bPreviewBackgroundToCharacter;
- SvxCharBasePage(TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet& rAttrSet);
+ SvxCharBasePage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet& rAttrSet);
void SetPrevFontWidthScale( const SfxItemSet& rSet );
void SetPrevFontEscapement( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc );
@@ -138,8 +138,8 @@ public:
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
public:
- SvxCharNamePage(TabPageParent pParent, const SfxItemSet& rSet);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+ SvxCharNamePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual ~SvxCharNamePage() override;
static const sal_uInt16* GetRanges() { return pNameRanges; }
@@ -209,8 +209,8 @@ private:
DECL_LINK(ColorBoxSelectHdl_Impl, ColorListBox&, void);
public:
- SvxCharEffectsPage(TabPageParent pParent, const SfxItemSet& rSet);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+ SvxCharEffectsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual ~SvxCharEffectsPage() override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
@@ -279,8 +279,8 @@ private:
void FontModifyHdl_Impl();
public:
- SvxCharPositionPage(TabPageParent pParent, const SfxItemSet& rSet);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+ SvxCharPositionPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual ~SvxCharPositionPage() override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
@@ -318,8 +318,8 @@ private:
DECL_LINK(CharacterMapHdl_Impl, weld::TreeView&, void);
public:
- SvxCharTwoLinesPage(TabPageParent pParent, const SfxItemSet& rSet);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+ SvxCharTwoLinesPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual ~SvxCharTwoLinesPage() override;
virtual void ActivatePage( const SfxItemSet& rSet ) override;
diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx
index d89fa4521676..1b41851476a1 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -58,10 +58,10 @@ private:
public:
- SvxConnectionPage(TabPageParent pWindow, const SfxItemSet& rInAttrs);
+ SvxConnectionPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxConnectionPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 751557c850fa..35142bf1c935 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -203,9 +203,9 @@ private:
virtual bool FillItemSet( SfxItemSet* rSet ) override;
public:
- TPGalleryThemeGeneral(TabPageParent pParent, const SfxItemSet& rSet);
+ TPGalleryThemeGeneral(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
void SetXChgData( ExchangeData* pData );
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
};
class TPGalleryThemeProperties : public SfxTabPage
@@ -261,7 +261,7 @@ class TPGalleryThemeProperties : public SfxTabPage
DECL_LINK(DialogClosedHdl, css::ui::dialogs::DialogClosedEvent*, void);
public:
- TPGalleryThemeProperties(TabPageParent pWindow, const SfxItemSet& rSet);
+ TPGalleryThemeProperties(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~TPGalleryThemeProperties() override;
void SetXChgData( ExchangeData* pData );
@@ -269,7 +269,7 @@ public:
void StartSearchFiles( const OUString& _rFolderURL, short _nDlgResult );
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet);
};
#endif // INCLUDED_CUI_SOURCE_INC_CUIGALDLG_HXX
diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index 64c152699315..fa2310d1729d 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -60,10 +60,10 @@ protected:
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
public:
- SvxGeneralTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SvxGeneralTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SvxGeneralTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 368090dc14bf..0ef979f11c85 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -186,10 +186,10 @@ class SvxTransparenceTabPage : public SfxTabPage
void InvalidatePreview (bool bEnable = true );
public:
- SvxTransparenceTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ SvxTransparenceTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxTransparenceTabPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent, const SfxItemSet*);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet*);
static const sal_uInt16* GetRanges() { return pTransparenceRanges; }
virtual bool FillItemSet(SfxItemSet*) override;
@@ -262,10 +262,10 @@ private:
DeactivateRC DeactivatePage_Impl( SfxItemSet* pSet );
public:
- SvxAreaTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ SvxAreaTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxAreaTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pAreaRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
@@ -321,10 +321,10 @@ private:
DECL_LINK(SelectShadowHdl_Impl, ColorListBox&, void);
public:
- SvxShadowTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ SvxShadowTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxShadowTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pShadowRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
@@ -396,12 +396,12 @@ private:
sal_Int32 SearchGradientList(const OUString& rGradientName);
public:
- SvxGradientTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ SvxGradientTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxGradientTabPage() override;
void Construct();
- static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
@@ -464,12 +464,12 @@ private:
sal_Int32 SearchHatchList(const OUString& rHatchName);
public:
- SvxHatchTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ SvxHatchTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxHatchTabPage() override;
void Construct();
- static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
@@ -544,12 +544,12 @@ private:
sal_Int32 SearchBitmapList(const GraphicObject& rGraphicObject);
public:
- SvxBitmapTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ SvxBitmapTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxBitmapTabPage() override;
void Construct();
- static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
@@ -598,12 +598,12 @@ private:
sal_Int32 SearchPatternList(const OUString& rPatternName);
public:
- SvxPatternTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ SvxPatternTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxPatternTabPage() override;
void Construct();
- static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
@@ -712,12 +712,12 @@ private:
sal_Int32 FindInPalette( const Color& rColor );
public:
- SvxColorTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ SvxColorTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxColorTabPage() override;
void Construct();
- static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index ae42ecc947bb..87ae008da36e 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -200,12 +200,12 @@ public:
void ShowSymbolControls(bool bOn);
- SvxLineTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ SvxLineTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxLineTabPage() override;
void Construct();
- static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pLineRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
@@ -291,12 +291,12 @@ private:
void CheckChanges_Impl();
public:
- SvxLineDefTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ SvxLineDefTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxLineDefTabPage() override;
void Construct();
- static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
@@ -351,12 +351,12 @@ private:
void CheckChanges_Impl();
public:
- SvxLineEndDefTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ SvxLineEndDefTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxLineEndDefTabPage() override;
void Construct();
- static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index dc3d9d17b232..06ea7809cb8b 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -68,10 +68,10 @@ namespace svx
void openLinkDialog(const OUString& sOldName, const OUString& sOldLocation, int nEntry = -1);
public:
- DbRegistrationOptionsPage(TabPageParent pParent, const SfxItemSet& rSet);
+ DbRegistrationOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~DbRegistrationOptionsPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx
index 7e3987a795e1..3d3c99de1c00 100644
--- a/cui/source/inc/dstribut.hxx
+++ b/cui/source/inc/dstribut.hxx
@@ -40,7 +40,7 @@ class SvxDistributePage : public SfxTabPage
std::unique_ptr<weld::RadioButton> m_xBtnVerBottom;
public:
- SvxDistributePage(TabPageParent pWindow, const SfxItemSet& rInAttrs,
+ SvxDistributePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs,
SvxDistributeHorizontal eHor,
SvxDistributeVertical eVer);
virtual ~SvxDistributePage() override;
diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index 1294c2cbab77..afdc7cb6ba6f 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -95,8 +95,8 @@ class SvxGrfCropPage : public SfxTabPage
static Size GetGrfOrigSize(const Graphic&);
public:
- SvxGrfCropPage(TabPageParent pParent, const SfxItemSet &rSet);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet *rSet );
+ SvxGrfCropPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet );
virtual ~SvxGrfCropPage() override;
virtual bool FillItemSet( SfxItemSet *rSet ) override;
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 267d4b8f9233..792ce61fc1a0 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -78,10 +78,10 @@ private:
DECL_LINK(SelectCaptTypeHdl_Impl, SvtValueSet*, void);
public:
- SvxCaptionTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ SvxCaptionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxCaptionTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pCaptionRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index 07ed15d2108a..2069cc4c2ea7 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -51,7 +51,7 @@ class SfxMacroTabPage final : public SfxTabPage
public:
SfxMacroTabPage(
- TabPageParent pParent,
+ weld::Container* pPage, weld::DialogController* pController,
const css::uno::Reference< css::frame::XFrame >& rxDocumentFrame,
const SfxItemSet& rSet
);
@@ -72,7 +72,7 @@ public:
bool IsReadOnly() const override;
// --------- inherit from the base -------------
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
};
class SfxMacroAssignDlg : public SfxSingleTabDialogController
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index 145463fadea5..c761e19423b7 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -70,7 +70,7 @@ protected:
bool bDocModified, bAppEvents, bInitialized;
EventDisplayNames aDisplayNames;
- SvxMacroTabPage_(TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet& rItemSet);
+ SvxMacroTabPage_(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet& rItemSet);
void EnableButtons();
static css::uno::Any GetPropsByName( const OUString& eventName, EventsHash& eventsHash );
@@ -95,7 +95,7 @@ class SvxMacroTabPage : public SvxMacroTabPage_
{
public:
SvxMacroTabPage(
- TabPageParent pParent,
+ weld::Container* pPage, weld::DialogController* pController,
const css::uno::Reference< css::frame::XFrame >& _rxDocumentFrame,
const SfxItemSet& rSet,
css::uno::Reference< css::container::XNameReplace > const & xNameReplace,
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index 58a38e822f2b..7915fcc381ea 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -67,10 +67,10 @@ private:
public:
- SvxMeasurePage(TabPageParent pWindow, const SfxItemSet& rInAttrs);
+ SvxMeasurePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxMeasurePage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index b822cd369f9b..5d68d4082ae9 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -60,8 +60,8 @@ class SvxNumberFormatTabPage : public SfxTabPage
static const sal_uInt16 pRanges[];
public:
- SvxNumberFormatTabPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
+ SvxNumberFormatTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet );
virtual ~SvxNumberFormatTabPage() override;
// Returns area information.
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index fffe71e4dee4..56131e25c841 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -73,10 +73,10 @@ class SvxSingleNumPickTabPage final : public SfxTabPage
DECL_LINK(DoubleClickHdl_Impl, SvtValueSet*, void);
public:
- SvxSingleNumPickTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SvxSingleNumPickTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SvxSingleNumPickTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
@@ -102,10 +102,10 @@ class SvxBulletPickTabPage final : public SfxTabPage
DECL_LINK(NumSelectHdl_Impl, SvtValueSet*, void);
DECL_LINK(DoubleClickHdl_Impl, SvtValueSet*, void);
public:
- SvxBulletPickTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SvxBulletPickTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SvxBulletPickTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
@@ -140,10 +140,10 @@ class SvxNumPickTabPage final : public SfxTabPage
DECL_LINK(DoubleClickHdl_Impl, SvtValueSet*, void);
public:
- SvxNumPickTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SvxNumPickTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SvxNumPickTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
@@ -179,10 +179,10 @@ class SvxBitmapPickTabPage final : public SfxTabPage
DECL_LINK(ClickAddBrowseHdl_Impl, weld::Button&, void);
public:
- SvxBitmapPickTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SvxBitmapPickTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SvxBitmapPickTabPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
@@ -279,10 +279,10 @@ class SvxNumOptionsTabPage : public SfxTabPage
void EditModifyHdl_Impl(const weld::Entry*);
public:
- SvxNumOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SvxNumOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SvxNumOptionsTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
@@ -364,7 +364,7 @@ class SvxNumPositionTabPage : public SfxTabPage
DECL_LINK(IndentAtHdl_Impl, weld::MetricSpinButton&, void);
public:
- SvxNumPositionTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SvxNumPositionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SvxNumPositionTabPage() override;
virtual void ActivatePage(const SfxItemSet& rSet) override;
@@ -372,7 +372,7 @@ public:
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
void SetMetric(FieldUnit eSet);
diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx
index ab38e033811a..f46a7d1a34db 100644
--- a/cui/source/inc/optasian.hxx
+++ b/cui/source/inc/optasian.hxx
@@ -47,10 +47,10 @@ class SvxAsianLayoutPage : public SfxTabPage
DECL_LINK(ModifyHdl, weld::Entry&, void);
public:
- SvxAsianLayoutPage(TabPageParent pParent, const SfxItemSet& rSet );
+ SvxAsianLayoutPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet );
virtual ~SvxAsianLayoutPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
static const sal_uInt16* GetRanges();
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index e0740cf8602a..37b3f0900f2e 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -133,8 +133,8 @@ private:
void UpdateDicBox_Impl();
public:
- SvxLinguTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+ SvxLinguTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual ~SvxLinguTabPage() override;
virtual bool FillItemSet( SfxItemSet* rSet ) override;
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index 7dd36f6b47ab..5dea8c1f201a 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -58,8 +58,8 @@ private:
const OUString& _rUserPath, const OUString& _rWritablePath );
public:
- SvxPathTabPage( TabPageParent pParent, const SfxItemSet& rSet );
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+ SvxPathTabPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual ~SvxPathTabPage() override;
virtual bool FillItemSet( SfxItemSet* rSet ) override;
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index 3448d8572202..04648e4342ac 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -161,8 +161,8 @@ protected:
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
public:
- SvxPageDescPage(TabPageParent pParent, const SfxItemSet& rSet);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+ SvxPageDescPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual ~SvxPageDescPage() override;
// returns the range of the Which values
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 3df98a5bed07..51fe77596c41 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -98,8 +98,8 @@ protected:
public:
- SvxStdParagraphTabPage(TabPageParent pParent, const SfxItemSet& rSet);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+ SvxStdParagraphTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual ~SvxStdParagraphTabPage() override;
DECL_LINK(ELRLoseFocusHdl, weld::MetricSpinButton&, void);
@@ -161,8 +161,8 @@ protected:
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
public:
- SvxParaAlignTabPage(TabPageParent pParent, const SfxItemSet& rSet);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+ SvxParaAlignTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual ~SvxParaAlignTabPage() override;
static const sal_uInt16* GetRanges() { return pAlignRanges; }
@@ -194,8 +194,8 @@ class SvxExtParagraphTabPage: public SfxTabPage
static const sal_uInt16 pExtRanges[];
public:
- SvxExtParagraphTabPage(TabPageParent pParent, const SfxItemSet& rSet);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
+ SvxExtParagraphTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rSet );
virtual ~SvxExtParagraphTabPage() override;
@@ -286,8 +286,8 @@ class SvxAsianTabPage : public SfxTabPage
std::unique_ptr<weld::CheckButton> m_xScriptSpaceCB;
public:
- SvxAsianTabPage(TabPageParent pParent, const SfxItemSet& rSet);
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
+ SvxAsianTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet);
virtual ~SvxAsianTabPage() override;
static const sal_uInt16* GetRanges();
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx
index d02d915a3b6e..1fe926566073 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -109,8 +109,8 @@ class SvxSwPosSizeTabPage : public SfxTabPage
void setOptimalRelWidth();
public:
- SvxSwPosSizeTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ SvxSwPosSizeTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
virtual ~SvxSwPosSizeTabPage() override;
static const sal_uInt16* GetRanges();
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index 38c95d2f52ce..a49d0e99095a 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -62,8 +62,8 @@ class SvxTabulatorTabPage : public SfxTabPage
static const sal_uInt16 pRanges[];
public:
- SvxTabulatorTabPage(TabPageParent pParent, const SfxItemSet& rSet);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+ SvxTabulatorTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual ~SvxTabulatorTabPage() override;
static const sal_uInt16* GetRanges() { return pRanges; }
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index b5b2ae409e1e..4b22395f7910 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -78,10 +78,10 @@ private:
sal_uInt16 GetSelectedDirection() const;
public:
- SvxTextAnimationPage(TabPageParent pPage, const SfxItemSet& rInAttrs);
+ SvxTextAnimationPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxTextAnimationPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx
index 0cc80c9e64ff..392794de9543 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -74,10 +74,10 @@ private:
public:
- SvxTextAttrPage(TabPageParent pWindow, const SfxItemSet& rInAttrs);
+ SvxTextAttrPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxTextAttrPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index f90b7318534a..973ff69dbddb 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -129,10 +129,10 @@ private:
DECL_LINK( ClickAutoHdl, weld::ToggleButton&, void );
public:
- SvxPositionSizeTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ SvxPositionSizeTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxPositionSizeTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pPosSizeRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
@@ -186,10 +186,10 @@ private:
std::unique_ptr<weld::CustomWeld> m_xCtlAngle;
public:
- SvxAngleTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ SvxAngleTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxAngleTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pAngleRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
@@ -232,10 +232,10 @@ private:
std::unique_ptr<weld::MetricSpinButton> m_aControlY[2];
public:
- SvxSlantTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ SvxSlantTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxSlantTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pSlantRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index 6f6449b52be0..45ca5d9f3e07 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -46,8 +46,8 @@ namespace offapp
return false;
}
- ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(TabPageParent pParent, const SfxItemSet& _rAttrSet)
- : SfxTabPage(pParent, "cui/ui/connpooloptions.ui", "ConnPoolPage", &_rAttrSet)
+ ConnectionPoolOptionsPage::ConnectionPoolOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet)
+ : SfxTabPage(pPage, pController, "cui/ui/connpooloptions.ui", "ConnPoolPage", &_rAttrSet)
, m_sYes(CuiResId(RID_SVXSTR_YES))
, m_sNo(CuiResId(RID_SVXSTR_NO))
, m_xEnablePooling(m_xBuilder->weld_check_button("connectionpooling"))
@@ -125,9 +125,9 @@ namespace offapp
{
}
- std::unique_ptr<SfxTabPage> ConnectionPoolOptionsPage::Create(TabPageParent pParent, const SfxItemSet* _rAttrSet)
+ std::unique_ptr<SfxTabPage> ConnectionPoolOptionsPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* _rAttrSet)
{
- return std::make_unique<ConnectionPoolOptionsPage>(pParent, *_rAttrSet);
+ return std::make_unique<ConnectionPoolOptionsPage>(pPage, pController, *_rAttrSet);
}
void ConnectionPoolOptionsPage::implInitControls(const SfxItemSet& _rSet)
diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx
index 41acf9cc453a..4e9420d76cb2 100644
--- a/cui/source/options/connpooloptions.hxx
+++ b/cui/source/options/connpooloptions.hxx
@@ -43,9 +43,9 @@ namespace offapp
std::unique_ptr<weld::SpinButton> m_xTimeout;
public:
- ConnectionPoolOptionsPage(TabPageParent _pParent, const SfxItemSet& _rAttrSet);
+ ConnectionPoolOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet);
virtual ~ConnectionPoolOptionsPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent _pParent, const SfxItemSet* _rAttrSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* _rAttrSet);
private:
virtual bool FillItemSet(SfxItemSet* _rSet) override;
diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx
index 08682efb1360..f58985d90b35 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -32,8 +32,7 @@ SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(weld::Window *pParent,
{
// m_xPage will be implicitly destroyed by the
// SfxSingleTabDialog destructor
- TabPageParent pPageParent(get_content_area(), this);
- SetTabPage(SvxJSearchOptionsPage::Create(pPageParent, &rOptionsSet)); //! implicitly calls m_xPage->Reset(...)!
+ SetTabPage(SvxJSearchOptionsPage::Create(get_content_area(), this, &rOptionsSet)); //! implicitly calls m_xPage->Reset(...)!
m_pPage = static_cast<SvxJSearchOptionsPage*>(GetTabPage());
m_pPage->EnableSaveOptions(false);
m_pPage->SetTransliterationFlags(nInitialFlags);
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index a58819d3caea..2e60ef473787 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -61,8 +61,7 @@ DatabaseRegistrationDialog::DatabaseRegistrationDialog(weld::Window* pParent, co
: RegistrationItemSetHolder(rInAttrs)
, SfxSingleTabDialogController(pParent, &getRegistrationItems())
{
- TabPageParent aParent(get_content_area(), this);
- SetTabPage(DbRegistrationOptionsPage::Create(aParent, &getRegistrationItems()));
+ SetTabPage(DbRegistrationOptionsPage::Create(get_content_area(), this, &getRegistrationItems()));
m_xDialog->set_title(CuiResId(RID_SVXSTR_REGISTERED_DATABASES));
}
@@ -80,8 +79,8 @@ short DatabaseRegistrationDialog::run()
// class DbRegistrationOptionsPage --------------------------------------------------
-DbRegistrationOptionsPage::DbRegistrationOptionsPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/dbregisterpage.ui", "DbRegisterPage", &rSet)
+DbRegistrationOptionsPage::DbRegistrationOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/dbregisterpage.ui", "DbRegisterPage", &rSet)
, m_nOldCount(0)
, m_bModified(false)
, m_xNew(m_xBuilder->weld_button("new"))
@@ -117,10 +116,10 @@ DbRegistrationOptionsPage::~DbRegistrationOptionsPage()
delete reinterpret_cast<DatabaseRegistration*>(m_xPathBox->get_id(i).toInt64());
}
-std::unique_ptr<SfxTabPage> DbRegistrationOptionsPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> DbRegistrationOptionsPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet )
{
- return std::make_unique<DbRegistrationOptionsPage>(pParent, *rAttrSet);
+ return std::make_unique<DbRegistrationOptionsPage>(pPage, pController, *rAttrSet);
}
bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet* rCoreSet )
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index c308dd72d7ad..4cedb534c6f9 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -32,8 +32,8 @@
/* */
/*********************************************************************/
-SvxFontSubstTabPage::SvxFontSubstTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/optfontspage.ui", "OptFontsPage", &rSet)
+SvxFontSubstTabPage::SvxFontSubstTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/optfontspage.ui", "OptFontsPage", &rSet)
, m_xConfig(new SvtFontSubstConfig)
, m_bSorted(false)
, m_xUseTableCB(m_xBuilder->weld_check_button("usetable"))
@@ -140,10 +140,10 @@ SvxFontSubstTabPage::~SvxFontSubstTabPage()
{
}
-std::unique_ptr<SfxTabPage> SvxFontSubstTabPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxFontSubstTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet)
{
- return std::make_unique<SvxFontSubstTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SvxFontSubstTabPage>(pPage, pController, *rAttrSet);
}
bool SvxFontSubstTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index a250a80c8bfa..880c11675858 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -50,8 +50,8 @@ class SvxFontSubstTabPage : public SfxTabPage
void setColSizes();
public:
- SvxFontSubstTabPage(TabPageParent pParent, const SfxItemSet& rSet);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet);
+ SvxFontSubstTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet);
virtual ~SvxFontSubstTabPage() override;
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index a251ea81ce94..a394ff955a4a 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -22,9 +22,9 @@
#include <vcl/svapp.hxx>
#include <officecfg/Office/Common.hxx>
-SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage(TabPageParent pParent,
+SvxAccessibilityOptionsTabPage::SvxAccessibilityOptionsTabPage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/optaccessibilitypage.ui", "OptAccessibilityPage", &rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/optaccessibilitypage.ui", "OptAccessibilityPage", &rSet)
, m_xAccessibilityTool(m_xBuilder->weld_check_button("acctool"))
, m_xTextSelectionInReadonly(m_xBuilder->weld_check_button("textselinreadonly"))
, m_xAnimatedGraphics(m_xBuilder->weld_check_button("animatedgraphics"))
@@ -43,9 +43,9 @@ SvxAccessibilityOptionsTabPage::~SvxAccessibilityOptionsTabPage()
{
}
-std::unique_ptr<SfxTabPage> SvxAccessibilityOptionsTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> SvxAccessibilityOptionsTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
{
- return std::make_unique<SvxAccessibilityOptionsTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SvxAccessibilityOptionsTabPage>(pPage, pController, *rAttrSet);
}
bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx
index 5f00ec328b50..93886c73555d 100644
--- a/cui/source/options/optaccessibility.hxx
+++ b/cui/source/options/optaccessibility.hxx
@@ -32,10 +32,10 @@ class SvxAccessibilityOptionsTabPage : public SfxTabPage
std::unique_ptr<weld::CheckButton> m_xPagePreviews;
public:
- SvxAccessibilityOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SvxAccessibilityOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SvxAccessibilityOptionsTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
};
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 2b053e30998a..9c57cac8eaac 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -100,8 +100,8 @@ void SvxAsianLayoutPage_Impl::addForbiddenCharacters(
static LanguageType eLastUsedLanguageTypeForForbiddenCharacters(USHRT_MAX);
-SvxAsianLayoutPage::SvxAsianLayoutPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/optasianpage.ui", "OptAsianPage", &rSet)
+SvxAsianLayoutPage::SvxAsianLayoutPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/optasianpage.ui", "OptAsianPage", &rSet)
, pImpl(new SvxAsianLayoutPage_Impl)
, m_xCharKerningRB(m_xBuilder->weld_radio_button("charkerning"))
, m_xCharPunctKerningRB(m_xBuilder->weld_radio_button("charpunctkerning"))
@@ -131,9 +131,9 @@ SvxAsianLayoutPage::~SvxAsianLayoutPage()
{
}
-std::unique_ptr<SfxTabPage> SvxAsianLayoutPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> SvxAsianLayoutPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
{
- return std::make_unique<SvxAsianLayoutPage>(pParent, *rAttrSet);
+ return std::make_unique<SvxAsianLayoutPage>(pPage, pController, *rAttrSet);
}
bool SvxAsianLayoutPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optbasic.cxx b/cui/source/options/optbasic.cxx
index 4563ed3887a6..c550d9440edd 100644
--- a/cui/source/options/optbasic.cxx
+++ b/cui/source/options/optbasic.cxx
@@ -21,8 +21,8 @@
#include <basic/codecompletecache.hxx>
#include <officecfg/Office/BasicIDE.hxx>
-SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/optbasicidepage.ui", "OptBasicIDEPage", &rSet)
+SvxBasicIDEOptionsPage::SvxBasicIDEOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/optbasicidepage.ui", "OptBasicIDEPage", &rSet)
, m_xCodeCompleteChk(m_xBuilder->weld_check_button("codecomplete_enable"))
, m_xAutocloseProcChk(m_xBuilder->weld_check_button("autoclose_proc"))
, m_xAutocloseParenChk(m_xBuilder->weld_check_button("autoclose_paren"))
@@ -118,9 +118,9 @@ void SvxBasicIDEOptionsPage::Reset( const SfxItemSet* /*rSet*/ )
m_xUseExtendedTypesChk->save_state();
}
-std::unique_ptr<SfxTabPage> SvxBasicIDEOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
+std::unique_ptr<SfxTabPage> SvxBasicIDEOptionsPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
{
- return std::make_unique<SvxBasicIDEOptionsPage>( pParent, *rAttrSet );
+ return std::make_unique<SvxBasicIDEOptionsPage>(pPage, pController, *rAttrSet);
}
void SvxBasicIDEOptionsPage::FillUserData()
diff --git a/cui/source/options/optbasic.hxx b/cui/source/options/optbasic.hxx
index 63f2fed9b299..5510fc12994c 100644
--- a/cui/source/options/optbasic.hxx
+++ b/cui/source/options/optbasic.hxx
@@ -35,10 +35,10 @@ private:
void LoadConfig();
public:
- SvxBasicIDEOptionsPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SvxBasicIDEOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SvxBasicIDEOptionsPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
virtual void FillUserData() override;
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 2f6938101f85..c2526074366c 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -88,8 +88,8 @@ void SvxDefaultColorOptPage::FillBoxChartColorLB()
m_xLbChartColors->thaw();
}
-SvxDefaultColorOptPage::SvxDefaultColorOptPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage(pParent, "cui/ui/optchartcolorspage.ui", "OptChartColorsPage", &rInAttrs)
+SvxDefaultColorOptPage::SvxDefaultColorOptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "cui/ui/optchartcolorspage.ui", "OptChartColorsPage", &rInAttrs)
, m_xLbChartColors(m_xBuilder->weld_tree_view("colors"))
, m_xLbPaletteSelector(m_xBuilder->weld_combo_box("paletteselector"))
, m_xPBDefault(m_xBuilder->weld_button("default"))
@@ -141,9 +141,9 @@ void SvxDefaultColorOptPage::Construct()
m_xLbChartColors->select( 0 );
}
-std::unique_ptr<SfxTabPage> SvxDefaultColorOptPage::Create( TabPageParent pParent, const SfxItemSet* rAttrs )
+std::unique_ptr<SfxTabPage> SvxDefaultColorOptPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrs )
{
- return std::make_unique<SvxDefaultColorOptPage>( pParent, *rAttrs );
+ return std::make_unique<SvxDefaultColorOptPage>( pPage, pController, *rAttrs );
}
bool SvxDefaultColorOptPage::FillItemSet( SfxItemSet* rOutAttrs )
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index 8a0da42f3b66..f8b0dcb8f1f4 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -65,12 +65,12 @@ private:
void FillBoxChartColorLB();
public:
- SvxDefaultColorOptPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ SvxDefaultColorOptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SvxDefaultColorOptPage() override;
void Construct();
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
virtual void Reset( const SfxItemSet* rInAttrs ) override;
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 828ecfd3c481..3ab68a498949 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -693,13 +693,13 @@ IMPL_LINK(ColorConfigCtrl_Impl, ControlFocusHdl, weld::Widget&, rCtrl, void)
}
// SvxColorOptionsTabPage
-SvxColorOptionsTabPage::SvxColorOptionsTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet)
- : SfxTabPage(pParent, "cui/ui/optappearancepage.ui", "OptAppearancePage", &rCoreSet)
+SvxColorOptionsTabPage::SvxColorOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet)
+ : SfxTabPage(pPage, pController, "cui/ui/optappearancepage.ui", "OptAppearancePage", &rCoreSet)
, bFillItemSetCalled(false)
, m_xColorSchemeLB(m_xBuilder->weld_combo_box("colorschemelb"))
, m_xSaveSchemePB(m_xBuilder->weld_button("save"))
, m_xDeleteSchemePB(m_xBuilder->weld_button("delete"))
- , m_xColorConfigCT(new ColorConfigCtrl_Impl(pParent.GetFrameWeld(), *m_xBuilder))
+ , m_xColorConfigCT(new ColorConfigCtrl_Impl(pController->getDialog(), *m_xBuilder))
, m_xTable(m_xBuilder->weld_widget("table"))
, m_xOnFT(m_xBuilder->weld_label("on"))
, m_xElementFT(m_xBuilder->weld_label("uielements"))
@@ -743,9 +743,9 @@ SvxColorOptionsTabPage::~SvxColorOptionsTabPage()
m_xColorConfigCT.reset();
}
-std::unique_ptr<SfxTabPage> SvxColorOptionsTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> SvxColorOptionsTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
{
- return std::make_unique<SvxColorOptionsTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SvxColorOptionsTabPage>(pPage, pController, *rAttrSet);
}
bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx
index a3b6349d75b8..8e59592bfbee 100644
--- a/cui/source/options/optcolor.hxx
+++ b/cui/source/options/optcolor.hxx
@@ -49,10 +49,10 @@ class SvxColorOptionsTabPage : public SfxTabPage
void UpdateColorConfig();
public:
- SvxColorOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SvxColorOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SvxColorOptionsTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index 35a207bc9f54..983f077e7ff8 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -37,8 +37,8 @@ IMPL_LINK_NOARG(SvxCTLOptionsPage, SequenceCheckingCB_Hdl, weld::Button&, void)
}
}
-SvxCTLOptionsPage::SvxCTLOptionsPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/optctlpage.ui", "OptCTLPage", &rSet)
+SvxCTLOptionsPage::SvxCTLOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/optctlpage.ui", "OptCTLPage", &rSet)
, m_xSequenceCheckingCB(m_xBuilder->weld_check_button("sequencechecking"))
, m_xRestrictedCB(m_xBuilder->weld_check_button("restricted"))
, m_xTypeReplaceCB(m_xBuilder->weld_check_button("typeandreplace"))
@@ -53,9 +53,9 @@ SvxCTLOptionsPage::~SvxCTLOptionsPage()
{
}
-std::unique_ptr<SfxTabPage> SvxCTLOptionsPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
+std::unique_ptr<SfxTabPage> SvxCTLOptionsPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
{
- return std::make_unique<SvxCTLOptionsPage>( pParent, *rAttrSet );
+ return std::make_unique<SvxCTLOptionsPage>( pPage, pController, *rAttrSet );
}
bool SvxCTLOptionsPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx
index f92cbcdb3db3..5f8e807b1cec 100644
--- a/cui/source/options/optctl.hxx
+++ b/cui/source/options/optctl.hxx
@@ -36,9 +36,9 @@ private:
DECL_LINK( SequenceCheckingCB_Hdl, weld::Button&, void );
public:
- SvxCTLOptionsPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SvxCTLOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SvxCTLOptionsPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
};
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 0a07a4bc83fd..5708f14a3575 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -36,8 +36,8 @@ enum class MSFltrPg2_CheckBoxEntries {
};
-OfaMSFilterTabPage::OfaMSFilterTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/optfltrpage.ui", "OptFltrPage", &rSet)
+OfaMSFilterTabPage::OfaMSFilterTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/optfltrpage.ui", "OptFltrPage", &rSet)
, m_xWBasicCodeCB(m_xBuilder->weld_check_button("wo_basic"))
, m_xWBasicWbctblCB(m_xBuilder->weld_check_button("wo_exec"))
, m_xWBasicStgCB(m_xBuilder->weld_check_button("wo_saveorig"))
@@ -65,10 +65,10 @@ IMPL_LINK_NOARG(OfaMSFilterTabPage, LoadExcelBasicCheckHdl_Impl, weld::Button&,
m_xEBasicExectblCB->set_sensitive(m_xEBasicCodeCB->get_active());
}
-std::unique_ptr<SfxTabPage> OfaMSFilterTabPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> OfaMSFilterTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet )
{
- return std::make_unique<OfaMSFilterTabPage>(pParent, *rAttrSet);
+ return std::make_unique<OfaMSFilterTabPage>(pPage, pController, *rAttrSet);
}
bool OfaMSFilterTabPage::FillItemSet( SfxItemSet* )
@@ -123,8 +123,8 @@ void OfaMSFilterTabPage::Reset( const SfxItemSet* )
m_xPBasicStgCB->save_state();
}
-OfaMSFilterTabPage2::OfaMSFilterTabPage2(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/optfltrembedpage.ui", "OptFilterPage", &rSet)
+OfaMSFilterTabPage2::OfaMSFilterTabPage2(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/optfltrembedpage.ui", "OptFilterPage", &rSet)
, sChgToFromMath(CuiResId(RID_SVXSTR_CHG_MATH))
, sChgToFromWriter(CuiResId(RID_SVXSTR_CHG_WRITER))
, sChgToFromCalc(CuiResId(RID_SVXSTR_CHG_CALC))
@@ -147,10 +147,10 @@ OfaMSFilterTabPage2::~OfaMSFilterTabPage2()
{
}
-std::unique_ptr<SfxTabPage> OfaMSFilterTabPage2::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> OfaMSFilterTabPage2::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet )
{
- return std::make_unique<OfaMSFilterTabPage2>( pParent, *rAttrSet );
+ return std::make_unique<OfaMSFilterTabPage2>( pPage, pController, *rAttrSet );
}
bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index a4e9edd88214..efc95684328a 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -35,10 +35,10 @@ class OfaMSFilterTabPage : public SfxTabPage
DECL_LINK(LoadWordBasicCheckHdl_Impl, weld::Button&, void);
DECL_LINK(LoadExcelBasicCheckHdl_Impl, weld::Button&, void);
public:
- OfaMSFilterTabPage(TabPageParent pParent, const SfxItemSet& rSet );
+ OfaMSFilterTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet );
virtual ~OfaMSFilterTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
@@ -68,8 +68,8 @@ class OfaMSFilterTabPage2 : public SfxTabPage
int GetEntry4Type( MSFltrPg2_CheckBoxEntries _nType ) const;
public:
- OfaMSFilterTabPage2(TabPageParent pParent, const SfxItemSet& rSet);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+ OfaMSFilterTabPage2(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
virtual ~OfaMSFilterTabPage2() override;
virtual bool FillItemSet( SfxItemSet* rSet ) override;
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 2568d901464e..c8d8f0f494ac 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -226,8 +226,8 @@ bool lcl_HasSystemFilePicker()
}
}
-OfaMiscTabPage::OfaMiscTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/optgeneralpage.ui", "OptGeneralPage", &rSet)
+OfaMiscTabPage::OfaMiscTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/optgeneralpage.ui", "OptGeneralPage", &rSet)
, m_xExtHelpCB(m_xBuilder->weld_check_button("exthelp"))
, m_xPopUpNoHelpCB(m_xBuilder->weld_check_button("popupnohelp"))
, m_xShowTipOfTheDay(m_xBuilder->weld_check_button("cbShowTipOfTheDay"))
@@ -283,9 +283,9 @@ OfaMiscTabPage::~OfaMiscTabPage()
{
}
-std::unique_ptr<SfxTabPage> OfaMiscTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
+std::unique_ptr<SfxTabPage> OfaMiscTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
{
- return std::make_unique<OfaMiscTabPage>( pParent, *rAttrSet );
+ return std::make_unique<OfaMiscTabPage>( pPage, pController, *rAttrSet );
}
bool OfaMiscTabPage::FillItemSet( SfxItemSet* rSet )
@@ -599,8 +599,8 @@ static bool DisplayNameCompareLessThan(const vcl::IconThemeInfo& rInfo1, const v
return rInfo1.GetDisplayName().compareTo(rInfo2.GetDisplayName()) < 0;
}
-OfaViewTabPage::OfaViewTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/optviewpage.ui", "OptViewPage", &rSet)
+OfaViewTabPage::OfaViewTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/optviewpage.ui", "OptViewPage", &rSet)
, nSizeLB_InitialSelection(0)
, nSidebarSizeLB_InitialSelection(0)
, nNotebookbarSizeLB_InitialSelection(0)
@@ -704,9 +704,9 @@ IMPL_LINK_NOARG(OfaViewTabPage, OnForceOpenGLToggled, weld::ToggleButton&, void)
}
}
-std::unique_ptr<SfxTabPage> OfaViewTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
+std::unique_ptr<SfxTabPage> OfaViewTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
{
- return std::make_unique<OfaViewTabPage>(pParent, *rAttrSet);
+ return std::make_unique<OfaViewTabPage>(pPage, pController, *rAttrSet);
}
bool OfaViewTabPage::FillItemSet( SfxItemSet* )
@@ -1092,8 +1092,8 @@ namespace
}
}
-OfaLanguagesTabPage::OfaLanguagesTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/optlanguagespage.ui", "OptLanguagesPage", &rSet)
+OfaLanguagesTabPage::OfaLanguagesTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/optlanguagespage.ui", "OptLanguagesPage", &rSet)
, pLangConfig(new LanguageConfig_Impl)
, m_bDatePatternsValid(false)
, m_xUserInterfaceLB(m_xBuilder->weld_combo_box("userinterface"))
@@ -1238,9 +1238,9 @@ OfaLanguagesTabPage::~OfaLanguagesTabPage()
{
}
-std::unique_ptr<SfxTabPage> OfaLanguagesTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
+std::unique_ptr<SfxTabPage> OfaLanguagesTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
{
- return std::make_unique<OfaLanguagesTabPage>(pParent, *rAttrSet);
+ return std::make_unique<OfaLanguagesTabPage>(pPage, pController, *rAttrSet);
}
static void lcl_Update(std::unique_ptr<SfxVoidItem> pInvalidItems[], std::unique_ptr<SfxBoolItem> pBoolItems[], sal_uInt16 nCount)
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index e32b65eaeac1..5a3737a4f591 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -60,10 +60,10 @@ protected:
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
public:
- OfaMiscTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ OfaMiscTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~OfaMiscTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
@@ -118,10 +118,10 @@ private:
void UpdateOGLStatus();
public:
- OfaViewTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ OfaViewTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~OfaViewTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
@@ -164,10 +164,10 @@ class OfaLanguagesTabPage : public SfxTabPage
DECL_LINK(DatePatternsHdl, weld::Entry&, void);
public:
- OfaLanguagesTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ OfaLanguagesTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~OfaLanguagesTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 55068ffcad0d..71b61b0cca79 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -206,9 +206,8 @@ public:
}
};
-
-SvxGeneralTabPage::SvxGeneralTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet)
- : SfxTabPage(pParent, "cui/ui/optuserpage.ui", "OptUserPage", &rCoreSet)
+SvxGeneralTabPage::SvxGeneralTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet)
+ : SfxTabPage(pPage, pController, "cui/ui/optuserpage.ui", "OptUserPage", &rCoreSet)
, m_xUseDataCB(m_xBuilder->weld_check_button("usefordocprop"))
, m_xCryptoFrame(m_xBuilder->weld_widget( "cryptography"))
, m_xSigningKeyLB(m_xBuilder->weld_combo_box("signingkey"))
@@ -336,9 +335,9 @@ void SvxGeneralTabPage::SetLinks ()
}
-std::unique_ptr<SfxTabPage> SvxGeneralTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
+std::unique_ptr<SfxTabPage> SvxGeneralTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
{
- return std::make_unique<SvxGeneralTabPage>( pParent, *rAttrSet );
+ return std::make_unique<SvxGeneralTabPage>( pPage, pController, *rAttrSet );
}
bool SvxGeneralTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/opthtml.cxx b/cui/source/options/opthtml.cxx
index 8b8c07c26f86..cfe4dc78473e 100644
--- a/cui/source/options/opthtml.cxx
+++ b/cui/source/options/opthtml.cxx
@@ -22,8 +22,8 @@
#include "opthtml.hxx"
-OfaHtmlTabPage::OfaHtmlTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/opthtmlpage.ui", "OptHtmlPage", &rSet)
+OfaHtmlTabPage::OfaHtmlTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/opthtmlpage.ui", "OptHtmlPage", &rSet)
, m_xSize1NF(m_xBuilder->weld_spin_button("size1"))
, m_xSize2NF(m_xBuilder->weld_spin_button("size2"))
, m_xSize3NF(m_xBuilder->weld_spin_button("size3"))
@@ -64,10 +64,10 @@ OfaHtmlTabPage::~OfaHtmlTabPage()
{
}
-std::unique_ptr<SfxTabPage> OfaHtmlTabPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> OfaHtmlTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet )
{
- return std::make_unique<OfaHtmlTabPage>(pParent, *rAttrSet);
+ return std::make_unique<OfaHtmlTabPage>(pPage, pController, *rAttrSet);
}
bool OfaHtmlTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx
index f0b26e7b3e08..96131571fcd9 100644
--- a/cui/source/options/opthtml.hxx
+++ b/cui/source/options/opthtml.hxx
@@ -46,9 +46,9 @@ class OfaHtmlTabPage : public SfxTabPage
DECL_LINK(CheckBoxHdl_Impl, weld::ToggleButton&, void);
public:
- OfaHtmlTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ OfaHtmlTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~OfaHtmlTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
diff --git a/cui/source/options/optinet2.cxx b/cui/source/options/optinet2.cxx
index 71df2eda60f1..16785d64c10a 100644
--- a/cui/source/options/optinet2.cxx
+++ b/cui/source/options/optinet2.cxx
@@ -128,8 +128,8 @@ IMPL_STATIC_LINK(SvxProxyTabPage, NoSpaceTextFilterHdl, OUString&, rTest, bool)
/* SvxProxyTabPage */
/* */
/********************************************************************/
-SvxProxyTabPage::SvxProxyTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/optproxypage.ui", "OptProxyPage", &rSet)
+SvxProxyTabPage::SvxProxyTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/optproxypage.ui", "OptProxyPage", &rSet)
, m_xProxyModeLB(m_xBuilder->weld_combo_box("proxymode"))
, m_xHttpProxyFT(m_xBuilder->weld_label("httpft"))
, m_xHttpProxyED(m_xBuilder->weld_entry("http"))
@@ -185,9 +185,9 @@ SvxProxyTabPage::~SvxProxyTabPage()
{
}
-std::unique_ptr<SfxTabPage> SvxProxyTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet )
+std::unique_ptr<SfxTabPage> SvxProxyTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
{
- return std::make_unique<SvxProxyTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SvxProxyTabPage>(pPage, pController, *rAttrSet);
}
void SvxProxyTabPage::ReadConfigData_Impl()
@@ -495,8 +495,8 @@ IMPL_STATIC_LINK(SvxProxyTabPage, LoseFocusHdl_Impl, weld::Widget&, rControl, vo
/* SvxSecurityTabPage */
/* */
/********************************************************************/
-SvxSecurityTabPage::SvxSecurityTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/optsecuritypage.ui", "OptSecurityPage", &rSet)
+SvxSecurityTabPage::SvxSecurityTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/optsecuritypage.ui", "OptSecurityPage", &rSet)
, mpSecOptions(new SvtSecurityOptions)
, m_xSecurityOptionsPB(m_xBuilder->weld_button("options"))
, m_xSavePasswordsCB(m_xBuilder->weld_check_button("savepassword"))
@@ -786,9 +786,9 @@ void SvxSecurityTabPage::InitControls()
}
}
-std::unique_ptr<SfxTabPage> SvxSecurityTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet )
+std::unique_ptr<SfxTabPage> SvxSecurityTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
{
- return std::make_unique<SvxSecurityTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SvxSecurityTabPage>(pPage, pController, *rAttrSet);
}
void SvxSecurityTabPage::ActivatePage( const SfxItemSet& )
@@ -864,8 +864,8 @@ struct SvxEMailTabPage_Impl
bool bROHideContent;
};
-SvxEMailTabPage::SvxEMailTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage( pParent, "cui/ui/optemailpage.ui", "OptEmailPage", &rSet)
+SvxEMailTabPage::SvxEMailTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage( pPage, pController, "cui/ui/optemailpage.ui", "OptEmailPage", &rSet)
, pImpl(new SvxEMailTabPage_Impl)
, m_xMailContainer(m_xBuilder->weld_container("program"))
, m_xMailerURLFI(m_xBuilder->weld_image("lockemail"))
@@ -888,9 +888,9 @@ SvxEMailTabPage::~SvxEMailTabPage()
/* -------------------------------------------------------------------------*/
-std::unique_ptr<SfxTabPage> SvxEMailTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
+std::unique_ptr<SfxTabPage> SvxEMailTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
{
- return std::make_unique<SvxEMailTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SvxEMailTabPage>(pPage, pController, *rAttrSet);
}
/* -------------------------------------------------------------------------*/
diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx
index 1abc8a0a9985..4d434ce8d03d 100644
--- a/cui/source/options/optinet2.hxx
+++ b/cui/source/options/optinet2.hxx
@@ -66,9 +66,9 @@ private:
DECL_STATIC_LINK(SvxProxyTabPage, LoseFocusHdl_Impl, weld::Widget&, void);
public:
- SvxProxyTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SvxProxyTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SvxProxyTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
};
@@ -123,8 +123,8 @@ protected:
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
public:
- SvxSecurityTabPage(TabPageParent pParent, const SfxItemSet& rSet);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+ SvxSecurityTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
virtual ~SvxSecurityTabPage() override;
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
@@ -149,10 +149,10 @@ class SvxEMailTabPage : public SfxTabPage
DECL_LINK(FileDialogHdl_Impl, weld::Button&, void);
public:
- SvxEMailTabPage(TabPageParent pParent, const SfxItemSet& rSet );
+ SvxEMailTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet );
virtual ~SvxEMailTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 2e8fccf8e69f..308e6cc5ada7 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -65,8 +65,8 @@ using namespace ::com::sun::star::ui::dialogs;
using namespace ::com::sun::star::uno;
// class SvxJavaOptionsPage ----------------------------------------------
-SvxJavaOptionsPage::SvxJavaOptionsPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/optadvancedpage.ui", "OptAdvancedPage", &rSet)
+SvxJavaOptionsPage::SvxJavaOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/optadvancedpage.ui", "OptAdvancedPage", &rSet)
, m_aResetIdle("cui options SvxJavaOptionsPage Reset")
, xDialogListener(new ::svt::DialogClosedListener())
, m_xJavaEnableCB(m_xBuilder->weld_check_button("javaenabled"))
@@ -469,9 +469,9 @@ void SvxJavaOptionsPage::RequestRestart(svtools::RestartReason eReason)
pParentDlg->SetNeedsRestart(eReason);
}
-std::unique_ptr<SfxTabPage> SvxJavaOptionsPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> SvxJavaOptionsPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
{
- return std::make_unique<SvxJavaOptionsPage>(pParent, *rAttrSet);
+ return std::make_unique<SvxJavaOptionsPage>(pPage, pController, *rAttrSet);
}
bool SvxJavaOptionsPage::FillItemSet( SfxItemSet* /*rCoreSet*/ )
diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx
index fec960a5c609..4375b2079e8d 100644
--- a/cui/source/options/optjava.hxx
+++ b/cui/source/options/optjava.hxx
@@ -106,10 +106,10 @@ private:
void RequestRestart( svtools::RestartReason eReason );
public:
- SvxJavaOptionsPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SvxJavaOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SvxJavaOptionsPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/options/optjsearch.cxx b/cui/source/options/optjsearch.cxx
index b110ad1c9fd6..46a97e0848b2 100644
--- a/cui/source/options/optjsearch.cxx
+++ b/cui/source/options/optjsearch.cxx
@@ -25,8 +25,8 @@
using namespace com::sun::star::i18n;
-SvxJSearchOptionsPage::SvxJSearchOptionsPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/optjsearchpage.ui", "OptJSearchPage", &rSet)
+SvxJSearchOptionsPage::SvxJSearchOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/optjsearchpage.ui", "OptJSearchPage", &rSet)
, m_xMatchCase(m_xBuilder->weld_check_button("matchcase"))
, m_xMatchFullHalfWidth(m_xBuilder->weld_check_button("matchfullhalfwidth"))
, m_xMatchHiraganaKatakana(m_xBuilder->weld_check_button("matchhiraganakatakana"))
@@ -55,9 +55,9 @@ SvxJSearchOptionsPage::~SvxJSearchOptionsPage()
{
}
-std::unique_ptr<SfxTabPage> SvxJSearchOptionsPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SvxJSearchOptionsPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
- return std::make_unique<SvxJSearchOptionsPage>(pParent, *rSet);
+ return std::make_unique<SvxJSearchOptionsPage>(pPage, pController, *rSet);
}
void SvxJSearchOptionsPage::SetTransliterationFlags( TransliterationFlags nSettings )
diff --git a/cui/source/options/optjsearch.hxx b/cui/source/options/optjsearch.hxx
index 526b1f430d89..8b2d68ddcf4d 100644
--- a/cui/source/options/optjsearch.hxx
+++ b/cui/source/options/optjsearch.hxx
@@ -56,9 +56,9 @@ private:
TransliterationFlags GetTransliterationFlags_Impl();
public:
- SvxJSearchOptionsPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SvxJSearchOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SvxJSearchOptionsPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet);
virtual void Reset( const SfxItemSet* rSet ) override;
virtual bool FillItemSet( SfxItemSet* rSet ) override;
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index 9f30b60d71f5..f2e4b7c8e4e3 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -811,8 +811,8 @@ void SvxLinguData_Impl::Reconfigure( const OUString &rDisplayName, bool bEnable
// class SvxLinguTabPage -------------------------------------------------
-SvxLinguTabPage::SvxLinguTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/optlingupage.ui", "OptLinguPage", &rSet)
+SvxLinguTabPage::SvxLinguTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/optlingupage.ui", "OptLinguPage", &rSet)
, sCapitalWords (CuiResId(RID_SVXSTR_CAPITAL_WORDS))
, sWordsWithDigits(CuiResId(RID_SVXSTR_WORDS_WITH_DIGITS))
, sSpellSpecial (CuiResId(RID_SVXSTR_SPELL_SPECIAL))
@@ -896,10 +896,10 @@ SvxLinguTabPage::~SvxLinguTabPage()
pLinguData.reset();
}
-std::unique_ptr<SfxTabPage> SvxLinguTabPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxLinguTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet )
{
- return std::make_unique<SvxLinguTabPage>( pParent, *rAttrSet );
+ return std::make_unique<SvxLinguTabPage>( pPage, pController, *rAttrSet );
}
bool SvxLinguTabPage::FillItemSet( SfxItemSet* rCoreSet )
diff --git a/cui/source/options/optopencl.cxx b/cui/source/options/optopencl.cxx
index 35f726472d40..e85ef1d7e23a 100644
--- a/cui/source/options/optopencl.cxx
+++ b/cui/source/options/optopencl.cxx
@@ -26,8 +26,8 @@
#include "optopencl.hxx"
-SvxOpenCLTabPage::SvxOpenCLTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/optopenclpage.ui", "OptOpenCLPage", &rSet)
+SvxOpenCLTabPage::SvxOpenCLTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/optopenclpage.ui", "OptOpenCLPage", &rSet)
, maConfig(OpenCLConfig::get())
, mxUseOpenCL(m_xBuilder->weld_check_button("useopencl"))
, mxOclUsed(m_xBuilder->weld_label("openclused"))
@@ -45,9 +45,9 @@ SvxOpenCLTabPage::~SvxOpenCLTabPage()
{
}
-std::unique_ptr<SfxTabPage> SvxOpenCLTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> SvxOpenCLTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
{
- return std::make_unique<SvxOpenCLTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SvxOpenCLTabPage>(pPage, pController, *rAttrSet);
}
bool SvxOpenCLTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optopencl.hxx b/cui/source/options/optopencl.hxx
index c9a73531ef71..f9fbca43edf1 100644
--- a/cui/source/options/optopencl.hxx
+++ b/cui/source/options/optopencl.hxx
@@ -33,8 +33,8 @@ private:
std::unique_ptr<weld::Label> mxOclNotUsed;
public:
- SvxOpenCLTabPage(TabPageParent pParent, const SfxItemSet& rSet);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+ SvxOpenCLTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual ~SvxOpenCLTabPage() override;
virtual bool FillItemSet( SfxItemSet* rSet ) override;
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 5f026366efac..dfc493a4e852 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -178,8 +178,8 @@ static bool IsMultiPath_Impl( const sal_uInt16 nIndex )
// class SvxPathTabPage --------------------------------------------------
-SvxPathTabPage::SvxPathTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage( pParent, "cui/ui/optpathspage.ui", "OptPathsPage", &rSet)
+SvxPathTabPage::SvxPathTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage( pPage, pController, "cui/ui/optpathspage.ui", "OptPathsPage", &rSet)
, pImpl(new OptPath_Impl)
, xDialogListener ( new ::svt::DialogClosedListener() )
, m_xStandardBtn(m_xBuilder->weld_button("default"))
@@ -205,10 +205,10 @@ SvxPathTabPage::~SvxPathTabPage()
delete reinterpret_cast<PathUserData_Impl*>(m_xPathBox->get_id(i).toInt64());
}
-std::unique_ptr<SfxTabPage> SvxPathTabPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxPathTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet )
{
- return std::make_unique<SvxPathTabPage>( pParent, *rAttrSet );
+ return std::make_unique<SvxPathTabPage>( pPage, pController, *rAttrSet );
}
bool SvxPathTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx
index 14cc52f86a24..72f736ce406b 100644
--- a/cui/source/options/optsave.cxx
+++ b/cui/source/options/optsave.cxx
@@ -66,8 +66,8 @@ SvxSaveTabPage_Impl::SvxSaveTabPage_Impl() : bInitialized( false )
// class SvxSaveTabPage --------------------------------------------------
-SvxSaveTabPage::SvxSaveTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet)
- : SfxTabPage( pParent, "cui/ui/optsavepage.ui", "OptSavePage", &rCoreSet )
+SvxSaveTabPage::SvxSaveTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet)
+ : SfxTabPage( pPage, pController, "cui/ui/optsavepage.ui", "OptSavePage", &rCoreSet )
, pImpl(new SvxSaveTabPage_Impl)
, m_xLoadUserSettingsCB(m_xBuilder->weld_check_button("load_settings"))
, m_xLoadDocPrinterCB(m_xBuilder->weld_check_button("load_docprinter"))
@@ -179,10 +179,10 @@ SvxSaveTabPage::~SvxSaveTabPage()
{
}
-std::unique_ptr<SfxTabPage> SvxSaveTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxSaveTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet)
{
- return std::make_unique<SvxSaveTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SvxSaveTabPage>(pPage, pController, *rAttrSet);
}
void SvxSaveTabPage::DetectHiddenControls()
diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx
index fd8b037b0953..4314bdda1ddf 100644
--- a/cui/source/options/optsave.hxx
+++ b/cui/source/options/optsave.hxx
@@ -70,10 +70,10 @@ private:
void DetectHiddenControls();
public:
- SvxSaveTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SvxSaveTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SvxSaveTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 5d085986faff..2f39687cc87d 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -43,8 +43,8 @@
using namespace ::css;
-SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/optonlineupdatepage.ui", "OptOnlineUpdatePage", &rSet)
+SvxOnlineUpdateTabPage::SvxOnlineUpdateTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/optonlineupdatepage.ui", "OptOnlineUpdatePage", &rSet)
, m_xNeverChecked(m_xBuilder->weld_label("neverchecked"))
, m_xAutoCheckCheckBox(m_xBuilder->weld_check_button("autocheck"))
, m_xEveryDayButton(m_xBuilder->weld_radio_button("everyday"))
@@ -175,9 +175,9 @@ void SvxOnlineUpdateTabPage::UpdateUserAgent()
}
}
-std::unique_ptr<SfxTabPage> SvxOnlineUpdateTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
+std::unique_ptr<SfxTabPage> SvxOnlineUpdateTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
{
- return std::make_unique<SvxOnlineUpdateTabPage>( pParent, *rAttrSet );
+ return std::make_unique<SvxOnlineUpdateTabPage>( pPage, pController, *rAttrSet );
}
bool SvxOnlineUpdateTabPage::FillItemSet( SfxItemSet* )
diff --git a/cui/source/options/optupdt.hxx b/cui/source/options/optupdt.hxx
index 5c7b3fb20ed3..bd418991ce5e 100644
--- a/cui/source/options/optupdt.hxx
+++ b/cui/source/options/optupdt.hxx
@@ -58,8 +58,8 @@ private:
void UpdateUserAgent();
public:
- SvxOnlineUpdateTabPage(TabPageParent pParent, const SfxItemSet& rSet);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+ SvxOnlineUpdateTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
virtual ~SvxOnlineUpdateTabPage() override;
virtual bool FillItemSet( SfxItemSet* rSet ) override;
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx
index a3f905106661..a732053bab7f 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -29,8 +29,11 @@ using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
// persona
-SvxPersonalizationTabPage::SvxPersonalizationTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/personalization_tab.ui", "PersonalizationTabPage", &rSet)
+SvxPersonalizationTabPage::SvxPersonalizationTabPage(weld::Container* pPage,
+ weld::DialogController* pController,
+ const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/personalization_tab.ui", "PersonalizationTabPage",
+ &rSet)
, m_xNoPersona(m_xBuilder->weld_radio_button("no_persona"))
, m_xDefaultPersona(m_xBuilder->weld_radio_button("default_persona"))
{
@@ -47,10 +50,11 @@ SvxPersonalizationTabPage::SvxPersonalizationTabPage(TabPageParent pParent, cons
SvxPersonalizationTabPage::~SvxPersonalizationTabPage() {}
-std::unique_ptr<SfxTabPage> SvxPersonalizationTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxPersonalizationTabPage::Create(weld::Container* pPage,
+ weld::DialogController* pController,
const SfxItemSet* rSet)
{
- return std::make_unique<SvxPersonalizationTabPage>(pParent, *rSet);
+ return std::make_unique<SvxPersonalizationTabPage>(pPage, pController, *rSet);
}
bool SvxPersonalizationTabPage::FillItemSet(SfxItemSet*)
diff --git a/cui/source/options/personalization.hxx b/cui/source/options/personalization.hxx
index a045059e92a8..072a89b8135f 100644
--- a/cui/source/options/personalization.hxx
+++ b/cui/source/options/personalization.hxx
@@ -27,10 +27,12 @@ private:
std::vector<OUString> m_vDefaultPersonaSettings;
public:
- SvxPersonalizationTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SvxPersonalizationTabPage(weld::Container* pPage, weld::DialogController* pController,
+ const SfxItemSet& rSet);
virtual ~SvxPersonalizationTabPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
+ static std::unique_ptr<SfxTabPage>
+ Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet);
/// Apply the settings ([OK] button).
virtual bool FillItemSet(SfxItemSet* rSet) override;
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index e484d9afe924..4163cc906945 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -267,8 +267,8 @@ void MailMergeCfg_Impl::Notify( const css::uno::Sequence< OUString >& )
{
}
-//typedef SfxTabPage* (*FNCreateTabPage)(TabPageParent pParent, const SfxItemSet &rAttrSet);
-static std::unique_ptr<SfxTabPage> CreateGeneralTabPage(sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet)
+//typedef SfxTabPage* (*FNCreateTabPage)(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rAttrSet);
+static std::unique_ptr<SfxTabPage> CreateGeneralTabPage(sal_uInt16 nId, weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
{
CreateTabPage fnCreate = nullptr;
switch(nId)
@@ -309,7 +309,7 @@ static std::unique_ptr<SfxTabPage> CreateGeneralTabPage(sal_uInt16 nId, TabPageP
#endif
}
- return fnCreate ? (*fnCreate)( pParent, &rSet ) : nullptr;
+ return fnCreate ? (*fnCreate)( pPage, pController, &rSet ) : nullptr;
}
struct OptionsMapping_Impl
@@ -901,12 +901,10 @@ void OfaTreeOptionsDialog::SelectHdl_Impl()
*pGroupInfo->m_pInItemSet->GetPool(),
pGroupInfo->m_pInItemSet->GetRanges());
- TabPageParent pPageParent(xTabBox.get(), this);
-
- pPageInfo->m_xPage = ::CreateGeneralTabPage(pPageInfo->m_nPageId, pPageParent, *pGroupInfo->m_pInItemSet);
+ pPageInfo->m_xPage = ::CreateGeneralTabPage(pPageInfo->m_nPageId, xTabBox.get(), this, *pGroupInfo->m_pInItemSet);
if(!pPageInfo->m_xPage && pGroupInfo->m_pModule)
- pPageInfo->m_xPage = pGroupInfo->m_pModule->CreateTabPage(pPageInfo->m_nPageId, pPageParent, *pGroupInfo->m_pInItemSet);
+ pPageInfo->m_xPage = pGroupInfo->m_pModule->CreateTabPage(pPageInfo->m_nPageId, xTabBox.get(), this, *pGroupInfo->m_pInItemSet);
DBG_ASSERT( pPageInfo->m_xPage, "tabpage could not created");
if ( pPageInfo->m_xPage )
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 91fbd29fcdce..c82d07848d07 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -96,8 +96,8 @@ void lcl_SetJustifyMethodToItemSet(SfxItemSet& rSet, sal_uInt16 nWhichJM, const
}//namespace
-AlignmentTabPage::AlignmentTabPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
- : SfxTabPage(pParent, "cui/ui/cellalignment.ui", "CellAlignPage", &rCoreAttrs)
+AlignmentTabPage::AlignmentTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs)
+ : SfxTabPage(pPage, pController, "cui/ui/cellalignment.ui", "CellAlignPage", &rCoreAttrs)
, m_aVsRefEdge(nullptr)
// text alignment
, m_xLbHorAlign(m_xBuilder->weld_combo_box("comboboxHorzAlign"))
@@ -160,9 +160,9 @@ AlignmentTabPage::~AlignmentTabPage()
m_xLbFrameDir.reset();
}
-std::unique_ptr<SfxTabPage> AlignmentTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> AlignmentTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
{
- return std::make_unique<AlignmentTabPage>(pParent, *rAttrSet);
+ return std::make_unique<AlignmentTabPage>(pPage, pController, *rAttrSet);
}
bool AlignmentTabPage::FillItemSet( SfxItemSet* rSet )
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index ff6095642cea..f92d254e30fb 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -177,8 +177,8 @@ IMPL_LINK_NOARG(OfaAutoCorrDlg, SelectLanguageHdl, weld::ComboBox&, void)
}
}
-OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/acoroptionspage.ui", "AutocorrectOptionsPage", &rSet)
+OfaAutocorrOptionsPage::OfaAutocorrOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/acoroptionspage.ui", "AutocorrectOptionsPage", &rSet)
, m_sInput(CuiResId(RID_SVXSTR_USE_REPLACE))
, m_sDoubleCaps(CuiResId(RID_SVXSTR_CPTL_STT_WORD))
, m_sStartCap(CuiResId(RID_SVXSTR_CPTL_STT_SENT))
@@ -199,10 +199,10 @@ OfaAutocorrOptionsPage::~OfaAutocorrOptionsPage()
{
}
-std::unique_ptr<SfxTabPage> OfaAutocorrOptionsPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> OfaAutocorrOptionsPage::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rSet)
{
- return std::make_unique<OfaAutocorrOptionsPage>(pParent, *rSet);
+ return std::make_unique<OfaAutocorrOptionsPage>(pPage, pController, *rSet);
}
#define CBCOL_FIRST 0
@@ -343,9 +343,9 @@ enum OfaAutoFmtOptions
MERGE_SINGLE_LINE_PARA
};
-OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage(TabPageParent pParent,
+OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rSet )
- : SfxTabPage(pParent, "cui/ui/applyautofmtpage.ui", "ApplyAutoFmtPage", &rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/applyautofmtpage.ui", "ApplyAutoFmtPage", &rSet)
, sDeleteEmptyPara(CuiResId(RID_SVXSTR_DEL_EMPTY_PARA))
, sUseReplaceTbl(CuiResId(RID_SVXSTR_USE_REPLACE))
, sCapitalStartWord(CuiResId(RID_SVXSTR_CPTL_STT_WORD))
@@ -397,10 +397,10 @@ OfaSwAutoFmtOptionsPage::~OfaSwAutoFmtOptionsPage()
delete reinterpret_cast<ImpUserData*>(m_xCheckLB->get_id(MERGE_SINGLE_LINE_PARA).toInt64());
}
-std::unique_ptr<SfxTabPage> OfaSwAutoFmtOptionsPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> OfaSwAutoFmtOptionsPage::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet)
{
- return std::make_unique<OfaSwAutoFmtOptionsPage>(pParent, *rAttrSet);
+ return std::make_unique<OfaSwAutoFmtOptionsPage>(pPage, pController, *rAttrSet);
}
bool OfaSwAutoFmtOptionsPage::FillItemSet( SfxItemSet* )
@@ -654,9 +654,9 @@ IMPL_LINK_NOARG(OfaSwAutoFmtOptionsPage, EditHdl, weld::Button&, void)
}
-OfaAutocorrReplacePage::OfaAutocorrReplacePage(TabPageParent pParent,
+OfaAutocorrReplacePage::OfaAutocorrReplacePage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/acorreplacepage.ui", "AcorReplacePage", &rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/acorreplacepage.ui", "AcorReplacePage", &rSet)
, eLang(eLastDialogLanguage)
, bHasSelectionText(false)
, bFirstSelect(true)
@@ -708,9 +708,9 @@ OfaAutocorrReplacePage::~OfaAutocorrReplacePage()
pCharClass.reset();
}
-std::unique_ptr<SfxTabPage> OfaAutocorrReplacePage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> OfaAutocorrReplacePage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
- return std::make_unique<OfaAutocorrReplacePage>(pParent, *rSet);
+ return std::make_unique<OfaAutocorrReplacePage>(pPage, pController, *rSet);
}
void OfaAutocorrReplacePage::ActivatePage( const SfxItemSet& )
@@ -1175,8 +1175,8 @@ static bool lcl_FindInArray(std::vector<OUString>& rStrings, const OUString& rSt
return false;
}
-OfaAutocorrExceptPage::OfaAutocorrExceptPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/acorexceptpage.ui", "AcorExceptPage", &rSet)
+OfaAutocorrExceptPage::OfaAutocorrExceptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/acorexceptpage.ui", "AcorExceptPage", &rSet)
, eLang(eLastDialogLanguage)
, m_xAbbrevED(m_xBuilder->weld_entry("abbrev"))
, m_xAbbrevLB(m_xBuilder->weld_tree_view("abbrevlist"))
@@ -1219,10 +1219,10 @@ OfaAutocorrExceptPage::~OfaAutocorrExceptPage()
pCompareClass.reset();
}
-std::unique_ptr<SfxTabPage> OfaAutocorrExceptPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> OfaAutocorrExceptPage::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rSet)
{
- return std::make_unique<OfaAutocorrExceptPage>(pParent, *rSet);
+ return std::make_unique<OfaAutocorrExceptPage>(pPage, pController, *rSet);
}
void OfaAutocorrExceptPage::ActivatePage( const SfxItemSet& )
@@ -1524,8 +1524,8 @@ void OfaQuoteTabPage::CreateEntry(weld::TreeView& rCheckLB, const OUString& rTxt
rCheckLB.set_text(nRow, rTxt, nTextCol);
}
-OfaQuoteTabPage::OfaQuoteTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/applylocalizedpage.ui", "ApplyLocalizedPage", &rSet)
+OfaQuoteTabPage::OfaQuoteTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/applylocalizedpage.ui", "ApplyLocalizedPage", &rSet)
, sNonBrkSpace(CuiResId(RID_SVXSTR_NON_BREAK_SPACE))
, sOrdinal(CuiResId(RID_SVXSTR_ORDINAL))
, cSglStartQuote(0)
@@ -1585,10 +1585,10 @@ OfaQuoteTabPage::~OfaQuoteTabPage()
{
}
-std::unique_ptr<SfxTabPage> OfaQuoteTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> OfaQuoteTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet)
{
- return std::make_unique<OfaQuoteTabPage>(pParent, *rAttrSet);
+ return std::make_unique<OfaQuoteTabPage>(pPage, pController, *rAttrSet);
}
bool OfaQuoteTabPage::FillItemSet( SfxItemSet* )
@@ -1843,9 +1843,9 @@ OUString OfaQuoteTabPage::ChangeStringExt_Impl( sal_UCS4 cChar )
return aOUStr;
}
-OfaAutoCompleteTabPage::OfaAutoCompleteTabPage(TabPageParent pParent,
+OfaAutoCompleteTabPage::OfaAutoCompleteTabPage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/wordcompletionpage.ui",
+ : SfxTabPage(pPage, pController, "cui/ui/wordcompletionpage.ui",
"WordCompletionPage", &rSet)
, m_pAutoCompleteList(nullptr)
, m_nAutoCmpltListCnt(0)
@@ -1901,10 +1901,10 @@ OfaAutoCompleteTabPage::~OfaAutoCompleteTabPage()
{
}
-std::unique_ptr<SfxTabPage> OfaAutoCompleteTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> OfaAutoCompleteTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rSet)
{
- return std::make_unique<OfaAutoCompleteTabPage>(pParent, *rSet);
+ return std::make_unique<OfaAutoCompleteTabPage>(pPage, pController, *rSet);
}
bool OfaAutoCompleteTabPage::FillItemSet( SfxItemSet* )
@@ -2093,9 +2093,9 @@ IMPL_LINK(OfaAutoCompleteTabPage, KeyReleaseHdl, const KeyEvent&, rEvent, bool)
// class OfaSmartTagOptionsTabPage ---------------------------------------------
-OfaSmartTagOptionsTabPage::OfaSmartTagOptionsTabPage(TabPageParent pParent,
+OfaSmartTagOptionsTabPage::OfaSmartTagOptionsTabPage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rSet )
- : SfxTabPage(pParent, "cui/ui/smarttagoptionspage.ui", "SmartTagOptionsPage", &rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/smarttagoptionspage.ui", "SmartTagOptionsPage", &rSet)
, m_xMainCB(m_xBuilder->weld_check_button("main"))
, m_xSmartTagTypesLB(m_xBuilder->weld_tree_view("list"))
, m_xPropertiesPB(m_xBuilder->weld_button("properties"))
@@ -2117,9 +2117,9 @@ OfaSmartTagOptionsTabPage::~OfaSmartTagOptionsTabPage()
{
}
-std::unique_ptr<SfxTabPage> OfaSmartTagOptionsTabPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> OfaSmartTagOptionsTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
- return std::make_unique<OfaSmartTagOptionsTabPage>(pParent, *rSet);
+ return std::make_unique<OfaSmartTagOptionsTabPage>(pPage, pController, *rSet);
}
/** This struct is used to associate list box entries with smart tag data
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index fd2b034607fa..cb736167d251 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -254,8 +254,8 @@ void BackgroundPreviewImpl::Paint(vcl::RenderContext& rRenderContext, const ::to
#define HDL(hdl) LINK(this,SvxBackgroundTabPage,hdl)
-SvxBackgroundTabPage::SvxBackgroundTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet)
- : SvxTabPage(pParent, "cui/ui/backgroundpage.ui", "BackgroundPage", rCoreSet)
+SvxBackgroundTabPage::SvxBackgroundTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet)
+ : SvxTabPage(pPage, pController, "cui/ui/backgroundpage.ui", "BackgroundPage", rCoreSet)
, nHtmlMode(0)
, bAllowShowSelector(true)
, bIsGraphicValid(false)
@@ -330,9 +330,9 @@ SvxBackgroundTabPage::~SvxBackgroundTabPage()
m_xWndPosition.reset();
}
-std::unique_ptr<SfxTabPage> SvxBackgroundTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> SvxBackgroundTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
{
- return std::make_unique<SvxBackgroundTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SvxBackgroundTabPage>(pPage, pController, *rAttrSet);
}
void SvxBackgroundTabPage::Reset( const SfxItemSet* rSet )
@@ -1357,8 +1357,8 @@ static sal_uInt16 lcl_GetTableDestSlot(sal_Int32 nTblDest)
}
}
-SvxBkgTabPage::SvxBkgTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SvxAreaTabPage(pParent, rInAttrs),
+SvxBkgTabPage::SvxBkgTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SvxAreaTabPage(pPage, pController, rInAttrs),
bHighlighting(false),
bCharBackColor(false),
maSet(rInAttrs)
@@ -1526,10 +1526,10 @@ bool SvxBkgTabPage::FillItemSet( SfxItemSet* rCoreSet )
return true;
}
-std::unique_ptr<SfxTabPage> SvxBkgTabPage::Create(TabPageParent pWindow, const SfxItemSet* rAttrs)
+std::unique_ptr<SfxTabPage> SvxBkgTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrs)
{
- auto xRet = std::make_unique<SvxBkgTabPage>(pWindow, *rAttrs);
- xRet->SetOptimalSize(pWindow.pController);
+ auto xRet = std::make_unique<SvxBkgTabPage>(pPage, pController, *rAttrs);
+ xRet->SetOptimalSize(pController);
return xRet;
}
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 375d8b3fc1ad..57534beb059c 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -227,8 +227,8 @@ void MarginControlsWrapper::SetControlDontKnow()
mrBottomWrp.set_text(sEmpty);
}
-SvxBorderTabPage::SvxBorderTabPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
- : SfxTabPage(pParent, "cui/ui/borderpage.ui", "BorderPage", &rCoreAttrs)
+SvxBorderTabPage::SvxBorderTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs)
+ : SfxTabPage(pPage, pController, "cui/ui/borderpage.ui", "BorderPage", &rCoreAttrs)
, nMinValue(0)
, nSWMode(SwBorderModes::NONE)
, mnBoxSlot(SID_ATTR_BORDER_OUTER)
@@ -250,7 +250,7 @@ SvxBorderTabPage::SvxBorderTabPage(TabPageParent pParent, const SfxItemSet& rCor
, m_xUserDefFT(m_xBuilder->weld_label("userdefft"))
, m_xFrameSelWin(new weld::CustomWeld(*m_xBuilder, "framesel", m_aFrameSel))
, m_xLbLineStyle(new SvtLineListBox(m_xBuilder->weld_menu_button("linestylelb")))
- , m_xLbLineColor(new ColorListBox(m_xBuilder->weld_menu_button("linecolorlb"), pParent.GetFrameWeld()))
+ , m_xLbLineColor(new ColorListBox(m_xBuilder->weld_menu_button("linecolorlb"), pController->getDialog()))
, m_xLineWidthMF(m_xBuilder->weld_metric_spin_button("linewidthmf", FieldUnit::POINT))
, m_xSpacingFrame(m_xBuilder->weld_container("spacing"))
, m_xLeftFT(m_xBuilder->weld_label("leftft"))
@@ -268,7 +268,7 @@ SvxBorderTabPage::SvxBorderTabPage(TabPageParent pParent, const SfxItemSet& rCor
, m_xFtShadowSize(m_xBuilder->weld_label("distanceft"))
, m_xEdShadowSize(m_xBuilder->weld_metric_spin_button("distancemf", FieldUnit::MM))
, m_xFtShadowColor(m_xBuilder->weld_label("shadowcolorft"))
- , m_xLbShadowColor(new ColorListBox(m_xBuilder->weld_menu_button("shadowcolorlb"), pParent.GetFrameWeld()))
+ , m_xLbShadowColor(new ColorListBox(m_xBuilder->weld_menu_button("shadowcolorlb"), pController->getDialog()))
, m_xPropertiesFrame(m_xBuilder->weld_container("properties"))
, m_xMergeWithNextCB(m_xBuilder->weld_check_button("mergewithnext"))
, m_xMergeAdjacentBordersCB(m_xBuilder->weld_check_button("mergeadjacent"))
@@ -544,10 +544,10 @@ SvxBorderTabPage::~SvxBorderTabPage()
m_xWndPresets.reset();
}
-std::unique_ptr<SfxTabPage> SvxBorderTabPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxBorderTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet )
{
- return std::make_unique<SvxBorderTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SvxBorderTabPage>(pPage, pController, *rAttrSet);
}
void SvxBorderTabPage::ResetFrameLine_Impl( svx::FrameBorderType eBorder, const SvxBorderLine* pCoreLine, bool bValid )
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 548b77ae7495..c6ac69619522 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -157,8 +157,8 @@ inline SvxFont& SvxCharBasePage::GetPreviewCTLFont()
return m_aPreviewWin.GetCTLFont();
}
-SvxCharBasePage::SvxCharBasePage(TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet& rItemset)
- : SfxTabPage(pParent, rUIXMLDescription, rID, &rItemset)
+SvxCharBasePage::SvxCharBasePage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet& rItemset)
+ : SfxTabPage(pPage, pController, rUIXMLDescription, rID, &rItemset)
, m_bPreviewBackgroundToCharacter( false )
{
}
@@ -212,8 +212,8 @@ struct SvxCharNamePage_Impl
// class SvxCharNamePage -------------------------------------------------
-SvxCharNamePage::SvxCharNamePage(TabPageParent pParent, const SfxItemSet& rInSet)
- : SvxCharBasePage(pParent, "cui/ui/charnamepage.ui", "CharNamePage", rInSet)
+SvxCharNamePage::SvxCharNamePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInSet)
+ : SvxCharBasePage(pPage, pController, "cui/ui/charnamepage.ui", "CharNamePage", rInSet)
, m_pImpl(new SvxCharNamePage_Impl)
, m_xEastFrame(m_xBuilder->weld_widget("asian"))
, m_xEastFontNameFT(m_xBuilder->weld_label("eastfontnameft"))
@@ -1190,9 +1190,9 @@ DeactivateRC SvxCharNamePage::DeactivatePage( SfxItemSet* _pSet )
return DeactivateRC::LeavePage;
}
-std::unique_ptr<SfxTabPage> SvxCharNamePage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SvxCharNamePage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
- return std::make_unique<SvxCharNamePage>(pParent, *rSet );
+ return std::make_unique<SvxCharNamePage>(pPage, pController, *rSet );
}
void SvxCharNamePage::Reset( const SfxItemSet* rSet )
@@ -1311,14 +1311,14 @@ void SvxCharNamePage::PageCreated(const SfxAllItemSet& aSet)
}
// class SvxCharEffectsPage ----------------------------------------------
-SvxCharEffectsPage::SvxCharEffectsPage(TabPageParent pParent, const SfxItemSet& rInSet)
- : SvxCharBasePage(pParent, "cui/ui/effectspage.ui", "EffectsPage", rInSet)
+SvxCharEffectsPage::SvxCharEffectsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInSet)
+ : SvxCharBasePage(pPage, pController, "cui/ui/effectspage.ui", "EffectsPage", rInSet)
, m_bOrigFontColor(false)
, m_bNewFontColor(false)
, m_bEnableNoneFontColor(false)
, m_bUnderlineColorDisabled(false)
, m_xFontColorFT(m_xBuilder->weld_label("fontcolorft"))
- , m_xFontColorLB(new ColorListBox(m_xBuilder->weld_menu_button("fontcolorlb"), pParent.GetFrameWeld()))
+ , m_xFontColorLB(new ColorListBox(m_xBuilder->weld_menu_button("fontcolorlb"), pController->getDialog()))
, m_xEffectsFT(m_xBuilder->weld_label("effectsft"))
, m_xEffectsLB(m_xBuilder->weld_combo_box("effectslb"))
, m_xReliefFT(m_xBuilder->weld_label("reliefft"))
@@ -1329,11 +1329,11 @@ SvxCharEffectsPage::SvxCharEffectsPage(TabPageParent pParent, const SfxItemSet&
, m_xHiddenBtn(m_xBuilder->weld_check_button("hiddencb"))
, m_xOverlineLB(m_xBuilder->weld_combo_box("overlinelb"))
, m_xOverlineColorFT(m_xBuilder->weld_label("overlinecolorft"))
- , m_xOverlineColorLB(new ColorListBox(m_xBuilder->weld_menu_button("overlinecolorlb"), pParent.GetFrameWeld()))
+ , m_xOverlineColorLB(new ColorListBox(m_xBuilder->weld_menu_button("overlinecolorlb"), pController->getDialog()))
, m_xStrikeoutLB(m_xBuilder->weld_combo_box("strikeoutlb"))
, m_xUnderlineLB(m_xBuilder->weld_combo_box("underlinelb"))
, m_xUnderlineColorFT(m_xBuilder->weld_label("underlinecolorft"))
- , m_xUnderlineColorLB(new ColorListBox(m_xBuilder->weld_menu_button("underlinecolorlb"), pParent.GetFrameWeld()))
+ , m_xUnderlineColorLB(new ColorListBox(m_xBuilder->weld_menu_button("underlinecolorlb"), pController->getDialog()))
, m_xIndividualWordsBtn(m_xBuilder->weld_check_button("individualwordscb"))
, m_xEmphasisFT(m_xBuilder->weld_label("emphasisft"))
, m_xEmphasisLB(m_xBuilder->weld_combo_box("emphasislb"))
@@ -1669,9 +1669,9 @@ DeactivateRC SvxCharEffectsPage::DeactivatePage( SfxItemSet* _pSet )
return DeactivateRC::LeavePage;
}
-std::unique_ptr<SfxTabPage> SvxCharEffectsPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
+std::unique_ptr<SfxTabPage> SvxCharEffectsPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet )
{
- return std::make_unique<SvxCharEffectsPage>( pParent, *rSet );
+ return std::make_unique<SvxCharEffectsPage>( pPage, pController, *rSet );
}
void SvxCharEffectsPage::Reset( const SfxItemSet* rSet )
@@ -2432,8 +2432,8 @@ void SvxCharEffectsPage::PageCreated(const SfxAllItemSet& aSet)
// class SvxCharPositionPage ---------------------------------------------
-SvxCharPositionPage::SvxCharPositionPage(TabPageParent pParent, const SfxItemSet& rInSet)
- : SvxCharBasePage(pParent, "cui/ui/positionpage.ui", "PositionPage", rInSet)
+SvxCharPositionPage::SvxCharPositionPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInSet)
+ : SvxCharBasePage(pPage, pController, "cui/ui/positionpage.ui", "PositionPage", rInSet)
, m_nSuperEsc(short(DFLT_ESC_SUPER))
, m_nSubEsc(short(DFLT_ESC_SUB))
, m_nScaleWidthItemSetVal(100)
@@ -2660,9 +2660,9 @@ DeactivateRC SvxCharPositionPage::DeactivatePage( SfxItemSet* _pSet )
return DeactivateRC::LeavePage;
}
-std::unique_ptr<SfxTabPage> SvxCharPositionPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SvxCharPositionPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
- return std::make_unique<SvxCharPositionPage>(pParent, *rSet);
+ return std::make_unique<SvxCharPositionPage>(pPage, pController, *rSet);
}
void SvxCharPositionPage::Reset( const SfxItemSet* rSet )
@@ -3045,8 +3045,8 @@ void SvxCharPositionPage::PageCreated(const SfxAllItemSet& aSet)
}
// class SvxCharTwoLinesPage ------------------------------------------------
-SvxCharTwoLinesPage::SvxCharTwoLinesPage(TabPageParent pParent, const SfxItemSet& rInSet)
- : SvxCharBasePage(pParent, "cui/ui/twolinespage.ui", "TwoLinesPage", rInSet)
+SvxCharTwoLinesPage::SvxCharTwoLinesPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInSet)
+ : SvxCharBasePage(pPage, pController, "cui/ui/twolinespage.ui", "TwoLinesPage", rInSet)
, m_nStartBracketPosition( 0 )
, m_nEndBracketPosition( 0 )
, m_xTwoLinesBtn(m_xBuilder->weld_check_button("twolines"))
@@ -3179,9 +3179,9 @@ DeactivateRC SvxCharTwoLinesPage::DeactivatePage( SfxItemSet* _pSet )
return DeactivateRC::LeavePage;
}
-std::unique_ptr<SfxTabPage> SvxCharTwoLinesPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SvxCharTwoLinesPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
- return std::make_unique<SvxCharTwoLinesPage>(pParent, *rSet);
+ return std::make_unique<SvxCharTwoLinesPage>(pPage, pController, *rSet);
}
void SvxCharTwoLinesPage::Reset( const SfxItemSet* rSet )
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index b64ea936ede0..70b38bbc95af 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -48,8 +48,7 @@ const sal_uInt16 SvxConnectionPage::pRanges[] =
SvxConnectionDialog::SvxConnectionDialog(weld::Window* pParent, const SfxItemSet& rInAttrs, const SdrView* pSdrView)
: SfxSingleTabDialogController(pParent, &rInAttrs)
{
- TabPageParent pPageParent(get_content_area(), this);
- auto xPage = std::make_unique<SvxConnectionPage>(pPageParent, rInAttrs);
+ auto xPage = std::make_unique<SvxConnectionPage>(get_content_area(), this, rInAttrs);
xPage->SetView(pSdrView);
xPage->Construct();
@@ -64,8 +63,8 @@ SvxConnectionDialog::SvxConnectionDialog(weld::Window* pParent, const SfxItemSet
|*
\************************************************************************/
-SvxConnectionPage::SvxConnectionPage(TabPageParent pWindow, const SfxItemSet& rInAttrs)
- : SfxTabPage(pWindow, "cui/ui/connectortabpage.ui", "ConnectorTabPage", &rInAttrs)
+SvxConnectionPage::SvxConnectionPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "cui/ui/connectortabpage.ui", "ConnectorTabPage", &rInAttrs)
, rOutAttrs(rInAttrs)
, aAttrSet(*rInAttrs.GetPool())
, pView(nullptr)
@@ -304,10 +303,10 @@ void SvxConnectionPage::Construct()
|* creates the page
|*
\************************************************************************/
-std::unique_ptr<SfxTabPage> SvxConnectionPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxConnectionPage::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrs)
{
- return std::make_unique<SvxConnectionPage>(pParent, *rAttrs);
+ return std::make_unique<SvxConnectionPage>(pPage, pController, *rAttrs);
}
IMPL_LINK_NOARG(SvxConnectionPage, ChangeAttrListBoxHdl_Impl, weld::ComboBox&, void)
diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx
index de3ca435f362..e1653ca4d65e 100644
--- a/cui/source/tabpages/dstribut.cxx
+++ b/cui/source/tabpages/dstribut.cxx
@@ -32,8 +32,7 @@ SvxDistributeDialog::SvxDistributeDialog(weld::Window* pParent,
: SfxSingleTabDialogController(pParent, &rInAttrs, "cui/ui/distributiondialog.ui",
"DistributionDialog")
{
- TabPageParent pPageParent(get_content_area(), this);
- SetTabPage(std::make_unique<SvxDistributePage>(pPageParent, rInAttrs, eHor, eVer));
+ SetTabPage(std::make_unique<SvxDistributePage>(get_content_area(), this, rInAttrs, eHor, eVer));
mpPage = static_cast<SvxDistributePage*>(GetTabPage());
}
@@ -47,10 +46,10 @@ SvxDistributeDialog::~SvxDistributeDialog()
|*
\************************************************************************/
-SvxDistributePage::SvxDistributePage(TabPageParent pWindow,
+SvxDistributePage::SvxDistributePage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rInAttrs, SvxDistributeHorizontal eHor,
SvxDistributeVertical eVer)
- : SfxTabPage(pWindow, "cui/ui/distributionpage.ui", "DistributionPage",
+ : SfxTabPage(pPage, pController, "cui/ui/distributionpage.ui", "DistributionPage",
&rInAttrs)
, m_eDistributeHor(eHor)
, m_eDistributeVer(eVer)
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index a9030218e0d9..21314063bf2b 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -49,8 +49,8 @@ static int lcl_GetValue(const weld::MetricSpinButton& rMetric, FieldUnit eUnit)
description: crop graphic
--------------------------------------------------------------------*/
-SvxGrfCropPage::SvxGrfCropPage(TabPageParent pParent, const SfxItemSet &rSet)
- : SfxTabPage(pParent, "cui/ui/croppage.ui", "CropPage", &rSet)
+SvxGrfCropPage::SvxGrfCropPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/croppage.ui", "CropPage", &rSet)
, nOldWidth(0)
, nOldHeight(0)
, bSetOrigSize(false)
@@ -106,9 +106,9 @@ SvxGrfCropPage::~SvxGrfCropPage()
m_xExampleWN.reset();
}
-std::unique_ptr<SfxTabPage> SvxGrfCropPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
+std::unique_ptr<SfxTabPage> SvxGrfCropPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet)
{
- return std::make_unique<SvxGrfCropPage>(pParent, *rSet);
+ return std::make_unique<SvxGrfCropPage>(pPage, pController, *rSet);
}
void SvxGrfCropPage::Reset( const SfxItemSet *rSet )
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 7480e488cbaa..440734c130a2 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -66,8 +66,8 @@ const sal_uInt16 SvxCaptionTabPage::pCaptionRanges[] =
0
};
-SvxCaptionTabPage::SvxCaptionTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage(pParent, "cui/ui/calloutpage.ui", "CalloutPage", &rInAttrs)
+SvxCaptionTabPage::SvxCaptionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "cui/ui/calloutpage.ui", "CalloutPage", &rInAttrs)
, nCaptionType(SdrCaptionType::Type1)
, nGap(0)
, nEscDir(SdrCaptionEscDir::Horizontal)
@@ -332,10 +332,10 @@ void SvxCaptionTabPage::Reset( const SfxItemSet* )
SetupType_Impl( nCaptionType );
}
-std::unique_ptr<SfxTabPage> SvxCaptionTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxCaptionTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rOutAttrs)
{
- return std::make_unique<SvxCaptionTabPage>(pParent, *rOutAttrs);
+ return std::make_unique<SvxCaptionTabPage>(pPage, pController, *rOutAttrs);
}
void SvxCaptionTabPage::SetupExtension_Impl( sal_uInt16 nType )
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index e2ea708880cf..7319847e85d6 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -98,8 +98,8 @@ void SfxMacroTabPage::EnableButtons()
mpImpl->m_xAssignPB->set_sensitive(false);
}
-SfxMacroTabPage::SfxMacroTabPage(TabPageParent pParent, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rAttrSet )
- : SfxTabPage(pParent, "cui/ui/eventassignpage.ui", "EventAssignPage", &rAttrSet)
+SfxMacroTabPage::SfxMacroTabPage(weld::Container* pPage, weld::DialogController* pController, const Reference< XFrame >& rxDocumentFrame, const SfxItemSet& rAttrSet )
+ : SfxTabPage(pPage, pController, "cui/ui/eventassignpage.ui", "EventAssignPage", &rAttrSet)
{
mpImpl.reset(new SfxMacroTabPage_Impl);
@@ -363,15 +363,15 @@ void SfxMacroTabPage::FillEvents()
namespace
{
- std::unique_ptr<SfxMacroTabPage> CreateSfxMacroTabPage(TabPageParent pParent, const SfxItemSet& rAttrSet)
+ std::unique_ptr<SfxMacroTabPage> CreateSfxMacroTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet)
{
- return std::make_unique<SfxMacroTabPage>( pParent, nullptr, rAttrSet );
+ return std::make_unique<SfxMacroTabPage>( pPage, pController, nullptr, rAttrSet );
}
}
-std::unique_ptr<SfxTabPage> SfxMacroTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> SfxMacroTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
{
- return CreateSfxMacroTabPage(pParent, *rAttrSet);
+ return CreateSfxMacroTabPage(pPage, pController, *rAttrSet);
}
SfxMacroAssignDlg::SfxMacroAssignDlg(weld::Widget* pParent,
@@ -379,8 +379,7 @@ SfxMacroAssignDlg::SfxMacroAssignDlg(weld::Widget* pParent,
: SfxSingleTabDialogController(pParent, &rSet,"cui/ui/eventassigndialog.ui",
"EventAssignDialog")
{
- TabPageParent pPageParent(get_content_area(), this);
- std::unique_ptr<SfxMacroTabPage> xPage = CreateSfxMacroTabPage(pPageParent, rSet);
+ std::unique_ptr<SfxMacroTabPage> xPage = CreateSfxMacroTabPage(get_content_area(), this, rSet);
xPage->SetFrame(rxDocumentFrame);
SetTabPage(std::move(xPage));
GetTabPage()->LaunchFillGroup();
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 9ca74cff4514..e7a7fbe12fdf 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -52,8 +52,7 @@ SvxMeasureDialog::SvxMeasureDialog(weld::Window* pParent, const SfxItemSet& rInA
const SdrView* pSdrView)
: SfxSingleTabDialogController(pParent, &rInAttrs)
{
- TabPageParent pPageParent(get_content_area(), this);
- auto xPage = std::make_unique<SvxMeasurePage>(pPageParent, rInAttrs);
+ auto xPage = std::make_unique<SvxMeasurePage>(get_content_area(), this, rInAttrs);
xPage->SetView(pSdrView);
xPage->Construct();
@@ -68,8 +67,8 @@ SvxMeasureDialog::SvxMeasureDialog(weld::Window* pParent, const SfxItemSet& rInA
|*
\************************************************************************/
-SvxMeasurePage::SvxMeasurePage(TabPageParent pWindow, const SfxItemSet& rInAttrs)
- : SvxTabPage(pWindow, "cui/ui/dimensionlinestabpage.ui", "DimensionLinesTabPage", rInAttrs)
+SvxMeasurePage::SvxMeasurePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SvxTabPage(pPage, pController, "cui/ui/dimensionlinestabpage.ui", "DimensionLinesTabPage", rInAttrs)
, rOutAttrs(rInAttrs)
, aAttrSet(*rInAttrs.GetPool())
, pView(nullptr)
@@ -520,10 +519,10 @@ void SvxMeasurePage::Construct()
m_aCtlPreview.Invalidate();
}
-std::unique_ptr<SfxTabPage> SvxMeasurePage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxMeasurePage::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrs)
{
- return std::make_unique<SvxMeasurePage>(pParent, *rAttrs);
+ return std::make_unique<SvxMeasurePage>(pPage, pController, *rAttrs);
}
void SvxMeasurePage::PointChanged(weld::DrawingArea* pDrawingArea, RectPoint /*eRP*/)
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index d8a9fee0948a..18517527dca6 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -186,9 +186,9 @@ void SvxNumberPreview::Paint(vcl::RenderContext& rRenderContext, const ::tools::
#define HDL(hdl) LINK( this, SvxNumberFormatTabPage, hdl )
-SvxNumberFormatTabPage::SvxNumberFormatTabPage(TabPageParent pParent,
+SvxNumberFormatTabPage::SvxNumberFormatTabPage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rCoreAttrs)
- : SfxTabPage(pParent, "cui/ui/numberingformatpage.ui", "NumberingFormatPage", &rCoreAttrs)
+ : SfxTabPage(pPage, pController, "cui/ui/numberingformatpage.ui", "NumberingFormatPage", &rCoreAttrs)
, nInitFormat(ULONG_MAX)
, bLegacyAutomaticCurrency(false)
, sAutomaticLangEntry(CuiResId(RID_SVXSTR_AUTO_ENTRY))
@@ -307,10 +307,10 @@ void SvxNumberFormatTabPage::Init_Impl()
m_xLbLanguage->InsertLanguage( LANGUAGE_SYSTEM );
}
-std::unique_ptr<SfxTabPage> SvxNumberFormatTabPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxNumberFormatTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet )
{
- return std::make_unique<SvxNumberFormatTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SvxNumberFormatTabPage>(pPage, pController, *rAttrSet);
}
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 093debdf6319..82ba9fb3b5ba 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -159,8 +159,8 @@ static const vcl::Font& lcl_GetDefaultBulletFont()
return aDefBulletFont;
}
-SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/picknumberingpage.ui", "PickNumberingPage", &rSet)
+SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/picknumberingpage.ui", "PickNumberingPage", &rSet)
, nActNumLvl(SAL_MAX_UINT16)
, bModified(false)
, bPreset(false)
@@ -207,10 +207,10 @@ SvxSingleNumPickTabPage::~SvxSingleNumPickTabPage()
m_xExamplesVS.reset();
}
-std::unique_ptr<SfxTabPage> SvxSingleNumPickTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxSingleNumPickTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet)
{
- return std::make_unique<SvxSingleNumPickTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SvxSingleNumPickTabPage>(pPage, pController, *rAttrSet);
}
bool SvxSingleNumPickTabPage::FillItemSet( SfxItemSet* rSet )
@@ -338,8 +338,8 @@ IMPL_LINK_NOARG(SvxSingleNumPickTabPage, DoubleClickHdl_Impl, SvtValueSet*, void
rOk.clicked();
}
-SvxBulletPickTabPage::SvxBulletPickTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/pickbulletpage.ui", "PickBulletPage", &rSet)
+SvxBulletPickTabPage::SvxBulletPickTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/pickbulletpage.ui", "PickBulletPage", &rSet)
, nActNumLvl(SAL_MAX_UINT16)
, bModified(false)
, bPreset(false)
@@ -359,10 +359,10 @@ SvxBulletPickTabPage::~SvxBulletPickTabPage()
m_xExamplesVS.reset();
}
-std::unique_ptr<SfxTabPage> SvxBulletPickTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxBulletPickTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet)
{
- return std::make_unique<SvxBulletPickTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SvxBulletPickTabPage>(pPage, pController, *rAttrSet);
}
bool SvxBulletPickTabPage::FillItemSet( SfxItemSet* rSet )
@@ -487,8 +487,8 @@ void SvxBulletPickTabPage::PageCreated(const SfxAllItemSet& aSet)
sBulletCharFormatName = pBulletCharFmt->GetValue();
}
-SvxNumPickTabPage::SvxNumPickTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/pickoutlinepage.ui", "PickOutlinePage", &rSet)
+SvxNumPickTabPage::SvxNumPickTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/pickoutlinepage.ui", "PickOutlinePage", &rSet)
, nActNumLvl(SAL_MAX_UINT16)
, nNumItemId(SID_ATTR_NUMBERING_RULE)
, bModified(false)
@@ -542,10 +542,10 @@ SvxNumPickTabPage::~SvxNumPickTabPage()
m_xExamplesVS.reset();
}
-std::unique_ptr<SfxTabPage> SvxNumPickTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxNumPickTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet)
{
- return std::make_unique<SvxNumPickTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SvxNumPickTabPage>(pPage, pController, *rAttrSet);
}
bool SvxNumPickTabPage::FillItemSet( SfxItemSet* rSet )
@@ -726,8 +726,8 @@ void SvxNumPickTabPage::PageCreated(const SfxAllItemSet& aSet)
SetCharFormatNames( pNumCharFmt->GetValue(),pBulletCharFmt->GetValue());
}
-SvxBitmapPickTabPage::SvxBitmapPickTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/pickgraphicpage.ui", "PickGraphicPage", &rSet)
+SvxBitmapPickTabPage::SvxBitmapPickTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/pickgraphicpage.ui", "PickGraphicPage", &rSet)
, nActNumLvl(SAL_MAX_UINT16)
, nNumItemId(SID_ATTR_NUMBERING_RULE)
, bModified(false)
@@ -780,10 +780,10 @@ SvxBitmapPickTabPage::~SvxBitmapPickTabPage()
m_xExamplesVS.reset();
}
-std::unique_ptr<SfxTabPage> SvxBitmapPickTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxBitmapPickTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet)
{
- return std::make_unique<SvxBitmapPickTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SvxBitmapPickTabPage>(pPage, pController, *rAttrSet);
}
void SvxBitmapPickTabPage::ActivatePage(const SfxItemSet& rSet)
@@ -1011,9 +1011,9 @@ IMPL_LINK_NOARG(SvxBitmapPickTabPage, ClickAddBrowseHdl_Impl, weld::Button&, voi
}
// tabpage numbering options
-SvxNumOptionsTabPage::SvxNumOptionsTabPage(TabPageParent pParent,
+SvxNumOptionsTabPage::SvxNumOptionsTabPage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/numberingoptionspage.ui", "NumberingOptionsPage", &rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/numberingoptionspage.ui", "NumberingOptionsPage", &rSet)
, bLastWidthModified(false)
, bModified(false)
, bPreset(false)
@@ -1033,7 +1033,7 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(TabPageParent pParent,
, m_xCharFmtFT(m_xBuilder->weld_label("charstyleft"))
, m_xCharFmtLB(m_xBuilder->weld_combo_box("charstyle"))
, m_xBulColorFT(m_xBuilder->weld_label("colorft"))
- , m_xBulColLB(new ColorListBox(m_xBuilder->weld_menu_button("color"), pParent.GetFrameWeld()))
+ , m_xBulColLB(new ColorListBox(m_xBuilder->weld_menu_button("color"), pController->getDialog()))
, m_xBulRelSizeFT(m_xBuilder->weld_label("relsizeft"))
, m_xBulRelSizeMF(m_xBuilder->weld_metric_spin_button("relsize", FieldUnit::PERCENT))
, m_xAllLevelFT(m_xBuilder->weld_label("sublevelsft"))
@@ -1123,10 +1123,10 @@ void SvxNumOptionsTabPage::SetMetric(FieldUnit eMetric)
m_xHeightMF->set_unit(eMetric);
}
-std::unique_ptr<SfxTabPage> SvxNumOptionsTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxNumOptionsTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet)
{
- return std::make_unique<SvxNumOptionsTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SvxNumOptionsTabPage>(pPage, pController, *rAttrSet);
};
void SvxNumOptionsTabPage::ActivatePage(const SfxItemSet& rSet)
@@ -2453,8 +2453,8 @@ void SvxNumberingPreview::Paint(vcl::RenderContext& rRenderContext, const ::tool
//dialog to this one, except with a different preview window impl.
//TODO, determine if SwNumPositionTabPage and SvxNumPositionTabPage can be
//merged
-SvxNumPositionTabPage::SvxNumPositionTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/numberingpositionpage.ui", "NumberingPositionPage", &rSet)
+SvxNumPositionTabPage::SvxNumPositionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/numberingpositionpage.ui", "NumberingPositionPage", &rSet)
, m_pLevelHdlEvent(nullptr)
, nActNumLvl(1)
, nNumItemId(SID_ATTR_NUMBERING_RULE)
@@ -2916,10 +2916,10 @@ void SvxNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode()
m_xIndentAtMF->set_visible( bLabelAlignmentPosAndSpaceModeActive );
}
-std::unique_ptr<SfxTabPage> SvxNumPositionTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxNumPositionTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet)
{
- return std::make_unique<SvxNumPositionTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SvxNumPositionTabPage>(pPage, pController, *rAttrSet);
}
void SvxNumPositionTabPage::SetMetric(FieldUnit eMetric)
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 75c963016988..5f161edca0e7 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -133,13 +133,13 @@ static bool IsEqualSize_Impl( const SvxSizeItem* pSize, const Size& rSize )
// class SvxPageDescPage --------------------------------------------------
-std::unique_ptr<SfxTabPage> SvxPageDescPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
+std::unique_ptr<SfxTabPage> SvxPageDescPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet )
{
- return std::make_unique<SvxPageDescPage>(pParent, *rSet);
+ return std::make_unique<SvxPageDescPage>(pPage, pController, *rSet);
}
-SvxPageDescPage::SvxPageDescPage(TabPageParent pParent, const SfxItemSet& rAttr)
- : SfxTabPage(pParent, "cui/ui/pageformatpage.ui", "PageFormatPage", &rAttr)
+SvxPageDescPage::SvxPageDescPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttr)
+ : SfxTabPage(pPage, pController, "cui/ui/pageformatpage.ui", "PageFormatPage", &rAttr)
, bLandscape(false)
, eMode(SVX_PAGE_MODE_STANDARD)
, ePaperStart(PAPER_A3)
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index b4299d7425f3..7990744f1cc3 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -205,9 +205,9 @@ IMPL_LINK_NOARG(SvxStdParagraphTabPage, ELRLoseFocusHdl, weld::MetricSpinButton&
ELRLoseFocus();
}
-std::unique_ptr<SfxTabPage> SvxStdParagraphTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SvxStdParagraphTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
- return std::make_unique<SvxStdParagraphTabPage>(pParent, *rSet);
+ return std::make_unique<SvxStdParagraphTabPage>(pPage, pController, *rSet);
}
bool SvxStdParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
@@ -669,8 +669,8 @@ DeactivateRC SvxStdParagraphTabPage::DeactivatePage( SfxItemSet* _pSet )
return DeactivateRC::LeavePage;
}
-SvxStdParagraphTabPage::SvxStdParagraphTabPage(TabPageParent pParent, const SfxItemSet& rAttr)
- : SfxTabPage(pParent, "cui/ui/paraindentspacing.ui", "ParaIndentSpacing", &rAttr)
+SvxStdParagraphTabPage::SvxStdParagraphTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttr)
+ : SfxTabPage(pPage, pController, "cui/ui/paraindentspacing.ui", "ParaIndentSpacing", &rAttr)
, nWidth(11905 /*567 * 50*/)
, nMinFixDist(0)
, bRelativeMode(false)
@@ -991,8 +991,8 @@ void SvxStdParagraphTabPage::PageCreated(const SfxAllItemSet& aSet)
#define LASTLINECOUNT_OLD 3
#define LASTLINECOUNT_NEW 4
-SvxParaAlignTabPage::SvxParaAlignTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/paragalignpage.ui", "ParaAlignPage", &rSet)
+SvxParaAlignTabPage::SvxParaAlignTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/paragalignpage.ui", "ParaAlignPage", &rSet)
, m_xLeft(m_xBuilder->weld_radio_button("radioBTN_LEFTALIGN"))
, m_xRight(m_xBuilder->weld_radio_button("radioBTN_RIGHTALIGN"))
, m_xCenter(m_xBuilder->weld_radio_button("radioBTN_CENTERALIGN"))
@@ -1059,9 +1059,9 @@ DeactivateRC SvxParaAlignTabPage::DeactivatePage( SfxItemSet* _pSet )
return DeactivateRC::LeavePage;
}
-std::unique_ptr<SfxTabPage> SvxParaAlignTabPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SvxParaAlignTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
- return std::make_unique<SvxParaAlignTabPage>(pParent, *rSet);
+ return std::make_unique<SvxParaAlignTabPage>(pPage, pController, *rSet);
}
bool SvxParaAlignTabPage::FillItemSet( SfxItemSet* rOutSet )
@@ -1356,9 +1356,9 @@ void SvxParaAlignTabPage::PageCreated (const SfxAllItemSet& aSet)
EnableJustifyExt();
}
-std::unique_ptr<SfxTabPage> SvxExtParagraphTabPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SvxExtParagraphTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
- return std::make_unique<SvxExtParagraphTabPage>(pParent, *rSet);
+ return std::make_unique<SvxExtParagraphTabPage>(pPage, pController, *rSet);
}
bool SvxExtParagraphTabPage::FillItemSet( SfxItemSet* rOutSet )
@@ -1899,8 +1899,8 @@ void SvxExtParagraphTabPage::DisablePageBreak()
m_xPagenumEdit->set_sensitive(false);
}
-SvxExtParagraphTabPage::SvxExtParagraphTabPage(TabPageParent pParent, const SfxItemSet& rAttr)
- : SfxTabPage(pParent, "cui/ui/textflowpage.ui", "TextFlowPage", &rAttr)
+SvxExtParagraphTabPage::SvxExtParagraphTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttr)
+ : SfxTabPage(pPage, pController, "cui/ui/textflowpage.ui", "TextFlowPage", &rAttr)
, bPageBreak(true)
, bHtmlMode(false)
, nStdPos(0)
@@ -2209,8 +2209,8 @@ void SvxExtParagraphTabPage::PageCreated(const SfxAllItemSet& aSet)
DisablePageBreak();
}
-SvxAsianTabPage::SvxAsianTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "cui/ui/asiantypography.ui", "AsianTypography", &rSet)
+SvxAsianTabPage::SvxAsianTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "cui/ui/asiantypography.ui", "AsianTypography", &rSet)
, m_xForbiddenRulesCB(m_xBuilder->weld_check_button("checkForbidList"))
, m_xHangingPunctCB(m_xBuilder->weld_check_button("checkHangPunct"))
, m_xScriptSpaceCB(m_xBuilder->weld_check_button("checkApplySpacing"))
@@ -2221,9 +2221,9 @@ SvxAsianTabPage::~SvxAsianTabPage()
{
}
-std::unique_ptr<SfxTabPage> SvxAsianTabPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SvxAsianTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
- return std::make_unique<SvxAsianTabPage>(pParent, *rSet);
+ return std::make_unique<SvxAsianTabPage>(pPage, pController, *rSet);
}
const sal_uInt16* SvxAsianTabPage::GetRanges()
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index 0e6a3a0ace28..d57c5443a65e 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -511,8 +511,8 @@ static LB lcl_GetLBRelationsForStrID(const FrmMap* _pMap,
return nLBRelations;
}
-SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage(pParent, "cui/ui/swpossizepage.ui", "SwPosSizePage", &rInAttrs)
+SvxSwPosSizeTabPage::SvxSwPosSizeTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "cui/ui/swpossizepage.ui", "SwPosSizePage", &rInAttrs)
, m_pVMap(nullptr)
, m_pHMap(nullptr)
, m_pSdrView(nullptr)
@@ -702,9 +702,9 @@ void SvxSwPosSizeTabPage::setOptimalRelWidth()
m_xHoriLB->clear();
}
-std::unique_ptr<SfxTabPage> SvxSwPosSizeTabPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SvxSwPosSizeTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
- return std::make_unique<SvxSwPosSizeTabPage>(pParent, *rSet);
+ return std::make_unique<SvxSwPosSizeTabPage>(pPage, pController, *rSet);
}
const sal_uInt16* SvxSwPosSizeTabPage::GetRanges()
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 71eb7ffd1417..5c347ffd5612 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -59,8 +59,8 @@ void TabWin_Impl::Paint(vcl::RenderContext& rRenderContext, const ::tools::Recta
Ruler::DrawTab(rRenderContext, rRenderContext.GetSettings().GetStyleSettings().GetFontColor(), aPoint, nTabStyle);
}
-SvxTabulatorTabPage::SvxTabulatorTabPage(TabPageParent pParent, const SfxItemSet& rAttr)
- : SfxTabPage(pParent, "cui/ui/paratabspage.ui", "ParagraphTabsPage", &rAttr)
+SvxTabulatorTabPage::SvxTabulatorTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttr)
+ : SfxTabPage(pPage, pController, "cui/ui/paratabspage.ui", "ParagraphTabsPage", &rAttr)
, aCurrentTab(0)
, aNewTabs(std::make_unique<SvxTabStopItem>(0, 0, SvxTabAdjust::Left, GetWhich(SID_ATTR_TABSTOP)))
, nDefDist(0)
@@ -208,9 +208,9 @@ bool SvxTabulatorTabPage::FillItemSet(SfxItemSet* rSet)
return bModified;
}
-std::unique_ptr<SfxTabPage> SvxTabulatorTabPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SvxTabulatorTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
- return std::make_unique<SvxTabulatorTabPage>(pParent, *rSet);
+ return std::make_unique<SvxTabulatorTabPage>(pPage, pController, *rSet);
}
void SvxTabulatorTabPage::Reset(const SfxItemSet* rSet)
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index 3a20a1e08ba1..9f4acaa05b76 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -75,15 +75,13 @@ void SvxTextTabDialog::PageCreated(const OString& rId, SfxTabPage &rPage)
}
}
-
/*************************************************************************
|*
|* Page
|*
\************************************************************************/
-
-SvxTextAnimationPage::SvxTextAnimationPage(TabPageParent pPage, const SfxItemSet& rInAttrs)
- : SfxTabPage(pPage, "cui/ui/textanimtabpage.ui", "TextAnimation", &rInAttrs)
+SvxTextAnimationPage::SvxTextAnimationPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "cui/ui/textanimtabpage.ui", "TextAnimation", &rInAttrs)
, rOutAttrs(rInAttrs)
, eAniKind(SdrTextAniKind::NONE)
, m_aUpState(TRISTATE_INDET)
@@ -377,9 +375,9 @@ bool SvxTextAnimationPage::FillItemSet( SfxItemSet* rAttrs)
|*
\************************************************************************/
-std::unique_ptr<SfxTabPage> SvxTextAnimationPage::Create(TabPageParent pParent, const SfxItemSet* rAttrs)
+std::unique_ptr<SfxTabPage> SvxTextAnimationPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrs)
{
- return std::make_unique<SvxTextAnimationPage>(pParent, *rAttrs);
+ return std::make_unique<SvxTextAnimationPage>(pPage, pController, *rAttrs);
}
IMPL_LINK_NOARG(SvxTextAnimationPage, SelectEffectHdl_Impl, weld::ComboBox&, void)
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 579c2b0436fa..b82e57ba3233 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -48,8 +48,8 @@ const sal_uInt16 SvxTextAttrPage::pRanges[] =
|* dialog (page) for copying objects
|*
\************************************************************************/
-SvxTextAttrPage::SvxTextAttrPage(TabPageParent pPage, const SfxItemSet& rInAttrs)
- : SvxTabPage(pPage, "cui/ui/textattrtabpage.ui", "TextAttributesPage", rInAttrs)
+SvxTextAttrPage::SvxTextAttrPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SvxTabPage(pPage, pController, "cui/ui/textattrtabpage.ui", "TextAttributesPage", rInAttrs)
, rOutAttrs(rInAttrs)
, m_eObjKind(OBJ_NONE)
, bAutoGrowSizeEnabled(false)
@@ -474,9 +474,9 @@ void SvxTextAttrPage::Construct()
m_xTsbWordWrapText->set_visible( bWordWrapTextEnabled );
}
-std::unique_ptr<SfxTabPage> SvxTextAttrPage::Create(TabPageParent pWindow, const SfxItemSet* rAttrs)
+std::unique_ptr<SfxTabPage> SvxTextAttrPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrs)
{
- return std::make_unique<SvxTextAttrPage>(pWindow, *rAttrs);
+ return std::make_unique<SvxTextAttrPage>(pPage, pController, *rAttrs);
}
/** Check whether we have to uncheck the "Full width" check box.
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 44f9864b147c..d0c70b60c456 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -70,8 +70,8 @@ void lclExtendSize(Size& rSize, const Size& rInputSize)
|*
\************************************************************************/
-SvxAreaTabPage::SvxAreaTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage(pParent, "cui/ui/areatabpage.ui", "AreaTabPage", &rInAttrs)
+SvxAreaTabPage::SvxAreaTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "cui/ui/areatabpage.ui", "AreaTabPage", &rInAttrs)
// local fixed not o be changed values for local pointers
, maFixed_ChangeType(ChangeType::NONE)
// init with pointers to fixed ChangeType
@@ -111,33 +111,31 @@ void SvxAreaTabPage::SetOptimalSize(weld::DialogController* pController)
{
m_xFillTab->set_size_request(-1, -1);
- TabPageParent aFillTab(m_xFillTab.get(), pController);
-
// Calculate optimal size of all pages...
- m_xFillTabPage = SvxColorTabPage::Create(aFillTab, &m_rXFSet);
+ m_xFillTabPage = SvxColorTabPage::Create(m_xFillTab.get(), pController, &m_rXFSet);
Size aSize(m_xFillTab->get_preferred_size());
if (m_xBtnGradient->get_visible())
{
- m_xFillTabPage = SvxGradientTabPage::Create(aFillTab, &m_rXFSet);
+ m_xFillTabPage = SvxGradientTabPage::Create(m_xFillTab.get(), pController, &m_rXFSet);
Size aGradientSize = m_xFillTab->get_preferred_size();
lclExtendSize(aSize, aGradientSize);
}
if (m_xBtnBitmap->get_visible())
{
- m_xFillTabPage = SvxBitmapTabPage::Create(aFillTab, &m_rXFSet);
+ m_xFillTabPage = SvxBitmapTabPage::Create(m_xFillTab.get(), pController, &m_rXFSet);
Size aBitmapSize = m_xFillTab->get_preferred_size();
lclExtendSize(aSize, aBitmapSize);
}
if (m_xBtnHatch->get_visible())
{
- m_xFillTabPage = SvxHatchTabPage::Create(aFillTab, &m_rXFSet);
+ m_xFillTabPage = SvxHatchTabPage::Create(m_xFillTab.get(), pController, &m_rXFSet);
Size aHatchSize = m_xFillTab->get_preferred_size();
lclExtendSize(aSize, aHatchSize);
}
if (m_xBtnPattern->get_visible())
{
- m_xFillTabPage = SvxPatternTabPage::Create(aFillTab, &m_rXFSet);
+ m_xFillTabPage = SvxPatternTabPage::Create(m_xFillTab.get(), pController, &m_rXFSet);
Size aPatternSize = m_xFillTab->get_preferred_size();
lclExtendSize(aSize, aPatternSize);
}
@@ -327,16 +325,16 @@ void SvxAreaTabPage::Reset( const SfxItemSet* rAttrs )
}
}
-std::unique_ptr<SfxTabPage> SvxAreaTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrs)
+std::unique_ptr<SfxTabPage> SvxAreaTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrs)
{
- auto xRet = std::make_unique<SvxAreaTabPage>(pParent, *rAttrs);
- xRet->SetOptimalSize(pParent.pController);
+ auto xRet = std::make_unique<SvxAreaTabPage>(pPage, pController, *rAttrs);
+ xRet->SetOptimalSize(pController);
return xRet;
}
namespace {
-std::unique_ptr<SfxTabPage> lcl_CreateFillStyleTabPage(sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet)
+std::unique_ptr<SfxTabPage> lcl_CreateFillStyleTabPage(sal_uInt16 nId, weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
{
CreateTabPage fnCreate = nullptr;
switch(nId)
@@ -348,7 +346,7 @@ std::unique_ptr<SfxTabPage> lcl_CreateFillStyleTabPage(sal_uInt16 nId, TabPagePa
case BITMAP: fnCreate = &SvxBitmapTabPage::Create; break;
case PATTERN: fnCreate = &SvxPatternTabPage::Create; break;
}
- return fnCreate ? (*fnCreate)( pParent, &rSet ) : nullptr;
+ return fnCreate ? (*fnCreate)( pPage, pController, &rSet ) : nullptr;
}
}
@@ -373,8 +371,7 @@ void SvxAreaTabPage::SelectFillType(weld::ToggleButton& rButton, const SfxItemSe
{
maBox.SelectButton(&rButton);
FillType eFillType = static_cast<FillType>(maBox.GetCurrentButtonPos());
- TabPageParent aFillTab(m_xFillTab.get(), GetDialogController());
- m_xFillTabPage = lcl_CreateFillStyleTabPage(eFillType, aFillTab, m_rXFSet);
+ m_xFillTabPage = lcl_CreateFillStyleTabPage(eFillType, m_xFillTab.get(), GetDialogController(), m_rXFSet);
if (m_xFillTabPage)
m_xFillTabPage->SetDialogController(GetDialogController());
CreatePage(eFillType, m_xFillTabPage.get());
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 64ac9d6413a5..13d49dabd1ae 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -68,8 +68,8 @@ const sal_uInt16 SvxBitmapTabPage::pBitmapRanges[] =
0
};
-SvxBitmapTabPage::SvxBitmapTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage(pParent, "cui/ui/bitmaptabpage.ui", "BitmapTabPage", &rInAttrs)
+SvxBitmapTabPage::SvxBitmapTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "cui/ui/bitmaptabpage.ui", "BitmapTabPage", &rInAttrs)
, m_rOutAttrs(rInAttrs)
, m_pnBitmapListState(nullptr)
, m_fObjectWidth(0.0)
@@ -416,9 +416,9 @@ void SvxBitmapTabPage::Reset( const SfxItemSet* rAttrs )
ClickBitmapHdl_Impl();
}
-std::unique_ptr<SfxTabPage> SvxBitmapTabPage::Create(TabPageParent pWindow, const SfxItemSet* rAttrs)
+std::unique_ptr<SfxTabPage> SvxBitmapTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrs)
{
- return std::make_unique<SvxBitmapTabPage>(pWindow, *rAttrs);
+ return std::make_unique<SvxBitmapTabPage>(pPage, pController, *rAttrs);
}
void SvxBitmapTabPage::ClickBitmapHdl_Impl()
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index 936a1b8df51f..70e36bfb3d09 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -37,8 +37,8 @@
using namespace com::sun::star;
-SvxColorTabPage::SvxColorTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage(pParent, "cui/ui/colorpage.ui", "ColorPage", &rInAttrs)
+SvxColorTabPage::SvxColorTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "cui/ui/colorpage.ui", "ColorPage", &rInAttrs)
, rOutAttrs ( rInAttrs )
// All the horrific pointers we store and should not
, pnColorListState( nullptr )
@@ -262,9 +262,9 @@ void SvxColorTabPage::Reset( const SfxItemSet* rSet )
UpdateModified();
}
-std::unique_ptr<SfxTabPage> SvxColorTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> SvxColorTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
{
- return std::make_unique<SvxColorTabPage>(pParent, *rOutAttrs);
+ return std::make_unique<SvxColorTabPage>(pPage, pController, *rOutAttrs);
}
// is called when the content of the MtrFields is changed for color values
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 3a5733f856b4..1dc2e6d7704e 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -40,8 +40,8 @@
using namespace com::sun::star;
-SvxGradientTabPage::SvxGradientTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage(pParent, "cui/ui/gradientpage.ui", "GradientPage", &rInAttrs)
+SvxGradientTabPage::SvxGradientTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "cui/ui/gradientpage.ui", "GradientPage", &rInAttrs)
, m_rOutAttrs(rInAttrs)
, m_pnGradientListState(nullptr)
, m_pnColorListState(nullptr)
@@ -56,9 +56,9 @@ SvxGradientTabPage::SvxGradientTabPage(TabPageParent pParent, const SfxItemSet&
, m_xSliderAngle(m_xBuilder->weld_scale("angleslider"))
, m_xMtrBorder(m_xBuilder->weld_metric_spin_button("bordermtr", FieldUnit::PERCENT))
, m_xSliderBorder(m_xBuilder->weld_scale("borderslider"))
- , m_xLbColorFrom(new ColorListBox(m_xBuilder->weld_menu_button("colorfromlb"), pParent.GetFrameWeld()))
+ , m_xLbColorFrom(new ColorListBox(m_xBuilder->weld_menu_button("colorfromlb"), pController->getDialog()))
, m_xMtrColorFrom(m_xBuilder->weld_metric_spin_button("colorfrommtr", FieldUnit::PERCENT))
- , m_xLbColorTo(new ColorListBox(m_xBuilder->weld_menu_button("colortolb"), pParent.GetFrameWeld()))
+ , m_xLbColorTo(new ColorListBox(m_xBuilder->weld_menu_button("colortolb"), pController->getDialog()))
, m_xMtrColorTo(m_xBuilder->weld_metric_spin_button("colortomtr", FieldUnit::PERCENT))
, m_xGradientLB(new SvxPresetListBox(m_xBuilder->weld_scrolled_window("gradientpresetlistwin")))
, m_xMtrIncrement(m_xBuilder->weld_spin_button("incrementmtr"))
@@ -227,10 +227,10 @@ void SvxGradientTabPage::Reset( const SfxItemSet* )
m_xBtnModify->set_sensitive(false);
}
-std::unique_ptr<SfxTabPage> SvxGradientTabPage::Create( TabPageParent pWindow,
+std::unique_ptr<SfxTabPage> SvxGradientTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rOutAttrs )
{
- return std::make_unique<SvxGradientTabPage>(pWindow, *rOutAttrs);
+ return std::make_unique<SvxGradientTabPage>(pPage, pController, *rOutAttrs);
}
IMPL_LINK( SvxGradientTabPage, ModifiedListBoxHdl_Impl, weld::ComboBox&, rListBox, void )
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 88fc1f57ee47..26df4b40c5d5 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -43,8 +43,8 @@
using namespace com::sun::star;
-SvxHatchTabPage::SvxHatchTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage(pParent, "cui/ui/hatchpage.ui", "HatchPage", &rInAttrs)
+SvxHatchTabPage::SvxHatchTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "cui/ui/hatchpage.ui", "HatchPage", &rInAttrs)
, m_rOutAttrs(rInAttrs)
, m_pnHatchingListState(nullptr)
, m_pnColorListState(nullptr)
@@ -54,9 +54,9 @@ SvxHatchTabPage::SvxHatchTabPage(TabPageParent pParent, const SfxItemSet& rInAtt
, m_xMtrAngle(m_xBuilder->weld_metric_spin_button("anglemtr", FieldUnit::DEGREE))
, m_xSliderAngle(m_xBuilder->weld_scale("angleslider"))
, m_xLbLineType(m_xBuilder->weld_combo_box("linetypelb"))
- , m_xLbLineColor(new ColorListBox(m_xBuilder->weld_menu_button("linecolorlb"), pParent.GetFrameWeld()))
+ , m_xLbLineColor(new ColorListBox(m_xBuilder->weld_menu_button("linecolorlb"), pController->getDialog()))
, m_xCbBackgroundColor(m_xBuilder->weld_check_button("backgroundcolor"))
- , m_xLbBackgroundColor(new ColorListBox(m_xBuilder->weld_menu_button("backgroundcolorlb"), pParent.GetFrameWeld()))
+ , m_xLbBackgroundColor(new ColorListBox(m_xBuilder->weld_menu_button("backgroundcolorlb"), pController->getDialog()))
, m_xHatchLB(new SvxPresetListBox(m_xBuilder->weld_scrolled_window("hatchpresetlistwin")))
, m_xBtnAdd(m_xBuilder->weld_button("add"))
, m_xBtnModify(m_xBuilder->weld_button("modify"))
@@ -266,10 +266,10 @@ void SvxHatchTabPage::Reset( const SfxItemSet* rSet )
m_aCtlPreview.Invalidate();
}
-std::unique_ptr<SfxTabPage> SvxHatchTabPage::Create( TabPageParent pWindow,
+std::unique_ptr<SfxTabPage> SvxHatchTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rSet )
{
- return std::make_unique<SvxHatchTabPage>(pWindow, *rSet);
+ return std::make_unique<SvxHatchTabPage>(pPage, pController, *rSet);
}
IMPL_LINK( SvxHatchTabPage, ModifiedListBoxHdl_Impl, weld::ComboBox&, rListBox, void )
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 00e2e4eb10ec..92db00bd2f70 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -80,8 +80,8 @@ const sal_uInt16 SvxLineTabPage::pLineRanges[] =
0
};
-SvxLineTabPage::SvxLineTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage(pParent, "cui/ui/linetabpage.ui", "LineTabPage", &rInAttrs)
+SvxLineTabPage::SvxLineTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "cui/ui/linetabpage.ui", "LineTabPage", &rInAttrs)
, m_pSymbolList(nullptr)
, m_bNewSize(false)
, m_nSymbolType(SVX_SYMBOLTYPE_UNKNOWN) // unknown respectively unchanged
@@ -102,7 +102,7 @@ SvxLineTabPage::SvxLineTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs
, m_pPosLineEndLb(nullptr)
, m_xBoxColor(m_xBuilder->weld_widget("boxCOLOR"))
, m_xLbLineStyle(new SvxLineLB(m_xBuilder->weld_combo_box("LB_LINE_STYLE")))
- , m_xLbColor(new ColorListBox(m_xBuilder->weld_menu_button("LB_COLOR"), pParent.GetFrameWeld()))
+ , m_xLbColor(new ColorListBox(m_xBuilder->weld_menu_button("LB_COLOR"), pController->getDialog()))
, m_xBoxWidth(m_xBuilder->weld_widget("boxWIDTH"))
, m_xMtrLineWidth(m_xBuilder->weld_metric_spin_button("MTR_FLD_LINE_WIDTH", FieldUnit::CM))
, m_xBoxTransparency(m_xBuilder->weld_widget("boxTRANSPARENCY"))
@@ -1176,10 +1176,10 @@ void SvxLineTabPage::Reset( const SfxItemSet* rAttrs )
ChangePreviewHdl_Impl( nullptr );
}
-std::unique_ptr<SfxTabPage> SvxLineTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxLineTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrs)
{
- return std::make_unique<SvxLineTabPage>(pParent, *rAttrs);
+ return std::make_unique<SvxLineTabPage>(pPage, pController, *rAttrs);
}
IMPL_LINK_NOARG(SvxLineTabPage, ChangePreviewListBoxHdl_Impl, ColorListBox&, void)
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index 4ed54c75aa1e..f5bac204f13d 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -50,8 +50,8 @@
using namespace com::sun::star;
-SvxLineDefTabPage::SvxLineDefTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage(pParent, "cui/ui/linestyletabpage.ui", "LineStylePage", &rInAttrs)
+SvxLineDefTabPage::SvxLineDefTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "cui/ui/linestyletabpage.ui", "LineStylePage", &rInAttrs)
, rOutAttrs(rInAttrs)
, aXLineAttr(rInAttrs.GetPool())
, rXLSet(aXLineAttr.GetItemSet())
@@ -296,9 +296,9 @@ void SvxLineDefTabPage::Reset( const SfxItemSet* rAttrs )
}
}
-std::unique_ptr<SfxTabPage> SvxLineDefTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs )
+std::unique_ptr<SfxTabPage> SvxLineDefTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs )
{
- return std::make_unique<SvxLineDefTabPage>(pParent, *rOutAttrs);
+ return std::make_unique<SvxLineDefTabPage>(pPage, pController, *rOutAttrs);
}
IMPL_LINK(SvxLineDefTabPage, SelectLinestyleListBoxHdl_Impl, weld::ComboBox&, rListBox, void)
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 3d108c81626b..eac0b4763d5f 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -49,8 +49,8 @@
#define XOUT_WIDTH 150
-SvxLineEndDefTabPage::SvxLineEndDefTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage(pParent , "cui/ui/lineendstabpage.ui", "LineEndPage", &rInAttrs)
+SvxLineEndDefTabPage::SvxLineEndDefTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "cui/ui/lineendstabpage.ui", "LineEndPage", &rInAttrs)
, rOutAttrs(rInAttrs)
, pPolyObj(nullptr)
, aXLineAttr(rInAttrs.GetPool())
@@ -231,9 +231,9 @@ void SvxLineEndDefTabPage::Reset( const SfxItemSet* )
}
}
-std::unique_ptr<SfxTabPage> SvxLineEndDefTabPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SvxLineEndDefTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
- return std::make_unique<SvxLineEndDefTabPage>(pParent, *rSet );
+ return std::make_unique<SvxLineEndDefTabPage>(pPage, pController, *rSet );
}
void SvxLineEndDefTabPage::SelectLineEndHdl_Impl()
diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx
index e4770e00bd6e..ecf3b75bdf2f 100644
--- a/cui/source/tabpages/tppattern.cxx
+++ b/cui/source/tabpages/tppattern.cxx
@@ -69,16 +69,16 @@ public:
void SetBackgroundColor( Color aColor ) { aBackgroundColor = aColor; }
};
-SvxPatternTabPage::SvxPatternTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SvxTabPage(pParent, "cui/ui/patterntabpage.ui", "PatternTabPage", rInAttrs)
+SvxPatternTabPage::SvxPatternTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SvxTabPage(pPage, pController, "cui/ui/patterntabpage.ui", "PatternTabPage", rInAttrs)
, m_rOutAttrs(rInAttrs)
, m_pnPatternListState(nullptr)
, m_pnColorListState(nullptr)
, m_aXFillAttr(rInAttrs.GetPool())
, m_rXFSet(m_aXFillAttr.GetItemSet())
, m_xCtlPixel(new SvxPixelCtl(this))
- , m_xLbColor(new ColorListBox(m_xBuilder->weld_menu_button("LB_COLOR"), pParent.GetFrameWeld()))
- , m_xLbBackgroundColor(new ColorListBox(m_xBuilder->weld_menu_button("LB_BACKGROUND_COLOR"), pParent.GetFrameWeld()))
+ , m_xLbColor(new ColorListBox(m_xBuilder->weld_menu_button("LB_COLOR"), pController->getDialog()))
+ , m_xLbBackgroundColor(new ColorListBox(m_xBuilder->weld_menu_button("LB_BACKGROUND_COLOR"), pController->getDialog()))
, m_xPatternLB(new SvxPresetListBox(m_xBuilder->weld_scrolled_window("patternpresetlistwin")))
, m_xBtnAdd(m_xBuilder->weld_button("BTN_ADD"))
, m_xBtnModify(m_xBuilder->weld_button("BTN_MODIFY"))
@@ -233,10 +233,10 @@ void SvxPatternTabPage::Reset( const SfxItemSet* )
}
}
-std::unique_ptr<SfxTabPage> SvxPatternTabPage::Create( TabPageParent pWindow,
+std::unique_ptr<SfxTabPage> SvxPatternTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rSet )
{
- return std::make_unique<SvxPatternTabPage>(pWindow, *rSet);
+ return std::make_unique<SvxPatternTabPage>(pPage, pController, *rSet);
}
IMPL_LINK_NOARG(SvxPatternTabPage, ChangePatternHdl_Impl, SvtValueSet*, void)
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index b5e9c18d4961..1c8c5051d0b9 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -52,8 +52,8 @@ const sal_uInt16 SvxShadowTabPage::pShadowRanges[] =
0
};
-SvxShadowTabPage::SvxShadowTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SvxTabPage(pParent, "cui/ui/shadowtabpage.ui", "ShadowTabPage", rInAttrs)
+SvxShadowTabPage::SvxShadowTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SvxTabPage(pPage, pController, "cui/ui/shadowtabpage.ui", "ShadowTabPage", rInAttrs)
, m_rOutAttrs(rInAttrs)
, m_pnColorListState(nullptr)
, m_nPageType(PageType::Area)
@@ -64,7 +64,7 @@ SvxShadowTabPage::SvxShadowTabPage(TabPageParent pParent, const SfxItemSet& rInA
, m_xTsbShowShadow(m_xBuilder->weld_check_button("TSB_SHOW_SHADOW"))
, m_xGridShadow(m_xBuilder->weld_widget("gridSHADOW"))
, m_xMtrDistance(m_xBuilder->weld_metric_spin_button("MTR_FLD_DISTANCE", FieldUnit::CM))
- , m_xLbShadowColor(new ColorListBox(m_xBuilder->weld_menu_button("LB_SHADOW_COLOR"), pParent.GetFrameWeld()))
+ , m_xLbShadowColor(new ColorListBox(m_xBuilder->weld_menu_button("LB_SHADOW_COLOR"), pController->getDialog()))
, m_xMtrTransparent(m_xBuilder->weld_metric_spin_button("MTR_SHADOW_TRANSPARENT", FieldUnit::PERCENT))
, m_xCtlPosition(new weld::CustomWeld(*m_xBuilder, "CTL_POSITION", m_aCtlPosition))
, m_xCtlXRectPreview(new weld::CustomWeld(*m_xBuilder, "CTL_COLOR_PREVIEW", m_aCtlXRectPreview))
@@ -412,10 +412,10 @@ void SvxShadowTabPage::Reset( const SfxItemSet* rAttrs )
ModifyShadowHdl_Impl(*m_xMtrTransparent);
}
-std::unique_ptr<SfxTabPage> SvxShadowTabPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SvxShadowTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrs )
{
- return std::make_unique<SvxShadowTabPage>(pParent, *rAttrs);
+ return std::make_unique<SvxShadowTabPage>(pPage, pController, *rAttrs);
}
IMPL_LINK_NOARG(SvxShadowTabPage, ClickShadowHdl_Impl, weld::ToggleButton&, void)
diff --git a/cui/source/tabpages/tptrans.cxx b/cui/source/tabpages/tptrans.cxx
index 495135a60e01..ac950ceb3a2e 100644
--- a/cui/source/tabpages/tptrans.cxx
+++ b/cui/source/tabpages/tptrans.cxx
@@ -191,8 +191,8 @@ void SvxTransparenceTabPage::SetControlState_Impl(css::awt::GradientStyle eXGS)
}
}
-SvxTransparenceTabPage::SvxTransparenceTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage(pParent, "cui/ui/transparencytabpage.ui", "TransparencyTabPage", &rInAttrs)
+SvxTransparenceTabPage::SvxTransparenceTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "cui/ui/transparencytabpage.ui", "TransparencyTabPage", &rInAttrs)
, rOutAttrs(rInAttrs)
, nPageType(PageType::Area)
, nDlgType(0)
@@ -244,9 +244,9 @@ SvxTransparenceTabPage::SvxTransparenceTabPage(TabPageParent pParent, const SfxI
SetExchangeSupport();
}
-std::unique_ptr<SfxTabPage> SvxTransparenceTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrs)
+std::unique_ptr<SfxTabPage> SvxTransparenceTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrs)
{
- return std::make_unique<SvxTransparenceTabPage>(pParent, *rAttrs);
+ return std::make_unique<SvxTransparenceTabPage>(pPage, pController, *rAttrs);
}
bool SvxTransparenceTabPage::FillItemSet(SfxItemSet* rAttrs)
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index 06e9c2ccf201..d47699dc735e 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -166,8 +166,8 @@ void SvxTransformTabDialog::SetValidateFramePosLink(const Link<SvxSwFrameValidat
|* angle and the rotation angle of the graphic objects
|*
\************************************************************************/
-SvxAngleTabPage::SvxAngleTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SvxTabPage(pParent, "cui/ui/rotationtabpage.ui", "Rotation", rInAttrs)
+SvxAngleTabPage::SvxAngleTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SvxTabPage(pPage, pController, "cui/ui/rotationtabpage.ui", "Rotation", rInAttrs)
, rOutAttrs(rInAttrs)
, pView(nullptr)
, eDlgUnit(FieldUnit::NONE)
@@ -301,9 +301,9 @@ void SvxAngleTabPage::Reset(const SfxItemSet* rAttrs)
m_xMtrPosY->save_value();
}
-std::unique_ptr<SfxTabPage> SvxAngleTabPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SvxAngleTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
- return std::make_unique<SvxAngleTabPage>(pParent, *rSet);
+ return std::make_unique<SvxAngleTabPage>(pPage, pController, *rSet);
}
void SvxAngleTabPage::ActivatePage(const SfxItemSet& rSet)
@@ -395,8 +395,8 @@ void SvxAngleTabPage::PointChanged(weld::DrawingArea* pDrawingArea, RectPoint eR
|* dialog for changing slant and corner radius
|*
\************************************************************************/
-SvxSlantTabPage::SvxSlantTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage(pParent, "cui/ui/slantcornertabpage.ui", "SlantAndCornerRadius", &rInAttrs)
+SvxSlantTabPage::SvxSlantTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "cui/ui/slantcornertabpage.ui", "SlantAndCornerRadius", &rInAttrs)
, rOutAttrs(rInAttrs)
, pView(nullptr)
, eDlgUnit(FieldUnit::NONE)
@@ -700,9 +700,9 @@ void SvxSlantTabPage::Reset(const SfxItemSet* rAttrs)
}
}
-std::unique_ptr<SfxTabPage> SvxSlantTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> SvxSlantTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
{
- return std::make_unique<SvxSlantTabPage>(pParent, *rOutAttrs);
+ return std::make_unique<SvxSlantTabPage>(pPage, pController, *rOutAttrs);
}
void SvxSlantTabPage::ActivatePage( const SfxItemSet& rSet )
@@ -736,8 +736,8 @@ DeactivateRC SvxSlantTabPage::DeactivatePage( SfxItemSet* _pSet )
|* Dialog for changing position and size of graphic objects
|*
\************************************************************************/
-SvxPositionSizeTabPage::SvxPositionSizeTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SvxTabPage(pParent, "cui/ui/possizetabpage.ui", "PositionAndSize", rInAttrs)
+SvxPositionSizeTabPage::SvxPositionSizeTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SvxTabPage(pPage, pController, "cui/ui/possizetabpage.ui", "PositionAndSize", rInAttrs)
, mrOutAttrs(rInAttrs)
, mpView(nullptr)
, meDlgUnit(FieldUnit::NONE)
@@ -1116,9 +1116,9 @@ void SvxPositionSizeTabPage::Reset( const SfxItemSet* )
ChangeSizeProtectHdl(*m_xTsbSizeProtect);
}
-std::unique_ptr<SfxTabPage> SvxPositionSizeTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> SvxPositionSizeTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
{
- return std::make_unique<SvxPositionSizeTabPage>(pParent, *rOutAttrs);
+ return std::make_unique<SvxPositionSizeTabPage>(pPage, pController, *rOutAttrs);
}
void SvxPositionSizeTabPage::ActivatePage( const SfxItemSet& rSet )
diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx
index 20711d3e6b4e..f1ec5954edce 100644
--- a/dbaccess/source/ui/control/ColumnControlWindow.cxx
+++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx
@@ -38,7 +38,7 @@ using namespace ::com::sun::star::lang;
// OColumnControlWindow
OColumnControlWindow::OColumnControlWindow(vcl::Window* pParent
,const Reference<XComponentContext>& _rxContext)
- : OFieldDescControl(pParent,nullptr)
+ : OFieldDescControl(nullptr, pParent, nullptr)
, m_xContext(_rxContext)
, m_sTypeNames(DBA_RES(STR_TABLEDESIGN_DBFIELDTYPES))
, m_bAutoIncrementEnabled(true)
diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx
index 86a1ed6eb6c0..1e4cfca41a3c 100644
--- a/dbaccess/source/ui/control/FieldDescControl.cxx
+++ b/dbaccess/source/ui/control/FieldDescControl.cxx
@@ -77,10 +77,10 @@ namespace
}
// class OFieldDescControl
-OFieldDescControl::OFieldDescControl(TabPageParent pParent, OTableDesignHelpBar* pHelpBar)
- :TabPage(pParent.pPage ? Application::GetDefDialogParent() : pParent.pParent.get(), WB_3DLOOK | WB_DIALOGCONTROL)
- ,m_xBuilder(pParent.pPage ? Application::CreateBuilder(pParent.pPage, "dbaccess/ui/fielddescpage.ui")
- : Application::CreateInterimBuilder(this, "dbaccess/ui/fielddescpage.ui"))
+OFieldDescControl::OFieldDescControl(weld::Container* pPage, vcl::Window* pParent, OTableDesignHelpBar* pHelpBar)
+ :TabPage(pPage ? Application::GetDefDialogParent() : pParent, WB_3DLOOK | WB_DIALOGCONTROL)
+ ,m_xBuilder(pPage ? Application::CreateBuilder(pPage, "dbaccess/ui/fielddescpage.ui")
+ : Application::CreateInterimBuilder(this, "dbaccess/ui/fielddescpage.ui"))
,m_xContainer(m_xBuilder->weld_container("FieldDescPage"))
,pHelp( pHelpBar )
,m_pLastFocusWindow(nullptr)
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
index 72fe9b8b0a01..4f01b9a4774b 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx
@@ -85,8 +85,8 @@ namespace dbaui
using namespace ::dbtools;
using namespace ::svt;
- OConnectionHelper::OConnectionHelper(TabPageParent pParent, const OUString& _rUIXMLDescription, const OString& _rId, const SfxItemSet& _rCoreAttrs)
- : OGenericAdministrationPage(pParent, _rUIXMLDescription, _rId, _rCoreAttrs)
+ OConnectionHelper::OConnectionHelper(weld::Container* pPage, weld::DialogController* pController, const OUString& _rUIXMLDescription, const OString& _rId, const SfxItemSet& _rCoreAttrs)
+ : OGenericAdministrationPage(pPage, pController, _rUIXMLDescription, _rId, _rCoreAttrs)
, m_bUserGrabFocus(false)
, m_pCollection(nullptr)
, m_xFT_Connection(m_xBuilder->weld_label("browseurllabel"))
diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
index 9d38e1d67b4d..4af8bbcef480 100644
--- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx
@@ -40,7 +40,7 @@ namespace dbaui
bool m_bUserGrabFocus;
public:
- OConnectionHelper(TabPageParent pParent, const OUString& _rUIXMLDescription, const OString& _rId, const SfxItemSet& _rCoreAttrs);
+ OConnectionHelper(weld::Container* pPage, weld::DialogController* pController, const OUString& _rUIXMLDescription, const OString& _rId, const SfxItemSet& _rCoreAttrs);
virtual ~OConnectionHelper() override;
OUString m_eType; // the type can't be changed in this class, so we hold it as member.
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx
index e9618fec8e05..4dacff794c91 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx
@@ -76,14 +76,14 @@ namespace dbaui
using namespace ::dbtools;
using namespace ::svt;
- std::unique_ptr<SfxTabPage> OConnectionTabPage::Create(TabPageParent pParent, const SfxItemSet* _rAttrSet)
+ std::unique_ptr<SfxTabPage> OConnectionTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* _rAttrSet)
{
- return std::make_unique<OConnectionTabPage>(pParent, *_rAttrSet);
+ return std::make_unique<OConnectionTabPage>(pPage, pController, *_rAttrSet);
}
// OConnectionTabPage
- OConnectionTabPage::OConnectionTabPage(TabPageParent pParent, const SfxItemSet& _rCoreAttrs)
- : OConnectionHelper(pParent, "dbaccess/ui/connectionpage.ui", "ConnectionPage", _rCoreAttrs)
+ OConnectionTabPage::OConnectionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs)
+ : OConnectionHelper(pPage, pController, "dbaccess/ui/connectionpage.ui", "ConnectionPage", _rCoreAttrs)
, m_xFL2(m_xBuilder->weld_label("userlabel"))
, m_xUserNameLabel(m_xBuilder->weld_label("userNameLabel"))
, m_xUserName(m_xBuilder->weld_entry("userNameEntry"))
diff --git a/dbaccess/source/ui/dlg/ConnectionPage.hxx b/dbaccess/source/ui/dlg/ConnectionPage.hxx
index 8ce5e1050ccf..11509f3bfb1d 100644
--- a/dbaccess/source/ui/dlg/ConnectionPage.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPage.hxx
@@ -55,8 +55,8 @@ namespace dbaui
DECL_LINK(OnEditModified, weld::Entry&, void);
public:
- OConnectionTabPage(TabPageParent pParent, const SfxItemSet& _rCoreAttrs);
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* _rAttrSet);
+ OConnectionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* _rAttrSet);
virtual ~OConnectionTabPage() override;
virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) override;
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
index 141f81fce5f0..198cb096419e 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx
@@ -61,33 +61,33 @@ namespace dbaui
using namespace ::dbtools;
using namespace ::svt;
- std::unique_ptr<OGenericAdministrationPage> OConnectionTabPageSetup::CreateDbaseTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet)
+ std::unique_ptr<OGenericAdministrationPage> OConnectionTabPageSetup::CreateDbaseTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet)
{
- return std::make_unique<OConnectionTabPageSetup>( pParent, "dbaccess/ui/dbwizconnectionpage.ui", "ConnectionPage", _rAttrSet, STR_DBASE_HELPTEXT, STR_DBASE_HEADERTEXT, STR_DBASE_PATH_OR_FILE );
+ return std::make_unique<OConnectionTabPageSetup>( pPage, pController, "dbaccess/ui/dbwizconnectionpage.ui", "ConnectionPage", _rAttrSet, STR_DBASE_HELPTEXT, STR_DBASE_HEADERTEXT, STR_DBASE_PATH_OR_FILE );
}
- std::unique_ptr<OGenericAdministrationPage> OConnectionTabPageSetup::CreateMSAccessTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet)
+ std::unique_ptr<OGenericAdministrationPage> OConnectionTabPageSetup::CreateMSAccessTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet)
{
- return std::make_unique<OConnectionTabPageSetup>( pParent, "dbaccess/ui/dbwizconnectionpage.ui", "ConnectionPage", _rAttrSet, STR_MSACCESS_HELPTEXT, STR_MSACCESS_HEADERTEXT, STR_MSACCESS_MDB_FILE );
+ return std::make_unique<OConnectionTabPageSetup>( pPage, pController, "dbaccess/ui/dbwizconnectionpage.ui", "ConnectionPage", _rAttrSet, STR_MSACCESS_HELPTEXT, STR_MSACCESS_HEADERTEXT, STR_MSACCESS_MDB_FILE );
}
- std::unique_ptr<OGenericAdministrationPage> OConnectionTabPageSetup::CreateADOTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet)
+ std::unique_ptr<OGenericAdministrationPage> OConnectionTabPageSetup::CreateADOTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet)
{
- return std::make_unique<OConnectionTabPageSetup>( pParent, "dbaccess/ui/dbwizconnectionpage.ui", "ConnectionPage", _rAttrSet, STR_ADO_HELPTEXT, STR_ADO_HEADERTEXT, STR_COMMONURL );
+ return std::make_unique<OConnectionTabPageSetup>( pPage, pController, "dbaccess/ui/dbwizconnectionpage.ui", "ConnectionPage", _rAttrSet, STR_ADO_HELPTEXT, STR_ADO_HEADERTEXT, STR_COMMONURL );
}
- std::unique_ptr<OGenericAdministrationPage> OConnectionTabPageSetup::CreateODBCTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet)
+ std::unique_ptr<OGenericAdministrationPage> OConnectionTabPageSetup::CreateODBCTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet)
{
- return std::make_unique<OConnectionTabPageSetup>( pParent, "dbaccess/ui/dbwizconnectionpage.ui", "ConnectionPage", _rAttrSet, STR_ODBC_HELPTEXT, STR_ODBC_HEADERTEXT, STR_NAME_OF_ODBC_DATASOURCE );
+ return std::make_unique<OConnectionTabPageSetup>( pPage, pController, "dbaccess/ui/dbwizconnectionpage.ui", "ConnectionPage", _rAttrSet, STR_ODBC_HELPTEXT, STR_ODBC_HEADERTEXT, STR_NAME_OF_ODBC_DATASOURCE );
}
- std::unique_ptr<OGenericAdministrationPage> OConnectionTabPageSetup::CreateUserDefinedTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet)
+ std::unique_ptr<OGenericAdministrationPage> OConnectionTabPageSetup::CreateUserDefinedTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet)
{
- return std::make_unique<OConnectionTabPageSetup>(pParent, "dbaccess/ui/dbwizconnectionpage.ui", "ConnectionPage", _rAttrSet, nullptr, nullptr, STR_COMMONURL);
+ return std::make_unique<OConnectionTabPageSetup>(pPage, pController, "dbaccess/ui/dbwizconnectionpage.ui", "ConnectionPage", _rAttrSet, nullptr, nullptr, STR_COMMONURL);
}
- OConnectionTabPageSetup::OConnectionTabPageSetup(TabPageParent pParent, const OUString& _rUIXMLDescription, const OString& _rId, const SfxItemSet& _rCoreAttrs, const char* pHelpTextResId, const char* pHeaderResId, const char* pUrlResId)
- : OConnectionHelper(pParent, _rUIXMLDescription, _rId, _rCoreAttrs)
+ OConnectionTabPageSetup::OConnectionTabPageSetup(weld::Container* pPage, weld::DialogController* pController, const OUString& _rUIXMLDescription, const OString& _rId, const SfxItemSet& _rCoreAttrs, const char* pHelpTextResId, const char* pHeaderResId, const char* pUrlResId)
+ : OConnectionHelper(pPage, pController, _rUIXMLDescription, _rId, _rCoreAttrs)
, m_xHelpText(m_xBuilder->weld_label("helptext"))
, m_xHeaderText(m_xBuilder->weld_label("header"))
{
diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
index b456f722f8ea..5ad6b7022bed 100644
--- a/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
+++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.hxx
@@ -43,14 +43,14 @@ namespace dbaui
DECL_LINK(OnEditModified, weld::Entry&, void);
public:
- OConnectionTabPageSetup(TabPageParent pParent, const OUString& _rUIXMLDescription, const OString& _rId, const SfxItemSet& _rCoreAttrs, const char* pHelpTextResId, const char* pHeaderResId, const char* pUrlResId);
+ OConnectionTabPageSetup(weld::Container* pPage, weld::DialogController* pController, const OUString& _rUIXMLDescription, const OString& _rId, const SfxItemSet& _rCoreAttrs, const char* pHelpTextResId, const char* pHeaderResId, const char* pUrlResId);
virtual ~OConnectionTabPageSetup() override;
- static std::unique_ptr<OGenericAdministrationPage> CreateDbaseTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet);
- static std::unique_ptr<OGenericAdministrationPage> CreateMSAccessTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet);
- static std::unique_ptr<OGenericAdministrationPage> CreateADOTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet);
- static std::unique_ptr<OGenericAdministrationPage> CreateODBCTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet);
- static std::unique_ptr<OGenericAdministrationPage> CreateUserDefinedTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet);
+ static std::unique_ptr<OGenericAdministrationPage> CreateDbaseTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet);
+ static std::unique_ptr<OGenericAdministrationPage> CreateMSAccessTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet);
+ static std::unique_ptr<OGenericAdministrationPage> CreateADOTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet);
+ static std::unique_ptr<OGenericAdministrationPage> CreateODBCTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet);
+ static std::unique_ptr<OGenericAdministrationPage> CreateUserDefinedTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet);
virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) override;
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
index b6a0bf5c962c..86ec9aba7eeb 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx
@@ -60,14 +60,14 @@ namespace dbaui
{
using namespace ::com::sun::star;
- std::unique_ptr<OGenericAdministrationPage> OTextConnectionPageSetup::CreateTextTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet)
+ std::unique_ptr<OGenericAdministrationPage> OTextConnectionPageSetup::CreateTextTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet)
{
- return std::make_unique<OTextConnectionPageSetup>(pParent, _rAttrSet);
+ return std::make_unique<OTextConnectionPageSetup>(pPage, pController, _rAttrSet);
}
// OTextConnectionPageSetup
- OTextConnectionPageSetup::OTextConnectionPageSetup(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
- : OConnectionTabPageSetup(pParent, "dbaccess/ui/dbwiztextpage.ui", "DBWizTextPage",
+ OTextConnectionPageSetup::OTextConnectionPageSetup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs)
+ : OConnectionTabPageSetup(pPage, pController, "dbaccess/ui/dbwiztextpage.ui", "DBWizTextPage",
rCoreAttrs, STR_TEXT_HELPTEXT, STR_TEXT_HEADERTEXT, STR_TEXT_PATH_OR_FILE)
, m_xSubContainer(m_xBuilder->weld_widget("TextPageContainer"))
, m_xTextConnectionHelper(new OTextConnectionHelper(m_xSubContainer.get(), TC_EXTENSION | TC_SEPARATORS))
@@ -126,14 +126,14 @@ using namespace ::com::sun::star;
return m_xTextConnectionHelper->prepareLeave();
}
- std::unique_ptr<OGenericAdministrationPage> OLDAPConnectionPageSetup::CreateLDAPTabPage( TabPageParent pParent, const SfxItemSet& _rAttrSet )
+ std::unique_ptr<OGenericAdministrationPage> OLDAPConnectionPageSetup::CreateLDAPTabPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet )
{
- return std::make_unique<OLDAPConnectionPageSetup>(pParent, _rAttrSet);
+ return std::make_unique<OLDAPConnectionPageSetup>(pPage, pController, _rAttrSet);
}
// OLDAPPageSetup
- OLDAPConnectionPageSetup::OLDAPConnectionPageSetup( TabPageParent pParent, const SfxItemSet& _rCoreAttrs )
- : OGenericAdministrationPage(pParent, "dbaccess/ui/ldapconnectionpage.ui", "LDAPConnectionPage", _rCoreAttrs)
+ OLDAPConnectionPageSetup::OLDAPConnectionPageSetup( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs )
+ : OGenericAdministrationPage(pPage, pController, "dbaccess/ui/ldapconnectionpage.ui", "LDAPConnectionPage", _rCoreAttrs)
, m_xFTHelpText(m_xBuilder->weld_label("helpLabel"))
, m_xFTHostServer(m_xBuilder->weld_label("hostNameLabel"))
, m_xETHostServer(m_xBuilder->weld_entry("hostNameEntry"))
@@ -219,13 +219,13 @@ using namespace ::com::sun::star;
OGenericAdministrationPage::callModifiedHdl();
}
- std::unique_ptr<OMySQLIntroPageSetup> OMySQLIntroPageSetup::CreateMySQLIntroTabPage(TabPageParent pParent, const SfxItemSet& rAttrSet)
+ std::unique_ptr<OMySQLIntroPageSetup> OMySQLIntroPageSetup::CreateMySQLIntroTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet)
{
- return std::make_unique<OMySQLIntroPageSetup>(pParent, rAttrSet);
+ return std::make_unique<OMySQLIntroPageSetup>(pPage, pController, rAttrSet);
}
- OMySQLIntroPageSetup::OMySQLIntroPageSetup(TabPageParent pParent, const SfxItemSet& _rCoreAttrs)
- : OGenericAdministrationPage(pParent, "dbaccess/ui/dbwizmysqlintropage.ui", "DBWizMysqlIntroPage", _rCoreAttrs)
+ OMySQLIntroPageSetup::OMySQLIntroPageSetup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs)
+ : OGenericAdministrationPage(pPage, pController, "dbaccess/ui/dbwizmysqlintropage.ui", "DBWizMysqlIntroPage", _rCoreAttrs)
, m_xODBCDatabase(m_xBuilder->weld_radio_button("odbc"))
, m_xJDBCDatabase(m_xBuilder->weld_radio_button("jdbc"))
, m_xNATIVEDatabase(m_xBuilder->weld_radio_button("directly"))
@@ -288,8 +288,8 @@ using namespace ::com::sun::star;
}
// MySQLNativeSetupPage
- MySQLNativeSetupPage::MySQLNativeSetupPage( TabPageParent pParent, const SfxItemSet& rCoreAttrs )
- : OGenericAdministrationPage(pParent, "dbaccess/ui/dbwizmysqlnativepage.ui", "DBWizMysqlNativePage", rCoreAttrs)
+ MySQLNativeSetupPage::MySQLNativeSetupPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs )
+ : OGenericAdministrationPage(pPage, pController, "dbaccess/ui/dbwizmysqlnativepage.ui", "DBWizMysqlNativePage", rCoreAttrs)
, m_xHelpText(m_xBuilder->weld_label("helptext"))
, m_xSettingsContainer(m_xBuilder->weld_container("MySQLSettingsContainer"))
, m_xMySQLSettings(new MySQLNativeSettings(m_xSettingsContainer.get(), LINK(this, OGenericAdministrationPage, OnControlModified)))
@@ -302,9 +302,9 @@ using namespace ::com::sun::star;
m_xMySQLSettings.reset();
}
- std::unique_ptr<OGenericAdministrationPage> MySQLNativeSetupPage::Create(TabPageParent pParent, const SfxItemSet& rAttrSet)
+ std::unique_ptr<OGenericAdministrationPage> MySQLNativeSetupPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet)
{
- return std::make_unique<MySQLNativeSetupPage>(pParent, rAttrSet);
+ return std::make_unique<MySQLNativeSetupPage>(pPage, pController, rAttrSet);
}
void MySQLNativeSetupPage::fillControls( std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList )
@@ -340,8 +340,8 @@ using namespace ::com::sun::star;
}
// OMySQLJDBCConnectionPageSetup
- OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( TabPageParent pParent, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, const char* pDefaultPortResId, const char* pHelpTextResId, const char* pHeaderTextResId, const char* pDriverClassId)
- : OGenericAdministrationPage(pParent, "dbaccess/ui/specialjdbcconnectionpage.ui", "SpecialJDBCConnectionPage", _rCoreAttrs)
+ OGeneralSpecialJDBCConnectionPageSetup::OGeneralSpecialJDBCConnectionPageSetup( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs ,sal_uInt16 _nPortId, const char* pDefaultPortResId, const char* pHelpTextResId, const char* pHeaderTextResId, const char* pDriverClassId)
+ : OGenericAdministrationPage(pPage, pController, "dbaccess/ui/specialjdbcconnectionpage.ui", "SpecialJDBCConnectionPage", _rCoreAttrs)
, m_nPortId(_nPortId)
, m_xHeaderText(m_xBuilder->weld_label("header"))
, m_xFTHelpText(m_xBuilder->weld_label("helpLabel"))
@@ -386,9 +386,9 @@ using namespace ::com::sun::star;
{
}
- std::unique_ptr<OGenericAdministrationPage> OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( TabPageParent pParent, const SfxItemSet& _rAttrSet )
+ std::unique_ptr<OGenericAdministrationPage> OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet )
{
- return std::make_unique<OGeneralSpecialJDBCConnectionPageSetup>(pParent,
+ return std::make_unique<OGeneralSpecialJDBCConnectionPageSetup>(pPage, pController,
_rAttrSet,
DSID_MYSQL_PORTNUMBER ,
STR_MYSQL_DEFAULT,
@@ -397,9 +397,9 @@ using namespace ::com::sun::star;
STR_MYSQL_DRIVERCLASSTEXT);
}
- std::unique_ptr<OGenericAdministrationPage> OGeneralSpecialJDBCConnectionPageSetup::CreateOracleJDBCTabPage( TabPageParent pParent, const SfxItemSet& _rAttrSet )
+ std::unique_ptr<OGenericAdministrationPage> OGeneralSpecialJDBCConnectionPageSetup::CreateOracleJDBCTabPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet )
{
- return std::make_unique<OGeneralSpecialJDBCConnectionPageSetup>(pParent,
+ return std::make_unique<OGeneralSpecialJDBCConnectionPageSetup>(pPage, pController,
_rAttrSet,
DSID_ORACLE_PORTNUMBER,
STR_ORACLE_DEFAULT,
@@ -510,14 +510,14 @@ using namespace ::com::sun::star;
OGenericAdministrationPage::callModifiedHdl();
}
- std::unique_ptr<OGenericAdministrationPage> OJDBCConnectionPageSetup::CreateJDBCTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet)
+ std::unique_ptr<OGenericAdministrationPage> OJDBCConnectionPageSetup::CreateJDBCTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet)
{
- return std::make_unique<OJDBCConnectionPageSetup>(pParent, _rAttrSet);
+ return std::make_unique<OJDBCConnectionPageSetup>(pPage, pController, _rAttrSet);
}
// OMySQLJDBCConnectionPageSetup
- OJDBCConnectionPageSetup::OJDBCConnectionPageSetup(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
- : OConnectionTabPageSetup(pParent, "dbaccess/ui/jdbcconnectionpage.ui", "JDBCConnectionPage", rCoreAttrs,
+ OJDBCConnectionPageSetup::OJDBCConnectionPageSetup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs)
+ : OConnectionTabPageSetup(pPage, pController, "dbaccess/ui/jdbcconnectionpage.ui", "JDBCConnectionPage", rCoreAttrs,
STR_JDBC_HELPTEXT, STR_JDBC_HEADERTEXT, STR_COMMONURL)
, m_xFTDriverClass(m_xBuilder->weld_label("jdbcLabel"))
, m_xETDriverClass(m_xBuilder->weld_entry("jdbcEntry"))
@@ -622,13 +622,13 @@ using namespace ::com::sun::star;
callModifiedHdl();
}
- std::unique_ptr<OGenericAdministrationPage> OSpreadSheetConnectionPageSetup::CreateDocumentOrSpreadSheetTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet)
+ std::unique_ptr<OGenericAdministrationPage> OSpreadSheetConnectionPageSetup::CreateDocumentOrSpreadSheetTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet)
{
- return std::make_unique<OSpreadSheetConnectionPageSetup>(pParent, _rAttrSet);
+ return std::make_unique<OSpreadSheetConnectionPageSetup>(pPage, pController, _rAttrSet);
}
- OSpreadSheetConnectionPageSetup::OSpreadSheetConnectionPageSetup(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
- : OConnectionTabPageSetup(pParent, "dbaccess/ui/dbwizspreadsheetpage.ui", "DBWizSpreadsheetPage",
+ OSpreadSheetConnectionPageSetup::OSpreadSheetConnectionPageSetup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs)
+ : OConnectionTabPageSetup(pPage, pController, "dbaccess/ui/dbwizspreadsheetpage.ui", "DBWizSpreadsheetPage",
rCoreAttrs, STR_SPREADSHEET_HELPTEXT, STR_SPREADSHEET_HEADERTEXT, STR_SPREADSHEETPATH)
, m_xPasswordrequired(m_xBuilder->weld_check_button("passwordrequired"))
{
@@ -657,13 +657,13 @@ using namespace ::com::sun::star;
return bChangedSomething;
}
- std::unique_ptr<OGenericAdministrationPage> OAuthentificationPageSetup::CreateAuthentificationTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet)
+ std::unique_ptr<OGenericAdministrationPage> OAuthentificationPageSetup::CreateAuthentificationTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet)
{
- return std::make_unique<OAuthentificationPageSetup>(pParent, _rAttrSet);
+ return std::make_unique<OAuthentificationPageSetup>(pPage, pController, _rAttrSet);
}
- OAuthentificationPageSetup::OAuthentificationPageSetup(TabPageParent pParent, const SfxItemSet& _rCoreAttrs)
- : OGenericAdministrationPage(pParent, "dbaccess/ui/authentificationpage.ui", "AuthentificationPage", _rCoreAttrs)
+ OAuthentificationPageSetup::OAuthentificationPageSetup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs)
+ : OGenericAdministrationPage(pPage, pController, "dbaccess/ui/authentificationpage.ui", "AuthentificationPage", _rCoreAttrs)
, m_xFTHelpText(m_xBuilder->weld_label("helptext"))
, m_xFTUserName(m_xBuilder->weld_label("generalUserNameLabel"))
, m_xETUserName(m_xBuilder->weld_entry("generalUserNameEntry"))
@@ -720,13 +720,13 @@ using namespace ::com::sun::star;
return bChangedSomething;
}
- std::unique_ptr<OGenericAdministrationPage> OFinalDBPageSetup::CreateFinalDBTabPageSetup(TabPageParent pParent, const SfxItemSet& _rAttrSet)
+ std::unique_ptr<OGenericAdministrationPage> OFinalDBPageSetup::CreateFinalDBTabPageSetup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet)
{
- return std::make_unique<OFinalDBPageSetup>(pParent, _rAttrSet);
+ return std::make_unique<OFinalDBPageSetup>(pPage, pController, _rAttrSet);
}
- OFinalDBPageSetup::OFinalDBPageSetup(TabPageParent pParent, const SfxItemSet& _rCoreAttrs)
- : OGenericAdministrationPage(pParent, "dbaccess/ui/finalpagewizard.ui", "PageFinal", _rCoreAttrs)
+ OFinalDBPageSetup::OFinalDBPageSetup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs)
+ : OGenericAdministrationPage(pPage, pController, "dbaccess/ui/finalpagewizard.ui", "PageFinal", _rCoreAttrs)
, m_xFTFinalHeader(m_xBuilder->weld_label("headerText"))
, m_xFTFinalHelpText(m_xBuilder->weld_label("helpText"))
, m_xRBRegisterDataSource(m_xBuilder->weld_radio_button("yesregister"))
diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
index 23d20562ad66..b0f51a854a0f 100644
--- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
+++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx
@@ -40,8 +40,8 @@ namespace dbaui
{
public:
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override;
- static std::unique_ptr<OGenericAdministrationPage> CreateDocumentOrSpreadSheetTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet);
- OSpreadSheetConnectionPageSetup(TabPageParent pParent, const SfxItemSet& _rCoreAttrs);
+ static std::unique_ptr<OGenericAdministrationPage> CreateDocumentOrSpreadSheetTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet);
+ OSpreadSheetConnectionPageSetup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs);
virtual ~OSpreadSheetConnectionPageSetup() override;
private:
@@ -56,8 +56,8 @@ namespace dbaui
{
public:
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override;
- static std::unique_ptr<OGenericAdministrationPage> CreateTextTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet );
- OTextConnectionPageSetup(TabPageParent pParent, const SfxItemSet& _rCoreAttrs);
+ static std::unique_ptr<OGenericAdministrationPage> CreateTextTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet );
+ OTextConnectionPageSetup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs);
virtual ~OTextConnectionPageSetup() override;
protected:
virtual bool prepareLeave() override;
@@ -76,8 +76,8 @@ namespace dbaui
{
public:
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override;
- static std::unique_ptr<OGenericAdministrationPage> CreateLDAPTabPage( TabPageParent pParent, const SfxItemSet& _rAttrSet );
- OLDAPConnectionPageSetup( TabPageParent pParent, const SfxItemSet& _rCoreAttrs );
+ static std::unique_ptr<OGenericAdministrationPage> CreateLDAPTabPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet );
+ OLDAPConnectionPageSetup( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs );
virtual ~OLDAPConnectionPageSetup() override;
virtual void callModifiedHdl(weld::Widget* pControl = nullptr) override;
@@ -107,10 +107,10 @@ namespace dbaui
std::unique_ptr<MySQLNativeSettings> m_xMySQLSettings;
public:
- MySQLNativeSetupPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
+ MySQLNativeSetupPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs);
virtual ~MySQLNativeSetupPage() override;
- static std::unique_ptr<OGenericAdministrationPage> Create(TabPageParent pParent, const SfxItemSet& rAttrSet);
+ static std::unique_ptr<OGenericAdministrationPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet);
protected:
virtual void fillControls( std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList ) override;
@@ -126,7 +126,7 @@ namespace dbaui
class OGeneralSpecialJDBCConnectionPageSetup final : public OGenericAdministrationPage
{
public:
- OGeneralSpecialJDBCConnectionPageSetup(TabPageParent pParent
+ OGeneralSpecialJDBCConnectionPageSetup(weld::Container* pPage, weld::DialogController* pController
, const SfxItemSet& _rCoreAttrs
, sal_uInt16 _nPortId
, const char* pDefaultPortResId
@@ -134,8 +134,8 @@ namespace dbaui
, const char* pHeaderTextResId
, const char* pDriverClassId );
virtual ~OGeneralSpecialJDBCConnectionPageSetup() override;
- static std::unique_ptr<OGenericAdministrationPage> CreateMySQLJDBCTabPage( TabPageParent pParent, const SfxItemSet& _rAttrSet );
- static std::unique_ptr<OGenericAdministrationPage> CreateOracleJDBCTabPage( TabPageParent pParent, const SfxItemSet& _rAttrSet );
+ static std::unique_ptr<OGenericAdministrationPage> CreateMySQLJDBCTabPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet );
+ static std::unique_ptr<OGenericAdministrationPage> CreateOracleJDBCTabPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet );
private:
virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override;
@@ -168,9 +168,9 @@ namespace dbaui
class OJDBCConnectionPageSetup final : public OConnectionTabPageSetup
{
public:
- OJDBCConnectionPageSetup(TabPageParent pParent, const SfxItemSet& _rCoreAttrs);
+ OJDBCConnectionPageSetup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs);
virtual ~OJDBCConnectionPageSetup() override;
- static std::unique_ptr<OGenericAdministrationPage> CreateJDBCTabPage(TabPageParent pParent, const SfxItemSet& rAttrSet);
+ static std::unique_ptr<OGenericAdministrationPage> CreateJDBCTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet);
private:
virtual bool checkTestConnection() override;
@@ -198,10 +198,10 @@ namespace dbaui
VIA_NATIVE
};
- OMySQLIntroPageSetup(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
+ OMySQLIntroPageSetup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs);
virtual ~OMySQLIntroPageSetup() override;
- static std::unique_ptr<OMySQLIntroPageSetup> CreateMySQLIntroTabPage(TabPageParent pParent, const SfxItemSet& rAttrSet);
+ static std::unique_ptr<OMySQLIntroPageSetup> CreateMySQLIntroTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet);
ConnectionType getMySQLMode() const;
void SetClickHdl( const Link<OMySQLIntroPageSetup *, void>& rLink ) { maClickHdl = rLink; }
@@ -225,8 +225,8 @@ namespace dbaui
{
public:
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override;
- static std::unique_ptr<OGenericAdministrationPage> CreateAuthentificationTabPage(TabPageParent pParent, const SfxItemSet& _rAttrSet);
- OAuthentificationPageSetup(TabPageParent pParent, const SfxItemSet& _rCoreAttrs);
+ static std::unique_ptr<OGenericAdministrationPage> CreateAuthentificationTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet);
+ OAuthentificationPageSetup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs);
virtual ~OAuthentificationPageSetup() override;
private:
@@ -246,9 +246,9 @@ namespace dbaui
{
public:
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override;
- static std::unique_ptr<OGenericAdministrationPage> CreateFinalDBTabPageSetup(TabPageParent pParent, const SfxItemSet& _rAttrSet);
+ static std::unique_ptr<OGenericAdministrationPage> CreateFinalDBTabPageSetup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rAttrSet);
- OFinalDBPageSetup(TabPageParent pParent, const SfxItemSet& _rCoreAttrs);
+ OFinalDBPageSetup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs);
virtual ~OFinalDBPageSetup() override;
bool IsDatabaseDocumentToBeRegistered() const;
bool IsDatabaseDocumentToBeOpened() const;
diff --git a/dbaccess/source/ui/dlg/DriverSettings.hxx b/dbaccess/source/ui/dlg/DriverSettings.hxx
index dc1482b7184f..367277bde656 100644
--- a/dbaccess/source/ui/dlg/DriverSettings.hxx
+++ b/dbaccess/source/ui/dlg/DriverSettings.hxx
@@ -36,48 +36,48 @@ namespace dbaui
/** Creates the detail page for ado
*/
- static std::unique_ptr<SfxTabPage> CreateDbase( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
+ static std::unique_ptr<SfxTabPage> CreateDbase( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* _rAttrSet );
/** Creates the detail page for ado
*/
- static std::unique_ptr<SfxTabPage> CreateAdo( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
+ static std::unique_ptr<SfxTabPage> CreateAdo( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* _rAttrSet );
/** Creates the detail page for ODBC
*/
- static std::unique_ptr<SfxTabPage> CreateODBC( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
+ static std::unique_ptr<SfxTabPage> CreateODBC( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* _rAttrSet );
/** Creates the detail page for user
*/
- static std::unique_ptr<SfxTabPage> CreateUser( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
+ static std::unique_ptr<SfxTabPage> CreateUser( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* _rAttrSet );
/** Creates the detail page for MySQLODBC
*/
- static std::unique_ptr<SfxTabPage> CreateMySQLODBC( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
+ static std::unique_ptr<SfxTabPage> CreateMySQLODBC( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* _rAttrSet );
/** Creates the detail page for MySQLJDBC
*/
- static std::unique_ptr<SfxTabPage> CreateMySQLJDBC( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
+ static std::unique_ptr<SfxTabPage> CreateMySQLJDBC( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* _rAttrSet );
/** Creates the detail page for MySQLNATIVE
*/
- static std::unique_ptr<SfxTabPage> CreateMySQLNATIVE( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
+ static std::unique_ptr<SfxTabPage> CreateMySQLNATIVE( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* _rAttrSet );
/** Creates the detail page for Oracle JDBC
*/
- static std::unique_ptr<SfxTabPage> CreateOracleJDBC( TabPageParent pParent, const SfxItemSet* _rAttrSet );
+ static std::unique_ptr<SfxTabPage> CreateOracleJDBC( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* _rAttrSet );
/** Creates the detail page for LDAP
*/
- static std::unique_ptr<SfxTabPage> CreateLDAP( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
+ static std::unique_ptr<SfxTabPage> CreateLDAP( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* _rAttrSet );
/// Creates the detail page for Text
- static std::unique_ptr<SfxTabPage> CreateText( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
+ static std::unique_ptr<SfxTabPage> CreateText( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* _rAttrSet );
/// creates the GeneratedValues page
- static std::unique_ptr<SfxTabPage> CreateGeneratedValuesPage( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
+ static std::unique_ptr<SfxTabPage> CreateGeneratedValuesPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* _rAttrSet );
/// creates the "Special Settings" page of the "Advanced Settings" dialog
- static std::unique_ptr<SfxTabPage> CreateSpecialSettingsPage( TabPageParent _pParent, const SfxItemSet* _rAttrSet );
+ static std::unique_ptr<SfxTabPage> CreateSpecialSettingsPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* _rAttrSet );
};
}
diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
index ab8a20fa0385..f1e74c7e47c0 100644
--- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
+++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx
@@ -48,8 +48,7 @@ OTableSubscriptionDialog::OTableSubscriptionDialog(weld::Window* pParent
m_pImpl->translateProperties(xDatasource, *m_pOutSet);
SetInputSet(m_pOutSet.get());
- TabPageParent pPageParent(get_content_area(), this);
- auto xTabPage = std::make_unique<OTableSubscriptionPage>(pPageParent, *m_pOutSet, this);
+ auto xTabPage = std::make_unique<OTableSubscriptionPage>(get_content_area(), this, *m_pOutSet);
xTabPage->SetServiceFactory(_rxORB);
SetTabPage(std::move(xTabPage));
}
diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx
index 4d65851e0664..7e08b356be8b 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.cxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.cxx
@@ -108,8 +108,8 @@ IMPL_LINK(OPasswordDialog, ModifiedHdl, weld::Entry&, rEdit, void)
}
// OUserAdmin
-OUserAdmin::OUserAdmin(TabPageParent pParent,const SfxItemSet& _rAttrSet)
- : OGenericAdministrationPage(pParent, "dbaccess/ui/useradminpage.ui", "UserAdminPage", _rAttrSet)
+OUserAdmin::OUserAdmin(weld::Container* pPage, weld::DialogController* pController,const SfxItemSet& _rAttrSet)
+ : OGenericAdministrationPage(pPage, pController, "dbaccess/ui/useradminpage.ui", "UserAdminPage", _rAttrSet)
, m_xUSER(m_xBuilder->weld_combo_box("user"))
, m_xNEWUSER(m_xBuilder->weld_button("add"))
, m_xCHANGEPWD(m_xBuilder->weld_button("changepass"))
@@ -180,9 +180,9 @@ void OUserAdmin::FillUserNames()
m_xTableCtrl->Enable(m_xUsers.is());
}
-std::unique_ptr<SfxTabPage> OUserAdmin::Create( TabPageParent pParent, const SfxItemSet* _rAttrSet )
+std::unique_ptr<SfxTabPage> OUserAdmin::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* _rAttrSet )
{
- return std::make_unique<OUserAdmin>( pParent, *_rAttrSet );
+ return std::make_unique<OUserAdmin>( pPage, pController, *_rAttrSet );
}
IMPL_LINK(OUserAdmin, UserHdl, weld::Button&, rButton, void)
diff --git a/dbaccess/source/ui/dlg/UserAdmin.hxx b/dbaccess/source/ui/dlg/UserAdmin.hxx
index 50561a95f256..a69b338f6744 100644
--- a/dbaccess/source/ui/dlg/UserAdmin.hxx
+++ b/dbaccess/source/ui/dlg/UserAdmin.hxx
@@ -58,8 +58,8 @@ class OUserAdmin final : public OGenericAdministrationPage
void FillUserNames();
public:
- OUserAdmin(TabPageParent pParent, const SfxItemSet& _rCoreAttrs);
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
+ OUserAdmin(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet);
virtual ~OUserAdmin() override;
OUString GetUser() const;
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 6678824e28db..5a88cba1771c 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -54,8 +54,8 @@ namespace dbaui
{
}
- OGenericAdministrationPage::OGenericAdministrationPage(TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rId, const SfxItemSet& rAttrSet)
- : SfxTabPage(pParent, rUIXMLDescription, rId, &rAttrSet)
+ OGenericAdministrationPage::OGenericAdministrationPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rId, const SfxItemSet& rAttrSet)
+ : SfxTabPage(pPage, pController, rUIXMLDescription, rId, &rAttrSet)
, m_abEnableRoadmap(false)
, m_pAdminDialog(nullptr)
, m_pItemSetHelper(nullptr)
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index bc473b627ece..0caab50c9636 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -101,7 +101,7 @@ namespace dbaui
css::uno::Reference< css::uno::XComponentContext >
m_xORB;
public:
- OGenericAdministrationPage(TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rId, const SfxItemSet& rAttrSet);
+ OGenericAdministrationPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rId, const SfxItemSet& rAttrSet);
/// set a handler which gets called every time something on the page has been modified
void SetModifiedHandler(const Link<OGenericAdministrationPage const *, void>& _rHandler) { m_aModifiedHandler = _rHandler; }
diff --git a/dbaccess/source/ui/dlg/advancedsettings.cxx b/dbaccess/source/ui/dlg/advancedsettings.cxx
index 02661a2871c0..72715285b013 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.cxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.cxx
@@ -54,8 +54,8 @@ namespace dbaui
};
// SpecialSettingsPage
- SpecialSettingsPage::SpecialSettingsPage(TabPageParent pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta)
- : OGenericAdministrationPage(pParent, "dbaccess/ui/specialsettingspage.ui", "SpecialSettingsPage", _rCoreAttrs)
+ SpecialSettingsPage::SpecialSettingsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta)
+ : OGenericAdministrationPage(pPage, pController, "dbaccess/ui/specialsettingspage.ui", "SpecialSettingsPage", _rCoreAttrs)
, m_aBooleanSettings {
{ m_xIsSQL92Check, "usesql92", DSID_SQL92CHECK, false, false },
{ m_xAppendTableAlias, "append", DSID_APPEND_TABLE_ALIAS, false, false },
@@ -284,8 +284,8 @@ namespace dbaui
}
// GeneratedValuesPage
- GeneratedValuesPage::GeneratedValuesPage(TabPageParent pParent, const SfxItemSet& _rCoreAttrs)
- : OGenericAdministrationPage(pParent, "dbaccess/ui/generatedvaluespage.ui", "GeneratedValuesPage", _rCoreAttrs)
+ GeneratedValuesPage::GeneratedValuesPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs)
+ : OGenericAdministrationPage(pPage, pController, "dbaccess/ui/generatedvaluespage.ui", "GeneratedValuesPage", _rCoreAttrs)
, m_xAutoRetrievingEnabled(m_xBuilder->weld_check_button("autoretrieve"))
, m_xGrid(m_xBuilder->weld_widget("grid"))
, m_xAutoIncrementLabel(m_xBuilder->weld_label("statementft"))
diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx
index 002c5cda4ac1..85848c716c97 100644
--- a/dbaccess/source/ui/dlg/advancedsettings.hxx
+++ b/dbaccess/source/ui/dlg/advancedsettings.hxx
@@ -72,7 +72,7 @@ namespace dbaui
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override;
- SpecialSettingsPage(TabPageParent pParent, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta);
+ SpecialSettingsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs, const DataSourceMetaData& _rDSMeta);
virtual ~SpecialSettingsPage() override;
private:
@@ -101,7 +101,7 @@ namespace dbaui
public:
virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) override;
- GeneratedValuesPage(TabPageParent pParent, const SfxItemSet& _rCoreAttrs);
+ GeneratedValuesPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs);
virtual ~GeneratedValuesPage() override;
private:
diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx
index 76e933a40651..b136744ed975 100644
--- a/dbaccess/source/ui/dlg/dbwiz.cxx
+++ b/dbaccess/source/ui/dlg/dbwiz.cxx
@@ -226,53 +226,51 @@ std::unique_ptr<BuilderPage> ODbTypeWizDialog::createPage(WizardState _nState)
OString sIdent(OString::number(_nState));
weld::Container* pPageContainer = m_xAssistant->append_page(sIdent);
- // TODO eventually pass DialogController as distinct argument instead of bundling into TabPageParent
- TabPageParent aParent(pPageContainer, this);
switch(_nState)
{
case START_PAGE: // start state
{
- xPage = std::make_unique<OGeneralPageDialog>(aParent, *m_pOutSet);
+ xPage = std::make_unique<OGeneralPageDialog>(pPageContainer, this, *m_pOutSet);
OGeneralPage* pGeneralPage = static_cast<OGeneralPage*>(xPage.get());
pGeneralPage->SetTypeSelectHandler( LINK( this, ODbTypeWizDialog, OnTypeSelected));
pStringId = STR_PAGETITLE_GENERAL;
}
break;
case CONNECTION_PAGE:
- xPage = OConnectionTabPage::Create(aParent, m_pOutSet.get());
+ xPage = OConnectionTabPage::Create(pPageContainer, this, m_pOutSet.get());
pStringId = STR_PAGETITLE_CONNECTION;
break;
case ADDITIONAL_PAGE_DBASE:
- xPage = ODriversSettings::CreateDbase(aParent, m_pOutSet.get());
+ xPage = ODriversSettings::CreateDbase(pPageContainer, this, m_pOutSet.get());
break;
case ADDITIONAL_PAGE_FLAT:
- xPage = ODriversSettings::CreateText(aParent, m_pOutSet.get());
+ xPage = ODriversSettings::CreateText(pPageContainer, this, m_pOutSet.get());
break;
case ADDITIONAL_PAGE_LDAP:
- xPage = ODriversSettings::CreateLDAP(aParent, m_pOutSet.get());
+ xPage = ODriversSettings::CreateLDAP(pPageContainer, this, m_pOutSet.get());
break;
case ADDITIONAL_PAGE_MYSQL_JDBC:
- xPage = ODriversSettings::CreateMySQLJDBC(aParent, m_pOutSet.get());
+ xPage = ODriversSettings::CreateMySQLJDBC(pPageContainer, this, m_pOutSet.get());
break;
case ADDITIONAL_PAGE_MYSQL_NATIVE:
- xPage = ODriversSettings::CreateMySQLNATIVE(aParent, m_pOutSet.get());
+ xPage = ODriversSettings::CreateMySQLNATIVE(pPageContainer, this, m_pOutSet.get());
break;
case ADDITIONAL_PAGE_MYSQL_ODBC:
- xPage = ODriversSettings::CreateMySQLODBC(aParent, m_pOutSet.get());
+ xPage = ODriversSettings::CreateMySQLODBC(pPageContainer, this, m_pOutSet.get());
break;
case ADDITIONAL_PAGE_ORACLE_JDBC:
- xPage = ODriversSettings::CreateOracleJDBC(aParent, m_pOutSet.get());
+ xPage = ODriversSettings::CreateOracleJDBC(pPageContainer, this, m_pOutSet.get());
break;
case ADDITIONAL_PAGE_ADO:
- xPage = ODriversSettings::CreateAdo(aParent, m_pOutSet.get());
+ xPage = ODriversSettings::CreateAdo(pPageContainer, this, m_pOutSet.get());
break;
case ADDITIONAL_PAGE_ODBC:
- xPage = ODriversSettings::CreateODBC(aParent, m_pOutSet.get());
+ xPage = ODriversSettings::CreateODBC(pPageContainer, this, m_pOutSet.get());
break;
case ADDITIONAL_USERDEFINED:
- xPage = ODriversSettings::CreateUser(aParent, m_pOutSet.get());
+ xPage = ODriversSettings::CreateUser(pPageContainer, this, m_pOutSet.get());
break;
default:
OSL_FAIL("Wrong state!");
diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx
index 6431801d82a7..a68ec099e218 100644
--- a/dbaccess/source/ui/dlg/dbwizsetup.cxx
+++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx
@@ -452,13 +452,11 @@ std::unique_ptr<BuilderPage> ODbTypeWizDialogSetup::createPage(WizardState _nSta
OString sIdent(OString::number(_nState));
weld::Container* pPageContainer = m_xAssistant->append_page(sIdent);
- // TODO eventually pass DialogController as distinct argument instead of bundling into TabPageParent
- TabPageParent aParent(pPageContainer, this);
switch(_nState)
{
case PAGE_DBSETUPWIZARD_INTRO:
- xPage = std::make_unique<OGeneralPageWizard>(aParent,*m_pOutSet);
+ xPage = std::make_unique<OGeneralPageWizard>(pPageContainer,this,*m_pOutSet);
m_pGeneralPage = static_cast<OGeneralPageWizard*>(xPage.get());
m_pGeneralPage->SetTypeSelectHandler(LINK(this, ODbTypeWizDialogSetup, OnTypeSelected));
m_pGeneralPage->SetCreationModeHandler(LINK( this, ODbTypeWizDialogSetup, OnChangeCreationMode ) );
@@ -467,70 +465,70 @@ std::unique_ptr<BuilderPage> ODbTypeWizDialogSetup::createPage(WizardState _nSta
break;
case PAGE_DBSETUPWIZARD_DBASE:
- xPage = OConnectionTabPageSetup::CreateDbaseTabPage(aParent, *m_pOutSet);
+ xPage = OConnectionTabPageSetup::CreateDbaseTabPage(pPageContainer, this, *m_pOutSet);
break;
case PAGE_DBSETUPWIZARD_ADO:
- xPage = OConnectionTabPageSetup::CreateADOTabPage(aParent, *m_pOutSet);
+ xPage = OConnectionTabPageSetup::CreateADOTabPage(pPageContainer, this, *m_pOutSet);
break;
case PAGE_DBSETUPWIZARD_TEXT:
- xPage = OTextConnectionPageSetup::CreateTextTabPage(aParent, *m_pOutSet);
+ xPage = OTextConnectionPageSetup::CreateTextTabPage(pPageContainer, this, *m_pOutSet);
break;
case PAGE_DBSETUPWIZARD_ODBC:
- xPage = OConnectionTabPageSetup::CreateODBCTabPage(aParent, *m_pOutSet);
+ xPage = OConnectionTabPageSetup::CreateODBCTabPage(pPageContainer, this, *m_pOutSet);
break;
case PAGE_DBSETUPWIZARD_JDBC:
- xPage = OJDBCConnectionPageSetup::CreateJDBCTabPage(aParent, *m_pOutSet);
+ xPage = OJDBCConnectionPageSetup::CreateJDBCTabPage(pPageContainer, this, *m_pOutSet);
break;
case PAGE_DBSETUPWIZARD_MYSQL_ODBC:
m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix("sdbc:mysql:odbc:")));
- xPage = OConnectionTabPageSetup::CreateODBCTabPage(aParent, *m_pOutSet);
+ xPage = OConnectionTabPageSetup::CreateODBCTabPage(pPageContainer, this, *m_pOutSet);
break;
case PAGE_DBSETUPWIZARD_MYSQL_JDBC:
m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix("sdbc:mysql:jdbc:")));
- xPage = OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage(aParent, *m_pOutSet);
+ xPage = OGeneralSpecialJDBCConnectionPageSetup::CreateMySQLJDBCTabPage(pPageContainer, this, *m_pOutSet);
break;
case PAGE_DBSETUPWIZARD_MYSQL_NATIVE:
m_pOutSet->Put(SfxStringItem(DSID_CONNECTURL, m_pCollection->getPrefix("sdbc:mysql:mysqlc:")));
- xPage = MySQLNativeSetupPage::Create(aParent, *m_pOutSet);
+ xPage = MySQLNativeSetupPage::Create(pPageContainer, this, *m_pOutSet);
break;
case PAGE_DBSETUPWIZARD_ORACLE:
- xPage = OGeneralSpecialJDBCConnectionPageSetup::CreateOracleJDBCTabPage(aParent, *m_pOutSet);
+ xPage = OGeneralSpecialJDBCConnectionPageSetup::CreateOracleJDBCTabPage(pPageContainer, this, *m_pOutSet);
break;
case PAGE_DBSETUPWIZARD_LDAP:
- xPage = OLDAPConnectionPageSetup::CreateLDAPTabPage(aParent, *m_pOutSet);
+ xPage = OLDAPConnectionPageSetup::CreateLDAPTabPage(pPageContainer, this, *m_pOutSet);
break;
case PAGE_DBSETUPWIZARD_DOCUMENT_OR_SPREADSHEET:
- xPage = OSpreadSheetConnectionPageSetup::CreateDocumentOrSpreadSheetTabPage(aParent, *m_pOutSet);
+ xPage = OSpreadSheetConnectionPageSetup::CreateDocumentOrSpreadSheetTabPage(pPageContainer, this, *m_pOutSet);
break;
case PAGE_DBSETUPWIZARD_MSACCESS:
- xPage = OConnectionTabPageSetup::CreateMSAccessTabPage(aParent, *m_pOutSet);
+ xPage = OConnectionTabPageSetup::CreateMSAccessTabPage(pPageContainer, this, *m_pOutSet);
break;
case PAGE_DBSETUPWIZARD_MYSQL_INTRO:
- xPage = OMySQLIntroPageSetup::CreateMySQLIntroTabPage(aParent, *m_pOutSet);
+ xPage = OMySQLIntroPageSetup::CreateMySQLIntroTabPage(pPageContainer, this, *m_pOutSet);
m_pMySQLIntroPage = static_cast<OMySQLIntroPageSetup*>(xPage.get());
m_pMySQLIntroPage->SetClickHdl(LINK( this, ODbTypeWizDialogSetup, ImplClickHdl ) );
break;
case PAGE_DBSETUPWIZARD_AUTHENTIFICATION:
- xPage = OAuthentificationPageSetup::CreateAuthentificationTabPage(aParent, *m_pOutSet);
+ xPage = OAuthentificationPageSetup::CreateAuthentificationTabPage(pPageContainer, this, *m_pOutSet);
break;
case PAGE_DBSETUPWIZARD_USERDEFINED:
- xPage = OConnectionTabPageSetup::CreateUserDefinedTabPage(aParent, *m_pOutSet);
+ xPage = OConnectionTabPageSetup::CreateUserDefinedTabPage(pPageContainer, this, *m_pOutSet);
break;
case PAGE_DBSETUPWIZARD_FINAL:
- xPage = OFinalDBPageSetup::CreateFinalDBTabPageSetup(aParent, *m_pOutSet);
+ xPage = OFinalDBPageSetup::CreateFinalDBTabPageSetup(pPageContainer, this, *m_pOutSet);
m_pFinalPage = static_cast<OFinalDBPageSetup*>(xPage.get());
break;
}
diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx
index 21ad0a6e312d..b41f59bc7260 100644
--- a/dbaccess/source/ui/dlg/detailpages.cxx
+++ b/dbaccess/source/ui/dlg/detailpages.cxx
@@ -54,10 +54,10 @@ namespace dbaui
using namespace ::com::sun::star::container;
using namespace ::dbtools;
- OCommonBehaviourTabPage::OCommonBehaviourTabPage(TabPageParent pParent,
+ OCommonBehaviourTabPage::OCommonBehaviourTabPage(weld::Container* pPage, weld::DialogController* pController,
const OUString& rUIXMLDescription, const OString& rId, const SfxItemSet& rCoreAttrs,
OCommonBehaviourTabPageFlags nControlFlags)
- : OGenericAdministrationPage(pParent, rUIXMLDescription, rId, rCoreAttrs)
+ : OGenericAdministrationPage(pPage, pController, rUIXMLDescription, rId, rCoreAttrs)
, m_nControlFlags(nControlFlags)
{
if (m_nControlFlags & OCommonBehaviourTabPageFlags::UseOptions)
@@ -159,8 +159,8 @@ namespace dbaui
}
// ODbaseDetailsPage
- ODbaseDetailsPage::ODbaseDetailsPage(TabPageParent pParent, const SfxItemSet& _rCoreAttrs)
- : OCommonBehaviourTabPage(pParent, "dbaccess/ui/dbasepage.ui", "DbasePage",
+ ODbaseDetailsPage::ODbaseDetailsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs)
+ : OCommonBehaviourTabPage(pPage, pController, "dbaccess/ui/dbasepage.ui", "DbasePage",
_rCoreAttrs, OCommonBehaviourTabPageFlags::UseCharset)
, m_xShowDeleted(m_xBuilder->weld_check_button("showDelRowsCheckbutton"))
, m_xFT_Message(m_xBuilder->weld_label("specMessageLabel"))
@@ -174,9 +174,9 @@ namespace dbaui
{
}
- std::unique_ptr<SfxTabPage> ODriversSettings::CreateDbase(TabPageParent pParent, const SfxItemSet* _rAttrSet)
+ std::unique_ptr<SfxTabPage> ODriversSettings::CreateDbase(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* _rAttrSet)
{
- return std::make_unique<ODbaseDetailsPage>(pParent, *_rAttrSet);
+ return std::make_unique<ODbaseDetailsPage>(pPage, pController, *_rAttrSet);
}
void ODbaseDetailsPage::implInitControls(const SfxItemSet& _rSet, bool _bSaveValue)
@@ -228,21 +228,21 @@ namespace dbaui
}
// OAdoDetailsPage
- OAdoDetailsPage::OAdoDetailsPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
- : OCommonBehaviourTabPage(pParent, "dbaccess/ui/autocharsetpage.ui", "AutoCharset",
+ OAdoDetailsPage::OAdoDetailsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs)
+ : OCommonBehaviourTabPage(pPage, pController, "dbaccess/ui/autocharsetpage.ui", "AutoCharset",
rCoreAttrs, OCommonBehaviourTabPageFlags::UseCharset )
{
}
- std::unique_ptr<SfxTabPage> ODriversSettings::CreateAdo(TabPageParent pParent, const SfxItemSet* rAttrSet)
+ std::unique_ptr<SfxTabPage> ODriversSettings::CreateAdo(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
{
- return std::make_unique<OAdoDetailsPage>(pParent, *rAttrSet);
+ return std::make_unique<OAdoDetailsPage>(pPage, pController, *rAttrSet);
}
// OOdbcDetailsPage
- OOdbcDetailsPage::OOdbcDetailsPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
- : OCommonBehaviourTabPage(pParent, "dbaccess/ui/odbcpage.ui", "ODBC", rCoreAttrs,
+ OOdbcDetailsPage::OOdbcDetailsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs)
+ : OCommonBehaviourTabPage(pPage, pController, "dbaccess/ui/odbcpage.ui", "ODBC", rCoreAttrs,
OCommonBehaviourTabPageFlags::UseCharset | OCommonBehaviourTabPageFlags::UseOptions)
, m_xUseCatalog(m_xBuilder->weld_check_button("useCatalogCheckbutton"))
{
@@ -253,9 +253,9 @@ namespace dbaui
{
}
- std::unique_ptr<SfxTabPage> ODriversSettings::CreateODBC(TabPageParent pParent, const SfxItemSet* pAttrSet)
+ std::unique_ptr<SfxTabPage> ODriversSettings::CreateODBC(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* pAttrSet)
{
- return std::make_unique<OOdbcDetailsPage>(pParent, *pAttrSet);
+ return std::make_unique<OOdbcDetailsPage>(pPage, pController, *pAttrSet);
}
bool OOdbcDetailsPage::FillItemSet( SfxItemSet* _rSet )
@@ -278,8 +278,8 @@ namespace dbaui
OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue);
}
// OOdbcDetailsPage
- OUserDriverDetailsPage::OUserDriverDetailsPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
- : OCommonBehaviourTabPage(pParent, "dbaccess/ui/userdetailspage.ui", "UserDetailsPage",
+ OUserDriverDetailsPage::OUserDriverDetailsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs)
+ : OCommonBehaviourTabPage(pPage, pController, "dbaccess/ui/userdetailspage.ui", "UserDetailsPage",
rCoreAttrs, OCommonBehaviourTabPageFlags::UseCharset | OCommonBehaviourTabPageFlags::UseOptions)
, m_xFTHostname(m_xBuilder->weld_label("hostnameft"))
, m_xEDHostname(m_xBuilder->weld_entry("hostname"))
@@ -294,9 +294,9 @@ namespace dbaui
{
}
- std::unique_ptr<SfxTabPage> ODriversSettings::CreateUser(TabPageParent pParent, const SfxItemSet* pAttrSet)
+ std::unique_ptr<SfxTabPage> ODriversSettings::CreateUser(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* pAttrSet)
{
- return std::make_unique<OUserDriverDetailsPage>(pParent, *pAttrSet);
+ return std::make_unique<OUserDriverDetailsPage>(pPage, pController, *pAttrSet);
}
bool OUserDriverDetailsPage::FillItemSet( SfxItemSet* _rSet )
@@ -346,20 +346,20 @@ namespace dbaui
OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue);
}
// OMySQLODBCDetailsPage
- OMySQLODBCDetailsPage::OMySQLODBCDetailsPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
- : OCommonBehaviourTabPage(pParent, "dbaccess/ui/autocharsetpage.ui", "AutoCharset",
+ OMySQLODBCDetailsPage::OMySQLODBCDetailsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs)
+ : OCommonBehaviourTabPage(pPage, pController, "dbaccess/ui/autocharsetpage.ui", "AutoCharset",
rCoreAttrs, OCommonBehaviourTabPageFlags::UseCharset )
{
}
- std::unique_ptr<SfxTabPage> ODriversSettings::CreateMySQLODBC(TabPageParent pParent, const SfxItemSet* pAttrSet)
+ std::unique_ptr<SfxTabPage> ODriversSettings::CreateMySQLODBC(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* pAttrSet)
{
- return std::make_unique<OMySQLODBCDetailsPage>(pParent, *pAttrSet);
+ return std::make_unique<OMySQLODBCDetailsPage>(pPage, pController, *pAttrSet);
}
// OMySQLJDBCDetailsPage
- OGeneralSpecialJDBCDetailsPage::OGeneralSpecialJDBCDetailsPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs ,sal_uInt16 _nPortId, bool bShowSocket)
- : OCommonBehaviourTabPage(pParent, "dbaccess/ui/generalspecialjdbcdetailspage.ui", "GeneralSpecialJDBCDetails",
+ OGeneralSpecialJDBCDetailsPage::OGeneralSpecialJDBCDetailsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs ,sal_uInt16 _nPortId, bool bShowSocket)
+ : OCommonBehaviourTabPage(pPage, pController, "dbaccess/ui/generalspecialjdbcdetailspage.ui", "GeneralSpecialJDBCDetails",
rCoreAttrs, OCommonBehaviourTabPageFlags::UseCharset)
, m_nPortId(_nPortId)
, m_bUseClass(true)
@@ -489,8 +489,8 @@ namespace dbaui
}
// MySQLNativePage
- MySQLNativePage::MySQLNativePage(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
- : OCommonBehaviourTabPage(pParent, "dbaccess/ui/mysqlnativepage.ui", "MysqlNativePage", rCoreAttrs, OCommonBehaviourTabPageFlags::UseCharset)
+ MySQLNativePage::MySQLNativePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs)
+ : OCommonBehaviourTabPage(pPage, pController, "dbaccess/ui/mysqlnativepage.ui", "MysqlNativePage", rCoreAttrs, OCommonBehaviourTabPageFlags::UseCharset)
, m_xMySQLSettingsContainer(m_xBuilder->weld_widget("MySQLSettingsContainer"))
, m_xMySQLSettings(new MySQLNativeSettings(m_xMySQLSettingsContainer.get(), LINK(this,OGenericAdministrationPage,OnControlModified)))
, m_xSeparator1(m_xBuilder->weld_label("connectionheader"))
@@ -563,24 +563,24 @@ namespace dbaui
OCommonBehaviourTabPage::implInitControls(_rSet, _bSaveValue);
}
- std::unique_ptr<SfxTabPage> ODriversSettings::CreateMySQLJDBC( TabPageParent pParent, const SfxItemSet* _rAttrSet )
+ std::unique_ptr<SfxTabPage> ODriversSettings::CreateMySQLJDBC( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* _rAttrSet )
{
- return std::make_unique<OGeneralSpecialJDBCDetailsPage>(pParent, *_rAttrSet,DSID_MYSQL_PORTNUMBER);
+ return std::make_unique<OGeneralSpecialJDBCDetailsPage>(pPage, pController, *_rAttrSet,DSID_MYSQL_PORTNUMBER);
}
- std::unique_ptr<SfxTabPage> ODriversSettings::CreateMySQLNATIVE(TabPageParent pParent, const SfxItemSet* pAttrSet)
+ std::unique_ptr<SfxTabPage> ODriversSettings::CreateMySQLNATIVE(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* pAttrSet)
{
- return std::make_unique<MySQLNativePage>(pParent, *pAttrSet);
+ return std::make_unique<MySQLNativePage>(pPage, pController, *pAttrSet);
}
- std::unique_ptr<SfxTabPage> ODriversSettings::CreateOracleJDBC(TabPageParent pParent, const SfxItemSet* _rAttrSet)
+ std::unique_ptr<SfxTabPage> ODriversSettings::CreateOracleJDBC(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* _rAttrSet)
{
- return std::make_unique<OGeneralSpecialJDBCDetailsPage>(pParent, *_rAttrSet,DSID_ORACLE_PORTNUMBER, false);
+ return std::make_unique<OGeneralSpecialJDBCDetailsPage>(pPage, pController, *_rAttrSet,DSID_ORACLE_PORTNUMBER, false);
}
// OLDAPDetailsPage
- OLDAPDetailsPage::OLDAPDetailsPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
- : OCommonBehaviourTabPage(pParent, "dbaccess/ui/ldappage.ui", "LDAP",
+ OLDAPDetailsPage::OLDAPDetailsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs)
+ : OCommonBehaviourTabPage(pPage, pController, "dbaccess/ui/ldappage.ui", "LDAP",
rCoreAttrs, OCommonBehaviourTabPageFlags::NONE)
, m_xETBaseDN(m_xBuilder->weld_entry("baseDNEntry"))
, m_xCBUseSSL(m_xBuilder->weld_check_button("useSSLCheckbutton"))
@@ -600,9 +600,9 @@ namespace dbaui
{
}
- std::unique_ptr<SfxTabPage> ODriversSettings::CreateLDAP(TabPageParent pParent, const SfxItemSet* _rAttrSet)
+ std::unique_ptr<SfxTabPage> ODriversSettings::CreateLDAP(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* _rAttrSet)
{
- return std::make_unique<OLDAPDetailsPage>(pParent, *_rAttrSet);
+ return std::make_unique<OLDAPDetailsPage>(pPage, pController, *_rAttrSet);
}
bool OLDAPDetailsPage::FillItemSet( SfxItemSet* _rSet )
@@ -655,8 +655,8 @@ namespace dbaui
}
// OTextDetailsPage
- OTextDetailsPage::OTextDetailsPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
- : OCommonBehaviourTabPage(pParent, "dbaccess/ui/emptypage.ui", "EmptyPage", rCoreAttrs, OCommonBehaviourTabPageFlags::NONE)
+ OTextDetailsPage::OTextDetailsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs)
+ : OCommonBehaviourTabPage(pPage, pController, "dbaccess/ui/emptypage.ui", "EmptyPage", rCoreAttrs, OCommonBehaviourTabPageFlags::NONE)
, m_xTextConnectionHelper(new OTextConnectionHelper(m_xContainer.get(), TC_EXTENSION | TC_HEADER | TC_SEPARATORS | TC_CHARSET))
{
}
@@ -666,9 +666,9 @@ namespace dbaui
m_xTextConnectionHelper.reset();
}
- std::unique_ptr<SfxTabPage> ODriversSettings::CreateText(TabPageParent pParent, const SfxItemSet* pAttrSet)
+ std::unique_ptr<SfxTabPage> ODriversSettings::CreateText(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* pAttrSet)
{
- return std::make_unique<OTextDetailsPage>(pParent, *pAttrSet);
+ return std::make_unique<OTextDetailsPage>(pPage, pController, *pAttrSet);
}
void OTextDetailsPage::fillControls(std::vector< std::unique_ptr<ISaveValueWrapper> >& _rControlList)
@@ -705,16 +705,16 @@ namespace dbaui
return m_xTextConnectionHelper->prepareLeave();
}
- std::unique_ptr<SfxTabPage> ODriversSettings::CreateGeneratedValuesPage(TabPageParent pParent, const SfxItemSet* _rAttrSet)
+ std::unique_ptr<SfxTabPage> ODriversSettings::CreateGeneratedValuesPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* _rAttrSet)
{
- return std::make_unique<GeneratedValuesPage>(pParent, *_rAttrSet);
+ return std::make_unique<GeneratedValuesPage>(pPage, pController, *_rAttrSet);
}
- std::unique_ptr<SfxTabPage> ODriversSettings::CreateSpecialSettingsPage(TabPageParent pParent, const SfxItemSet* _rAttrSet)
+ std::unique_ptr<SfxTabPage> ODriversSettings::CreateSpecialSettingsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* _rAttrSet)
{
OUString eType = ODbDataSourceAdministrationHelper::getDatasourceType( *_rAttrSet );
DataSourceMetaData aMetaData( eType );
- return std::make_unique<SpecialSettingsPage>(pParent, *_rAttrSet, aMetaData);
+ return std::make_unique<SpecialSettingsPage>(pPage, pController, *_rAttrSet, aMetaData);
}
} // namespace dbaui
diff --git a/dbaccess/source/ui/dlg/detailpages.hxx b/dbaccess/source/ui/dlg/detailpages.hxx
index bc0086d65648..541c289255f6 100644
--- a/dbaccess/source/ui/dlg/detailpages.hxx
+++ b/dbaccess/source/ui/dlg/detailpages.hxx
@@ -65,7 +65,7 @@ namespace dbaui
public:
virtual bool FillItemSet (SfxItemSet* _rCoreAttrs) override;
- OCommonBehaviourTabPage(TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rId, const SfxItemSet& _rCoreAttrs, OCommonBehaviourTabPageFlags nControlFlags);
+ OCommonBehaviourTabPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rId, const SfxItemSet& _rCoreAttrs, OCommonBehaviourTabPageFlags nControlFlags);
protected:
virtual ~OCommonBehaviourTabPage() override;
@@ -89,7 +89,7 @@ namespace dbaui
public:
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override;
- ODbaseDetailsPage(TabPageParent pParent, const SfxItemSet& _rCoreAttrs);
+ ODbaseDetailsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs);
virtual ~ODbaseDetailsPage() override;
private:
OUString m_sDsn;
@@ -109,7 +109,7 @@ namespace dbaui
class OAdoDetailsPage : public OCommonBehaviourTabPage
{
public:
- OAdoDetailsPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
+ OAdoDetailsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs);
};
// OOdbcDetailsPage
@@ -118,7 +118,7 @@ namespace dbaui
public:
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override;
- OOdbcDetailsPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
+ OOdbcDetailsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs);
virtual ~OOdbcDetailsPage() override;
protected:
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
@@ -132,7 +132,7 @@ namespace dbaui
public:
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override;
- OUserDriverDetailsPage(TabPageParent pParent, const SfxItemSet& _rCoreAttrs);
+ OUserDriverDetailsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rCoreAttrs);
virtual ~OUserDriverDetailsPage() override;
protected:
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
@@ -150,14 +150,14 @@ namespace dbaui
class OMySQLODBCDetailsPage : public OCommonBehaviourTabPage
{
public:
- OMySQLODBCDetailsPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
+ OMySQLODBCDetailsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs);
};
// OGeneralSpecialJDBCDetailsPage
class OGeneralSpecialJDBCDetailsPage final : public OCommonBehaviourTabPage
{
public:
- OGeneralSpecialJDBCDetailsPage(TabPageParent pParent,
+ OGeneralSpecialJDBCDetailsPage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& _rCoreAttrs,
sal_uInt16 _nPortId,
bool bShowSocket = true);
@@ -188,7 +188,7 @@ namespace dbaui
class MySQLNativePage : public OCommonBehaviourTabPage
{
public:
- MySQLNativePage(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
+ MySQLNativePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs);
virtual ~MySQLNativePage() override;
private:
@@ -213,7 +213,7 @@ namespace dbaui
public:
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override;
- OLDAPDetailsPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
+ OLDAPDetailsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs);
virtual ~OLDAPDetailsPage() override;
protected:
virtual void implInitControls(const SfxItemSet& _rSet, bool _bSaveValue) override;
@@ -235,7 +235,7 @@ namespace dbaui
public:
virtual bool FillItemSet ( SfxItemSet* _rCoreAttrs ) override;
- OTextDetailsPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
+ OTextDetailsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs);
virtual ~OTextDetailsPage() override;
protected:
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index 8c65d9720f41..97cf3ef08625 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -53,8 +53,8 @@ namespace dbaui
using namespace ::com::sun::star::container;
// OGeneralPage
- OGeneralPage::OGeneralPage(TabPageParent pParent, const OUString& _rUIXMLDescription, const SfxItemSet& _rItems)
- : OGenericAdministrationPage(pParent, _rUIXMLDescription, "PageGeneral", _rItems)
+ OGeneralPage::OGeneralPage(weld::Container* pPage, weld::DialogController* pController, const OUString& _rUIXMLDescription, const SfxItemSet& _rItems)
+ : OGenericAdministrationPage(pPage, pController, _rUIXMLDescription, "PageGeneral", _rItems)
, m_xSpecialMessage(m_xBuilder->weld_label("specialMessage"))
, m_eLastMessage(smNone)
, m_bInitTypeList(true)
@@ -401,8 +401,8 @@ namespace dbaui
}
// OGeneralPageDialog
- OGeneralPageDialog::OGeneralPageDialog(TabPageParent pParent, const SfxItemSet& _rItems)
- : OGeneralPage(pParent, "dbaccess/ui/generalpagedialog.ui", _rItems)
+ OGeneralPageDialog::OGeneralPageDialog(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rItems)
+ : OGeneralPage(pPage, pController, "dbaccess/ui/generalpagedialog.ui", _rItems)
{
}
@@ -444,8 +444,8 @@ namespace dbaui
}
// OGeneralPageWizard
- OGeneralPageWizard::OGeneralPageWizard(TabPageParent pParent, const SfxItemSet& _rItems)
- : OGeneralPage( pParent, "dbaccess/ui/generalpagewizard.ui", _rItems )
+ OGeneralPageWizard::OGeneralPageWizard(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rItems)
+ : OGeneralPage( pPage, pController, "dbaccess/ui/generalpagewizard.ui", _rItems )
, m_xRB_CreateDatabase(m_xBuilder->weld_radio_button("createDatabase"))
, m_xRB_OpenExistingDatabase(m_xBuilder->weld_radio_button("openExistingDatabase"))
, m_xRB_ConnectDatabase(m_xBuilder->weld_radio_button("connectDatabase"))
diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx
index 4200b16483d2..1579b6bb74a6 100644
--- a/dbaccess/source/ui/dlg/generalpage.hxx
+++ b/dbaccess/source/ui/dlg/generalpage.hxx
@@ -29,7 +29,7 @@ namespace dbaui
class OGeneralPage : public OGenericAdministrationPage
{
protected:
- OGeneralPage(TabPageParent pParent, const OUString& _rUIXMLDescription, const SfxItemSet& _rItems);
+ OGeneralPage(weld::Container* pPage, weld::DialogController* pController, const OUString& _rUIXMLDescription, const SfxItemSet& _rItems);
OUString m_eCurrentSelection; /// currently selected type
@@ -101,7 +101,7 @@ namespace dbaui
class OGeneralPageDialog : public OGeneralPage
{
public:
- OGeneralPageDialog(TabPageParent pParent, const SfxItemSet& _rItems);
+ OGeneralPageDialog(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rItems);
protected:
virtual bool FillItemSet( SfxItemSet* _rCoreAttrs ) override;
@@ -114,7 +114,7 @@ namespace dbaui
class OGeneralPageWizard final : public OGeneralPage
{
public:
- OGeneralPageWizard( TabPageParent pParent, const SfxItemSet& _rItems );
+ OGeneralPageWizard( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& _rItems );
virtual ~OGeneralPageWizard() override;
enum CreationMode
diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx
index ec1d912ac7cf..fb42e7ec49ab 100644
--- a/dbaccess/source/ui/dlg/tablespage.cxx
+++ b/dbaccess/source/ui/dlg/tablespage.cxx
@@ -65,11 +65,10 @@ namespace dbaui
using namespace ::comphelper;
// OTableSubscriptionPage
- OTableSubscriptionPage::OTableSubscriptionPage(TabPageParent pParent, const SfxItemSet& _rCoreAttrs,
- OTableSubscriptionDialog* _pTablesDlg)
- : OGenericAdministrationPage(pParent, "dbaccess/ui/tablesfilterpage.ui", "TablesFilterPage", _rCoreAttrs)
+ OTableSubscriptionPage::OTableSubscriptionPage(weld::Container* pPage, OTableSubscriptionDialog* pTablesDlg, const SfxItemSet& _rCoreAttrs)
+ : OGenericAdministrationPage(pPage, pTablesDlg, "dbaccess/ui/tablesfilterpage.ui", "TablesFilterPage", _rCoreAttrs)
, m_bCatalogAtStart(true)
- , m_pTablesDlg(_pTablesDlg)
+ , m_pTablesDlg(pTablesDlg)
, m_xTables(m_xBuilder->weld_widget("TablesFilterPage"))
, m_xTablesList(new TableTreeListBox(m_xBuilder->weld_tree_view("treeview")))
{
diff --git a/dbaccess/source/ui/dlg/tablespage.hxx b/dbaccess/source/ui/dlg/tablespage.hxx
index 24ef1c05f9e5..d545e9408bc6 100644
--- a/dbaccess/source/ui/dlg/tablespage.hxx
+++ b/dbaccess/source/ui/dlg/tablespage.hxx
@@ -49,7 +49,7 @@ namespace dbaui
virtual bool FillItemSet(SfxItemSet* _rCoreAttrs) override;
virtual DeactivateRC DeactivatePage(SfxItemSet* _pSet) override;
- OTableSubscriptionPage(TabPageParent pParent, const SfxItemSet& _rCoreAttrs ,OTableSubscriptionDialog* _pTablesDlg);
+ OTableSubscriptionPage(weld::Container* pPage, OTableSubscriptionDialog* pController, const SfxItemSet& _rCoreAttrs);
virtual ~OTableSubscriptionPage() override;
private:
diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx
index 5a4c6111eb05..cd247af88380 100644
--- a/dbaccess/source/ui/inc/FieldDescControl.hxx
+++ b/dbaccess/source/ui/inc/FieldDescControl.hxx
@@ -164,7 +164,7 @@ namespace dbaui
void implFocusLost(weld::Widget* _pWhich);
public:
- OFieldDescControl(TabPageParent pParent, OTableDesignHelpBar* pHelpBar);
+ OFieldDescControl(weld::Container* pPage, vcl::Window* pParent, OTableDesignHelpBar* pHelpBar);
virtual ~OFieldDescControl() override;
virtual void dispose() override;
diff --git a/dbaccess/source/ui/inc/WCPage.hxx b/dbaccess/source/ui/inc/WCPage.hxx
index 4bfeb5909a13..e3fc5af1bc57 100644
--- a/dbaccess/source/ui/inc/WCPage.hxx
+++ b/dbaccess/source/ui/inc/WCPage.hxx
@@ -59,7 +59,7 @@ namespace dbaui
virtual bool LeavePage() override;
virtual OUString GetTitle() const override ;
- OCopyTable(OCopyTableWizard* pWizard, TabPageParent pParent);
+ OCopyTable(weld::Container* pParent, OCopyTableWizard* pWizard);
virtual ~OCopyTable() override;
bool IsOptionDefData() const { return m_xRB_DefData->get_active(); }
diff --git a/dbaccess/source/ui/inc/WColumnSelect.hxx b/dbaccess/source/ui/inc/WColumnSelect.hxx
index 23024c46b021..0121af1f2e5e 100644
--- a/dbaccess/source/ui/inc/WColumnSelect.hxx
+++ b/dbaccess/source/ui/inc/WColumnSelect.hxx
@@ -78,7 +78,7 @@ namespace dbaui
virtual bool LeavePage() override;
virtual OUString GetTitle() const override ;
- OWizColumnSelect(OCopyTableWizard* pWizard, TabPageParent pParent);
+ OWizColumnSelect(weld::Container* pParent, OCopyTableWizard* pWizard);
virtual ~OWizColumnSelect() override;
};
}
diff --git a/dbaccess/source/ui/inc/WCopyTable.hxx b/dbaccess/source/ui/inc/WCopyTable.hxx
index e12c00b159cb..f076c0c24131 100644
--- a/dbaccess/source/ui/inc/WCopyTable.hxx
+++ b/dbaccess/source/ui/inc/WCopyTable.hxx
@@ -296,7 +296,7 @@ namespace dbaui
sal_uInt16 GetCurLevel() const { return getCurrentState(); }
- TabPageParent CreatePageContainer();
+ weld::Container* CreatePageContainer();
public:
// used for copy tables or queries
diff --git a/dbaccess/source/ui/inc/WExtendPages.hxx b/dbaccess/source/ui/inc/WExtendPages.hxx
index b9cc15b6fda1..05a251c0ee8b 100644
--- a/dbaccess/source/ui/inc/WExtendPages.hxx
+++ b/dbaccess/source/ui/inc/WExtendPages.hxx
@@ -32,12 +32,12 @@ namespace dbaui
protected:
virtual void createReaderAndCallParser(sal_Int32 _nRows) override;
public:
- OWizHTMLExtend(OCopyTableWizard* pWizard, TabPageParent pParent, SvStream& rStream)
- : OWizTypeSelect(pWizard, pParent, &rStream)
+ OWizHTMLExtend(weld::Container* pPage, OCopyTableWizard* pWizard, SvStream& rStream)
+ : OWizTypeSelect(pPage, pWizard, &rStream)
{
}
- static std::unique_ptr<OWizTypeSelect> Create(OCopyTableWizard* pWizard, TabPageParent pParent, SvStream& rInput ) { return std::make_unique<OWizHTMLExtend>(pWizard, pParent, rInput); }
+ static std::unique_ptr<OWizTypeSelect> Create(weld::Container* pPage, OCopyTableWizard* pWizard, SvStream& rInput ) { return std::make_unique<OWizHTMLExtend>(pPage, pWizard, rInput); }
};
// Wizard Page: OWizRTFExtend
class OWizRTFExtend : public OWizTypeSelect
@@ -45,12 +45,12 @@ namespace dbaui
protected:
virtual void createReaderAndCallParser(sal_Int32 _nRows) override;
public:
- OWizRTFExtend(OCopyTableWizard* pWizard, TabPageParent pParent, SvStream& rStream)
- : OWizTypeSelect(pWizard, pParent, &rStream)
+ OWizRTFExtend(weld::Container* pPage, OCopyTableWizard* pWizard, SvStream& rStream)
+ : OWizTypeSelect(pPage, pWizard, &rStream)
{
}
- static std::unique_ptr<OWizTypeSelect> Create(OCopyTableWizard* pWizard, TabPageParent pParent, SvStream& rInput) { return std::make_unique<OWizRTFExtend>(pWizard, pParent, rInput); }
+ static std::unique_ptr<OWizTypeSelect> Create(weld::Container* pPage, OCopyTableWizard* pWizard, SvStream& rInput) { return std::make_unique<OWizRTFExtend>(pPage, pWizard, rInput); }
};
// Wizard Page: OWizNormalExtend
@@ -59,8 +59,8 @@ namespace dbaui
protected:
virtual void createReaderAndCallParser(sal_Int32 _nRows) override;
public:
- OWizNormalExtend(OCopyTableWizard* pWizard, TabPageParent pParent)
- : OWizTypeSelect(pWizard, pParent)
+ OWizNormalExtend(weld::Container* pPage, OCopyTableWizard* pWizard)
+ : OWizTypeSelect(pPage, pWizard)
{
EnableAuto(false);
}
diff --git a/dbaccess/source/ui/inc/WNameMatch.hxx b/dbaccess/source/ui/inc/WNameMatch.hxx
index 5bf0df89dbea..8aa2b6befaa8 100644
--- a/dbaccess/source/ui/inc/WNameMatch.hxx
+++ b/dbaccess/source/ui/inc/WNameMatch.hxx
@@ -59,7 +59,7 @@ namespace dbaui
virtual bool LeavePage() override;
virtual OUString GetTitle() const override ;
- OWizNameMatching(OCopyTableWizard* pWizard, TabPageParent pParent);
+ OWizNameMatching(weld::Container* pPage, OCopyTableWizard* pWizard);
virtual ~OWizNameMatching() override;
};
}
diff --git a/dbaccess/source/ui/inc/WTabPage.hxx b/dbaccess/source/ui/inc/WTabPage.hxx
index 9f8abfa011c8..0bcd04082dcd 100644
--- a/dbaccess/source/ui/inc/WTabPage.hxx
+++ b/dbaccess/source/ui/inc/WTabPage.hxx
@@ -32,7 +32,7 @@ namespace dbaui
OCopyTableWizard* m_pParent;
bool m_bFirstTime; // Page is called the first time; should be set in the reset method
- OWizardPage(OCopyTableWizard* pWizard, TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rID);
+ OWizardPage(weld::Container* pPage, OCopyTableWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID);
public:
virtual ~OWizardPage() override;
diff --git a/dbaccess/source/ui/inc/WTypeSelect.hxx b/dbaccess/source/ui/inc/WTypeSelect.hxx
index aafdd9e94f9b..767c533f25e8 100644
--- a/dbaccess/source/ui/inc/WTypeSelect.hxx
+++ b/dbaccess/source/ui/inc/WTypeSelect.hxx
@@ -51,7 +51,7 @@ namespace dbaui
virtual OUString getAutoIncrementValue() const override;
public:
- OWizTypeSelectControl(TabPageParent pParent, OWizTypeSelect* pParentTabPage);
+ OWizTypeSelectControl(weld::Container* pPage, OWizTypeSelect* pParentTabPage);
virtual ~OWizTypeSelectControl() override;
virtual css::uno::Reference< css::sdbc::XDatabaseMetaData> getMetaData() override;
@@ -136,14 +136,14 @@ namespace dbaui
virtual bool LeavePage() override;
virtual OUString GetTitle() const override;
- OWizTypeSelect(OCopyTableWizard* pWizard, TabPageParent pParent, SvStream* pStream = nullptr);
+ OWizTypeSelect(weld::Container* pParent, OCopyTableWizard* pWizard, SvStream* pStream = nullptr);
virtual ~OWizTypeSelect() override;
void setDisplayRow(sal_Int32 _nRow) { m_nDisplayRow = _nRow - 1; }
void setDuplicateName(bool _bDuplicateName) { m_bDuplicateName = _bDuplicateName; }
};
- typedef std::unique_ptr<OWizTypeSelect> (*TypeSelectionPageFactory)(OCopyTableWizard*, TabPageParent, SvStream&);
+ typedef std::unique_ptr<OWizTypeSelect> (*TypeSelectionPageFactory)(weld::Container*, OCopyTableWizard*, SvStream&);
}
#endif // INCLUDED_DBACCESS_SOURCE_UI_INC_WTYPESELECT_HXX
diff --git a/dbaccess/source/ui/misc/WCPage.cxx b/dbaccess/source/ui/misc/WCPage.cxx
index fe3b15b869a6..4ab6480ca136 100644
--- a/dbaccess/source/ui/misc/WCPage.cxx
+++ b/dbaccess/source/ui/misc/WCPage.cxx
@@ -48,8 +48,8 @@ using namespace ::com::sun::star::sdbcx;
namespace CopyTableOperation = css::sdb::application::CopyTableOperation;
-OCopyTable::OCopyTable(OCopyTableWizard* pWizard, TabPageParent pParent)
- : OWizardPage(pWizard, pParent, "dbaccess/ui/copytablepage.ui", "CopyTablePage")
+OCopyTable::OCopyTable(weld::Container* pPage, OCopyTableWizard* pWizard)
+ : OWizardPage(pPage, pWizard, "dbaccess/ui/copytablepage.ui", "CopyTablePage")
, m_bPKeyAllowed(false)
, m_bUseHeaderAllowed(true)
, m_nOldOperation(0)
diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx
index 5939edaacbed..d137ef8ea7a7 100644
--- a/dbaccess/source/ui/misc/WColumnSelect.cxx
+++ b/dbaccess/source/ui/misc/WColumnSelect.cxx
@@ -43,8 +43,8 @@ namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOper
OUString OWizColumnSelect::GetTitle() const { return DBA_RES(STR_WIZ_COLUMN_SELECT_TITEL); }
-OWizardPage::OWizardPage(OCopyTableWizard* pWizard, TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rID)
- : ::vcl::OWizardPage(pParent, rUIXMLDescription, rID)
+OWizardPage::OWizardPage(weld::Container* pPage, OCopyTableWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID)
+ : ::vcl::OWizardPage(pPage, pWizard, rUIXMLDescription, rID)
, m_pParent(pWizard)
, m_bFirstTime(true)
{
@@ -55,8 +55,8 @@ OWizardPage::~OWizardPage()
}
// OWizColumnSelect
-OWizColumnSelect::OWizColumnSelect(OCopyTableWizard* pWizard, TabPageParent pParent)
- : OWizardPage(pWizard, pParent, "dbaccess/ui/applycolpage.ui", "ApplyColPage")
+OWizColumnSelect::OWizColumnSelect(weld::Container* pPage, OCopyTableWizard* pWizard)
+ : OWizardPage(pPage, pWizard, "dbaccess/ui/applycolpage.ui", "ApplyColPage")
, m_xOrgColumnNames(m_xBuilder->weld_tree_view("from"))
, m_xColumn_RH(m_xBuilder->weld_button("colrh"))
, m_xColumns_RH(m_xBuilder->weld_button("colsrh"))
diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx b/dbaccess/source/ui/misc/WCopyTable.cxx
index e4c26e74e0a8..98ec40a808b6 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -566,26 +566,26 @@ OCopyTableWizard::OCopyTableWizard(weld::Window* pParent, const OUString& _rDefa
m_sName = ::dbtools::composeTableName(m_xDestConnection->getMetaData(),sCatalog,sSchema,sTable,false,::dbtools::EComposeRule::InTableDefinitions);
}
- std::unique_ptr<OCopyTable> xPage1(new OCopyTable(this, CreatePageContainer()));
+ std::unique_ptr<OCopyTable> xPage1(new OCopyTable(CreatePageContainer(), this));
xPage1->disallowUseHeaderLine();
if ( !bAllowViews )
xPage1->disallowViews();
xPage1->setCreateStyleAction();
AddWizardPage(std::move(xPage1));
- AddWizardPage( std::make_unique<OWizNameMatching>(this, CreatePageContainer() ) );
- AddWizardPage( std::make_unique<OWizColumnSelect>(this, CreatePageContainer() ) );
- AddWizardPage( std::make_unique<OWizNormalExtend>(this, CreatePageContainer() ) );
+ AddWizardPage( std::make_unique<OWizNameMatching>(CreatePageContainer(), this));
+ AddWizardPage( std::make_unique<OWizColumnSelect>(CreatePageContainer(), this));
+ AddWizardPage( std::make_unique<OWizNormalExtend>(CreatePageContainer(), this));
ActivatePage();
m_xAssistant->set_current_page(0);
}
-TabPageParent OCopyTableWizard::CreatePageContainer()
+weld::Container* OCopyTableWizard::CreatePageContainer()
{
OString sIdent(OString::number(m_nPageCount));
weld::Container* pPageContainer = m_xAssistant->append_page(sIdent);
- return TabPageParent(pPageContainer, this);
+ return pPageContainer;
}
OCopyTableWizard::OCopyTableWizard( weld::Window* pParent, const OUString& _rDefaultName, sal_Int16 _nOperation,
@@ -620,14 +620,14 @@ OCopyTableWizard::OCopyTableWizard( weld::Window* pParent, const OUString& _rDef
m_xInteractionHandler = InteractionHandler::createWithParent(m_xContext, nullptr);
- std::unique_ptr<OCopyTable> xPage1(new OCopyTable(this, CreatePageContainer()));
+ std::unique_ptr<OCopyTable> xPage1(new OCopyTable(CreatePageContainer(), this));
xPage1->disallowViews();
xPage1->setCreateStyleAction();
AddWizardPage(std::move(xPage1));
- AddWizardPage( std::make_unique<OWizNameMatching>( this, CreatePageContainer() ) );
- AddWizardPage( std::make_unique<OWizColumnSelect>( this, CreatePageContainer() ) );
- AddWizardPage( (*_pTypeSelectionPageFactory)( this, CreatePageContainer(), _rTypeSelectionPageArg ) );
+ AddWizardPage(std::make_unique<OWizNameMatching>(CreatePageContainer(), this));
+ AddWizardPage(std::make_unique<OWizColumnSelect>(CreatePageContainer(), this));
+ AddWizardPage((*_pTypeSelectionPageFactory)(CreatePageContainer(), this, _rTypeSelectionPageArg));
ActivatePage();
diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx
index 47539c27ae6b..c7726e9462f8 100644
--- a/dbaccess/source/ui/misc/WNameMatch.cxx
+++ b/dbaccess/source/ui/misc/WNameMatch.cxx
@@ -33,8 +33,8 @@
using namespace ::dbaui;
// OWizColumnSelect
-OWizNameMatching::OWizNameMatching(OCopyTableWizard* pWizard, TabPageParent pParent)
- : OWizardPage(pWizard, pParent, "dbaccess/ui/namematchingpage.ui", "NameMatching")
+OWizNameMatching::OWizNameMatching(weld::Container* pPage, OCopyTableWizard* pWizard)
+ : OWizardPage(pPage, pWizard, "dbaccess/ui/namematchingpage.ui", "NameMatching")
, m_xTABLE_LEFT(m_xBuilder->weld_label("leftlabel"))
, m_xTABLE_RIGHT(m_xBuilder->weld_label("rightlabel"))
, m_xCTRL_LEFT(m_xBuilder->weld_tree_view("left"))
diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx
index a9bf1af33e40..7d561b899772 100644
--- a/dbaccess/source/ui/misc/WTypeSelect.cxx
+++ b/dbaccess/source/ui/misc/WTypeSelect.cxx
@@ -44,8 +44,8 @@ using namespace ::com::sun::star::util;
using namespace ::com::sun::star::sdbc;
// OWizTypeSelectControl
-OWizTypeSelectControl::OWizTypeSelectControl(TabPageParent pParent, OWizTypeSelect* pParentTabPage)
- : OFieldDescControl(pParent, nullptr)
+OWizTypeSelectControl::OWizTypeSelectControl(weld::Container* pPage, OWizTypeSelect* pParentTabPage)
+ : OFieldDescControl(pPage, nullptr, nullptr)
, m_pParentTabPage(pParentTabPage)
{
}
@@ -207,12 +207,12 @@ OUString OWizTypeSelectControl::getAutoIncrementValue() const
return m_pParentTabPage->m_sAutoIncrementValue;
}
-OWizTypeSelect::OWizTypeSelect(OCopyTableWizard* pWizard, TabPageParent pParent, SvStream* pStream)
- : OWizardPage(pWizard, pParent, "dbaccess/ui/typeselectpage.ui", "TypeSelect")
+OWizTypeSelect::OWizTypeSelect(weld::Container* pPage, OCopyTableWizard* pWizard, SvStream* pStream)
+ : OWizardPage(pPage, pWizard, "dbaccess/ui/typeselectpage.ui", "TypeSelect")
, m_xColumnNames(new OWizTypeSelectList(m_xBuilder->weld_tree_view("columnnames")))
, m_xColumns(m_xBuilder->weld_label("columns"))
, m_xControlContainer(m_xBuilder->weld_container("control_container"))
- , m_xTypeControl(VclPtr<OWizTypeSelectControl>::Create(TabPageParent(m_xControlContainer.get(), pWizard), this))
+ , m_xTypeControl(VclPtr<OWizTypeSelectControl>::Create(m_xControlContainer.get(), this))
, m_xAutoType(m_xBuilder->weld_label("autotype"))
, m_xAutoFt(m_xBuilder->weld_label("autolabel"))
, m_xAutoEt(m_xBuilder->weld_spin_button("auto"))
diff --git a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
index e88813e1fc6b..4d3f3d3b8c8e 100644
--- a/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
+++ b/dbaccess/source/ui/tabledesign/TableFieldControl.cxx
@@ -36,7 +36,8 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::sdbc;
using namespace dbaui;
-OTableFieldControl::OTableFieldControl( vcl::Window* pParent, OTableDesignHelpBar* pHelpBar) :OFieldDescControl(pParent,pHelpBar)
+OTableFieldControl::OTableFieldControl(vcl::Window* pParent, OTableDesignHelpBar* pHelpBar)
+ : OFieldDescControl(nullptr, pParent, pHelpBar)
{
}
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx
index 952c4a1f78da..d420a3658791 100644
--- a/extensions/source/abpilot/abpfinalpage.cxx
+++ b/extensions/source/abpilot/abpfinalpage.cxx
@@ -42,8 +42,8 @@ namespace abp
return pFilter;
}
- FinalPage::FinalPage(OAddressBookSourcePilot* pDialog, TabPageParent pPageParent)
- : AddressBookSourcePage(pDialog, pPageParent, "modules/sabpilot/ui/datasourcepage.ui",
+ FinalPage::FinalPage(weld::Container* pPage, OAddressBookSourcePilot* pWizard)
+ : AddressBookSourcePage(pPage, pWizard, "modules/sabpilot/ui/datasourcepage.ui",
"DataSourcePage")
, m_xLocation(new URLBox(m_xBuilder->weld_combo_box("location")))
, m_xBrowse(m_xBuilder->weld_button("browse"))
@@ -57,8 +57,8 @@ namespace abp
m_xLocation->SetSmartProtocol(INetProtocol::File);
m_xLocation->DisableHistory();
- m_xLocationController.reset( new svx::DatabaseLocationInputController(pDialog->getORB(),
- *m_xLocation, *m_xBrowse, *pPageParent.GetFrameWeld()) );
+ m_xLocationController.reset( new svx::DatabaseLocationInputController(pWizard->getORB(),
+ *m_xLocation, *m_xBrowse, *pWizard->getDialog()) );
m_xName->connect_changed( LINK(this, FinalPage, OnEntryNameModified) );
m_xLocation->connect_changed( LINK(this, FinalPage, OnComboNameModified) );
diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx
index e919b79dbd9a..c4cc6bccf6c0 100644
--- a/extensions/source/abpilot/abpfinalpage.hxx
+++ b/extensions/source/abpilot/abpfinalpage.hxx
@@ -46,7 +46,7 @@ namespace abp
StringBag m_aInvalidDataSourceNames;
public:
- explicit FinalPage(OAddressBookSourcePilot* pDialog, TabPageParent pPageParent);
+ explicit FinalPage(weld::Container* pPage, OAddressBookSourcePilot* pController);
virtual ~FinalPage() override;
private:
diff --git a/extensions/source/abpilot/abspage.cxx b/extensions/source/abpilot/abspage.cxx
index 640fa30b0afb..774ed245e0b0 100644
--- a/extensions/source/abpilot/abspage.cxx
+++ b/extensions/source/abpilot/abspage.cxx
@@ -20,18 +20,15 @@
#include "abspage.hxx"
#include "abspilot.hxx"
-
namespace abp
{
-
-
using namespace ::svt;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
- AddressBookSourcePage::AddressBookSourcePage(OAddressBookSourcePilot* pParent, TabPageParent pPageParent, const OUString& rUIXMLDescription, const OString& rID)
- : AddressBookSourcePage_Base(pPageParent, rUIXMLDescription, rID)
- , m_pDialog(pParent)
+ AddressBookSourcePage::AddressBookSourcePage(weld::Container* pPage, OAddressBookSourcePilot* pDialog, const OUString& rUIXMLDescription, const OString& rID)
+ : AddressBookSourcePage_Base(pPage, pDialog, rUIXMLDescription, rID)
+ , m_pDialog(pDialog)
{
}
diff --git a/extensions/source/abpilot/abspage.hxx b/extensions/source/abpilot/abspage.hxx
index a7298e1270f5..b10ee599c144 100644
--- a/extensions/source/abpilot/abspage.hxx
+++ b/extensions/source/abpilot/abspage.hxx
@@ -37,7 +37,7 @@ namespace abp
OAddressBookSourcePilot* m_pDialog;
protected:
- AddressBookSourcePage(OAddressBookSourcePilot *pParent, TabPageParent pPageParent, const OUString& rUIXMLDescription, const OString& rID);
+ AddressBookSourcePage(weld::Container* pPage, OAddressBookSourcePilot* pController, const OUString& rUIXMLDescription, const OString& rID);
protected:
// helper
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index 231adb51c3a9..e6e16d118076 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -370,27 +370,25 @@ namespace abp
{
OString sIdent(OString::number(_nState));
weld::Container* pPageContainer = m_xAssistant->append_page(sIdent);
- // TODO eventually pass DialogController as distinct argument instead of bundling into TabPageParent
- TabPageParent aParent(pPageContainer, this);
std::unique_ptr<vcl::OWizardPage> xRet;
switch (_nState)
{
case STATE_SELECT_ABTYPE:
- xRet = std::make_unique<TypeSelectionPage>( this, aParent );
+ xRet = std::make_unique<TypeSelectionPage>(pPageContainer, this);
break;
case STATE_INVOKE_ADMIN_DIALOG:
- xRet = std::make_unique<AdminDialogInvokationPage>( this, aParent );
+ xRet = std::make_unique<AdminDialogInvokationPage>(pPageContainer, this);
break;
case STATE_TABLE_SELECTION:
- xRet = std::make_unique<TableSelectionPage>( this, aParent );
+ xRet = std::make_unique<TableSelectionPage>(pPageContainer, this);
break;
case STATE_MANUAL_FIELD_MAPPING:
- xRet = std::make_unique<FieldMappingPage>( this, aParent );
+ xRet = std::make_unique<FieldMappingPage>(pPageContainer, this);
break;
case STATE_FINAL_CONFIRM:
- xRet = std::make_unique<FinalPage>( this, aParent );
+ xRet = std::make_unique<FinalPage>(pPageContainer, this);
break;
default:
assert(false && "OAddressBookSourcePilot::createPage: invalid state!");
diff --git a/extensions/source/abpilot/admininvokationpage.cxx b/extensions/source/abpilot/admininvokationpage.cxx
index f1a2127b6237..2f51d8639896 100644
--- a/extensions/source/abpilot/admininvokationpage.cxx
+++ b/extensions/source/abpilot/admininvokationpage.cxx
@@ -23,8 +23,8 @@
namespace abp
{
- AdminDialogInvokationPage::AdminDialogInvokationPage(OAddressBookSourcePilot* pDialog, TabPageParent pPageParent)
- : AddressBookSourcePage(pDialog, pPageParent, "modules/sabpilot/ui/invokeadminpage.ui", "InvokeAdminPage")
+ AdminDialogInvokationPage::AdminDialogInvokationPage(weld::Container* pPage, OAddressBookSourcePilot* pController)
+ : AddressBookSourcePage(pPage, pController, "modules/sabpilot/ui/invokeadminpage.ui", "InvokeAdminPage")
, m_xInvokeAdminDialog(m_xBuilder->weld_button("settings"))
, m_xErrorMessage(m_xBuilder->weld_label("warning"))
{
diff --git a/extensions/source/abpilot/admininvokationpage.hxx b/extensions/source/abpilot/admininvokationpage.hxx
index b5dcaaeaeaed..5765e1fd5c33 100644
--- a/extensions/source/abpilot/admininvokationpage.hxx
+++ b/extensions/source/abpilot/admininvokationpage.hxx
@@ -31,7 +31,7 @@ namespace abp
std::unique_ptr<weld::Label> m_xErrorMessage;
public:
- explicit AdminDialogInvokationPage(OAddressBookSourcePilot* pDialog, TabPageParent pPageParent);
+ explicit AdminDialogInvokationPage(weld::Container* pPage, OAddressBookSourcePilot* pDialog);
virtual ~AdminDialogInvokationPage() override;
private:
// BuilderPage overridables
diff --git a/extensions/source/abpilot/fieldmappingpage.cxx b/extensions/source/abpilot/fieldmappingpage.cxx
index 54e2ab86e7ed..1652723fda99 100644
--- a/extensions/source/abpilot/fieldmappingpage.cxx
+++ b/extensions/source/abpilot/fieldmappingpage.cxx
@@ -25,8 +25,8 @@
namespace abp
{
- FieldMappingPage::FieldMappingPage(OAddressBookSourcePilot* pDialog, TabPageParent pPageParent)
- : AddressBookSourcePage(pDialog, pPageParent, "modules/sabpilot/ui/fieldassignpage.ui", "FieldAssignPage")
+ FieldMappingPage::FieldMappingPage(weld::Container* pPage, OAddressBookSourcePilot* pController)
+ : AddressBookSourcePage(pPage, pController, "modules/sabpilot/ui/fieldassignpage.ui", "FieldAssignPage")
, m_xInvokeDialog(m_xBuilder->weld_button("assign"))
, m_xHint(m_xBuilder->weld_label("hint"))
{
diff --git a/extensions/source/abpilot/fieldmappingpage.hxx b/extensions/source/abpilot/fieldmappingpage.hxx
index 63b5b2158832..1423da470b25 100644
--- a/extensions/source/abpilot/fieldmappingpage.hxx
+++ b/extensions/source/abpilot/fieldmappingpage.hxx
@@ -30,7 +30,7 @@ namespace abp
std::unique_ptr<weld::Button> m_xInvokeDialog;
std::unique_ptr<weld::Label> m_xHint;
public:
- explicit FieldMappingPage(OAddressBookSourcePilot* pDialog, TabPageParent pPageParent);
+ explicit FieldMappingPage(weld::Container* pPage, OAddressBookSourcePilot* pController);
virtual ~FieldMappingPage() override;
private:
// OWizardPage overridables
diff --git a/extensions/source/abpilot/tableselectionpage.cxx b/extensions/source/abpilot/tableselectionpage.cxx
index a897326902ac..585a5ea3d5ae 100644
--- a/extensions/source/abpilot/tableselectionpage.cxx
+++ b/extensions/source/abpilot/tableselectionpage.cxx
@@ -27,8 +27,8 @@
namespace abp
{
- TableSelectionPage::TableSelectionPage(OAddressBookSourcePilot* pDialog, TabPageParent pPageParent)
- : AddressBookSourcePage(pDialog, pPageParent, "modules/sabpilot/ui/selecttablepage.ui", "SelectTablePage")
+ TableSelectionPage::TableSelectionPage(weld::Container* pPage, OAddressBookSourcePilot* pController)
+ : AddressBookSourcePage(pPage, pController, "modules/sabpilot/ui/selecttablepage.ui", "SelectTablePage")
, m_xTableList(m_xBuilder->weld_tree_view("table"))
{
m_xTableList->connect_changed( LINK( this, TableSelectionPage, OnTableSelected ) );
diff --git a/extensions/source/abpilot/tableselectionpage.hxx b/extensions/source/abpilot/tableselectionpage.hxx
index 35f2e40e6cc3..2f96aeb60bd2 100644
--- a/extensions/source/abpilot/tableselectionpage.hxx
+++ b/extensions/source/abpilot/tableselectionpage.hxx
@@ -30,7 +30,7 @@ namespace abp
std::unique_ptr<weld::TreeView> m_xTableList;
public:
- explicit TableSelectionPage(OAddressBookSourcePilot* pDialog, TabPageParent pPageParent);
+ explicit TableSelectionPage(weld::Container* pPage, OAddressBookSourcePilot* pController);
virtual ~TableSelectionPage() override;
private:
// OWizardPage overridables
diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx
index 394b6889cefb..3aac37ef7dcb 100644
--- a/extensions/source/abpilot/typeselectionpage.cxx
+++ b/extensions/source/abpilot/typeselectionpage.cxx
@@ -31,8 +31,8 @@ namespace abp
using namespace ::com::sun::star::sdbc;
// TypeSelectionPage
- TypeSelectionPage::TypeSelectionPage(OAddressBookSourcePilot* pDialog, TabPageParent pPageParent)
- : AddressBookSourcePage(pDialog, pPageParent, "modules/sabpilot/ui/selecttypepage.ui", "SelectTypePage")
+ TypeSelectionPage::TypeSelectionPage(weld::Container* pPage, OAddressBookSourcePilot* pDialog)
+ : AddressBookSourcePage(pPage, pDialog, "modules/sabpilot/ui/selecttypepage.ui", "SelectTypePage")
, m_xEvolution(m_xBuilder->weld_radio_button("evolution"))
, m_xEvolutionGroupwise(m_xBuilder->weld_radio_button("groupwise"))
, m_xEvolutionLdap(m_xBuilder->weld_radio_button("evoldap"))
diff --git a/extensions/source/abpilot/typeselectionpage.hxx b/extensions/source/abpilot/typeselectionpage.hxx
index ef8a609cd6ad..7488495f20c0 100644
--- a/extensions/source/abpilot/typeselectionpage.hxx
+++ b/extensions/source/abpilot/typeselectionpage.hxx
@@ -55,7 +55,7 @@ namespace abp
std::vector< ButtonItem > m_aAllTypes;
public:
- explicit TypeSelectionPage(OAddressBookSourcePilot* pDialog, TabPageParent pPageParent);
+ explicit TypeSelectionPage(weld::Container* pPage, OAddressBookSourcePilot* pController);
virtual ~TypeSelectionPage() override;
// retrieves the currently selected type
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index 2d006f60ed30..a1d4617225f6 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -51,6 +51,7 @@
#include <com/sun/star/container/XNameContainer.hpp>
#include <svl/urihelper.hxx>
#include <tools/debug.hxx>
+#include <vcl/weld.hxx>
#include "datman.hxx"
#include "bibresid.hxx"
#include "bibmod.hxx"
@@ -63,6 +64,7 @@
#include <strings.hrc>
#include <helpids.h>
#include <connectivity/dbtools.hxx>
+#include <connectivity/dbtools.hxx>
#include <memory>
using namespace ::com::sun::star;
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 0488e15745b5..a36efe9b550a 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/waitobj.hxx>
#include <com/sun/star/util/URL.hpp>
#include <vcl/stdtext.hxx>
#include <comphelper/types.hxx>
@@ -49,6 +48,7 @@
#include <sot/exchange.hxx>
#include <sot/formats.hxx>
#include <vcl/edit.hxx>
+#include <vcl/weld.hxx>
#include <osl/mutex.hxx>
#include <unordered_map>
diff --git a/extensions/source/bibliography/framectr.hxx b/extensions/source/bibliography/framectr.hxx
index 8b6209c1d98b..21e5f7b23fae 100644
--- a/extensions/source/bibliography/framectr.hxx
+++ b/extensions/source/bibliography/framectr.hxx
@@ -27,6 +27,8 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/frame/XDispatchInformationProvider.hpp>
#include <cppuhelper/implbase.hxx>
+#include <rtl/ref.hxx>
+#include <tools/link.hxx>
#include <vector>
#include <memory>
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 79d8c1920640..513d02050679 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -54,8 +54,8 @@ namespace dbp
using namespace ::com::sun::star::task;
using namespace ::comphelper;
- OTableSelectionPage::OTableSelectionPage(OControlWizard* pParent, TabPageParent pPageParent)
- : OControlWizardPage(pParent, pPageParent, "modules/sabpilot/ui/tableselectionpage.ui", "TableSelectionPage")
+ OTableSelectionPage::OTableSelectionPage(weld::Container* pPage, OControlWizard* pWizard)
+ : OControlWizardPage(pPage, pWizard, "modules/sabpilot/ui/tableselectionpage.ui", "TableSelectionPage")
, m_xTable(m_xBuilder->weld_tree_view("table"))
, m_xDatasource(m_xBuilder->weld_tree_view("datasource"))
, m_xDatasourceLabel(m_xBuilder->weld_label("datasourcelabel"))
@@ -343,8 +343,8 @@ namespace dbp
lcl_fillEntries(*m_xTable, aQueryNames, BMP_QUERY, CommandType::QUERY);
}
- OMaybeListSelectionPage::OMaybeListSelectionPage(OControlWizard* pParent, TabPageParent pPageParent, const OUString& rUIXMLDescription, const OString& rID)
- : OControlWizardPage(pParent, pPageParent, rUIXMLDescription, rID)
+ OMaybeListSelectionPage::OMaybeListSelectionPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID)
+ : OControlWizardPage(pPage, pWizard, rUIXMLDescription, rID)
, m_pYes(nullptr)
, m_pNo(nullptr)
, m_pList(nullptr)
@@ -403,8 +403,8 @@ namespace dbp
m_pNo->grab_focus();
}
- ODBFieldPage::ODBFieldPage(OControlWizard* pParent, TabPageParent pPageParent)
- : OMaybeListSelectionPage(pParent, pPageParent, "modules/sabpilot/ui/optiondbfieldpage.ui", "OptionDBField")
+ ODBFieldPage::ODBFieldPage(weld::Container* pPage, OControlWizard* pWizard)
+ : OMaybeListSelectionPage(pPage, pWizard, "modules/sabpilot/ui/optiondbfieldpage.ui", "OptionDBField")
, m_xDescription(m_xBuilder->weld_label("explLabel"))
, m_xStoreYes(m_xBuilder->weld_radio_button("yesRadiobutton"))
, m_xStoreNo(m_xBuilder->weld_radio_button("noRadiobutton"))
diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx
index 70b750dfadb6..08ddd560ab84 100644
--- a/extensions/source/dbpilots/commonpagesdbp.hxx
+++ b/extensions/source/dbpilots/commonpagesdbp.hxx
@@ -38,7 +38,7 @@ namespace dbp
m_xDSContext;
public:
- explicit OTableSelectionPage(OControlWizard* pParent, TabPageParent pPageParent);
+ explicit OTableSelectionPage(weld::Container* pPage, OControlWizard* pParent);
virtual ~OTableSelectionPage() override;
private:
@@ -67,7 +67,7 @@ namespace dbp
weld::ComboBox* m_pList;
public:
- OMaybeListSelectionPage(OControlWizard* pParent, TabPageParent pPageParent, const OUString& rUIXMLDescription, const OString& rID);
+ OMaybeListSelectionPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID);
virtual ~OMaybeListSelectionPage() override;
protected:
@@ -97,7 +97,7 @@ namespace dbp
std::unique_ptr<weld::ComboBox> m_xStoreWhere;
public:
- explicit ODBFieldPage(OControlWizard* pParent, TabPageParent pPageParent);
+ explicit ODBFieldPage(weld::Container* pPage, OControlWizard* pWizard);
virtual ~ODBFieldPage() override;
protected:
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index e8aaed73991b..740c821571b2 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -73,9 +73,9 @@ namespace dbp
OAccessRegulator() { }
};
- OControlWizardPage::OControlWizardPage(OControlWizard* pDialog, TabPageParent pPageParent, const OUString& rUIXMLDescription, const OString& rID)
- : OControlWizardPage_Base(pPageParent, rUIXMLDescription, rID)
- , m_pDialog(pDialog)
+ OControlWizardPage::OControlWizardPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID)
+ : OControlWizardPage_Base(pPage, pWizard, rUIXMLDescription, rID)
+ , m_pDialog(pWizard)
{
m_xContainer->set_size_request(m_xContainer->get_approximate_digit_width() * WIZARD_SIZE_X,
m_xContainer->get_text_height() * WIZARD_SIZE_Y);
diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx
index d8590356fd2d..f918a5a94ab8 100644
--- a/extensions/source/dbpilots/controlwizard.hxx
+++ b/extensions/source/dbpilots/controlwizard.hxx
@@ -62,7 +62,7 @@ namespace dbp
css::uno::Reference< css::sdbc::XConnection >
getFormConnection() const;
public:
- OControlWizardPage(OControlWizard* pDialog, TabPageParent pPageParent, const OUString& rUIXMLDescription, const OString& rID);
+ OControlWizardPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID);
virtual ~OControlWizardPage() override;
protected:
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index 2fc497e720bf..aba9a1f46506 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -220,15 +220,13 @@ namespace dbp
{
OString sIdent(OString::number(_nState));
weld::Container* pPageContainer = m_xAssistant->append_page(sIdent);
- // TODO eventually pass DialogController as distinct argument instead of bundling into TabPageParent
- TabPageParent aParent(pPageContainer, this);
switch (_nState)
{
case GW_STATE_DATASOURCE_SELECTION:
- return std::make_unique<OTableSelectionPage>(this, aParent);
+ return std::make_unique<OTableSelectionPage>(pPageContainer, this);
case GW_STATE_FIELDSELECTION:
- return std::make_unique<OGridFieldsSelection>(this, aParent);
+ return std::make_unique<OGridFieldsSelection>(pPageContainer, this);
}
return nullptr;
@@ -283,8 +281,8 @@ namespace dbp
return true;
}
- OGridFieldsSelection::OGridFieldsSelection(OGridWizard* pParent, TabPageParent pPageParent)
- : OGridPage(pParent, pPageParent, "modules/sabpilot/ui/gridfieldsselectionpage.ui", "GridFieldsSelection")
+ OGridFieldsSelection::OGridFieldsSelection(weld::Container* pPage, OGridWizard* pWizard)
+ : OGridPage(pPage, pWizard, "modules/sabpilot/ui/gridfieldsselectionpage.ui", "GridFieldsSelection")
, m_xExistFields(m_xBuilder->weld_tree_view("existingfields"))
, m_xSelectOne(m_xBuilder->weld_button("fieldright"))
, m_xSelectAll(m_xBuilder->weld_button("allfieldsright"))
diff --git a/extensions/source/dbpilots/gridwizard.hxx b/extensions/source/dbpilots/gridwizard.hxx
index c96a86d3271f..c8258cd88b2d 100644
--- a/extensions/source/dbpilots/gridwizard.hxx
+++ b/extensions/source/dbpilots/gridwizard.hxx
@@ -61,8 +61,8 @@ namespace dbp
class OGridPage : public OControlWizardPage
{
public:
- OGridPage(OGridWizard* pParent, TabPageParent pPageParent, const OUString& rUIXMLDescription, const OString& rID)
- : OControlWizardPage(pParent, pPageParent, rUIXMLDescription, rID)
+ OGridPage(weld::Container* pPage, OGridWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID)
+ : OControlWizardPage(pPage, pWizard, rUIXMLDescription, rID)
{
}
protected:
@@ -79,7 +79,7 @@ namespace dbp
std::unique_ptr<weld::TreeView> m_xSelFields;
public:
- explicit OGridFieldsSelection(OGridWizard* pParent, TabPageParent pPageParent);
+ explicit OGridFieldsSelection(weld::Container* pPage, OGridWizard* pWizard);
virtual ~OGridFieldsSelection() override;
private:
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index 031433b391a7..4ea1fc2ec369 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -64,25 +64,23 @@ namespace dbp
{
OString sIdent(OString::number(_nState));
weld::Container* pPageContainer = m_xAssistant->append_page(sIdent);
- // TODO eventually pass DialogController as distinct argument instead of bundling into TabPageParent
- TabPageParent aParent(pPageContainer, this);
switch (_nState)
{
case GBW_STATE_OPTIONLIST:
- return std::make_unique<ORadioSelectionPage>(this, aParent);
+ return std::make_unique<ORadioSelectionPage>(pPageContainer, this);
case GBW_STATE_DEFAULTOPTION:
- return std::make_unique<ODefaultFieldSelectionPage>(this, aParent);
+ return std::make_unique<ODefaultFieldSelectionPage>(pPageContainer, this);
case GBW_STATE_OPTIONVALUES:
- return std::make_unique<OOptionValuesPage>(this, aParent);
+ return std::make_unique<OOptionValuesPage>(pPageContainer, this);
case GBW_STATE_DBFIELD:
- return std::make_unique<OOptionDBFieldPage>(this, aParent);
+ return std::make_unique<OOptionDBFieldPage>(pPageContainer, this);
case GBW_STATE_FINALIZE:
- return std::make_unique<OFinalizeGBWPage>(this, aParent);
+ return std::make_unique<OFinalizeGBWPage>(pPageContainer, this);
}
return nullptr;
@@ -169,8 +167,8 @@ namespace dbp
return OControlWizard::onFinish();
}
- ORadioSelectionPage::ORadioSelectionPage(OControlWizard* pParent, TabPageParent pPageParent)
- : OGBWPage(pParent, pPageParent, "modules/sabpilot/ui/groupradioselectionpage.ui", "GroupRadioSelectionPage")
+ ORadioSelectionPage::ORadioSelectionPage(weld::Container* pPage, OControlWizard* pWizard)
+ : OGBWPage(pPage, pWizard, "modules/sabpilot/ui/groupradioselectionpage.ui", "GroupRadioSelectionPage")
, m_xRadioName(m_xBuilder->weld_entry("radiolabels"))
, m_xMoveRight(m_xBuilder->weld_button("toright"))
, m_xMoveLeft(m_xBuilder->weld_button("toleft"))
@@ -297,8 +295,8 @@ namespace dbp
}
}
- ODefaultFieldSelectionPage::ODefaultFieldSelectionPage(OControlWizard* pParent, TabPageParent pPageParent)
- : OMaybeListSelectionPage(pParent, pPageParent, "modules/sabpilot/ui/defaultfieldselectionpage.ui", "DefaultFieldSelectionPage")
+ ODefaultFieldSelectionPage::ODefaultFieldSelectionPage(weld::Container* pPage, OControlWizard* pWizard)
+ : OMaybeListSelectionPage(pPage, pWizard, "modules/sabpilot/ui/defaultfieldselectionpage.ui", "DefaultFieldSelectionPage")
, m_xDefSelYes(m_xBuilder->weld_radio_button("defaultselectionyes"))
, m_xDefSelNo(m_xBuilder->weld_radio_button("defaultselectionno"))
, m_xDefSelection(m_xBuilder->weld_combo_box("defselectionfield"))
@@ -335,8 +333,8 @@ namespace dbp
return true;
}
- OOptionValuesPage::OOptionValuesPage(OControlWizard* pParent, TabPageParent pPageParent)
- : OGBWPage(pParent, pPageParent, "modules/sabpilot/ui/optionvaluespage.ui", "OptionValuesPage")
+ OOptionValuesPage::OOptionValuesPage(weld::Container* pPage, OControlWizard* pWizard)
+ : OGBWPage(pPage, pWizard, "modules/sabpilot/ui/optionvaluespage.ui", "OptionValuesPage")
, m_xValue(m_xBuilder->weld_entry("optionvalue"))
, m_xOptions(m_xBuilder->weld_tree_view("radiobuttons"))
, m_nLastSelection(::vcl::WizardTypes::WizardState(-1))
@@ -411,8 +409,8 @@ namespace dbp
return true;
}
- OOptionDBFieldPage::OOptionDBFieldPage(OControlWizard* pParent, TabPageParent pPageParent)
- : ODBFieldPage(pParent, pPageParent)
+ OOptionDBFieldPage::OOptionDBFieldPage(weld::Container* pPage, OControlWizard* pWizard)
+ : ODBFieldPage(pPage, pWizard)
{
setDescriptionText(compmodule::ModuleRes(RID_STR_GROUPWIZ_DBFIELD));
}
@@ -422,8 +420,8 @@ namespace dbp
return static_cast<OGroupBoxWizard*>(getDialog())->getSettings().sDBField;
}
- OFinalizeGBWPage::OFinalizeGBWPage(OControlWizard* pParent, TabPageParent pPageParent)
- : OGBWPage(pParent, pPageParent, "modules/sabpilot/ui/optionsfinalpage.ui", "OptionsFinalPage")
+ OFinalizeGBWPage::OFinalizeGBWPage(weld::Container* pPage, OControlWizard* pWizard)
+ : OGBWPage(pPage, pWizard, "modules/sabpilot/ui/optionsfinalpage.ui", "OptionsFinalPage")
, m_xName(m_xBuilder->weld_entry("nameit"))
{
}
diff --git a/extensions/source/dbpilots/groupboxwiz.hxx b/extensions/source/dbpilots/groupboxwiz.hxx
index 19a10f9f29c0..b9f375865323 100644
--- a/extensions/source/dbpilots/groupboxwiz.hxx
+++ b/extensions/source/dbpilots/groupboxwiz.hxx
@@ -66,8 +66,8 @@ namespace dbp
class OGBWPage : public OControlWizardPage
{
public:
- OGBWPage(OControlWizard* pParent, TabPageParent pPageParent, const OUString& rUIXMLDescription, const OString& rID)
- : OControlWizardPage(pParent, pPageParent, rUIXMLDescription, rID)
+ OGBWPage(weld::Container* pPage, OControlWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID)
+ : OControlWizardPage(pPage, pWizard, rUIXMLDescription, rID)
{
}
@@ -83,7 +83,7 @@ namespace dbp
std::unique_ptr<weld::TreeView> m_xExistingRadios;
public:
- explicit ORadioSelectionPage(OControlWizard* pParent, TabPageParent pPageParent);
+ explicit ORadioSelectionPage(weld::Container* pPage, OControlWizard* pWizard);
virtual ~ORadioSelectionPage() override;
private:
@@ -109,7 +109,7 @@ namespace dbp
std::unique_ptr<weld::ComboBox> m_xDefSelection;
public:
- explicit ODefaultFieldSelectionPage(OControlWizard* pParent, TabPageParent pPageParent);
+ explicit ODefaultFieldSelectionPage(weld::Container* pPage, OControlWizard* pWizard);
virtual ~ODefaultFieldSelectionPage() override;
private:
@@ -130,7 +130,7 @@ namespace dbp
m_nLastSelection;
public:
- explicit OOptionValuesPage(OControlWizard* pParent, TabPageParent pPageParent);
+ explicit OOptionValuesPage(weld::Container* pPage, OControlWizard* pWizard);
virtual ~OOptionValuesPage() override;
private:
@@ -149,7 +149,7 @@ namespace dbp
class OOptionDBFieldPage : public ODBFieldPage
{
public:
- explicit OOptionDBFieldPage(OControlWizard* pParent, TabPageParent pPageParent);
+ explicit OOptionDBFieldPage(weld::Container* pPage, OControlWizard* pWizard);
protected:
// ODBFieldPage overridables
@@ -161,7 +161,7 @@ namespace dbp
std::unique_ptr<weld::Entry> m_xName;
public:
- explicit OFinalizeGBWPage(OControlWizard* pParent, TabPageParent pPageParent);
+ explicit OFinalizeGBWPage(weld::Container* pPage, OControlWizard* pWizard);
virtual ~OFinalizeGBWPage() override;
private:
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index 55107a19bf07..f7be36c12af3 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -87,21 +87,19 @@ namespace dbp
{
OString sIdent(OString::number(_nState));
weld::Container* pPageContainer = m_xAssistant->append_page(sIdent);
- // TODO eventually pass DialogController as distinct argument instead of bundling into TabPageParent
- TabPageParent aParent(pPageContainer, this);
switch (_nState)
{
case LCW_STATE_DATASOURCE_SELECTION:
- return std::make_unique<OTableSelectionPage>(this, aParent);
+ return std::make_unique<OTableSelectionPage>(pPageContainer, this);
case LCW_STATE_TABLESELECTION:
- return std::make_unique<OContentTableSelection>(this, aParent);
+ return std::make_unique<OContentTableSelection>(pPageContainer, this);
case LCW_STATE_FIELDSELECTION:
- return std::make_unique<OContentFieldSelection>(this, aParent);
+ return std::make_unique<OContentFieldSelection>(pPageContainer, this);
case LCW_STATE_FIELDLINK:
- return std::make_unique<OLinkFieldsPage>(this, aParent);
+ return std::make_unique<OLinkFieldsPage>(pPageContainer, this);
case LCW_STATE_COMBODBFIELD:
- return std::make_unique<OComboDBFieldPage>(this, aParent);
+ return std::make_unique<OComboDBFieldPage>(pPageContainer, this);
}
return nullptr;
@@ -262,8 +260,8 @@ namespace dbp
return aColumnNames;
}
- OContentTableSelection::OContentTableSelection(OListComboWizard* pParent, TabPageParent pPageParent)
- : OLCPage(pParent, pPageParent, "modules/sabpilot/ui/contenttablepage.ui", "TableSelectionPage")
+ OContentTableSelection::OContentTableSelection(weld::Container* pPage, OListComboWizard* pWizard)
+ : OLCPage(pPage, pWizard, "modules/sabpilot/ui/contenttablepage.ui", "TableSelectionPage")
, m_xSelectTable(m_xBuilder->weld_tree_view("table"))
{
enableFormDatasourceDisplay();
@@ -338,8 +336,8 @@ namespace dbp
return true;
}
- OContentFieldSelection::OContentFieldSelection(OListComboWizard* pParent, TabPageParent pPageParent)
- : OLCPage(pParent, pPageParent, "modules/sabpilot/ui/contentfieldpage.ui", "FieldSelectionPage")
+ OContentFieldSelection::OContentFieldSelection(weld::Container* pPage, OListComboWizard* pWizard)
+ : OLCPage(pPage, pWizard, "modules/sabpilot/ui/contentfieldpage.ui", "FieldSelectionPage")
, m_xSelectTableField(m_xBuilder->weld_tree_view("selectfield"))
, m_xDisplayedField(m_xBuilder->weld_entry("displayfield"))
, m_xInfo(m_xBuilder->weld_label("info"))
@@ -394,8 +392,8 @@ namespace dbp
return true;
}
- OLinkFieldsPage::OLinkFieldsPage(OListComboWizard* pParent, TabPageParent pPageParent)
- : OLCPage(pParent, pPageParent, "modules/sabpilot/ui/fieldlinkpage.ui", "FieldLinkPage")
+ OLinkFieldsPage::OLinkFieldsPage(weld::Container* pPage, OListComboWizard* pWizard)
+ : OLCPage(pPage, pWizard, "modules/sabpilot/ui/fieldlinkpage.ui", "FieldLinkPage")
, m_xValueListField(m_xBuilder->weld_combo_box("valuefield"))
, m_xTableField(m_xBuilder->weld_combo_box("listtable"))
{
@@ -458,8 +456,8 @@ namespace dbp
return true;
}
- OComboDBFieldPage::OComboDBFieldPage(OControlWizard* pParent, TabPageParent pPageParent)
- : ODBFieldPage(pParent, pPageParent)
+ OComboDBFieldPage::OComboDBFieldPage(weld::Container* pPage, OControlWizard* pWizard)
+ : ODBFieldPage(pPage, pWizard)
{
setDescriptionText(compmodule::ModuleRes(RID_STR_COMBOWIZ_DBFIELD));
}
diff --git a/extensions/source/dbpilots/listcombowizard.hxx b/extensions/source/dbpilots/listcombowizard.hxx
index caa2335f1d0d..d01d270f858b 100644
--- a/extensions/source/dbpilots/listcombowizard.hxx
+++ b/extensions/source/dbpilots/listcombowizard.hxx
@@ -51,7 +51,7 @@ namespace dbp
public:
OListComboWizard(
- weld::Window* _pParent,
+ weld::Window* pParent,
const css::uno::Reference< css::beans::XPropertySet >& _rxObjectModel,
const css::uno::Reference< css::uno::XComponentContext >& _rxContext
);
@@ -78,8 +78,8 @@ namespace dbp
class OLCPage : public OControlWizardPage
{
public:
- OLCPage(OListComboWizard* pParent, TabPageParent pPageParent, const OUString& rUIXMLDescription, const OString& rID)
- : OControlWizardPage(pParent, pPageParent, rUIXMLDescription, rID)
+ OLCPage(weld::Container* pPage, OListComboWizard* pWizard, const OUString& rUIXMLDescription, const OString& rID)
+ : OControlWizardPage(pPage, pWizard, rUIXMLDescription, rID)
{
}
@@ -97,7 +97,7 @@ namespace dbp
std::unique_ptr<weld::TreeView> m_xSelectTable;
public:
- explicit OContentTableSelection(OListComboWizard* pParent, TabPageParent pPageParent);
+ explicit OContentTableSelection(weld::Container* pPage, OListComboWizard* pWizard);
virtual ~OContentTableSelection() override;
private:
@@ -120,7 +120,7 @@ namespace dbp
std::unique_ptr<weld::Label> m_xInfo;
public:
- explicit OContentFieldSelection(OListComboWizard* pParent, TabPageParent pPageParent);
+ explicit OContentFieldSelection(weld::Container* pPage, OListComboWizard* pWizard);
virtual ~OContentFieldSelection() override;
private:
@@ -139,7 +139,7 @@ namespace dbp
std::unique_ptr<weld::ComboBox> m_xTableField;
public:
- explicit OLinkFieldsPage(OListComboWizard* pParent, TabPageParent pPageParent);
+ explicit OLinkFieldsPage(weld::Container* pPage, OListComboWizard* pWizard);
virtual ~OLinkFieldsPage() override;
private:
@@ -159,7 +159,7 @@ namespace dbp
class OComboDBFieldPage : public ODBFieldPage
{
public:
- explicit OComboDBFieldPage(OControlWizard* pParent, TabPageParent pPageParent);
+ explicit OComboDBFieldPage(weld::Container* pPage, OControlWizard* pWizard);
protected:
// BuilderPage overridables
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 128307f30456..220e915f4d24 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -2720,8 +2720,7 @@ namespace pcr
if ( !fnCreatePage )
throw RuntimeException(); // caught below
- TabPageParent aParent(aDialog.get_content_area(), &aDialog);
- aDialog.SetTabPage((*fnCreatePage)(aParent, &aCoreSet));
+ aDialog.SetTabPage((*fnCreatePage)(aDialog.get_content_area(), &aDialog, &aCoreSet));
_rClearBeforeDialog.clear();
if ( RET_OK == aDialog.run() )
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 8d595624e815..7b24639dd4ae 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -450,8 +450,8 @@ Sequence< PropertyValue > ImpPDFTabDialog::GetFilterData()
}
-ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(TabPageParent pParent, const SfxItemSet& rCoreSet)
- : SfxTabPage(pParent, "filter/ui/pdfgeneralpage.ui", "PdfGeneralPage", &rCoreSet)
+ImpPDFTabGeneralPage::ImpPDFTabGeneralPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet)
+ : SfxTabPage(pPage, pController, "filter/ui/pdfgeneralpage.ui", "PdfGeneralPage", &rCoreSet)
, mbUseTaggedPDFUserSelection(false)
, mbIsPresentation(false)
, mbIsSpreadsheet(false)
@@ -683,10 +683,10 @@ void ImpPDFTabGeneralPage::GetFilterConfigItem( ImpPDFTabDialog* pParent )
pParent->mbAllowDuplicateFieldNames = mxCbAllowDuplicateFieldNames->get_active();
}
-std::unique_ptr<SfxTabPage> ImpPDFTabGeneralPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> ImpPDFTabGeneralPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet)
{
- return std::make_unique<ImpPDFTabGeneralPage>(pParent, *rAttrSet);
+ return std::make_unique<ImpPDFTabGeneralPage>(pPage, pController, *rAttrSet);
}
IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleAllHdl, weld::ToggleButton&, void)
@@ -811,8 +811,8 @@ IMPL_LINK_NOARG(ImpPDFTabGeneralPage, ToggleExportPDFAHdl, weld::ToggleButton&,
}
/// The option features tab page
-ImpPDFTabOpnFtrPage::ImpPDFTabOpnFtrPage(TabPageParent pParent, const SfxItemSet& rCoreSet)
- : SfxTabPage(pParent, "filter/ui/pdfviewpage.ui", "PdfViewPage", &rCoreSet)
+ImpPDFTabOpnFtrPage::ImpPDFTabOpnFtrPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet)
+ : SfxTabPage(pPage, pController, "filter/ui/pdfviewpage.ui", "PdfViewPage", &rCoreSet)
, mbUseCTLFont(false)
, mxRbOpnPageOnly(m_xBuilder->weld_radio_button("pageonly"))
, mxRbOpnOutline(m_xBuilder->weld_radio_button("outline"))
@@ -841,9 +841,9 @@ ImpPDFTabOpnFtrPage::~ImpPDFTabOpnFtrPage()
{
}
-std::unique_ptr<SfxTabPage> ImpPDFTabOpnFtrPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> ImpPDFTabOpnFtrPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
{
- return std::make_unique<ImpPDFTabOpnFtrPage>(pParent, *rAttrSet);
+ return std::make_unique<ImpPDFTabOpnFtrPage>(pPage, pController, *rAttrSet);
}
void ImpPDFTabOpnFtrPage::GetFilterConfigItem( ImpPDFTabDialog* pParent )
@@ -968,8 +968,8 @@ IMPL_LINK_NOARG( ImpPDFTabOpnFtrPage, ToggleRbMagnHdl, weld::ToggleButton&, void
}
/// The Viewer preferences tab page
-ImpPDFTabViewerPage::ImpPDFTabViewerPage(TabPageParent pParent, const SfxItemSet& rCoreSet )
- : SfxTabPage(pParent, "filter/ui/pdfuserinterfacepage.ui", "PdfUserInterfacePage", &rCoreSet)
+ImpPDFTabViewerPage::ImpPDFTabViewerPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet )
+ : SfxTabPage(pPage, pController, "filter/ui/pdfuserinterfacepage.ui", "PdfUserInterfacePage", &rCoreSet)
, mbIsPresentation(false)
, m_xCbResWinInit(m_xBuilder->weld_check_button("resize"))
, m_xCbCenterWindow(m_xBuilder->weld_check_button("center"))
@@ -996,10 +996,10 @@ IMPL_LINK_NOARG( ImpPDFTabViewerPage, ToggleRbBookmarksHdl, weld::ToggleButton&,
m_xNumBookmarkLevels->set_sensitive(m_xRbVisibleBookmarkLevels->get_active());
}
-std::unique_ptr<SfxTabPage> ImpPDFTabViewerPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> ImpPDFTabViewerPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet)
{
- return std::make_unique<ImpPDFTabViewerPage>(pParent, *rAttrSet);
+ return std::make_unique<ImpPDFTabViewerPage>(pPage, pController, *rAttrSet);
}
void ImpPDFTabViewerPage::GetFilterConfigItem( ImpPDFTabDialog* pParent )
@@ -1043,8 +1043,8 @@ void ImpPDFTabViewerPage::SetFilterConfigItem( const ImpPDFTabDialog* pParent )
}
/// The Security preferences tab page
-ImpPDFTabSecurityPage::ImpPDFTabSecurityPage(TabPageParent i_pParent, const SfxItemSet& i_rCoreSet)
- : SfxTabPage(i_pParent, "filter/ui/pdfsecuritypage.ui", "PdfSecurityPage", &i_rCoreSet)
+ImpPDFTabSecurityPage::ImpPDFTabSecurityPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& i_rCoreSet)
+ : SfxTabPage(pPage, pController, "filter/ui/pdfsecuritypage.ui", "PdfSecurityPage", &i_rCoreSet)
, msUserPwdTitle( PDFFilterResId( STR_PDF_EXPORT_UDPWD ) )
, mbHaveOwnerPassword( false )
, mbHaveUserPassword( false )
@@ -1079,9 +1079,9 @@ ImpPDFTabSecurityPage::~ImpPDFTabSecurityPage()
{
}
-std::unique_ptr<SfxTabPage> ImpPDFTabSecurityPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> ImpPDFTabSecurityPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
{
- return std::make_unique<ImpPDFTabSecurityPage>(pParent, *rAttrSet);
+ return std::make_unique<ImpPDFTabSecurityPage>(pPage, pController, *rAttrSet);
}
void ImpPDFTabSecurityPage::GetFilterConfigItem( ImpPDFTabDialog* pParent )
@@ -1272,8 +1272,8 @@ void ImpPDFTabSecurityPage::ImplPDFASecurityControl( bool bEnableSecurity )
}
/// The link preferences tab page (relative and other stuff)
-ImpPDFTabLinksPage::ImpPDFTabLinksPage(TabPageParent pParent, const SfxItemSet& rCoreSet)
- : SfxTabPage(pParent, "filter/ui/pdflinkspage.ui", "PdfLinksPage", &rCoreSet)
+ImpPDFTabLinksPage::ImpPDFTabLinksPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet)
+ : SfxTabPage(pPage, pController, "filter/ui/pdflinkspage.ui", "PdfLinksPage", &rCoreSet)
, mbOpnLnksDefaultUserState(false)
, mbOpnLnksLaunchUserState(false)
, mbOpnLnksBrowserUserState(false)
@@ -1290,9 +1290,9 @@ ImpPDFTabLinksPage::~ImpPDFTabLinksPage()
{
}
-std::unique_ptr<SfxTabPage> ImpPDFTabLinksPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> ImpPDFTabLinksPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
{
- return std::make_unique<ImpPDFTabLinksPage>(pParent, *rAttrSet);
+ return std::make_unique<ImpPDFTabLinksPage>(pPage, pController, *rAttrSet);
}
void ImpPDFTabLinksPage::GetFilterConfigItem( ImpPDFTabDialog* pParent )
@@ -1451,8 +1451,8 @@ IMPL_LINK_NOARG(ImplErrorDialog, SelectHdl, weld::TreeView&, void)
}
/// The digital signatures tab page
-ImpPDFTabSigningPage::ImpPDFTabSigningPage(TabPageParent pParent, const SfxItemSet& rCoreSet)
- : SfxTabPage(pParent, "filter/ui/pdfsignpage.ui", "PdfSignPage", &rCoreSet)
+ImpPDFTabSigningPage::ImpPDFTabSigningPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet)
+ : SfxTabPage(pPage, pController, "filter/ui/pdfsignpage.ui", "PdfSignPage", &rCoreSet)
, maSignCertificate()
, mxEdSignCert(m_xBuilder->weld_entry("cert"))
, mxPbSignCertSelect(m_xBuilder->weld_button("select"))
@@ -1528,10 +1528,10 @@ IMPL_LINK_NOARG(ImpPDFTabSigningPage, ClickmaPbSignCertClear, weld::Button&, voi
mxLBSignTSA->set_sensitive(false);
}
-std::unique_ptr<SfxTabPage> ImpPDFTabSigningPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> ImpPDFTabSigningPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet)
{
- return std::make_unique<ImpPDFTabSigningPage>(pParent, *rAttrSet);
+ return std::make_unique<ImpPDFTabSigningPage>(pPage, pController, *rAttrSet);
}
void ImpPDFTabSigningPage::GetFilterConfigItem( ImpPDFTabDialog* pParent )
diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx
index 7eb512f20569..5087f6a4bee8 100644
--- a/filter/source/pdf/impdialog.hxx
+++ b/filter/source/pdf/impdialog.hxx
@@ -222,10 +222,10 @@ class ImpPDFTabGeneralPage : public SfxTabPage
public:
DECL_LINK(ToggleExportPDFAHdl, weld::ToggleButton&, void);
- ImpPDFTabGeneralPage(TabPageParent pParent, const SfxItemSet& rSet);
+ ImpPDFTabGeneralPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~ImpPDFTabGeneralPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet);
void GetFilterConfigItem(ImpPDFTabDialog* paParent);
void SetFilterConfigItem(ImpPDFTabDialog* paParent);
@@ -259,10 +259,10 @@ class ImpPDFTabOpnFtrPage : public SfxTabPage
void ToggleRbPgLyContinueFacingHdl();
public:
- ImpPDFTabOpnFtrPage(TabPageParent pParent, const SfxItemSet& rSet);
+ ImpPDFTabOpnFtrPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~ImpPDFTabOpnFtrPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
void GetFilterConfigItem( ImpPDFTabDialog* paParent);
void SetFilterConfigItem( const ImpPDFTabDialog* paParent );
@@ -288,10 +288,10 @@ class ImpPDFTabViewerPage : public SfxTabPage
DECL_LINK(ToggleRbBookmarksHdl, weld::ToggleButton&, void);
public:
- ImpPDFTabViewerPage(TabPageParent pParent, const SfxItemSet& rSet);
+ ImpPDFTabViewerPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~ImpPDFTabViewerPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
void GetFilterConfigItem( ImpPDFTabDialog* paParent);
void SetFilterConfigItem( const ImpPDFTabDialog* paParent );
@@ -336,10 +336,10 @@ class ImpPDFTabSecurityPage : public SfxTabPage
void enablePermissionControls();
public:
- ImpPDFTabSecurityPage(TabPageParent pParent, const SfxItemSet& rSet);
+ ImpPDFTabSecurityPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~ImpPDFTabSecurityPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet);
void GetFilterConfigItem( ImpPDFTabDialog* paParent);
void SetFilterConfigItem( const ImpPDFTabDialog* paParent );
@@ -365,10 +365,10 @@ class ImpPDFTabLinksPage : public SfxTabPage
DECL_LINK(ClickRbOpnLnksBrowserHdl, weld::ToggleButton&, void);
public:
- ImpPDFTabLinksPage(TabPageParent pParent, const SfxItemSet& rSet);
+ ImpPDFTabLinksPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~ImpPDFTabLinksPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet);
void GetFilterConfigItem( ImpPDFTabDialog* paParent);
void SetFilterConfigItem( const ImpPDFTabDialog* paParent );
@@ -394,10 +394,10 @@ class ImpPDFTabSigningPage : public SfxTabPage
DECL_LINK(ClickmaPbSignCertClear, weld::Button&, void);
public:
- ImpPDFTabSigningPage(TabPageParent pParent, const SfxItemSet& rSet);
+ ImpPDFTabSigningPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~ImpPDFTabSigningPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
void GetFilterConfigItem( ImpPDFTabDialog* paParent);
void SetFilterConfigItem( const ImpPDFTabDialog* paParent );
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index caa618f0466f..248350e02d4b 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -204,8 +204,8 @@ protected:
virtual void Reset( const SfxItemSet* ) override;
public:
- SfxDocumentPage(TabPageParent pParent, const SfxItemSet&);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* );
+ SfxDocumentPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet&);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
virtual ~SfxDocumentPage() override;
void EnableUseUserData();
@@ -227,9 +227,9 @@ protected:
virtual void Reset( const SfxItemSet* ) override;
public:
- SfxDocumentDescPage(TabPageParent pParent, const SfxItemSet&);
+ SfxDocumentDescPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet&);
virtual ~SfxDocumentDescPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
};
// class SfxDocumentInfoDialog -------------------------------------------
@@ -454,8 +454,8 @@ protected:
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
public:
- SfxCustomPropertiesPage(TabPageParent pParent, const SfxItemSet&);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* );
+ SfxCustomPropertiesPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet&);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
virtual ~SfxCustomPropertiesPage() override;
};
@@ -570,9 +570,9 @@ protected:
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
public:
- SfxCmisPropertiesPage(TabPageParent pParent, const SfxItemSet&);
+ SfxCmisPropertiesPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet&);
virtual ~SfxCmisPropertiesPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet*);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet*);
};
#endif // #ifndef _ INCLUDED_SFX2_DINFDLG_HXX
diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx
index 1f40b35bb958..26a1a32ca69c 100644
--- a/include/sfx2/mgetempl.hxx
+++ b/include/sfx2/mgetempl.hxx
@@ -75,7 +75,7 @@ class SfxManageStyleSheetPage final : public SfxTabPage
void SetDescriptionText_Impl();
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
virtual bool FillItemSet(SfxItemSet *) override;
virtual void Reset(const SfxItemSet *) override;
@@ -85,7 +85,7 @@ class SfxManageStyleSheetPage final : public SfxTabPage
virtual DeactivateRC DeactivatePage(SfxItemSet *) override;
public:
- SfxManageStyleSheetPage(TabPageParent pParent, const SfxItemSet &rAttrSet);
+ SfxManageStyleSheetPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rAttrSet);
virtual ~SfxManageStyleSheetPage() override;
};
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index 78d159d75236..6278b7f0a8bf 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
@@ -44,6 +44,10 @@ namespace com { namespace sun { namespace star { namespace frame {
class XFrame;
} } } }
+namespace weld {
+ class Container;
+ class DialogController;
+}
class SFX2_DLLPUBLIC SfxModule : public SfxShell
{
@@ -74,7 +78,7 @@ public:
void RegisterStatusBarControl(const SfxStbCtrlFactory&);
virtual std::unique_ptr<SfxTabPage> CreateTabPage( sal_uInt16 nId,
- TabPageParent pParent,
+ weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rSet );
virtual void Invalidate(sal_uInt16 nId = 0) override;
diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx
index c6b47b88a1ea..9b072a9e597e 100644
--- a/include/sfx2/printopt.hxx
+++ b/include/sfx2/printopt.hxx
@@ -76,12 +76,12 @@ protected:
public:
- SfxCommonPrintOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SfxCommonPrintOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SfxCommonPrintOptionsTabPage() override;
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet*);
};
#endif // INCLUDED_SFX2_PRINTOPT_HXX
diff --git a/include/sfx2/securitypage.hxx b/include/sfx2/securitypage.hxx
index 14478eaf063c..ed9686176fb4 100644
--- a/include/sfx2/securitypage.hxx
+++ b/include/sfx2/securitypage.hxx
@@ -33,8 +33,8 @@ protected:
virtual void Reset( const SfxItemSet* ) override;
public:
- SfxSecurityPage(TabPageParent pParent, const SfxItemSet&);
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet*);
+ SfxSecurityPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet&);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet*);
weld::Builder& GetBuilder() const { return *m_xBuilder; }
};
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 1ff48d364bfe..3d0176fe3964 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -32,7 +32,7 @@
class SfxTabPage;
-typedef std::unique_ptr<SfxTabPage> (*CreateTabPage)(TabPageParent pParent, const SfxItemSet *rAttrSet);
+typedef std::unique_ptr<SfxTabPage> (*CreateTabPage)(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rAttrSet);
typedef const sal_uInt16* (*GetTabPageRanges)(); // provides international Which-value
struct TabPageImpl;
@@ -175,7 +175,7 @@ private:
std::unique_ptr< TabPageImpl > pImpl;
protected:
- SfxTabPage(TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet *rAttrSet);
+ SfxTabPage(weld::Container* pPage, weld::DialogController* pController, 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 0463c3a1eaa5..8e781d2d1611 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -41,7 +41,11 @@ class SfxBaseController;
class Size;
class Point;
class Fraction;
-namespace weld { class Window; }
+namespace weld {
+ class Container;
+ class DialogController;
+ class Window;
+}
class KeyEvent;
class SvBorder;
class SdrView;
@@ -237,7 +241,7 @@ public:
virtual SfxPrinter* GetPrinter( bool bCreate = false );
virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL );
virtual bool HasPrintOptionsPage() const;
- virtual std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(TabPageParent pParent, const SfxItemSet &rOptions);
+ virtual std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rOptions);
Printer* GetActivePrinter() const;
// Working set
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index f2053d4b9c09..08e2f0eeb64b 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -45,8 +45,8 @@ class SAL_WARN_UNUSED SvxTabPage : public SfxTabPage
{
public:
- SvxTabPage(TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet &rAttrSet)
- : SfxTabPage(pParent, rUIXMLDescription, rID, &rAttrSet)
+ SvxTabPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet &rAttrSet)
+ : SfxTabPage(pPage, pController, rUIXMLDescription, rID, &rAttrSet)
{
}
virtual void PointChanged(weld::DrawingArea* pArea, RectPoint eRP) = 0;
diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx
index 177323136b34..5f343dcf3766 100644
--- a/include/svx/hdft.hxx
+++ b/include/svx/hdft.hxx
@@ -55,7 +55,7 @@ protected:
virtual void ActivatePage( const SfxItemSet& rSet ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
- SvxHFPage(TabPageParent pParent, const SfxItemSet& rSet, sal_uInt16 nSetId);
+ SvxHFPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet, sal_uInt16 nSetId);
sal_uInt16 const nId;
std::unique_ptr<SfxItemSet> pBBSet;
@@ -95,18 +95,18 @@ private:
class SVX_DLLPUBLIC SvxHeaderPage : public SvxHFPage
{
public:
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
// returns the Which values to the range
static const sal_uInt16* GetRanges() { return pRanges; }
- SVX_DLLPRIVATE SvxHeaderPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SVX_DLLPRIVATE SvxHeaderPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
};
class SVX_DLLPUBLIC SvxFooterPage : public SvxHFPage
{
public:
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges() { return pRanges; }
- SVX_DLLPRIVATE SvxFooterPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SVX_DLLPRIVATE SvxFooterPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
};
class SVX_DLLPUBLIC DeleteHeaderDialog : public weld::MessageDialogController
diff --git a/include/svx/optgrid.hxx b/include/svx/optgrid.hxx
index 5339bfd55ef3..ba3c21c63ce3 100644
--- a/include/svx/optgrid.hxx
+++ b/include/svx/optgrid.hxx
@@ -89,10 +89,10 @@ public:
class SVX_DLLPUBLIC SvxGridTabPage : public SfxTabPage
{
public:
- SvxGridTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SvxGridTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SvxGridTabPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet& rAttrSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx
index 29af647d6cd7..9af5c1062954 100644
--- a/include/vcl/tabpage.hxx
+++ b/include/vcl/tabpage.hxx
@@ -22,35 +22,9 @@
#include <vcl/dllapi.h>
#include <vcl/builder.hxx>
-#include <vcl/weld.hxx>
#include <vcl/window.hxx>
#include <vcl/IContext.hxx>
-struct TabPageParent
-{
- TabPageParent(vcl::Window* _pParent)
- : pParent(_pParent)
- , pPage(nullptr)
- , pController(nullptr)
- {
- }
- TabPageParent(weld::Container* _pPage, weld::DialogController* _pController)
- : pParent(nullptr)
- , pPage(_pPage)
- , pController(_pController)
- {
- }
- weld::Window* GetFrameWeld() const
- {
- if (pController)
- return pController->getDialog();
- return pParent->GetFrameWeld();
- }
- VclPtr<vcl::Window> pParent;
- weld::Container* const pPage;
- weld::DialogController* pController;
-};
-
class VCL_DLLPUBLIC TabPage
: public vcl::Window
, public VclBuilderContainer
diff --git a/include/vcl/wizardmachine.hxx b/include/vcl/wizardmachine.hxx
index 88788fdc549c..6fb6adf3390f 100644
--- a/include/vcl/wizardmachine.hxx
+++ b/include/vcl/wizardmachine.hxx
@@ -81,7 +81,7 @@ namespace vcl
class VCL_DLLPUBLIC OWizardPage : public BuilderPage, public IWizardPageController
{
public:
- OWizardPage(TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rID);
+ OWizardPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID);
virtual ~OWizardPage() override;
// IWizardPageController overridables
diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx
index 1f9067a58b5e..bfb4ffbb84ce 100644
--- a/sc/inc/scmod.hxx
+++ b/sc/inc/scmod.hxx
@@ -234,7 +234,7 @@ public:
// virtual methods for the options dialog
virtual std::unique_ptr<SfxItemSet> CreateItemSet( sal_uInt16 nId ) override;
virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) override;
- virtual std::unique_ptr<SfxTabPage> CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) override;
+ virtual std::unique_ptr<SfxTabPage> CreateTabPage( sal_uInt16 nId, weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet ) override;
virtual std::unique_ptr<SfxStyleFamilies> CreateStyleFamilies() override;
void SetInSharedDocLoading( bool bNew ) { m_bIsInSharedDocLoading = bNew; }
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 77ba4c0f4e97..fe8cd6c92d09 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -2025,7 +2025,7 @@ void ScModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet )
}
}
-std::unique_ptr<SfxTabPage> ScModule::CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet )
+std::unique_ptr<SfxTabPage> ScModule::CreateTabPage( sal_uInt16 nId, weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet )
{
std::unique_ptr<SfxTabPage> xRet;
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
@@ -2035,66 +2035,66 @@ std::unique_ptr<SfxTabPage> ScModule::CreateTabPage( sal_uInt16 nId, TabPagePare
{
::CreateTabPage ScTpLayoutOptionsCreate = pFact->GetTabPageCreatorFunc(SID_SC_TP_LAYOUT);
if (ScTpLayoutOptionsCreate)
- xRet = (*ScTpLayoutOptionsCreate)(pParent, &rSet);
+ xRet = (*ScTpLayoutOptionsCreate)(pPage, pController, &rSet);
break;
}
case SID_SC_TP_CONTENT:
{
::CreateTabPage ScTpContentOptionsCreate = pFact->GetTabPageCreatorFunc(SID_SC_TP_CONTENT);
if (ScTpContentOptionsCreate)
- xRet = (*ScTpContentOptionsCreate)(pParent, &rSet);
+ xRet = (*ScTpContentOptionsCreate)(pPage, pController, &rSet);
break;
}
case SID_SC_TP_GRID:
- xRet = SvxGridTabPage::Create(pParent, rSet);
+ xRet = SvxGridTabPage::Create(pPage, pController, rSet);
break;
case SID_SC_TP_USERLISTS:
{
::CreateTabPage ScTpUserListsCreate = pFact->GetTabPageCreatorFunc(SID_SC_TP_USERLISTS);
if (ScTpUserListsCreate)
- xRet = (*ScTpUserListsCreate)(pParent, &rSet);
+ xRet = (*ScTpUserListsCreate)(pPage, pController, &rSet);
break;
}
case SID_SC_TP_CALC:
{
::CreateTabPage ScTpCalcOptionsCreate = pFact->GetTabPageCreatorFunc(SID_SC_TP_CALC);
if (ScTpCalcOptionsCreate)
- xRet = (*ScTpCalcOptionsCreate)(pParent, &rSet);
+ xRet = (*ScTpCalcOptionsCreate)(pPage, pController, &rSet);
break;
}
case SID_SC_TP_FORMULA:
{
::CreateTabPage ScTpFormulaOptionsCreate = pFact->GetTabPageCreatorFunc(SID_SC_TP_FORMULA);
if (ScTpFormulaOptionsCreate)
- xRet = (*ScTpFormulaOptionsCreate)(pParent, &rSet);
+ xRet = (*ScTpFormulaOptionsCreate)(pPage, pController, &rSet);
break;
}
case SID_SC_TP_COMPATIBILITY:
{
::CreateTabPage ScTpCompatOptionsCreate = pFact->GetTabPageCreatorFunc(SID_SC_TP_COMPATIBILITY);
if (ScTpCompatOptionsCreate)
- xRet = (*ScTpCompatOptionsCreate)(pParent, &rSet);
+ xRet = (*ScTpCompatOptionsCreate)(pPage, pController, &rSet);
break;
}
case SID_SC_TP_CHANGES:
{
::CreateTabPage ScRedlineOptionsTabPageCreate = pFact->GetTabPageCreatorFunc(SID_SC_TP_CHANGES);
if (ScRedlineOptionsTabPageCreate)
- xRet =(*ScRedlineOptionsTabPageCreate)(pParent, &rSet);
+ xRet =(*ScRedlineOptionsTabPageCreate)(pPage, pController, &rSet);
break;
}
case RID_SC_TP_PRINT:
{
::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc(RID_SC_TP_PRINT);
if (ScTpPrintOptionsCreate)
- xRet = (*ScTpPrintOptionsCreate)(pParent, &rSet);
+ xRet = (*ScTpPrintOptionsCreate)(pPage, pController, &rSet);
break;
}
case RID_SC_TP_DEFAULTS:
{
::CreateTabPage ScTpDefaultsOptionsCreate = pFact->GetTabPageCreatorFunc(RID_SC_TP_DEFAULTS);
if (ScTpDefaultsOptionsCreate)
- xRet = (*ScTpDefaultsOptionsCreate)(pParent, &rSet);
+ xRet = (*ScTpDefaultsOptionsCreate)(pPage, pController, &rSet);
break;
}
}
diff --git a/sc/source/ui/attrdlg/tabpages.cxx b/sc/source/ui/attrdlg/tabpages.cxx
index 68f720b3f88d..572e1dc362f6 100644
--- a/sc/source/ui/attrdlg/tabpages.cxx
+++ b/sc/source/ui/attrdlg/tabpages.cxx
@@ -34,8 +34,8 @@ const sal_uInt16 ScTabPageProtection::pProtectionRanges[] =
// Zellschutz-Tabpage:
-ScTabPageProtection::ScTabPageProtection(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
- : SfxTabPage(pParent, "modules/scalc/ui/cellprotectionpage.ui", "CellProtectionPage", &rCoreAttrs)
+ScTabPageProtection::ScTabPageProtection(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs)
+ : SfxTabPage(pPage, pController, "modules/scalc/ui/cellprotectionpage.ui", "CellProtectionPage", &rCoreAttrs)
, m_xBtnHideCell(m_xBuilder->weld_check_button("checkHideAll"))
, m_xBtnProtect(m_xBuilder->weld_check_button("checkProtected"))
, m_xBtnHideFormula(m_xBuilder->weld_check_button("checkHideFormula"))
@@ -57,9 +57,9 @@ ScTabPageProtection::~ScTabPageProtection()
{
}
-std::unique_ptr<SfxTabPage> ScTabPageProtection::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> ScTabPageProtection::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
{
- return std::make_unique<ScTabPageProtection>(pParent, *rAttrSet);
+ return std::make_unique<ScTabPageProtection>(pPage, pController, *rAttrSet);
}
void ScTabPageProtection::Reset( const SfxItemSet* rCoreAttrs )
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 4af234bcfbc4..d0daf6debbc0 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -68,8 +68,8 @@ using namespace com::sun::star;
// Sort Criteria Tab page
-ScTabPageSortFields::ScTabPageSortFields(TabPageParent pParent, const SfxItemSet& rArgSet)
- : SfxTabPage(pParent, "modules/scalc/ui/sortcriteriapage.ui", "SortCriteriaPage", &rArgSet)
+ScTabPageSortFields::ScTabPageSortFields(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet)
+ : SfxTabPage(pPage, pController, "modules/scalc/ui/sortcriteriapage.ui", "SortCriteriaPage", &rArgSet)
,
aStrUndefined ( ScResId( SCSTR_UNDEFINED ) ),
@@ -123,9 +123,9 @@ void ScTabPageSortFields::Init()
}
}
-std::unique_ptr<SfxTabPage> ScTabPageSortFields::Create(TabPageParent pParent, const SfxItemSet* pArgSet)
+std::unique_ptr<SfxTabPage> ScTabPageSortFields::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* pArgSet)
{
- return std::make_unique<ScTabPageSortFields>(pParent, *pArgSet);
+ return std::make_unique<ScTabPageSortFields>(pPage, pController, *pArgSet);
}
void ScTabPageSortFields::Reset( const SfxItemSet* /* rArgSet */ )
@@ -473,8 +473,8 @@ void ScTabPageSortFields::AddSortKey( sal_uInt16 nItem )
// Sort option Tab Page:
-ScTabPageSortOptions::ScTabPageSortOptions(TabPageParent pParent, const SfxItemSet& rArgSet)
- : SfxTabPage(pParent, "modules/scalc/ui/sortoptionspage.ui", "SortOptionsPage", &rArgSet)
+ScTabPageSortOptions::ScTabPageSortOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet)
+ : SfxTabPage(pPage, pController, "modules/scalc/ui/sortoptionspage.ui", "SortOptionsPage", &rArgSet)
, aStrRowLabel(ScResId(SCSTR_ROW_LABEL))
, aStrColLabel(ScResId(SCSTR_COL_LABEL))
, aStrUndefined(ScResId(SCSTR_UNDEFINED))
@@ -574,9 +574,9 @@ void ScTabPageSortOptions::Init()
m_xLbLanguage->InsertLanguage( LANGUAGE_SYSTEM );
}
-std::unique_ptr<SfxTabPage> ScTabPageSortOptions::Create(TabPageParent pParent, const SfxItemSet* rArgSet)
+std::unique_ptr<SfxTabPage> ScTabPageSortOptions::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rArgSet)
{
- return std::make_unique<ScTabPageSortOptions>(pParent, *rArgSet);
+ return std::make_unique<ScTabPageSortOptions>(pPage, pController, *rArgSet);
}
void ScTabPageSortOptions::Reset( const SfxItemSet* /* rArgSet */ )
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index 7cf70ff0c3dc..faaf04e7a48a 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -37,8 +37,8 @@
// Subtotals group tabpage:
-ScTpSubTotalGroup::ScTpSubTotalGroup(TabPageParent pParent, const SfxItemSet& rArgSet)
- : SfxTabPage(pParent, "modules/scalc/ui/subtotalgrppage.ui", "SubTotalGrpPage", &rArgSet)
+ScTpSubTotalGroup::ScTpSubTotalGroup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet)
+ : SfxTabPage(pPage, pController, "modules/scalc/ui/subtotalgrppage.ui", "SubTotalGrpPage", &rArgSet)
, aStrNone(ScResId(SCSTR_NONE))
, aStrColumn(ScResId(SCSTR_COLUMN))
, pViewData(nullptr)
@@ -372,34 +372,34 @@ IMPL_LINK( ScTpSubTotalGroup, CheckHdl, const row_col&, rRowCol, void )
// Derived Group TabPages:
-std::unique_ptr<SfxTabPage> ScTpSubTotalGroup1::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> ScTpSubTotalGroup1::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rArgSet )
{
- return std::make_unique<ScTpSubTotalGroup1>( pParent, *rArgSet );
+ return std::make_unique<ScTpSubTotalGroup1>( pPage, pController, *rArgSet );
}
-std::unique_ptr<SfxTabPage> ScTpSubTotalGroup2::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> ScTpSubTotalGroup2::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rArgSet )
{
- return std::make_unique<ScTpSubTotalGroup2>( pParent, *rArgSet );
+ return std::make_unique<ScTpSubTotalGroup2>( pPage, pController, *rArgSet );
}
-std::unique_ptr<SfxTabPage> ScTpSubTotalGroup3::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> ScTpSubTotalGroup3::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rArgSet )
{
- return std::make_unique<ScTpSubTotalGroup3>( pParent, *rArgSet );
+ return std::make_unique<ScTpSubTotalGroup3>( pPage, pController, *rArgSet );
}
-ScTpSubTotalGroup1::ScTpSubTotalGroup1( TabPageParent pParent, const SfxItemSet& rArgSet ) :
- ScTpSubTotalGroup( pParent, rArgSet )
+ScTpSubTotalGroup1::ScTpSubTotalGroup1( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet ) :
+ ScTpSubTotalGroup( pPage, pController, rArgSet )
{}
-ScTpSubTotalGroup2::ScTpSubTotalGroup2( TabPageParent pParent, const SfxItemSet& rArgSet ) :
- ScTpSubTotalGroup( pParent, rArgSet )
+ScTpSubTotalGroup2::ScTpSubTotalGroup2( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet ) :
+ ScTpSubTotalGroup( pPage, pController, rArgSet )
{}
-ScTpSubTotalGroup3::ScTpSubTotalGroup3( TabPageParent pParent, const SfxItemSet& rArgSet ) :
- ScTpSubTotalGroup( pParent, rArgSet )
+ScTpSubTotalGroup3::ScTpSubTotalGroup3( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet ) :
+ ScTpSubTotalGroup( pPage, pController, rArgSet )
{}
#define RESET(i) (ScTpSubTotalGroup::DoReset( (i), *rArgSet ))
@@ -416,9 +416,9 @@ bool ScTpSubTotalGroup3::FillItemSet( SfxItemSet* rArgSet ) { return FILLSET(3);
// options tab page:
-ScTpSubTotalOptions::ScTpSubTotalOptions(TabPageParent pParent, const SfxItemSet& rArgSet)
+ScTpSubTotalOptions::ScTpSubTotalOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet)
- : SfxTabPage ( pParent,
+ : SfxTabPage ( pPage, pController,
"modules/scalc/ui/subtotaloptionspage.ui", "SubTotalOptionsPage",
&rArgSet ),
pViewData ( nullptr ),
@@ -460,10 +460,10 @@ void ScTpSubTotalOptions::Init()
FillUserSortListBox();
}
-std::unique_ptr<SfxTabPage> ScTpSubTotalOptions::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> ScTpSubTotalOptions::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rArgSet)
{
- return std::make_unique<ScTpSubTotalOptions>(pParent, *rArgSet);
+ return std::make_unique<ScTpSubTotalOptions>(pPage, pController, *rArgSet);
}
void ScTpSubTotalOptions::Reset( const SfxItemSet* /* rArgSet */ )
diff --git a/sc/source/ui/dbgui/validate.cxx b/sc/source/ui/dbgui/validate.cxx
index de6504b55363..3c6660dec95b 100644
--- a/sc/source/ui/dbgui/validate.cxx
+++ b/sc/source/ui/dbgui/validate.cxx
@@ -325,8 +325,8 @@ bool lclGetStringListFromFormula( OUString& rStringList, const OUString& rFmlaSt
} // namespace
-ScTPValidationValue::ScTPValidationValue(TabPageParent pParent, const SfxItemSet& rArgSet)
- : SfxTabPage(pParent, "modules/scalc/ui/validationcriteriapage.ui",
+ScTPValidationValue::ScTPValidationValue(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet)
+ : SfxTabPage(pPage, pController, "modules/scalc/ui/validationcriteriapage.ui",
"ValidationCriteriaPage", &rArgSet)
, maStrMin(ScResId(SCSTR_VALID_MINIMUM))
, maStrMax(ScResId(SCSTR_VALID_MAXIMUM))
@@ -404,9 +404,9 @@ void ScTPValidationValue::Init()
CheckHdl( *m_xCbShow );
}
-std::unique_ptr<SfxTabPage> ScTPValidationValue::Create(TabPageParent pParent, const SfxItemSet* rArgSet)
+std::unique_ptr<SfxTabPage> ScTPValidationValue::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rArgSet)
{
- return std::make_unique<ScTPValidationValue>(pParent, *rArgSet);
+ return std::make_unique<ScTPValidationValue>(pPage, pController, *rArgSet);
}
void ScTPValidationValue::Reset( const SfxItemSet* rArgSet )
@@ -678,8 +678,8 @@ IMPL_LINK_NOARG(ScTPValidationValue, CheckHdl, weld::Button&, void)
// Input Help Page
-ScTPValidationHelp::ScTPValidationHelp(TabPageParent pParent, const SfxItemSet& rArgSet)
- : SfxTabPage(pParent, "modules/scalc/ui/validationhelptabpage.ui", "ValidationHelpTabPage", &rArgSet)
+ScTPValidationHelp::ScTPValidationHelp(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet)
+ : SfxTabPage(pPage, pController, "modules/scalc/ui/validationhelptabpage.ui", "ValidationHelpTabPage", &rArgSet)
, m_xTsbHelp(m_xBuilder->weld_check_button("tsbhelp"))
, m_xEdtTitle(m_xBuilder->weld_entry("title"))
, m_xEdInputHelp(m_xBuilder->weld_text_view("inputhelp"))
@@ -691,10 +691,10 @@ ScTPValidationHelp::~ScTPValidationHelp()
{
}
-std::unique_ptr<SfxTabPage> ScTPValidationHelp::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> ScTPValidationHelp::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rArgSet)
{
- return std::make_unique<ScTPValidationHelp>(pParent, *rArgSet);
+ return std::make_unique<ScTPValidationHelp>(pPage, pController, *rArgSet);
}
void ScTPValidationHelp::Reset( const SfxItemSet* rArgSet )
@@ -728,10 +728,10 @@ bool ScTPValidationHelp::FillItemSet( SfxItemSet* rArgSet )
// Error Alert Page
-ScTPValidationError::ScTPValidationError(TabPageParent pParent,
+ScTPValidationError::ScTPValidationError(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rArgSet)
- : SfxTabPage ( pParent,
+ : SfxTabPage ( pPage, pController,
"modules/scalc/ui/erroralerttabpage.ui", "ErrorAlertTabPage",
&rArgSet )
, m_xTsbShow(m_xBuilder->weld_check_button("tsbshow"))
@@ -759,10 +759,10 @@ void ScTPValidationError::Init()
SelectActionHdl(*m_xLbAction);
}
-std::unique_ptr<SfxTabPage> ScTPValidationError::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> ScTPValidationError::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rArgSet)
{
- return std::make_unique<ScTPValidationError>(pParent, *rArgSet);
+ return std::make_unique<ScTPValidationError>(pPage, pController, *rArgSet);
}
void ScTPValidationError::Reset( const SfxItemSet* rArgSet )
diff --git a/sc/source/ui/docshell/tpstat.cxx b/sc/source/ui/docshell/tpstat.cxx
index 615d7de0a13c..e7544e54128e 100644
--- a/sc/source/ui/docshell/tpstat.cxx
+++ b/sc/source/ui/docshell/tpstat.cxx
@@ -28,13 +28,13 @@
// Dokumentinfo-Tabpage:
-std::unique_ptr<SfxTabPage> ScDocStatPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
+std::unique_ptr<SfxTabPage> ScDocStatPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet )
{
- return std::make_unique<ScDocStatPage>( pParent, *rSet );
+ return std::make_unique<ScDocStatPage>( pPage, pController, *rSet );
}
-ScDocStatPage::ScDocStatPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "modules/scalc/ui/statisticsinfopage.ui", "StatisticsInfoPage", &rSet)
+ScDocStatPage::ScDocStatPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "modules/scalc/ui/statisticsinfopage.ui", "StatisticsInfoPage", &rSet)
, m_xFtTables(m_xBuilder->weld_label("nosheets"))
, m_xFtCells(m_xBuilder->weld_label("nocells"))
, m_xFtPages(m_xBuilder->weld_label("nopages"))
diff --git a/sc/source/ui/inc/opredlin.hxx b/sc/source/ui/inc/opredlin.hxx
index dba8539c90d2..b32d848dd6aa 100644
--- a/sc/source/ui/inc/opredlin.hxx
+++ b/sc/source/ui/inc/opredlin.hxx
@@ -31,8 +31,8 @@ class ScRedlineOptionsTabPage : public SfxTabPage
std::unique_ptr<ColorListBox> m_xMoveColorLB;
public:
- ScRedlineOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet );
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+ ScRedlineOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
virtual ~ScRedlineOptionsTabPage() override;
virtual bool FillItemSet( SfxItemSet* rSet ) override;
diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index 8c2660ea5319..9ea577b4f622 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -104,7 +104,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 std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(TabPageParent pParent, const SfxItemSet &rOptions) override;
+ virtual std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController, 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 0f114fa13d9c..fd3c301e7653 100644
--- a/sc/source/ui/inc/scuitphfedit.hxx
+++ b/sc/source/ui/inc/scuitphfedit.hxx
@@ -54,7 +54,7 @@ public:
void ClearTextAreas();
protected:
- ScHFEditPage( TabPageParent pParent,
+ ScHFEditPage( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rCoreSet,
sal_uInt16 nWhich,
bool bHeader );
@@ -116,29 +116,29 @@ private:
class ScRightHeaderEditPage : public ScHFEditPage
{
public:
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rCoreSet );
- ScRightHeaderEditPage( TabPageParent pParent, const SfxItemSet& rSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet );
+ ScRightHeaderEditPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet );
};
class ScLeftHeaderEditPage : public ScHFEditPage
{
public:
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rCoreSet );
- ScLeftHeaderEditPage( TabPageParent pParent, const SfxItemSet& rSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet );
+ ScLeftHeaderEditPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet );
};
class ScRightFooterEditPage : public ScHFEditPage
{
public:
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rCoreSet );
- ScRightFooterEditPage( TabPageParent pParent, const SfxItemSet& rSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet );
+ ScRightFooterEditPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet );
};
class ScLeftFooterEditPage : public ScHFEditPage
{
public:
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rCoreSet );
- ScLeftFooterEditPage( TabPageParent pParent, const SfxItemSet& rSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet );
+ ScLeftFooterEditPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet );
};
#endif
diff --git a/sc/source/ui/inc/tabpages.hxx b/sc/source/ui/inc/tabpages.hxx
index 9cdffb2144d3..ba8e35e4945f 100644
--- a/sc/source/ui/inc/tabpages.hxx
+++ b/sc/source/ui/inc/tabpages.hxx
@@ -26,8 +26,8 @@ class ScTabPageProtection : public SfxTabPage
{
static const sal_uInt16 pProtectionRanges[];
public:
- ScTabPageProtection(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent,
+ ScTabPageProtection(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
virtual ~ScTabPageProtection() override;
diff --git a/sc/source/ui/inc/tabvwsh.hxx b/sc/source/ui/inc/tabvwsh.hxx
index 3b6005afa36f..f1a67a7f96a8 100644
--- a/sc/source/ui/inc/tabvwsh.hxx
+++ b/sc/source/ui/inc/tabvwsh.hxx
@@ -319,7 +319,7 @@ public:
SfxPrinterChangeFlags nDiffFlags = SFX_PRINTER_ALL ) override;
virtual bool HasPrintOptionsPage() const override;
- virtual std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(TabPageParent pParent, const SfxItemSet &rOptions) override;
+ virtual std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController, 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 d32704f496f4..150a5a615d11 100644
--- a/sc/source/ui/inc/tpcalc.hxx
+++ b/sc/source/ui/inc/tpcalc.hxx
@@ -28,8 +28,8 @@ class ScDocOptions;
class ScTpCalcOptions : public SfxTabPage
{
public:
- ScTpCalcOptions(TabPageParent pParent, const SfxItemSet& rCoreSet);
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rCoreSet);
+ ScTpCalcOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet);
virtual ~ScTpCalcOptions() override;
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 4bceec955a15..4a61426a5431 100644
--- a/sc/source/ui/inc/tpcompatibility.hxx
+++ b/sc/source/ui/inc/tpcompatibility.hxx
@@ -15,8 +15,8 @@
class ScTpCompatOptions : public SfxTabPage
{
public:
- explicit ScTpCompatOptions(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rCoreAttrs);
+ explicit ScTpCompatOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreAttrs);
virtual ~ScTpCompatOptions() override;
virtual bool FillItemSet(SfxItemSet* rCoreAttrs) override;
diff --git a/sc/source/ui/inc/tpdefaults.hxx b/sc/source/ui/inc/tpdefaults.hxx
index a2a88e7e95f9..44eea6e872a0 100644
--- a/sc/source/ui/inc/tpdefaults.hxx
+++ b/sc/source/ui/inc/tpdefaults.hxx
@@ -16,8 +16,8 @@
class ScTpDefaultsOptions : public SfxTabPage
{
public:
- explicit ScTpDefaultsOptions(TabPageParent pParent, const SfxItemSet& rCoreSet);
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rCoreSet);
+ explicit ScTpDefaultsOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet);
virtual ~ScTpDefaultsOptions() override;
virtual bool FillItemSet(SfxItemSet* rCoreSet) override;
diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx
index 2aee580c16a3..4de05560cfd3 100644
--- a/sc/source/ui/inc/tpformula.hxx
+++ b/sc/source/ui/inc/tpformula.hxx
@@ -28,8 +28,8 @@
class ScTpFormulaOptions : public SfxTabPage
{
public:
- explicit ScTpFormulaOptions(TabPageParent pParent, const SfxItemSet& rCoreSet);
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rCoreSet);
+ explicit ScTpFormulaOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet);
virtual ~ScTpFormulaOptions() override;
virtual bool FillItemSet(SfxItemSet* rCoreSet) override;
diff --git a/sc/source/ui/inc/tphf.hxx b/sc/source/ui/inc/tphf.hxx
index 17d7c2a598aa..53c71e3d86c1 100644
--- a/sc/source/ui/inc/tphf.hxx
+++ b/sc/source/ui/inc/tphf.hxx
@@ -36,7 +36,7 @@ public:
void SetStyleDlg ( ScStyleDlg* pDlg ) { pStyleDlg = pDlg; }
protected:
- ScHFPage(TabPageParent pParent, const SfxItemSet& rSet, sal_uInt16 nSetId);
+ ScHFPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet, sal_uInt16 nSetId);
virtual void ActivatePage( const SfxItemSet& rSet ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
@@ -56,16 +56,16 @@ private:
class ScHeaderPage : public ScHFPage
{
public:
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
- ScHeaderPage(TabPageParent pParent, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
+ ScHeaderPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
static const sal_uInt16* GetRanges();
};
class ScFooterPage : public ScHFPage
{
public:
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
- ScFooterPage(TabPageParent pParent, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
+ ScFooterPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
static const sal_uInt16* GetRanges();
};
diff --git a/sc/source/ui/inc/tpprint.hxx b/sc/source/ui/inc/tpprint.hxx
index ef15a39b7537..4e2d0f91712c 100644
--- a/sc/source/ui/inc/tpprint.hxx
+++ b/sc/source/ui/inc/tpprint.hxx
@@ -29,8 +29,8 @@ class ScTpPrintOptions : public SfxTabPage
std::unique_ptr<weld::CheckButton> m_xForceBreaksCB;
public:
- ScTpPrintOptions(TabPageParent pPage, const SfxItemSet& rCoreSet);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rCoreSet );
+ ScTpPrintOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet );
virtual ~ScTpPrintOptions() override;
virtual bool FillItemSet( SfxItemSet* rCoreSet ) override;
diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx
index 655ff11747aa..5765b7096e05 100644
--- a/sc/source/ui/inc/tpsort.hxx
+++ b/sc/source/ui/inc/tpsort.hxx
@@ -42,8 +42,8 @@ class ScViewData;
class ScTabPageSortFields : public SfxTabPage
{
public:
- ScTabPageSortFields(TabPageParent pParent, const SfxItemSet& rArgSet);
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rArgSet);
+ ScTabPageSortFields(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rArgSet);
virtual ~ScTabPageSortFields() override;
virtual bool FillItemSet ( SfxItemSet* rArgSet ) override;
@@ -94,8 +94,8 @@ class ScDocument;
class ScTabPageSortOptions : public SfxTabPage
{
public:
- ScTabPageSortOptions(TabPageParent pParent, const SfxItemSet& rArgSet);
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* pArgSet);
+ ScTabPageSortOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* pArgSet);
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 a317345dcadd..71d3dd7cd94b 100644
--- a/sc/source/ui/inc/tpstat.hxx
+++ b/sc/source/ui/inc/tpstat.hxx
@@ -25,8 +25,8 @@
class ScDocStatPage: public SfxTabPage
{
public:
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
- ScDocStatPage(TabPageParent pParent, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet);
+ ScDocStatPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~ScDocStatPage() override;
protected:
diff --git a/sc/source/ui/inc/tpsubt.hxx b/sc/source/ui/inc/tpsubt.hxx
index 4f3c48ee880e..f4e52a5a6517 100644
--- a/sc/source/ui/inc/tpsubt.hxx
+++ b/sc/source/ui/inc/tpsubt.hxx
@@ -33,7 +33,7 @@ struct ScSubTotalParam;
class ScTpSubTotalGroup : public SfxTabPage
{
protected:
- ScTpSubTotalGroup(TabPageParent pParent, const SfxItemSet& rArgSet);
+ ScTpSubTotalGroup(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet);
public:
virtual ~ScTpSubTotalGroup() override;
@@ -76,9 +76,9 @@ private:
class ScTpSubTotalGroup1 final : public ScTpSubTotalGroup
{
public:
- ScTpSubTotalGroup1( TabPageParent pParent,
+ ScTpSubTotalGroup1( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rArgSet );
- static std::unique_ptr<SfxTabPage> Create ( TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create ( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rArgSet );
virtual ~ScTpSubTotalGroup1() override;
@@ -89,9 +89,9 @@ public:
class ScTpSubTotalGroup2 final : public ScTpSubTotalGroup
{
public:
- ScTpSubTotalGroup2( TabPageParent pParent,
+ ScTpSubTotalGroup2( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rArgSet );
- static std::unique_ptr<SfxTabPage> Create ( TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create ( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rArgSet );
virtual ~ScTpSubTotalGroup2() override;
@@ -102,9 +102,9 @@ public:
class ScTpSubTotalGroup3 final : public ScTpSubTotalGroup
{
public:
- ScTpSubTotalGroup3( TabPageParent pParent,
+ ScTpSubTotalGroup3( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rArgSet );
- static std::unique_ptr<SfxTabPage> Create ( TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create ( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rArgSet );
virtual ~ScTpSubTotalGroup3() override;
@@ -115,8 +115,8 @@ public:
class ScTpSubTotalOptions final : public SfxTabPage
{
public:
- ScTpSubTotalOptions(TabPageParent pParent, const SfxItemSet& rArgSet);
- static std::unique_ptr<SfxTabPage> Create ( TabPageParent pParent,
+ ScTpSubTotalOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet);
+ static std::unique_ptr<SfxTabPage> Create ( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rArgSet );
virtual ~ScTpSubTotalOptions() override;
diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx
index fe517c35a5a1..fe86f338ec9a 100644
--- a/sc/source/ui/inc/tptable.hxx
+++ b/sc/source/ui/inc/tptable.hxx
@@ -26,8 +26,8 @@ class ScTablePage : public SfxTabPage
{
static const sal_uInt16 pPageTableRanges[];
public:
- ScTablePage(TabPageParent pParent, const SfxItemSet& rCoreSet);
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rCoreSet);
+ ScTablePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet);
virtual ~ScTablePage() override;
static const sal_uInt16* GetRanges () { return pPageTableRanges; }
diff --git a/sc/source/ui/inc/tpusrlst.hxx b/sc/source/ui/inc/tpusrlst.hxx
index 438d897569a9..dd3d4cf133a4 100644
--- a/sc/source/ui/inc/tpusrlst.hxx
+++ b/sc/source/ui/inc/tpusrlst.hxx
@@ -33,8 +33,8 @@ class ScRefAddress;
class ScTpUserLists : public SfxTabPage
{
public:
- ScTpUserLists(TabPageParent pParent, const SfxItemSet& rArgSet);
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent,
+ ScTpUserLists(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
virtual ~ScTpUserLists() override;
virtual bool FillItemSet ( SfxItemSet* rCoreAttrs ) override;
diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx
index 3e47c2d8ae03..bed1e1325e69 100644
--- a/sc/source/ui/inc/tpview.hxx
+++ b/sc/source/ui/inc/tpview.hxx
@@ -62,8 +62,8 @@ class ScTpContentOptions : public SfxTabPage
DECL_LINK( CBHdl, weld::ToggleButton&, void );
public:
- ScTpContentOptions(TabPageParent pParent, const SfxItemSet& rArgSet);
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rCoreSet);
+ ScTpContentOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet);
virtual ~ScTpContentOptions() override;
virtual bool FillItemSet ( SfxItemSet* rCoreSet ) override;
virtual void Reset ( const SfxItemSet* rCoreSet ) override;
@@ -100,8 +100,8 @@ class ScTpLayoutOptions : public SfxTabPage
public:
- ScTpLayoutOptions(TabPageParent pParent, const SfxItemSet& rArgSet );
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent,
+ ScTpLayoutOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet );
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rCoreSet);
virtual ~ScTpLayoutOptions() override;
virtual bool FillItemSet ( SfxItemSet* rCoreSet ) override;
diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx
index d5f33838f818..2bb9043e8fb3 100644
--- a/sc/source/ui/inc/validate.hxx
+++ b/sc/source/ui/inc/validate.hxx
@@ -77,8 +77,8 @@ class ScTPValidationValue : public ScRefHandlerCaller, public SfxTabPage
{
static const sal_uInt16 pValueRanges[];
public:
- explicit ScTPValidationValue(TabPageParent pParent, const SfxItemSet& rArgSet);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rArgSet );
+ explicit ScTPValidationValue(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rArgSet );
virtual ~ScTPValidationValue() override;
static const sal_uInt16* GetRanges() { return pValueRanges; }
@@ -237,8 +237,8 @@ private:
std::unique_ptr<weld::TextView> m_xEdInputHelp;
public:
- ScTPValidationHelp(TabPageParent pParent, const SfxItemSet& rArgSet);
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rArgSet);
+ ScTPValidationHelp(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rArgSet);
virtual ~ScTPValidationHelp() override;
virtual bool FillItemSet ( SfxItemSet* rArgSet ) override;
@@ -262,8 +262,8 @@ private:
DECL_LINK(ClickSearchHdl, weld::Button&, void);
public:
- ScTPValidationError(TabPageParent pParent, const SfxItemSet& rArgSet);
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rArgSet);
+ ScTPValidationError(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rArgSet);
virtual ~ScTPValidationError() override;
virtual bool FillItemSet ( SfxItemSet* rArgSet ) override;
diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx
index c3a4d3f0f58a..4d8f1a24c483 100644
--- a/sc/source/ui/optdlg/opredlin.cxx
+++ b/sc/source/ui/optdlg/opredlin.cxx
@@ -28,12 +28,12 @@
#include <opredlin.hxx>
-ScRedlineOptionsTabPage::ScRedlineOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "modules/scalc/ui/optchangespage.ui", "OptChangesPage", &rSet)
- , m_xContentColorLB(new ColorListBox(m_xBuilder->weld_menu_button("changes"), pParent.GetFrameWeld()))
- , m_xRemoveColorLB(new ColorListBox(m_xBuilder->weld_menu_button("deletions"), pParent.GetFrameWeld()))
- , m_xInsertColorLB(new ColorListBox(m_xBuilder->weld_menu_button("entries"), pParent.GetFrameWeld()))
- , m_xMoveColorLB(new ColorListBox(m_xBuilder->weld_menu_button("insertions"), pParent.GetFrameWeld()))
+ScRedlineOptionsTabPage::ScRedlineOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "modules/scalc/ui/optchangespage.ui", "OptChangesPage", &rSet)
+ , m_xContentColorLB(new ColorListBox(m_xBuilder->weld_menu_button("changes"), pController->getDialog()))
+ , m_xRemoveColorLB(new ColorListBox(m_xBuilder->weld_menu_button("deletions"), pController->getDialog()))
+ , m_xInsertColorLB(new ColorListBox(m_xBuilder->weld_menu_button("entries"), pController->getDialog()))
+ , m_xMoveColorLB(new ColorListBox(m_xBuilder->weld_menu_button("insertions"), pController->getDialog()))
{
m_xContentColorLB->SetSlotId(SID_AUTHOR_COLOR);
m_xRemoveColorLB->SetSlotId(SID_AUTHOR_COLOR);
@@ -49,9 +49,9 @@ ScRedlineOptionsTabPage::~ScRedlineOptionsTabPage()
m_xMoveColorLB.reset();
}
-std::unique_ptr<SfxTabPage> ScRedlineOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
+std::unique_ptr<SfxTabPage> ScRedlineOptionsTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet )
{
- return std::make_unique<ScRedlineOptionsTabPage>( pParent, *rSet );
+ return std::make_unique<ScRedlineOptionsTabPage>( pPage, pController, *rSet );
}
bool ScRedlineOptionsTabPage::FillItemSet( SfxItemSet* /* rSet */ )
diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index 5ea4b4089d08..923e11f60130 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -32,8 +32,8 @@
#include <tpcalc.hxx>
-ScTpCalcOptions::ScTpCalcOptions(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
- : SfxTabPage(pParent, "modules/scalc/ui/optcalculatepage.ui", "OptCalculatePage", &rCoreAttrs)
+ScTpCalcOptions::ScTpCalcOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs)
+ : SfxTabPage(pPage, pController, "modules/scalc/ui/optcalculatepage.ui", "OptCalculatePage", &rCoreAttrs)
, pOldOptions(new ScDocOptions(
static_cast<const ScTpCalcItem&>(rCoreAttrs.Get(
GetWhich(SID_SCDOCOPTIONS))).GetDocOptions()))
@@ -77,9 +77,9 @@ void ScTpCalcOptions::Init()
m_xBtnThread->connect_toggled( LINK( this, ScTpCalcOptions, CheckClickHdl ) );
}
-std::unique_ptr<SfxTabPage> ScTpCalcOptions::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
+std::unique_ptr<SfxTabPage> ScTpCalcOptions::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
{
- return std::make_unique<ScTpCalcOptions>( pParent, *rAttrSet );
+ return std::make_unique<ScTpCalcOptions>( pPage, pController, *rAttrSet );
}
void ScTpCalcOptions::Reset( const SfxItemSet* /* rCoreAttrs */ )
diff --git a/sc/source/ui/optdlg/tpcompatibility.cxx b/sc/source/ui/optdlg/tpcompatibility.cxx
index 17493b6948c3..65d1b80b4ddb 100644
--- a/sc/source/ui/optdlg/tpcompatibility.cxx
+++ b/sc/source/ui/optdlg/tpcompatibility.cxx
@@ -15,8 +15,8 @@
#include <sc.hrc>
#include <optutil.hxx>
-ScTpCompatOptions::ScTpCompatOptions(TabPageParent pParent, const SfxItemSet &rCoreAttrs)
- : SfxTabPage(pParent, "modules/scalc/ui/optcompatibilitypage.ui", "OptCompatibilityPage", &rCoreAttrs)
+ScTpCompatOptions::ScTpCompatOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rCoreAttrs)
+ : SfxTabPage(pPage, pController, "modules/scalc/ui/optcompatibilitypage.ui", "OptCompatibilityPage", &rCoreAttrs)
, m_xLbKeyBindings(m_xBuilder->weld_combo_box("keybindings"))
{
}
@@ -25,9 +25,9 @@ ScTpCompatOptions::~ScTpCompatOptions()
{
}
-std::unique_ptr<SfxTabPage> ScTpCompatOptions::Create(TabPageParent pParent, const SfxItemSet *rCoreAttrs)
+std::unique_ptr<SfxTabPage> ScTpCompatOptions::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rCoreAttrs)
{
- return std::make_unique<ScTpCompatOptions>(pParent, *rCoreAttrs);
+ return std::make_unique<ScTpCompatOptions>(pPage, pController, *rCoreAttrs);
}
bool ScTpCompatOptions::FillItemSet(SfxItemSet *rCoreAttrs)
diff --git a/sc/source/ui/optdlg/tpdefaults.cxx b/sc/source/ui/optdlg/tpdefaults.cxx
index 456053258d48..a0c8234eefc9 100644
--- a/sc/source/ui/optdlg/tpdefaults.cxx
+++ b/sc/source/ui/optdlg/tpdefaults.cxx
@@ -14,8 +14,8 @@
#include <defaultsoptions.hxx>
#include <document.hxx>
-ScTpDefaultsOptions::ScTpDefaultsOptions(TabPageParent pParent, const SfxItemSet &rCoreSet)
- : SfxTabPage(pParent, "modules/scalc/ui/optdefaultpage.ui", "OptDefaultPage", &rCoreSet)
+ScTpDefaultsOptions::ScTpDefaultsOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rCoreSet)
+ : SfxTabPage(pPage, pController, "modules/scalc/ui/optdefaultpage.ui", "OptDefaultPage", &rCoreSet)
, m_xEdNSheets(m_xBuilder->weld_spin_button("sheetsnumber"))
, m_xEdSheetPrefix(m_xBuilder->weld_entry("sheetprefix"))
{
@@ -28,9 +28,9 @@ ScTpDefaultsOptions::~ScTpDefaultsOptions()
{
}
-std::unique_ptr<SfxTabPage> ScTpDefaultsOptions::Create(TabPageParent pParent, const SfxItemSet *rCoreAttrs)
+std::unique_ptr<SfxTabPage> ScTpDefaultsOptions::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rCoreAttrs)
{
- return std::make_unique<ScTpDefaultsOptions>(pParent, *rCoreAttrs);
+ return std::make_unique<ScTpDefaultsOptions>(pPage, pController, *rCoreAttrs);
}
bool ScTpDefaultsOptions::FillItemSet(SfxItemSet *rCoreSet)
diff --git a/sc/source/ui/optdlg/tpformula.cxx b/sc/source/ui/optdlg/tpformula.cxx
index 2edc691e3541..42e1e6e10dec 100644
--- a/sc/source/ui/optdlg/tpformula.cxx
+++ b/sc/source/ui/optdlg/tpformula.cxx
@@ -30,8 +30,8 @@
#include <unotools/localedatawrapper.hxx>
-ScTpFormulaOptions::ScTpFormulaOptions(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
- : SfxTabPage(pParent, "modules/scalc/ui/optformula.ui", "OptFormula", &rCoreAttrs)
+ScTpFormulaOptions::ScTpFormulaOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs)
+ : SfxTabPage(pPage, pController, "modules/scalc/ui/optformula.ui", "OptFormula", &rCoreAttrs)
, mnDecSep(0)
, mxLbFormulaSyntax(m_xBuilder->weld_combo_box("formulasyntax"))
, mxCbEnglishFuncName(m_xBuilder->weld_check_button("englishfuncname"))
@@ -203,9 +203,9 @@ IMPL_LINK( ScTpFormulaOptions, SepEditOnFocusHdl, weld::Widget&, rControl, void
OnFocusSeparatorInput(dynamic_cast<weld::Entry*>(&rControl));
}
-std::unique_ptr<SfxTabPage> ScTpFormulaOptions::Create(TabPageParent pParent, const SfxItemSet* rCoreSet)
+std::unique_ptr<SfxTabPage> ScTpFormulaOptions::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet)
{
- return std::make_unique<ScTpFormulaOptions>(pParent, *rCoreSet);
+ return std::make_unique<ScTpFormulaOptions>(pPage, pController, *rCoreSet);
}
bool ScTpFormulaOptions::FillItemSet(SfxItemSet* rCoreSet)
diff --git a/sc/source/ui/optdlg/tpprint.cxx b/sc/source/ui/optdlg/tpprint.cxx
index b3c5ee139f00..e8294c92f196 100644
--- a/sc/source/ui/optdlg/tpprint.cxx
+++ b/sc/source/ui/optdlg/tpprint.cxx
@@ -26,9 +26,9 @@
#include <scmod.hxx>
#include <sc.hrc>
-ScTpPrintOptions::ScTpPrintOptions( TabPageParent pPage,
+ScTpPrintOptions::ScTpPrintOptions( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rCoreAttrs )
- : SfxTabPage(pPage, "modules/scalc/ui/optdlg.ui", "optCalcPrintPage", &rCoreAttrs )
+ : SfxTabPage(pPage, pController, "modules/scalc/ui/optdlg.ui", "optCalcPrintPage", &rCoreAttrs )
, m_xSkipEmptyPagesCB(m_xBuilder->weld_check_button("suppressCB"))
, m_xSelectedSheetsCB(m_xBuilder->weld_check_button("printCB"))
, m_xForceBreaksCB(m_xBuilder->weld_check_button("forceBreaksCB"))
@@ -39,9 +39,9 @@ ScTpPrintOptions::~ScTpPrintOptions()
{
}
-std::unique_ptr<SfxTabPage> ScTpPrintOptions::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> ScTpPrintOptions::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
{
- return std::make_unique<ScTpPrintOptions>(pParent, *rAttrSet);
+ return std::make_unique<ScTpPrintOptions>(pPage, pController, *rAttrSet);
}
DeactivateRC ScTpPrintOptions::DeactivatePage( SfxItemSet* pSetP )
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 3d7120935e9d..b243095191ea 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -44,9 +44,9 @@ static const sal_Unicode cDelimiter = ',';
// Benutzerdefinierte Listen:
-ScTpUserLists::ScTpUserLists( TabPageParent pParent,
+ScTpUserLists::ScTpUserLists( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rCoreAttrs )
- : SfxTabPage(pParent, "modules/scalc/ui/optsortlists.ui", "OptSortLists",
+ : SfxTabPage(pPage, pController, "modules/scalc/ui/optsortlists.ui", "OptSortLists",
&rCoreAttrs )
, mxFtLists(m_xBuilder->weld_label("listslabel"))
, mxLbLists(m_xBuilder->weld_tree_view("lists"))
@@ -128,9 +128,9 @@ void ScTpUserLists::Init()
}
-std::unique_ptr<SfxTabPage> ScTpUserLists::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
+std::unique_ptr<SfxTabPage> ScTpUserLists::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
{
- return std::make_unique<ScTpUserLists>(pParent, *rAttrSet);
+ return std::make_unique<ScTpUserLists>(pPage, pController, *rAttrSet);
}
void ScTpUserLists::Reset( const SfxItemSet* rCoreAttrs )
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index 0fff707bac20..3e544ebaaa92 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -32,11 +32,11 @@
#include <svx/colorbox.hxx>
#include <svtools/unitconv.hxx>
-ScTpContentOptions::ScTpContentOptions(TabPageParent pParent, const SfxItemSet& rArgSet)
- : SfxTabPage(pParent, "modules/scalc/ui/tpviewpage.ui", "TpViewPage", &rArgSet)
+ScTpContentOptions::ScTpContentOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet)
+ : SfxTabPage(pPage, pController, "modules/scalc/ui/tpviewpage.ui", "TpViewPage", &rArgSet)
, m_xGridLB(m_xBuilder->weld_combo_box("grid"))
, m_xColorFT(m_xBuilder->weld_label("color_label"))
- , m_xColorLB(new ColorListBox(m_xBuilder->weld_menu_button("color"), pParent.GetFrameWeld()))
+ , m_xColorLB(new ColorListBox(m_xBuilder->weld_menu_button("color"), pController->getDialog()))
, m_xBreakCB(m_xBuilder->weld_check_button("break"))
, m_xGuideLineCB(m_xBuilder->weld_check_button("guideline"))
, m_xFormulaCB(m_xBuilder->weld_check_button("formula"))
@@ -90,10 +90,10 @@ ScTpContentOptions::~ScTpContentOptions()
m_xColorLB.reset();
}
-std::unique_ptr<SfxTabPage> ScTpContentOptions::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> ScTpContentOptions::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rCoreSet )
{
- return std::make_unique<ScTpContentOptions>(pParent, *rCoreSet);
+ return std::make_unique<ScTpContentOptions>(pPage, pController, *rCoreSet);
}
bool ScTpContentOptions::FillItemSet( SfxItemSet* rCoreSet )
@@ -300,8 +300,8 @@ IMPL_LINK( ScTpContentOptions, GridHdl, weld::ComboBox&, rLb, void )
m_xLocalOptions->SetOption( VOPT_GRID_ONTOP, bGridOnTop );
}
-ScTpLayoutOptions::ScTpLayoutOptions(TabPageParent pParent, const SfxItemSet& rArgSet)
- : SfxTabPage(pParent, "modules/scalc/ui/scgeneralpage.ui", "ScGeneralPage", &rArgSet)
+ScTpLayoutOptions::ScTpLayoutOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet)
+ : SfxTabPage(pPage, pController, "modules/scalc/ui/scgeneralpage.ui", "ScGeneralPage", &rArgSet)
, pDoc(nullptr)
, m_xUnitLB(m_xBuilder->weld_combo_box("unitlb"))
, m_xTabMF(m_xBuilder->weld_metric_spin_button("tabmf", FieldUnit::CM))
@@ -353,10 +353,10 @@ ScTpLayoutOptions::~ScTpLayoutOptions()
{
}
-std::unique_ptr<SfxTabPage> ScTpLayoutOptions::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> ScTpLayoutOptions::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rCoreSet )
{
- auto xNew = std::make_unique<ScTpLayoutOptions>(pParent, *rCoreSet);
+ auto xNew = std::make_unique<ScTpLayoutOptions>(pPage, pController, *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 4a1d5590e731..539aa5955a1c 100644
--- a/sc/source/ui/pagedlg/scuitphfedit.cxx
+++ b/sc/source/ui/pagedlg/scuitphfedit.cxx
@@ -40,11 +40,11 @@
// class ScHFEditPage
-ScHFEditPage::ScHFEditPage(TabPageParent pParent,
+ScHFEditPage::ScHFEditPage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rCoreAttrs,
sal_uInt16 nWhichId,
bool bHeader)
- : SfxTabPage(pParent, "modules/scalc/ui/headerfootercontent.ui", "HeaderFooterContent", &rCoreAttrs)
+ : SfxTabPage(pPage, pController, "modules/scalc/ui/headerfootercontent.ui", "HeaderFooterContent", &rCoreAttrs)
, nWhich( nWhichId )
, m_bDropDownActive(false)
, m_nTimeToggled(-1)
@@ -67,9 +67,9 @@ ScHFEditPage::ScHFEditPage(TabPageParent pParent,
, m_xFtCustomized(m_xBuilder->weld_label("labelSTR_HF_CUSTOMIZED"))
, m_xLeft(m_xBuilder->weld_widget("labelFT_LEFT"))
, m_xRight(m_xBuilder->weld_widget("labelFT_RIGHT"))
- , m_xWndLeft(new ScEditWindow(Left, pParent.GetFrameWeld()))
- , m_xWndCenter(new ScEditWindow(Center, pParent.GetFrameWeld()))
- , m_xWndRight(new ScEditWindow(Right, pParent.GetFrameWeld()))
+ , m_xWndLeft(new ScEditWindow(Left, pController->getDialog()))
+ , m_xWndCenter(new ScEditWindow(Center, pController->getDialog()))
+ , m_xWndRight(new ScEditWindow(Right, pController->getDialog()))
, m_xWndLeftWnd(new weld::CustomWeld(*m_xBuilder, "textviewWND_LEFT", *m_xWndLeft))
, m_xWndCenterWnd(new weld::CustomWeld(*m_xBuilder, "textviewWND_CENTER", *m_xWndCenter))
, m_xWndRightWnd(new weld::CustomWeld(*m_xBuilder, "textviewWND_RIGHT", *m_xWndRight))
@@ -781,58 +781,58 @@ IMPL_LINK(ScHFEditPage, MenuHdl, const OString&, rSelectedId, void)
// class ScRightHeaderEditPage
-ScRightHeaderEditPage::ScRightHeaderEditPage( TabPageParent pParent, const SfxItemSet& rCoreSet )
- : ScHFEditPage( pParent,
+ScRightHeaderEditPage::ScRightHeaderEditPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet )
+ : ScHFEditPage( pPage, pController,
rCoreSet,
rCoreSet.GetPool()->GetWhich(SID_SCATTR_PAGE_HEADERRIGHT ),
true )
{}
-std::unique_ptr<SfxTabPage> ScRightHeaderEditPage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet )
+std::unique_ptr<SfxTabPage> ScRightHeaderEditPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet )
{
- return std::make_unique<ScRightHeaderEditPage>( pParent, *rCoreSet );
+ return std::make_unique<ScRightHeaderEditPage>( pPage, pController, *rCoreSet );
}
// class ScLeftHeaderEditPage
-ScLeftHeaderEditPage::ScLeftHeaderEditPage( TabPageParent pParent, const SfxItemSet& rCoreSet )
- : ScHFEditPage( pParent,
+ScLeftHeaderEditPage::ScLeftHeaderEditPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet )
+ : ScHFEditPage( pPage, pController,
rCoreSet,
rCoreSet.GetPool()->GetWhich(SID_SCATTR_PAGE_HEADERLEFT ),
true )
{}
-std::unique_ptr<SfxTabPage> ScLeftHeaderEditPage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet )
+std::unique_ptr<SfxTabPage> ScLeftHeaderEditPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet )
{
- return std::make_unique<ScLeftHeaderEditPage>( pParent, *rCoreSet );
+ return std::make_unique<ScLeftHeaderEditPage>( pPage, pController, *rCoreSet );
}
// class ScRightFooterEditPage
-ScRightFooterEditPage::ScRightFooterEditPage( TabPageParent pParent, const SfxItemSet& rCoreSet )
- : ScHFEditPage( pParent,
+ScRightFooterEditPage::ScRightFooterEditPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet )
+ : ScHFEditPage( pPage, pController,
rCoreSet,
rCoreSet.GetPool()->GetWhich(SID_SCATTR_PAGE_FOOTERRIGHT ),
false )
{}
-std::unique_ptr<SfxTabPage> ScRightFooterEditPage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet )
+std::unique_ptr<SfxTabPage> ScRightFooterEditPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet )
{
- return std::make_unique<ScRightFooterEditPage>( pParent, *rCoreSet );
+ return std::make_unique<ScRightFooterEditPage>( pPage, pController, *rCoreSet );
}
// class ScLeftFooterEditPage
-ScLeftFooterEditPage::ScLeftFooterEditPage( TabPageParent pParent, const SfxItemSet& rCoreSet )
- : ScHFEditPage( pParent,
+ScLeftFooterEditPage::ScLeftFooterEditPage( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet )
+ : ScHFEditPage( pPage, pController,
rCoreSet,
rCoreSet.GetPool()->GetWhich(SID_SCATTR_PAGE_FOOTERLEFT ),
false )
{}
-std::unique_ptr<SfxTabPage> ScLeftFooterEditPage::Create( TabPageParent pParent, const SfxItemSet* rCoreSet )
+std::unique_ptr<SfxTabPage> ScLeftFooterEditPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet )
{
- return std::make_unique<ScLeftFooterEditPage>( pParent, *rCoreSet );
+ return std::make_unique<ScLeftFooterEditPage>( pPage, pController, *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 604c8520ccbf..f037e0c2ee08 100644
--- a/sc/source/ui/pagedlg/tphf.cxx
+++ b/sc/source/ui/pagedlg/tphf.cxx
@@ -42,8 +42,8 @@
// class ScHFPage
-ScHFPage::ScHFPage(TabPageParent pParent, const SfxItemSet& rSet, sal_uInt16 nSetId)
- : SvxHFPage(pParent, rSet, nSetId)
+ScHFPage::ScHFPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet, sal_uInt16 nSetId)
+ : SvxHFPage(pPage, pController, rSet, nSetId)
, aDataSet(*rSet.GetPool(), svl::Items<ATTR_PAGE, ATTR_PAGE, ATTR_PAGE_HEADERLEFT, ATTR_PAGE_FOOTERRIGHT>{})
, nPageUsage(SvxPageUsage::All)
, pStyleDlg(nullptr)
@@ -180,24 +180,23 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl, void*, void)
{
OUString aText;
SfxSingleTabDialogController aDlg(GetDialogFrameWeld(), &aDataSet);
- TabPageParent pPageParent(aDlg.get_content_area(), &aDlg);
bool bRightPage = m_xCntSharedBox->get_active() || (SvxPageUsage::Left != nPageUsage);
if ( nId == SID_ATTR_PAGE_HEADERSET )
{
aText = ScResId( STR_PAGEHEADER );
if ( bRightPage )
- aDlg.SetTabPage(ScRightHeaderEditPage::Create(pPageParent, &aDataSet));
+ aDlg.SetTabPage(ScRightHeaderEditPage::Create(aDlg.get_content_area(), &aDlg, &aDataSet));
else
- aDlg.SetTabPage(ScLeftHeaderEditPage::Create(pPageParent, &aDataSet));
+ aDlg.SetTabPage(ScLeftHeaderEditPage::Create(aDlg.get_content_area(), &aDlg, &aDataSet));
}
else
{
aText = ScResId( STR_PAGEFOOTER );
if ( bRightPage )
- aDlg.SetTabPage(ScRightFooterEditPage::Create(pPageParent, &aDataSet));
+ aDlg.SetTabPage(ScRightFooterEditPage::Create(aDlg.get_content_area(), &aDlg, &aDataSet));
else
- aDlg.SetTabPage(ScLeftFooterEditPage::Create(pPageParent, &aDataSet));
+ aDlg.SetTabPage(ScLeftFooterEditPage::Create(aDlg.get_content_area(), &aDlg, &aDataSet));
}
SvxNumType eNumType = aDataSet.Get(ATTR_PAGE).GetNumType();
@@ -217,14 +216,14 @@ IMPL_LINK_NOARG(ScHFPage, HFEditHdl, void*, void)
// class ScHeaderPage
-ScHeaderPage::ScHeaderPage(TabPageParent pParent, const SfxItemSet& rSet)
- : ScHFPage(pParent, rSet, SID_ATTR_PAGE_HEADERSET)
+ScHeaderPage::ScHeaderPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : ScHFPage(pPage, pController, rSet, SID_ATTR_PAGE_HEADERSET)
{
}
-std::unique_ptr<SfxTabPage> ScHeaderPage::Create(TabPageParent pParent, const SfxItemSet* rCoreSet)
+std::unique_ptr<SfxTabPage> ScHeaderPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet)
{
- return std::make_unique<ScHeaderPage>(pParent, *rCoreSet);
+ return std::make_unique<ScHeaderPage>(pPage, pController, *rCoreSet);
}
const sal_uInt16* ScHeaderPage::GetRanges()
@@ -234,14 +233,14 @@ const sal_uInt16* ScHeaderPage::GetRanges()
// class ScFooterPage
-ScFooterPage::ScFooterPage(TabPageParent pParent, const SfxItemSet& rSet)
- : ScHFPage( pParent, rSet, SID_ATTR_PAGE_FOOTERSET )
+ScFooterPage::ScFooterPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : ScHFPage( pPage, pController, rSet, SID_ATTR_PAGE_FOOTERSET )
{
}
-std::unique_ptr<SfxTabPage> ScFooterPage::Create(TabPageParent pParent, const SfxItemSet* rCoreSet)
+std::unique_ptr<SfxTabPage> ScFooterPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet)
{
- return std::make_unique<ScFooterPage>(pParent, *rCoreSet);
+ return std::make_unique<ScFooterPage>(pPage, pController, *rCoreSet);
}
const sal_uInt16* ScFooterPage::GetRanges()
diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index 5656364d6c4c..692fc245f617 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -94,8 +94,8 @@ bool WAS_DEFAULT(sal_uInt16 w, SfxItemSet const & s)
#define SC_TPTABLE_SCALE_TO 1
#define SC_TPTABLE_SCALE_TO_PAGES 2
-ScTablePage::ScTablePage(TabPageParent pParent, const SfxItemSet& rCoreAttrs)
- : SfxTabPage(pParent, "modules/scalc/ui/sheetprintpage.ui", "SheetPrintPage", &rCoreAttrs)
+ScTablePage::ScTablePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreAttrs)
+ : SfxTabPage(pPage, pController, "modules/scalc/ui/sheetprintpage.ui", "SheetPrintPage", &rCoreAttrs)
, m_nOrigScalePageWidth(0)
, m_nOrigScalePageHeight(0)
, m_xBtnTopDown(m_xBuilder->weld_radio_button("radioBTN_TOPDOWN"))
@@ -142,9 +142,9 @@ ScTablePage::~ScTablePage()
{
}
-std::unique_ptr<SfxTabPage> ScTablePage::Create(TabPageParent pParent, const SfxItemSet* rCoreSet)
+std::unique_ptr<SfxTabPage> ScTablePage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rCoreSet)
{
- return std::make_unique<ScTablePage>(pParent, *rCoreSet);
+ return std::make_unique<ScTablePage>(pPage, pController, *rCoreSet);
}
void ScTablePage::Reset( const SfxItemSet* rCoreSet )
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index 8d72ef4c6185..9c6c49f7e37a 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -524,12 +524,12 @@ bool ScPreviewShell::HasPrintOptionsPage() const
return true;
}
-std::unique_ptr<SfxTabPage> ScPreviewShell::CreatePrintOptionsPage(TabPageParent pParent, const SfxItemSet &rOptions)
+std::unique_ptr<SfxTabPage> ScPreviewShell::CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rOptions)
{
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc(RID_SC_TP_PRINT);
if ( ScTpPrintOptionsCreate )
- return ScTpPrintOptionsCreate(pParent, &rOptions);
+ return ScTpPrintOptionsCreate(pPage, pController, &rOptions);
return nullptr;
}
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index 4c907049c2a0..9bf853e23197 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -1035,12 +1035,12 @@ bool ScTabViewShell::HasPrintOptionsPage() const
return true;
}
-std::unique_ptr<SfxTabPage> ScTabViewShell::CreatePrintOptionsPage(TabPageParent pParent, const SfxItemSet &rOptions )
+std::unique_ptr<SfxTabPage> ScTabViewShell::CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rOptions )
{
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
::CreateTabPage ScTpPrintOptionsCreate = pFact->GetTabPageCreatorFunc(RID_SC_TP_PRINT);
if ( ScTpPrintOptionsCreate )
- return ScTpPrintOptionsCreate(pParent, &rOptions);
+ return ScTpPrintOptionsCreate(pPage, pController, &rOptions);
return nullptr;
}
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index a747e91b2cc3..2a336f5a8289 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<SfxItemSet> CreateItemSet( sal_uInt16 nId ) override;
virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) override;
- virtual std::unique_ptr<SfxTabPage> CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) override;
+ virtual std::unique_ptr<SfxTabPage> CreateTabPage( sal_uInt16 nId, weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet ) override;
virtual std::unique_ptr<SfxStyleFamilies> CreateStyleFamilies() override;
SdExtPropertySetInfoCache gImplImpressPropertySetInfoCache;
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 971ef20cbe66..1a09eb06f44b 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -730,7 +730,7 @@ void SdModule::ApplyItemSet( sal_uInt16 nSlot, const SfxItemSet& rSet )
pViewShell->GetViewFrame()->GetBindings().InvalidateAll( true );
}
-std::unique_ptr<SfxTabPage> SdModule::CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet )
+std::unique_ptr<SfxTabPage> SdModule::CreateTabPage( sal_uInt16 nId, weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet )
{
std::unique_ptr<SfxTabPage> xRet;
SfxAllItemSet aSet(*(rSet.GetPool()));
@@ -743,7 +743,7 @@ std::unique_ptr<SfxTabPage> SdModule::CreateTabPage( sal_uInt16 nId, TabPagePare
{
::CreateTabPage fnCreatePage = pFact->GetSdOptionsContentsTabPageCreatorFunc();
if( fnCreatePage )
- xRet = (*fnCreatePage)( pParent, &rSet );
+ xRet = (*fnCreatePage)( pPage, pController, &rSet );
}
break;
case SID_SD_TP_SNAP:
@@ -751,7 +751,7 @@ std::unique_ptr<SfxTabPage> SdModule::CreateTabPage( sal_uInt16 nId, TabPagePare
{
::CreateTabPage fnCreatePage = pFact->GetSdOptionsSnapTabPageCreatorFunc();
if( fnCreatePage )
- xRet = (*fnCreatePage)( pParent, &rSet );
+ xRet = (*fnCreatePage)( pPage, pController, &rSet );
}
break;
case SID_SD_TP_PRINT:
@@ -760,7 +760,7 @@ std::unique_ptr<SfxTabPage> SdModule::CreateTabPage( sal_uInt16 nId, TabPagePare
::CreateTabPage fnCreatePage = pFact->GetSdPrintOptionsTabPageCreatorFunc();
if( fnCreatePage )
{
- xRet = (*fnCreatePage)( pParent, &rSet );
+ xRet = (*fnCreatePage)( pPage, pController, &rSet );
if(SID_SD_TP_PRINT == nId)
aSet.Put (SfxUInt32Item(SID_SDMODE_FLAG,SD_DRAW_MODE));
xRet->PageCreated(aSet);
@@ -773,7 +773,7 @@ std::unique_ptr<SfxTabPage> SdModule::CreateTabPage( sal_uInt16 nId, TabPagePare
::CreateTabPage fnCreatePage = pFact->GetSdOptionsMiscTabPageCreatorFunc();
if( fnCreatePage )
{
- xRet = (*fnCreatePage)( pParent, &rSet );
+ xRet = (*fnCreatePage)( pPage, pController, &rSet );
if(SID_SD_TP_MISC == nId)
aSet.Put (SfxUInt32Item(SID_SDMODE_FLAG,SD_DRAW_MODE));
else
@@ -787,7 +787,7 @@ std::unique_ptr<SfxTabPage> SdModule::CreateTabPage( sal_uInt16 nId, TabPagePare
SfxAbstractDialogFactory* pSfxFact = SfxAbstractDialogFactory::Create();
::CreateTabPage fnCreatePage = pSfxFact->GetTabPageCreatorFunc( nId );
if ( fnCreatePage )
- xRet = (*fnCreatePage)( pParent, &rSet );
+ xRet = (*fnCreatePage)( pPage, pController, &rSet );
}
break;
}
diff --git a/sd/source/ui/dlg/paragr.cxx b/sd/source/ui/dlg/paragr.cxx
index 7b35e7a52e08..5fea036b484f 100644
--- a/sd/source/ui/dlg/paragr.cxx
+++ b/sd/source/ui/dlg/paragr.cxx
@@ -34,8 +34,8 @@
class SdParagraphNumTabPage : public SfxTabPage
{
public:
- SdParagraphNumTabPage(TabPageParent pParent, const SfxItemSet& rSet);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+ SdParagraphNumTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges();
@@ -51,8 +51,8 @@ private:
DECL_LINK( ImplNewStartHdl, weld::Button&, void );
};
-SdParagraphNumTabPage::SdParagraphNumTabPage(TabPageParent pParent, const SfxItemSet& rAttr)
- : SfxTabPage(pParent, "modules/sdraw/ui/paranumberingtab.ui", "DrawParaNumbering", &rAttr)
+SdParagraphNumTabPage::SdParagraphNumTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttr)
+ : SfxTabPage(pPage, pController, "modules/sdraw/ui/paranumberingtab.ui", "DrawParaNumbering", &rAttr)
, mbModified(false)
, m_xNewStartCB(m_xBuilder->weld_check_button("checkbuttonCB_NEW_START"))
, m_xNewStartNumberCB(m_xBuilder->weld_check_button("checkbuttonCB_NUMBER_NEW_START"))
@@ -62,9 +62,9 @@ SdParagraphNumTabPage::SdParagraphNumTabPage(TabPageParent pParent, const SfxIte
m_xNewStartNumberCB->connect_clicked(LINK(this, SdParagraphNumTabPage, ImplNewStartHdl));
}
-std::unique_ptr<SfxTabPage> SdParagraphNumTabPage::Create(TabPageParent pParent, const SfxItemSet * rAttrSet)
+std::unique_ptr<SfxTabPage> SdParagraphNumTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet * rAttrSet)
{
- return std::make_unique<SdParagraphNumTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SdParagraphNumTabPage>(pPage, pController, *rAttrSet);
}
const sal_uInt16* SdParagraphNumTabPage::GetRanges()
diff --git a/sd/source/ui/dlg/prntopts.cxx b/sd/source/ui/dlg/prntopts.cxx
index 637954da1f4d..e15262806609 100644
--- a/sd/source/ui/dlg/prntopts.cxx
+++ b/sd/source/ui/dlg/prntopts.cxx
@@ -26,8 +26,8 @@
/**
* dialog to adjust print options
*/
-SdPrintOptions::SdPrintOptions(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage(pParent, "modules/simpress/ui/prntopts.ui", "prntopts", &rInAttrs)
+SdPrintOptions::SdPrintOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "modules/simpress/ui/prntopts.ui", "prntopts", &rInAttrs)
, m_xFrmContent(m_xBuilder->weld_frame("contentframe"))
, m_xCbxDraw(m_xBuilder->weld_check_button("drawingcb"))
, m_xCbxNotes(m_xBuilder->weld_check_button("notecb"))
@@ -175,10 +175,10 @@ void SdPrintOptions::Reset( const SfxItemSet* rAttrs )
updateControls();
}
-std::unique_ptr<SfxTabPage> SdPrintOptions::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SdPrintOptions::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rOutAttrs )
{
- return std::make_unique<SdPrintOptions>( pParent, *rOutAttrs );
+ return std::make_unique<SdPrintOptions>( pPage, pController, *rOutAttrs );
}
IMPL_LINK(SdPrintOptions, ClickCheckboxHdl, weld::ToggleButton&, rCbx, void)
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 467e928e1ec3..550857e5e1de 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -73,8 +73,7 @@ SdActionDlg::SdActionDlg(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::V
"InteractionDialog")
, rOutAttrs(*pAttr)
{
- TabPageParent aParent(get_content_area(), this);
- std::unique_ptr<SfxTabPage> xNewPage = SdTPAction::Create(aParent, rOutAttrs);
+ std::unique_ptr<SfxTabPage> xNewPage = SdTPAction::Create(get_content_area(), this, rOutAttrs);
// formerly in PageCreated
static_cast<SdTPAction*>( xNewPage.get() )->SetView( pView );
@@ -86,8 +85,8 @@ SdActionDlg::SdActionDlg(weld::Window* pParent, const SfxItemSet* pAttr, ::sd::V
/**
* Action-TabPage
*/
-SdTPAction::SdTPAction(TabPageParent pWindow, const SfxItemSet& rInAttrs)
- : SfxTabPage(pWindow, "modules/simpress/ui/interactionpage.ui", "InteractionPage", &rInAttrs)
+SdTPAction::SdTPAction(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "modules/simpress/ui/interactionpage.ui", "InteractionPage", &rInAttrs)
, mpView(nullptr)
, mpDoc(nullptr)
, bTreeUpdated(false)
@@ -343,9 +342,9 @@ DeactivateRC SdTPAction::DeactivatePage( SfxItemSet* pPageSet )
return DeactivateRC::LeavePage;
}
-std::unique_ptr<SfxTabPage> SdTPAction::Create(TabPageParent pParent, const SfxItemSet& rAttrs)
+std::unique_ptr<SfxTabPage> SdTPAction::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrs)
{
- return std::make_unique<SdTPAction>( pParent, rAttrs );
+ return std::make_unique<SdTPAction>( pPage, pController, rAttrs );
}
void SdTPAction::UpdateTree()
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index d78a81912d47..e6a910f11f47 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -41,8 +41,8 @@
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
-SdTpOptionsSnap::SdTpOptionsSnap(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SvxGridTabPage(pParent, rInAttrs)
+SdTpOptionsSnap::SdTpOptionsSnap(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SvxGridTabPage(pPage, pController, rInAttrs)
{
m_xSnapFrames->show();
}
@@ -95,10 +95,10 @@ void SdTpOptionsSnap::Reset( const SfxItemSet* rAttrs )
ClickRotateHdl_Impl(*m_xCbxRotate);
}
-std::unique_ptr<SfxTabPage> SdTpOptionsSnap::Create( TabPageParent pWindow,
+std::unique_ptr<SfxTabPage> SdTpOptionsSnap::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrs )
{
- return std::make_unique<SdTpOptionsSnap>(pWindow, *rAttrs);
+ return std::make_unique<SdTpOptionsSnap>(pPage, pController, *rAttrs);
}
/*************************************************************************
@@ -106,8 +106,8 @@ std::unique_ptr<SfxTabPage> SdTpOptionsSnap::Create( TabPageParent pWindow,
|* TabPage to adjust the content options
|*
\************************************************************************/
-SdTpOptionsContents::SdTpOptionsContents(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage(pParent, "modules/simpress/ui/sdviewpage.ui", "SdViewPage", &rInAttrs)
+SdTpOptionsContents::SdTpOptionsContents(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "modules/simpress/ui/sdviewpage.ui", "SdViewPage", &rInAttrs)
, m_xCbxRuler(m_xBuilder->weld_check_button("ruler"))
, m_xCbxDragStripes(m_xBuilder->weld_check_button("dragstripes"))
, m_xCbxHandlesBezier(m_xBuilder->weld_check_button("handlesbezier"))
@@ -157,10 +157,10 @@ void SdTpOptionsContents::Reset( const SfxItemSet* rAttrs )
m_xCbxHandlesBezier->save_state();
}
-std::unique_ptr<SfxTabPage> SdTpOptionsContents::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SdTpOptionsContents::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrs )
{
- return std::make_unique<SdTpOptionsContents>(pParent, *rAttrs);
+ return std::make_unique<SdTpOptionsContents>(pPage, pController, *rAttrs);
}
/*************************************************************************
@@ -171,8 +171,8 @@ std::unique_ptr<SfxTabPage> SdTpOptionsContents::Create( TabPageParent pParent,
#define TABLE_COUNT 12
#define TOKEN ':'
-SdTpOptionsMisc::SdTpOptionsMisc(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage(pParent, "modules/simpress/ui/optimpressgeneralpage.ui", "OptSavePage", &rInAttrs)
+SdTpOptionsMisc::SdTpOptionsMisc(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "modules/simpress/ui/optimpressgeneralpage.ui", "OptSavePage", &rInAttrs)
, nWidth(0)
, nHeight(0)
, m_xCbxQuickEdit(m_xBuilder->weld_check_button("qickedit"))
@@ -473,10 +473,10 @@ void SdTpOptionsMisc::Reset( const SfxItemSet* rAttrs )
UpdateCompatibilityControls ();
}
-std::unique_ptr<SfxTabPage> SdTpOptionsMisc::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SdTpOptionsMisc::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrs )
{
- return std::make_unique<SdTpOptionsMisc>( pParent, *rAttrs );
+ return std::make_unique<SdTpOptionsMisc>( pPage, pController, *rAttrs );
}
IMPL_LINK_NOARG(SdTpOptionsMisc, SelectMetricHdl_Impl, weld::ComboBox&, void)
diff --git a/sd/source/ui/inc/prntopts.hxx b/sd/source/ui/inc/prntopts.hxx
index 2ed29ac79a07..554182b8203d 100644
--- a/sd/source/ui/inc/prntopts.hxx
+++ b/sd/source/ui/inc/prntopts.hxx
@@ -53,10 +53,10 @@ private:
void updateControls();
public:
- SdPrintOptions(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ SdPrintOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SdPrintOptions() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx
index fec2110a8008..0a1e4bf7829a 100644
--- a/sd/source/ui/inc/tpaction.hxx
+++ b/sd/source/ui/inc/tpaction.hxx
@@ -87,10 +87,10 @@ private:
static const char* GetClickActionSdResId(css::presentation::ClickAction eCA);
public:
- SdTPAction(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ SdTPAction(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SdTPAction() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet& );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx
index fd1a300afdb3..1cc5a88f2ffa 100644
--- a/sd/source/ui/inc/tpoption.hxx
+++ b/sd/source/ui/inc/tpoption.hxx
@@ -29,8 +29,8 @@
class SdTpOptionsSnap : public SvxGridTabPage
{
public:
- SdTpOptionsSnap(TabPageParent pParent, const SfxItemSet& rInAttrs);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ SdTpOptionsSnap(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
virtual ~SdTpOptionsSnap() override;
virtual bool FillItemSet( SfxItemSet* ) override;
@@ -49,8 +49,8 @@ private:
std::unique_ptr<weld::CheckButton> m_xCbxMoveOutline;
public:
- SdTpOptionsContents(TabPageParent pParent, const SfxItemSet& rInAttrs);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ SdTpOptionsContents(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
virtual ~SdTpOptionsContents() override;
virtual bool FillItemSet( SfxItemSet* ) override;
@@ -122,8 +122,8 @@ protected:
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
public:
- SdTpOptionsMisc(TabPageParent pParent, const SfxItemSet& rInAttrs);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ SdTpOptionsMisc(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* );
virtual ~SdTpOptionsMisc() override;
virtual bool FillItemSet( SfxItemSet* ) override;
diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx
index fa86b58ec904..e1e2ce680747 100644
--- a/sd/source/ui/view/FormShellManager.cxx
+++ b/sd/source/ui/view/FormShellManager.cxx
@@ -24,6 +24,7 @@
#include <ViewShellBase.hxx>
#include <ViewShellManager.hxx>
#include <Window.hxx>
+#include <vcl/vclevent.hxx>
#include <svx/fmshell.hxx>
namespace sd {
diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx
index e7f2426b56a1..b6cb9ce04ab4 100644
--- a/sd/source/ui/view/ViewShellManager.cxx
+++ b/sd/source/ui/view/ViewShellManager.cxx
@@ -28,8 +28,10 @@
#include <sfx2/viewfrm.hxx>
#include <svx/svxids.hrc>
#include <svx/fmshell.hxx>
+#include <vcl/vclevent.hxx>
#include <iterator>
+#include <list>
#include <unordered_map>
namespace sd {
diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx
index 46eb48bbbc15..839c697bb010 100644
--- a/sd/source/ui/view/tabcontr.cxx
+++ b/sd/source/ui/view/tabcontr.cxx
@@ -22,6 +22,7 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/dispatch.hxx>
#include <vcl/commandevent.hxx>
+#include <vcl/vclevent.hxx>
#include <app.hrc>
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index dbdf7b151ab4..9cd0dd0682fa 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();
}
-std::unique_ptr<SfxTabPage> SfxModule::CreateTabPage(sal_uInt16, TabPageParent, const SfxItemSet&)
+std::unique_ptr<SfxTabPage> SfxModule::CreateTabPage(sal_uInt16, weld::Container*, weld::DialogController*, const SfxItemSet&)
{
return nullptr;
}
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index b2beb7a7a679..a37f75144364 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -601,9 +601,9 @@ bool SfxDocumentInfoItem::PutValue( const Any& rVal, sal_uInt8 nMemberId )
return bRet;
}
-SfxDocumentDescPage::SfxDocumentDescPage(TabPageParent pParent, const SfxItemSet& rItemSet)
- : SfxTabPage(pParent, "sfx/ui/descriptioninfopage.ui", "DescriptionInfoPage", &rItemSet)
- , m_pInfoItem( nullptr)
+SfxDocumentDescPage::SfxDocumentDescPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rItemSet)
+ : SfxTabPage(pPage, pController, "sfx/ui/descriptioninfopage.ui", "DescriptionInfoPage", &rItemSet)
+ , m_pInfoItem(nullptr)
, m_xTitleEd(m_xBuilder->weld_entry("title"))
, m_xThemaEd(m_xBuilder->weld_entry("subject"))
, m_xKeywordsEd(m_xBuilder->weld_entry("keywords"))
@@ -617,9 +617,9 @@ SfxDocumentDescPage::~SfxDocumentDescPage()
{
}
-std::unique_ptr<SfxTabPage> SfxDocumentDescPage::Create(TabPageParent pParent, const SfxItemSet *rItemSet)
+std::unique_ptr<SfxTabPage> SfxDocumentDescPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rItemSet)
{
- return std::make_unique<SfxDocumentDescPage>(pParent, *rItemSet);
+ return std::make_unique<SfxDocumentDescPage>(pPage, pController, *rItemSet);
}
bool SfxDocumentDescPage::FillItemSet(SfxItemSet *rSet)
@@ -699,8 +699,8 @@ void SfxDocumentDescPage::Reset(const SfxItemSet *rSet)
}
}
-SfxDocumentPage::SfxDocumentPage(TabPageParent pParent, const SfxItemSet& rItemSet)
- : SfxTabPage(pParent, "sfx/ui/documentinfopage.ui", "DocumentInfoPage", &rItemSet)
+SfxDocumentPage::SfxDocumentPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rItemSet)
+ : SfxTabPage(pPage, pController, "sfx/ui/documentinfopage.ui", "DocumentInfoPage", &rItemSet)
, bEnableUseUserData( false )
, bHandleDelete( false )
, m_xBmp(m_xBuilder->weld_image("icon"))
@@ -856,9 +856,9 @@ void SfxDocumentPage::ImplCheckPasswordState()
m_xChangePassBtn->set_sensitive(false);
}
-std::unique_ptr<SfxTabPage> SfxDocumentPage::Create( TabPageParent pParent, const SfxItemSet* rItemSet )
+std::unique_ptr<SfxTabPage> SfxDocumentPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rItemSet)
{
- return std::make_unique<SfxDocumentPage>(pParent, *rItemSet);
+ return std::make_unique<SfxDocumentPage>(pPage, pController, *rItemSet);
}
void SfxDocumentPage::EnableUseUserData()
@@ -1852,8 +1852,8 @@ void CustomPropertiesControl::SetCustomProperties(std::vector< std::unique_ptr<C
}
// class SfxCustomPropertiesPage -----------------------------------------
-SfxCustomPropertiesPage::SfxCustomPropertiesPage(TabPageParent pParent, const SfxItemSet& rItemSet )
- : SfxTabPage(pParent, "sfx/ui/custominfopage.ui", "CustomInfoPage", &rItemSet)
+SfxCustomPropertiesPage::SfxCustomPropertiesPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rItemSet )
+ : SfxTabPage(pPage, pController, "sfx/ui/custominfopage.ui", "CustomInfoPage", &rItemSet)
, m_xPropertiesCtrl(new CustomPropertiesControl)
, m_xAdd(m_xBuilder->weld_button("add"))
{
@@ -1946,9 +1946,9 @@ DeactivateRC SfxCustomPropertiesPage::DeactivatePage( SfxItemSet* /*pSet*/ )
return nRet;
}
-std::unique_ptr<SfxTabPage> SfxCustomPropertiesPage::Create( TabPageParent pParent, const SfxItemSet* rItemSet )
+std::unique_ptr<SfxTabPage> SfxCustomPropertiesPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rItemSet)
{
- return std::make_unique<SfxCustomPropertiesPage>(pParent, *rItemSet);
+ return std::make_unique<SfxCustomPropertiesPage>(pPage, pController, *rItemSet);
}
CmisValue::CmisValue(weld::Widget* pParent, const OUString& aStr)
@@ -2239,11 +2239,10 @@ void CmisPropertiesControl::AddLine( const OUString& sId, const OUString& sName,
}
// class SfxCmisPropertiesPage -----------------------------------------
-SfxCmisPropertiesPage::SfxCmisPropertiesPage(TabPageParent pParent, const SfxItemSet& rItemSet)
- : SfxTabPage(pParent, "sfx/ui/cmisinfopage.ui", "CmisInfoPage", &rItemSet)
+SfxCmisPropertiesPage::SfxCmisPropertiesPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rItemSet)
+ : SfxTabPage(pPage, pController, "sfx/ui/cmisinfopage.ui", "CmisInfoPage", &rItemSet)
, m_xPropertiesCtrl(new CmisPropertiesControl(*m_xBuilder))
{
-
}
SfxCmisPropertiesPage::~SfxCmisPropertiesPage()
@@ -2339,9 +2338,9 @@ DeactivateRC SfxCmisPropertiesPage::DeactivatePage( SfxItemSet* /*pSet*/ )
return DeactivateRC::LeavePage;
}
-std::unique_ptr<SfxTabPage> SfxCmisPropertiesPage::Create( TabPageParent pParent, const SfxItemSet* rItemSet )
+std::unique_ptr<SfxTabPage> SfxCmisPropertiesPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rItemSet)
{
- return std::make_unique<SfxCmisPropertiesPage>(pParent, *rItemSet);
+ return std::make_unique<SfxCmisPropertiesPage>(pPage, pController, *rItemSet);
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/dialog/documentfontsdialog.cxx b/sfx2/source/dialog/documentfontsdialog.cxx
index 8f5212579846..e64e0c5bba80 100644
--- a/sfx2/source/dialog/documentfontsdialog.cxx
+++ b/sfx2/source/dialog/documentfontsdialog.cxx
@@ -26,13 +26,13 @@
using namespace ::com::sun::star;
-std::unique_ptr<SfxTabPage> SfxDocumentFontsPage::Create(TabPageParent pParent, const SfxItemSet* set)
+std::unique_ptr<SfxTabPage> SfxDocumentFontsPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* set)
{
- return std::make_unique<SfxDocumentFontsPage>(pParent, *set);
+ return std::make_unique<SfxDocumentFontsPage>(pPage, pController, *set);
}
-SfxDocumentFontsPage::SfxDocumentFontsPage(TabPageParent parent, const SfxItemSet& set)
- : SfxTabPage(parent, "sfx/ui/documentfontspage.ui", "DocumentFontsPage", &set)
+SfxDocumentFontsPage::SfxDocumentFontsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& set)
+ : SfxTabPage(pPage, pController, "sfx/ui/documentfontspage.ui", "DocumentFontsPage", &set)
, embedFontsCheckbox(m_xBuilder->weld_check_button("embedFonts"))
, embedUsedFontsCheckbox(m_xBuilder->weld_check_button("embedUsedFonts"))
, embedLatinScriptFontsCheckbox(m_xBuilder->weld_check_button("embedLatinScriptFonts"))
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index eb430426b601..22e6b6165615 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -47,9 +47,9 @@
*
* initializes the list box with the templates
*/
-SfxManageStyleSheetPage::SfxManageStyleSheetPage(TabPageParent pParent, const SfxItemSet& rAttrSet)
- : SfxTabPage(pParent, "sfx/ui/managestylepage.ui", "ManageStylePage", &rAttrSet)
- , pStyle(&static_cast<SfxStyleDialogController*>(pParent.pController)->GetStyleSheet())
+SfxManageStyleSheetPage::SfxManageStyleSheetPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet)
+ : SfxTabPage(pPage, pController, "sfx/ui/managestylepage.ui", "ManageStylePage", &rAttrSet)
+ , pStyle(&static_cast<SfxStyleDialogController*>(pController)->GetStyleSheet())
, pItem(nullptr)
, bModified(false)
, aName(pStyle->GetName())
@@ -526,10 +526,10 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet* /*rAttrSet*/ )
}
}
-std::unique_ptr<SfxTabPage> SfxManageStyleSheetPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SfxManageStyleSheetPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet *rAttrSet )
{
- return std::make_unique<SfxManageStyleSheetPage>(pParent, *rAttrSet);
+ return std::make_unique<SfxManageStyleSheetPage>(pPage, pController, *rAttrSet);
}
void SfxManageStyleSheetPage::ActivatePage( const SfxItemSet& rSet)
diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx
index cbd3d9408bfe..63313a5a09ba 100644
--- a/sfx2/source/dialog/printopt.cxx
+++ b/sfx2/source/dialog/printopt.cxx
@@ -34,8 +34,8 @@ static bool bOutputForPrinter = true;
#define DPI_COUNT SAL_N_ELEMENTS(aDPIArray)
-SfxCommonPrintOptionsTabPage::SfxCommonPrintOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "sfx/ui/optprintpage.ui", "OptPrintPage", &rSet)
+SfxCommonPrintOptionsTabPage::SfxCommonPrintOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "sfx/ui/optprintpage.ui", "OptPrintPage", &rSet)
, m_xPrinterOutputRB(m_xBuilder->weld_radio_button("printer"))
, m_xPrintFileOutputRB(m_xBuilder->weld_radio_button("file"))
, m_xReduceTransparencyCB(m_xBuilder->weld_check_button("reducetrans"))
@@ -86,9 +86,9 @@ SfxCommonPrintOptionsTabPage::~SfxCommonPrintOptionsTabPage()
{
}
-std::unique_ptr<SfxTabPage> SfxCommonPrintOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
+std::unique_ptr<SfxTabPage> SfxCommonPrintOptionsTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
{
- return std::make_unique<SfxCommonPrintOptionsTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SfxCommonPrintOptionsTabPage>(pPage, pController, *rAttrSet);
}
bool SfxCommonPrintOptionsTabPage::FillItemSet( SfxItemSet* /*rSet*/ )
diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx
index dfc3ddb8e71c..169bce179463 100644
--- a/sfx2/source/dialog/securitypage.cxx
+++ b/sfx2/source/dialog/securitypage.cxx
@@ -400,13 +400,13 @@ IMPL_LINK_NOARG(SfxSecurityPage_Impl, ChangeProtectionPBHdl, weld::Button&, void
m_xProtectPB->set_visible(!bNewProtection);
}
-std::unique_ptr<SfxTabPage> SfxSecurityPage::Create(TabPageParent pParent, const SfxItemSet * rItemSet)
+std::unique_ptr<SfxTabPage> SfxSecurityPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet * rItemSet)
{
- return std::make_unique<SfxSecurityPage>(pParent, *rItemSet);
+ return std::make_unique<SfxSecurityPage>(pPage, pController, *rItemSet);
}
-SfxSecurityPage::SfxSecurityPage(TabPageParent pParent, const SfxItemSet& rItemSet)
- : SfxTabPage(pParent, "sfx/ui/securityinfopage.ui", "SecurityInfoPage", &rItemSet)
+SfxSecurityPage::SfxSecurityPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rItemSet)
+ : SfxTabPage(pPage, pController, "sfx/ui/securityinfopage.ui", "SecurityInfoPage", &rItemSet)
{
m_pImpl.reset(new SfxSecurityPage_Impl( *this ));
}
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index b3299c64ab4e..73338d864c95 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -137,8 +137,8 @@ css::uno::Reference< css::frame::XFrame > SfxTabPage::GetFrame() const
return css::uno::Reference< css::frame::XFrame >();
}
-SfxTabPage::SfxTabPage(TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet *rAttrSet)
- : BuilderPage(pParent.pPage, pParent.pController, rUIXMLDescription, rID)
+SfxTabPage::SfxTabPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID, const SfxItemSet *rAttrSet)
+ : BuilderPage(pPage, pController, rUIXMLDescription, rID)
, pSet ( rAttrSet )
, bHasExchangeSupport ( false )
, pImpl ( new TabPageImpl )
@@ -900,13 +900,10 @@ void SfxTabDialogController::CreatePages()
if (pDataObject->xTabPage)
continue;
weld::Container* pPage = m_xTabCtrl->get_page(pDataObject->sId);
- // TODO eventually pass DialogController as distinct argument instead of bundling into TabPageParent
-
- TabPageParent aParent(pPage, this);
if (m_pSet)
- pDataObject->xTabPage = (pDataObject->fnCreatePage)(aParent, m_pSet.get());
+ pDataObject->xTabPage = (pDataObject->fnCreatePage)(pPage, this, m_pSet.get());
else
- pDataObject->xTabPage = (pDataObject->fnCreatePage)(aParent, CreateInputItemSet(pDataObject->sId));
+ pDataObject->xTabPage = (pDataObject->fnCreatePage)(pPage, this, CreateInputItemSet(pDataObject->sId));
pDataObject->xTabPage->SetDialogController(this);
OUString sConfigId = OStringToOUString(pDataObject->xTabPage->GetConfigId(), RTL_TEXTENCODING_UTF8);
SvtViewOptions aPageOpt(EViewType::TabPage, sConfigId);
diff --git a/sfx2/source/inc/documentfontsdialog.hxx b/sfx2/source/inc/documentfontsdialog.hxx
index c9de2b74f285..408c93ae6302 100644
--- a/sfx2/source/inc/documentfontsdialog.hxx
+++ b/sfx2/source/inc/documentfontsdialog.hxx
@@ -27,9 +27,9 @@
class SfxDocumentFontsPage: public SfxTabPage
{
public:
- SfxDocumentFontsPage(TabPageParent parent, const SfxItemSet& set);
+ SfxDocumentFontsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& set);
virtual ~SfxDocumentFontsPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent parent, const SfxItemSet* set);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* set);
protected:
virtual bool FillItemSet( SfxItemSet* set ) override;
virtual void Reset( const SfxItemSet* set ) override;
diff --git a/sfx2/source/view/printer.cxx b/sfx2/source/view/printer.cxx
index 802e6f07a799..7138caa0bab9 100644
--- a/sfx2/source/view/printer.cxx
+++ b/sfx2/source/view/printer.cxx
@@ -171,7 +171,7 @@ SfxPrintOptionsDialog::SfxPrintOptionsDialog(weld::Window *pParent,
, pOptions(pSet->Clone())
, m_xHelpBtn(m_xBuilder->weld_widget("help"))
, m_xContainer(m_xDialog->weld_content_area())
- , m_xPage(pViewShell->CreatePrintOptionsPage(TabPageParent(m_xContainer.get(), this), *pOptions)) // Insert TabPage
+ , m_xPage(pViewShell->CreatePrintOptionsPage(m_xContainer.get(), this, *pOptions)) // Insert TabPage
{
DBG_ASSERT( m_xPage, "CreatePrintOptions != SFX_VIEW_HAS_PRINTOPTIONS" );
if (m_xPage)
diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx
index 46a6842b466f..73f5e6e48546 100644
--- a/sfx2/source/view/viewprn.cxx
+++ b/sfx2/source/view/viewprn.cxx
@@ -900,7 +900,7 @@ sal_uInt16 SfxViewShell::SetPrinter( SfxPrinter* /*pNewPrinter*/, SfxPrinterChan
return 0;
}
-std::unique_ptr<SfxTabPage> SfxViewShell::CreatePrintOptionsPage(TabPageParent /*pParent*/, const SfxItemSet& /*rOptions*/)
+std::unique_ptr<SfxTabPage> SfxViewShell::CreatePrintOptionsPage(weld::Container*, weld::DialogController*, const SfxItemSet&)
{
return nullptr;
}
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 0c6c6a91f271..615053baff78 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -57,9 +57,9 @@ class SmPrintOptionsTabPage : public SfxTabPage
virtual void Reset(const SfxItemSet* rSet) override;
public:
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pWindow, const SfxItemSet &rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet);
- SmPrintOptionsTabPage(TabPageParent pPage, const SfxItemSet &rOptions);
+ SmPrintOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rOptions);
virtual ~SmPrintOptionsTabPage() override;
};
diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx
index 8e3759e575ea..3dcbbcfe50b2 100644
--- a/starmath/inc/smmod.hxx
+++ b/starmath/inc/smmod.hxx
@@ -97,7 +97,7 @@ public:
//virtual methods for options dialog
virtual std::unique_ptr<SfxItemSet> CreateItemSet( sal_uInt16 nId ) override;
virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) override;
- virtual std::unique_ptr<SfxTabPage> CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) override;
+ virtual std::unique_ptr<SfxTabPage> CreateTabPage( sal_uInt16 nId, weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet ) override;
};
#define SM_MOD() ( static_cast<SmModule*>(SfxApplication::GetModule(SfxToolsModule::Math)) )
diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx
index 62068e586824..687fd1850bf0 100644
--- a/starmath/inc/view.hxx
+++ b/starmath/inc/view.hxx
@@ -249,7 +249,7 @@ protected:
void InsertFrom(SfxMedium &rMedium);
virtual bool HasPrintOptionsPage() const override;
- virtual std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(TabPageParent pParent,
+ virtual std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController,
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 6be0c38d0c59..c8ef9c49cb5c 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -160,8 +160,8 @@ IMPL_LINK_NOARG(SmPrintOptionsTabPage, SizeButtonClickHdl, weld::ToggleButton&,
m_xZoom->set_sensitive(m_xSizeZoomed->get_active());
}
-SmPrintOptionsTabPage::SmPrintOptionsTabPage(TabPageParent pPage, const SfxItemSet& rOptions)
- : SfxTabPage(pPage, "modules/smath/ui/smathsettings.ui", "SmathSettings", &rOptions)
+SmPrintOptionsTabPage::SmPrintOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rOptions)
+ : SfxTabPage(pPage, pController, "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"))
@@ -224,9 +224,9 @@ void SmPrintOptionsTabPage::Reset(const SfxItemSet* rSet)
m_xAutoCloseBrackets->set_active(static_cast<const SfxBoolItem &>(rSet->Get(GetWhich(SID_AUTO_CLOSE_BRACKETS))).GetValue());
}
-std::unique_ptr<SfxTabPage> SmPrintOptionsTabPage::Create(TabPageParent pParent, const SfxItemSet& rSet)
+std::unique_ptr<SfxTabPage> SmPrintOptionsTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
{
- return std::make_unique<SmPrintOptionsTabPage>(pParent, rSet);
+ return std::make_unique<SmPrintOptionsTabPage>(pPage, pController, rSet);
}
void SmShowFont::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& /*rRect*/)
diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx
index 6429e4abdb6c..788f5f5e2c91 100644
--- a/starmath/source/smmod.cxx
+++ b/starmath/source/smmod.cxx
@@ -224,11 +224,11 @@ void SmModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet )
}
}
-std::unique_ptr<SfxTabPage> SmModule::CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet )
+std::unique_ptr<SfxTabPage> SmModule::CreateTabPage( sal_uInt16 nId, weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet )
{
std::unique_ptr<SfxTabPage> xRet;
if (nId == SID_SM_TP_PRINTOPTIONS)
- xRet = SmPrintOptionsTabPage::Create(pParent, rSet);
+ xRet = SmPrintOptionsTabPage::Create(pPage, pController, rSet);
return xRet;
}
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index b0a020fdc448..bb12c5563d70 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -1266,10 +1266,10 @@ bool SmViewShell::HasPrintOptionsPage() const
return true;
}
-std::unique_ptr<SfxTabPage> SmViewShell::CreatePrintOptionsPage(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SmViewShell::CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet &rOptions)
{
- return SmPrintOptionsTabPage::Create(pParent, rOptions);
+ return SmPrintOptionsTabPage::Create(pPage, pController, rOptions);
}
SmEditWindow *SmViewShell::GetEditWindow()
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 108a37d349df..4eaf4244944b 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -108,28 +108,28 @@ namespace svx {
}
}
-std::unique_ptr<SfxTabPage> SvxHeaderPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
+std::unique_ptr<SfxTabPage> SvxHeaderPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet )
{
- return std::make_unique<SvxHeaderPage>( pParent, *rSet );
+ return std::make_unique<SvxHeaderPage>( pPage, pController, *rSet );
}
-std::unique_ptr<SfxTabPage> SvxFooterPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
+std::unique_ptr<SfxTabPage> SvxFooterPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet )
{
- return std::make_unique<SvxFooterPage>( pParent, *rSet );
+ return std::make_unique<SvxFooterPage>( pPage, pController, *rSet );
}
-SvxHeaderPage::SvxHeaderPage(TabPageParent pParent, const SfxItemSet& rAttr)
- : SvxHFPage( pParent, rAttr, SID_ATTR_PAGE_HEADERSET )
+SvxHeaderPage::SvxHeaderPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttr)
+ : SvxHFPage( pPage, pController, rAttr, SID_ATTR_PAGE_HEADERSET )
{
}
-SvxFooterPage::SvxFooterPage(TabPageParent pParent, const SfxItemSet& rAttr)
- : SvxHFPage( pParent, rAttr, SID_ATTR_PAGE_FOOTERSET )
+SvxFooterPage::SvxFooterPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttr)
+ : SvxHFPage( pPage, pController, rAttr, SID_ATTR_PAGE_FOOTERSET )
{
}
-SvxHFPage::SvxHFPage(TabPageParent pParent, const SfxItemSet& rSet, sal_uInt16 nSetId)
- : SfxTabPage(pParent, "svx/ui/headfootformatpage.ui", "HFFormatPage", &rSet)
+SvxHFPage::SvxHFPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet, sal_uInt16 nSetId)
+ : SfxTabPage(pPage, pController, "svx/ui/headfootformatpage.ui", "HFFormatPage", &rSet)
, nId(nSetId)
, mbDisableQueryBox(false)
, mbEnableDrawingLayerFillStyles(false)
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index 836dbdbf7a14..7ea72b55ef4c 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -89,8 +89,8 @@ bool SvxGridItem::GetPresentation
}
// TabPage Screen Settings
-SvxGridTabPage::SvxGridTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet)
- : SfxTabPage(pParent, "svx/ui/optgridpage.ui", "OptGridPage", &rCoreSet)
+SvxGridTabPage::SvxGridTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet)
+ : SfxTabPage(pPage, pController, "svx/ui/optgridpage.ui", "OptGridPage", &rCoreSet)
, bAttrModified(false)
, m_xCbxUseGridsnap(m_xBuilder->weld_check_button("usegridsnap"))
, m_xCbxGridVisible(m_xBuilder->weld_check_button("gridvisible"))
@@ -146,9 +146,9 @@ SvxGridTabPage::~SvxGridTabPage()
{
}
-std::unique_ptr<SfxTabPage> SvxGridTabPage::Create(TabPageParent pParent, const SfxItemSet& rAttrSet)
+std::unique_ptr<SfxTabPage> SvxGridTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet)
{
- return std::make_unique<SvxGridTabPage>(pParent, rAttrSet);
+ return std::make_unique<SvxGridTabPage>(pPage, pController, rAttrSet);
}
bool SvxGridTabPage::FillItemSet( SfxItemSet* rCoreSet )
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index fe84e9ccf340..7942eee58af5 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -712,8 +712,7 @@ void SvxGrafAttrHelper::ExecuteGrafAttr( SfxRequest& rReq, SdrView& rView )
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_GRFCROP );
- TabPageParent pPageParent(aCropDialog.get_content_area(), &aCropDialog);
- std::unique_ptr<SfxTabPage> xTabPage = (*fnCreatePage)(pPageParent, &aCropDlgAttr);
+ std::unique_ptr<SfxTabPage> xTabPage = (*fnCreatePage)(aCropDialog.get_content_area(), &aCropDialog, &aCropDlgAttr);
xTabPage->SetPageTitle(aCropStr);
aCropDialog.SetTabPage(std::move(xTabPage));
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 01767974d139..a102410d7118 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -229,7 +229,7 @@ public:
// Virtual methods for options dialog.
virtual std::unique_ptr<SfxItemSet> CreateItemSet( sal_uInt16 nId ) override;
virtual void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet ) override;
- virtual std::unique_ptr<SfxTabPage> CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet ) override;
+ virtual std::unique_ptr<SfxTabPage> CreateTabPage( sal_uInt16 nId, weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet ) override;
virtual std::unique_ptr<SfxStyleFamilies> CreateStyleFamilies() override;
// Pool is created here and set at SfxShell.
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index 83412953a18d..e6142006d50c 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -630,7 +630,7 @@ public:
// methods for printing
SAL_DLLPRIVATE virtual SfxPrinter* GetPrinter( bool bCreate = false ) override;
SAL_DLLPRIVATE virtual bool HasPrintOptionsPage() const override;
- SAL_DLLPRIVATE virtual std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(TabPageParent pParent,
+ SAL_DLLPRIVATE virtual std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rSet) override;
static SvxSearchItem* GetSearchItem() { return s_pSrchItem; }
/// See SfxViewShell::getPart().
@@ -690,7 +690,7 @@ inline const SwDocShell *SwView::GetDocShell() const
return const_cast<SwView*>(this)->GetDocShell();
}
-std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet &rOptions,
bool bPreview);
diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx
index 68eba76bdb55..28269c65852c 100644
--- a/sw/source/ui/chrdlg/chardlg.cxx
+++ b/sw/source/ui/chrdlg/chardlg.cxx
@@ -135,8 +135,8 @@ void SwCharDlg::PageCreated(const OString& rId, SfxTabPage &rPage)
}
}
-SwCharURLPage::SwCharURLPage(TabPageParent pParent, const SfxItemSet& rCoreSet)
- : SfxTabPage(pParent, "modules/swriter/ui/charurlpage.ui", "CharURLPage", &rCoreSet)
+SwCharURLPage::SwCharURLPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/charurlpage.ui", "CharURLPage", &rCoreSet)
, bModified(false)
, m_xURLED(m_xBuilder->weld_entry("urled"))
, m_xTextFT(m_xBuilder->weld_label("textft"))
@@ -284,9 +284,9 @@ bool SwCharURLPage::FillItemSet(SfxItemSet* rSet)
return bModified;
}
-std::unique_ptr<SfxTabPage> SwCharURLPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> SwCharURLPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
{
- return std::make_unique<SwCharURLPage>(pParent, *rAttrSet);
+ return std::make_unique<SwCharURLPage>(pPage, pController, *rAttrSet);
}
IMPL_LINK_NOARG(SwCharURLPage, InsertFileHdl, weld::Button&, void)
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 82ab519c4b60..0c539a16901d 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -453,14 +453,13 @@ void SwDropCapsPict::InitPrinter_()
SwDropCapsDlg::SwDropCapsDlg(weld::Window *pParent, const SfxItemSet &rSet)
: SfxSingleTabDialogController(pParent, &rSet)
{
- TabPageParent pPageParent(get_content_area(), this);
- auto xNewPage(SwDropCapsPage::Create(pPageParent, &rSet));
+ auto xNewPage(SwDropCapsPage::Create(get_content_area(), this, &rSet));
static_cast<SwDropCapsPage*>(xNewPage.get())->SetFormat(false);
SetTabPage(std::move(xNewPage));
}
-SwDropCapsPage::SwDropCapsPage(TabPageParent pParent, const SfxItemSet &rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/dropcapspage.ui", "DropCapPage", &rSet)
+SwDropCapsPage::SwDropCapsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/dropcapspage.ui", "DropCapPage", &rSet)
, bModified(false)
, bFormat(true)
, rSh(::GetActiveView()->GetWrtShell())
@@ -520,9 +519,9 @@ DeactivateRC SwDropCapsPage::DeactivatePage(SfxItemSet * _pSet)
return DeactivateRC::LeavePage;
}
-std::unique_ptr<SfxTabPage> SwDropCapsPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
+std::unique_ptr<SfxTabPage> SwDropCapsPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet)
{
- return std::make_unique<SwDropCapsPage>(pParent, *rSet);
+ return std::make_unique<SwDropCapsPage>(pPage, pController, *rSet);
}
bool SwDropCapsPage::FillItemSet(SfxItemSet *rSet)
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index 83ed68c907ac..fe7458310a6d 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -42,8 +42,8 @@ const sal_uInt16 SwParagraphNumTabPage::aPageRg[] = {
0
};
-SwParagraphNumTabPage::SwParagraphNumTabPage(TabPageParent pParent, const SfxItemSet& rAttr)
- : SfxTabPage(pParent, "modules/swriter/ui/numparapage.ui", "NumParaPage", &rAttr)
+SwParagraphNumTabPage::SwParagraphNumTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttr)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/numparapage.ui", "NumParaPage", &rAttr)
, msOutlineNumbering(SwResId(STR_OUTLINE_NUMBERING ))
, bModified(false)
, bCurNumrule(false)
@@ -98,9 +98,9 @@ SwParagraphNumTabPage::~SwParagraphNumTabPage()
{
}
-std::unique_ptr<SfxTabPage> SwParagraphNumTabPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SwParagraphNumTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
- return std::make_unique<SwParagraphNumTabPage>(pParent, *rSet);
+ return std::make_unique<SwParagraphNumTabPage>(pPage, pController, *rSet);
}
bool SwParagraphNumTabPage::FillItemSet( SfxItemSet* rSet )
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx
index 36bac20761bc..0a32569351fd 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -43,8 +43,8 @@ const sal_uInt16 SwCondCollPage::m_aPageRg[] = {
0
};
-SwCondCollPage::SwCondCollPage(TabPageParent pParent, const SfxItemSet &rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/conditionpage.ui", "ConditionPage", &rSet)
+SwCondCollPage::SwCondCollPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/conditionpage.ui", "ConditionPage", &rSet)
, m_rSh(::GetActiveView()->GetWrtShell())
, m_pCmds(SwCondCollItem::GetCmds())
, m_pFormat(nullptr)
@@ -111,9 +111,9 @@ DeactivateRC SwCondCollPage::DeactivatePage(SfxItemSet * _pSet)
return DeactivateRC::LeavePage;
}
-std::unique_ptr<SfxTabPage> SwCondCollPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
+std::unique_ptr<SfxTabPage> SwCondCollPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet)
{
- return std::make_unique<SwCondCollPage>(pParent, *rSet);
+ return std::make_unique<SwCondCollPage>(pPage, pController, *rSet);
}
bool SwCondCollPage::FillItemSet(SfxItemSet *rSet)
diff --git a/sw/source/ui/chrdlg/tblnumfm.cxx b/sw/source/ui/chrdlg/tblnumfm.cxx
index cb227959eefe..078706cc6468 100644
--- a/sw/source/ui/chrdlg/tblnumfm.cxx
+++ b/sw/source/ui/chrdlg/tblnumfm.cxx
@@ -35,8 +35,7 @@ SwNumFormatDlg::SwNumFormatDlg(weld::Widget* pParent, const SfxItemSet& rSet)
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc(RID_SVXPAGE_NUMBERFORMAT);
if ( fnCreatePage )
{
- TabPageParent pPageParent(get_content_area(), this);
- std::unique_ptr<SfxTabPage> xNewPage = (*fnCreatePage)(pPageParent, &rSet);
+ std::unique_ptr<SfxTabPage> xNewPage = (*fnCreatePage)(get_content_area(), this, &rSet);
SfxAllItemSet aSet(*(rSet.GetPool()));
aSet.Put(xNewPage->GetItemSet().Get( SID_ATTR_NUMBERFORMAT_INFO));
xNewPage->PageCreated(aSet);
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index eff36f3e1f54..9a3546409763 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -103,8 +103,8 @@ public:
SwAuthenticationSettingsDialog(weld::Window* pParent, SwMailMergeConfigItem& rItem);
};
-SwMailConfigPage::SwMailConfigPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/mailconfigpage.ui", "MailConfigPage", &rSet)
+SwMailConfigPage::SwMailConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/mailconfigpage.ui", "MailConfigPage", &rSet)
, m_pConfigItem(new SwMailMergeConfigItem)
, m_xDisplayNameED(m_xBuilder->weld_entry("displayname"))
, m_xAddressED(m_xBuilder->weld_entry("address"))
@@ -128,9 +128,9 @@ SwMailConfigPage::~SwMailConfigPage()
m_pConfigItem.reset();
}
-std::unique_ptr<SfxTabPage> SwMailConfigPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> SwMailConfigPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
{
- return std::make_unique<SwMailConfigPage>(pParent, *rAttrSet);
+ return std::make_unique<SwMailConfigPage>(pPage, pController, *rAttrSet);
}
bool SwMailConfigPage::FillItemSet( SfxItemSet* /*rSet*/ )
@@ -356,9 +356,8 @@ void SwTestAccountSettingsDialog::Test()
SwMailConfigDlg::SwMailConfigDlg(weld::Window* pParent, SfxItemSet& rSet)
: SfxSingleTabDialogController(pParent, &rSet)
{
- TabPageParent pPageParent(get_content_area(), this);
// create TabPage
- SetTabPage(SwMailConfigPage::Create(pPageParent, &rSet));
+ SetTabPage(SwMailConfigPage::Create(get_content_area(), this, &rSet));
m_xDialog->set_title(SwResId(STR_MAILCONFIG_DLG_TITLE));
}
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index 4dfac04edb27..5561b2a24a4a 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -52,8 +52,8 @@ struct SwCompatibilityOptPage_Impl
std::vector< SvtCompatibilityEntry > m_aList;
};
-SwCompatibilityOptPage::SwCompatibilityOptPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/optcompatpage.ui", "OptCompatPage", &rSet)
+SwCompatibilityOptPage::SwCompatibilityOptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/optcompatpage.ui", "OptCompatPage", &rSet)
, m_pWrtShell(nullptr)
, m_pImpl(new SwCompatibilityOptPage_Impl)
, m_nSavedOptions(0)
@@ -340,9 +340,9 @@ void SwCompatibilityOptPage::WriteOptions()
m_aConfigItem.AppendItem(rItem);
}
-std::unique_ptr<SfxTabPage> SwCompatibilityOptPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> SwCompatibilityOptPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
{
- return std::make_unique<SwCompatibilityOptPage>(pParent, *rAttrSet);
+ return std::make_unique<SwCompatibilityOptPage>(pPage, pController, *rAttrSet);
}
bool SwCompatibilityOptPage::FillItemSet( SfxItemSet* )
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 59bcb5cff276..02f36d51c149 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -81,8 +81,8 @@ FieldUnit SwFieldUnitTable::GetValue(sal_uInt32 nPos)
return FieldUnit::NONE;
}
-SwLoadOptPage::SwLoadOptPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/optgeneralpage.ui", "OptGeneralPage", &rSet)
+SwLoadOptPage::SwLoadOptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/optgeneralpage.ui", "OptGeneralPage", &rSet)
, m_pWrtShell(nullptr)
, m_nLastTab(0)
, m_nOldLinkMode(MANUAL)
@@ -145,10 +145,10 @@ SwLoadOptPage::~SwLoadOptPage()
{
}
-std::unique_ptr<SfxTabPage> SwLoadOptPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SwLoadOptPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet )
{
- return std::make_unique<SwLoadOptPage>(pParent, *rAttrSet );
+ return std::make_unique<SwLoadOptPage>(pPage, pController, *rAttrSet );
}
IMPL_LINK_NOARG(SwLoadOptPage, StandardizedPageCountCheckHdl, weld::Button&, void)
@@ -375,8 +375,7 @@ SwCaptionOptDlg::SwCaptionOptDlg(weld::Window* pParent, const SfxItemSet& rSet)
"CaptionDialog")
{
// create TabPage
- TabPageParent aParent(get_content_area(), this);
- SetTabPage(SwCaptionOptPage::Create(aParent, &rSet));
+ SetTabPage(SwCaptionOptPage::Create(get_content_area(), this, &rSet));
}
SwCaptionPreview::SwCaptionPreview()
@@ -430,8 +429,8 @@ IMPL_LINK(SwCaptionOptPage, TextFilterHdl, OUString&, rTest, bool)
return true;
}
-SwCaptionOptPage::SwCaptionOptPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/optcaptionpage.ui", "OptCaptionPage", &rSet)
+SwCaptionOptPage::SwCaptionOptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/optcaptionpage.ui", "OptCaptionPage", &rSet)
, m_sSWTable(SwResId(STR_CAPTION_TABLE))
, m_sSWFrame(SwResId(STR_CAPTION_FRAME))
, m_sSWGraphic(SwResId(STR_CAPTION_GRAPHIC))
@@ -545,10 +544,10 @@ SwCaptionOptPage::~SwCaptionOptPage()
m_xPreview.reset();
}
-std::unique_ptr<SfxTabPage> SwCaptionOptPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SwCaptionOptPage::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet)
{
- return std::make_unique<SwCaptionOptPage>(pParent, *rAttrSet);
+ return std::make_unique<SwCaptionOptPage>(pPage, pController, *rAttrSet);
}
bool SwCaptionOptPage::FillItemSet( SfxItemSet* )
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 8f5a0ed6106c..8e891fc49281 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -94,8 +94,8 @@ void drawRect(vcl::RenderContext& rRenderContext, const tools::Rectangle &rRect,
// Tools->Options->Writer->View
// Tools->Options->Writer/Web->View
-SwContentOptPage::SwContentOptPage(TabPageParent pParent, const SfxItemSet& rCoreSet)
- : SfxTabPage(pParent, "modules/swriter/ui/viewoptionspage.ui", "ViewOptionsPage", &rCoreSet)
+SwContentOptPage::SwContentOptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/viewoptionspage.ui", "ViewOptionsPage", &rCoreSet)
, m_xCrossCB(m_xBuilder->weld_check_button("helplines"))
, m_xHMetric(m_xBuilder->weld_combo_box("hrulercombobox"))
, m_xVRulerCBox(m_xBuilder->weld_check_button("vruler"))
@@ -170,10 +170,10 @@ SwContentOptPage::~SwContentOptPage()
{
}
-std::unique_ptr<SfxTabPage> SwContentOptPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SwContentOptPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet)
{
- return std::make_unique<SwContentOptPage>(pParent, *rAttrSet);
+ return std::make_unique<SwContentOptPage>(pPage, pController, *rAttrSet);
}
static void lcl_SelectMetricLB(weld::ComboBox& rMetric, sal_uInt16 nSID, const SfxItemSet& rSet)
@@ -277,9 +277,9 @@ IMPL_LINK(SwContentOptPage, VertRulerHdl, weld::ToggleButton&, rBox, void)
}
// TabPage Printer additional settings
-SwAddPrinterTabPage::SwAddPrinterTabPage(TabPageParent pParent,
+SwAddPrinterTabPage::SwAddPrinterTabPage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rCoreSet)
- : SfxTabPage(pParent, "modules/swriter/ui/printoptionspage.ui", "PrintOptionsPage", &rCoreSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/printoptionspage.ui", "PrintOptionsPage", &rCoreSet)
, sNone(SwResId(SW_STR_NONE))
, bAttrModified(false)
, bPreview(false)
@@ -350,10 +350,10 @@ void SwAddPrinterTabPage::SetPreview(bool bPrev)
m_xPagesFrame->set_sensitive(!bPreview);
}
-std::unique_ptr<SfxTabPage> SwAddPrinterTabPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SwAddPrinterTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet )
{
- return std::make_unique<SwAddPrinterTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SwAddPrinterTabPage>(pPage, pController, *rAttrSet);
}
bool SwAddPrinterTabPage::FillItemSet( SfxItemSet* rCoreSet )
@@ -490,8 +490,8 @@ void SwAddPrinterTabPage::PageCreated( const SfxAllItemSet& aSet)
}
// Tabpage Standardfonts
-SwStdFontTabPage::SwStdFontTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/optfonttabpage.ui", "OptFontTabPage", &rSet)
+SwStdFontTabPage::SwStdFontTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/optfonttabpage.ui", "OptFontTabPage", &rSet)
, m_pPrt(nullptr)
, m_pFontConfig(nullptr)
, m_pWrtShell(nullptr)
@@ -556,10 +556,10 @@ SwStdFontTabPage::~SwStdFontTabPage()
m_pPrt.clear();
}
-std::unique_ptr<SfxTabPage> SwStdFontTabPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SwStdFontTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet )
{
- return std::make_unique<SwStdFontTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SwStdFontTabPage>(pPage, pController, *rAttrSet);
}
static void lcl_SetColl(SwWrtShell* pWrtShell, sal_uInt16 nType,
@@ -996,8 +996,8 @@ void SwStdFontTabPage::PageCreated( const SfxAllItemSet& aSet)
m_nFontGroup = sal::static_int_cast< sal_uInt8, sal_uInt16>( pFlagItem->GetValue() );
}
-SwTableOptionsTabPage::SwTableOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/opttablepage.ui", "OptTablePage", &rSet)
+SwTableOptionsTabPage::SwTableOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/opttablepage.ui", "OptTablePage", &rSet)
, m_pWrtShell(nullptr)
, m_bHTMLMode(false)
, m_xHeaderCB(m_xBuilder->weld_check_button("header"))
@@ -1025,10 +1025,10 @@ SwTableOptionsTabPage::~SwTableOptionsTabPage()
{
}
-std::unique_ptr<SfxTabPage> SwTableOptionsTabPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SwTableOptionsTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet )
{
- return std::make_unique<SwTableOptionsTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SwTableOptionsTabPage>(pPage, pController, *rAttrSet);
}
bool SwTableOptionsTabPage::FillItemSet( SfxItemSet* )
@@ -1196,8 +1196,8 @@ void SwTableOptionsTabPage::PageCreated( const SfxAllItemSet& aSet)
m_pWrtShell = pWrtSh->GetValue();
}
-SwShdwCursorOptionsTabPage::SwShdwCursorOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/optformataidspage.ui", "OptFormatAidsPage", &rSet)
+SwShdwCursorOptionsTabPage::SwShdwCursorOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/optformataidspage.ui", "OptFormatAidsPage", &rSet)
, m_pWrtShell(nullptr)
, m_xParaCB(m_xBuilder->weld_check_button("paragraph"))
, m_xSHyphCB(m_xBuilder->weld_check_button("hyphens"))
@@ -1258,9 +1258,9 @@ SwShdwCursorOptionsTabPage::~SwShdwCursorOptionsTabPage()
{
}
-std::unique_ptr<SfxTabPage> SwShdwCursorOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet )
+std::unique_ptr<SfxTabPage> SwShdwCursorOptionsTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet )
{
- return std::make_unique<SwShdwCursorOptionsTabPage>(pParent, *rSet );
+ return std::make_unique<SwShdwCursorOptionsTabPage>(pPage, pController, *rSet);
}
void SwShdwCursorOptionsTabPage::PageCreated( const SfxAllItemSet& aSet )
@@ -1563,23 +1563,23 @@ namespace
}
}
-SwRedlineOptionsTabPage::SwRedlineOptionsTabPage(TabPageParent pParent,
+SwRedlineOptionsTabPage::SwRedlineOptionsTabPage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/optredlinepage.ui", "OptRedLinePage", &rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/optredlinepage.ui", "OptRedLinePage", &rSet)
, m_xInsertLB(m_xBuilder->weld_combo_box("insert"))
- , m_xInsertColorLB(new ColorListBox(m_xBuilder->weld_menu_button("insertcolor"), pParent.GetFrameWeld()))
+ , m_xInsertColorLB(new ColorListBox(m_xBuilder->weld_menu_button("insertcolor"), pController->getDialog()))
, m_xInsertedPreviewWN(new FontPrevWindow)
, m_xInsertedPreview(new weld::CustomWeld(*m_xBuilder, "insertedpreview", *m_xInsertedPreviewWN))
, m_xDeletedLB(m_xBuilder->weld_combo_box("deleted"))
- , m_xDeletedColorLB(new ColorListBox(m_xBuilder->weld_menu_button("deletedcolor"), pParent.GetFrameWeld()))
+ , m_xDeletedColorLB(new ColorListBox(m_xBuilder->weld_menu_button("deletedcolor"), pController->getDialog()))
, m_xDeletedPreviewWN(new FontPrevWindow)
, m_xDeletedPreview(new weld::CustomWeld(*m_xBuilder, "deletedpreview", *m_xDeletedPreviewWN))
, m_xChangedLB(m_xBuilder->weld_combo_box("changed"))
- , m_xChangedColorLB(new ColorListBox(m_xBuilder->weld_menu_button("changedcolor"), pParent.GetFrameWeld()))
+ , m_xChangedColorLB(new ColorListBox(m_xBuilder->weld_menu_button("changedcolor"), pController->getDialog()))
, m_xChangedPreviewWN(new FontPrevWindow)
, m_xChangedPreview(new weld::CustomWeld(*m_xBuilder, "changedpreview", *m_xChangedPreviewWN))
, m_xMarkPosLB(m_xBuilder->weld_combo_box("markpos"))
- , m_xMarkColorLB(new ColorListBox(m_xBuilder->weld_menu_button("markcolor"), pParent.GetFrameWeld()))
+ , m_xMarkColorLB(new ColorListBox(m_xBuilder->weld_menu_button("markcolor"), pController->getDialog()))
, m_xMarkPreviewWN(new SwMarkPreview)
, m_xMarkPreview(new weld::CustomWeld(*m_xBuilder, "markpreview", *m_xMarkPreviewWN))
{
@@ -1638,9 +1638,9 @@ SwRedlineOptionsTabPage::~SwRedlineOptionsTabPage()
m_xMarkPreviewWN.reset();
}
-std::unique_ptr<SfxTabPage> SwRedlineOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SwRedlineOptionsTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
- return std::make_unique<SwRedlineOptionsTabPage>(pParent, *rSet );
+ return std::make_unique<SwRedlineOptionsTabPage>(pPage, pController, *rSet);
}
bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet* )
@@ -2004,8 +2004,8 @@ void SwRedlineOptionsTabPage::InitFontStyle(FontPrevWindow& rExampleWin, const O
rExampleWin.SetBackColor(aBackCol);
}
-SwCompareOptionsTabPage::SwCompareOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/optcomparison.ui", "OptComparison", &rSet)
+SwCompareOptionsTabPage::SwCompareOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/optcomparison.ui", "OptComparison", &rSet)
, m_xAutoRB(m_xBuilder->weld_radio_button("auto"))
, m_xWordRB(m_xBuilder->weld_radio_button("byword"))
, m_xCharRB(m_xBuilder->weld_radio_button("bycharacter"))
@@ -2026,9 +2026,9 @@ SwCompareOptionsTabPage::~SwCompareOptionsTabPage()
{
}
-std::unique_ptr<SfxTabPage> SwCompareOptionsTabPage::Create( TabPageParent pParent, const SfxItemSet* rAttrSet )
+std::unique_ptr<SfxTabPage> SwCompareOptionsTabPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet )
{
- return std::make_unique<SwCompareOptionsTabPage>(pParent, *rAttrSet );
+ return std::make_unique<SwCompareOptionsTabPage>(pPage, pController, *rAttrSet);
}
bool SwCompareOptionsTabPage::FillItemSet( SfxItemSet* )
@@ -2137,8 +2137,8 @@ IMPL_LINK_NOARG(SwCompareOptionsTabPage, IgnoreHdl, weld::Button&, void)
#ifdef DBG_UTIL
-SwTestTabPage::SwTestTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet)
- : SfxTabPage( pParent, "modules/swriter/ui/opttestpage.ui", "OptTestPage", &rCoreSet)
+SwTestTabPage::SwTestTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rCoreSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/opttestpage.ui", "OptTestPage", &rCoreSet)
, bAttrModified( false )
, m_xTest1CBox(m_xBuilder->weld_check_button("unused"))
, m_xTest2CBox(m_xBuilder->weld_check_button("dynamic"))
@@ -2158,10 +2158,10 @@ SwTestTabPage::~SwTestTabPage()
{
}
-std::unique_ptr<SfxTabPage> SwTestTabPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SwTestTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet )
{
- return std::make_unique<SwTestTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SwTestTabPage>(pPage, pController, *rAttrSet);
}
bool SwTestTabPage::FillItemSet( SfxItemSet* rCoreSet )
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index ceea20e79223..aa18828648fc 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -92,14 +92,12 @@ std::unique_ptr<BuilderPage> SwMailMergeWizard::createPage(WizardState _nState)
{
OString sIdent(OString::number(_nState));
weld::Container* pPageContainer = m_xAssistant->append_page(sIdent);
- // TODO eventually pass DialogController as distinct argument instead of bundling into TabPageParent
- TabPageParent aParent(pPageContainer, this);
std::unique_ptr<vcl::OWizardPage> xRet;
switch(_nState)
{
case MM_DOCUMENTSELECTPAGE :
- xRet = std::make_unique<SwMailMergeDocSelectPage>(this, aParent);
+ xRet = std::make_unique<SwMailMergeDocSelectPage>(pPageContainer, this);
/* tdf#52986 Set help ID using SetRoadmapHelpId for all pages
so that when by default the focus is on the left side pane of
@@ -108,19 +106,19 @@ std::unique_ptr<BuilderPage> SwMailMergeWizard::createPage(WizardState _nState)
SetRoadmapHelpId("modules/swriter/ui/mmselectpage/MMSelectPage");
break;
case MM_OUTPUTTYPETPAGE :
- xRet = std::make_unique<SwMailMergeOutputTypePage>(this, aParent);
+ xRet = std::make_unique<SwMailMergeOutputTypePage>(pPageContainer, this);
SetRoadmapHelpId("modules/swriter/ui/mmoutputtypepage/MMOutputTypePage");
break;
case MM_ADDRESSBLOCKPAGE :
- xRet = std::make_unique<SwMailMergeAddressBlockPage>(this, aParent);
+ xRet = std::make_unique<SwMailMergeAddressBlockPage>(pPageContainer, this);
SetRoadmapHelpId("modules/swriter/ui/mmaddressblockpage/MMAddressBlockPage");
break;
case MM_GREETINGSPAGE :
- xRet = std::make_unique<SwMailMergeGreetingsPage>(this, aParent);
+ xRet = std::make_unique<SwMailMergeGreetingsPage>(pPageContainer, this);
SetRoadmapHelpId("modules/swriter/ui/mmsalutationpage/MMSalutationPage");
break;
case MM_LAYOUTPAGE :
- xRet = std::make_unique<SwMailMergeLayoutPage>(this, aParent);
+ xRet = std::make_unique<SwMailMergeLayoutPage>(pPageContainer, this);
SetRoadmapHelpId("modules/swriter/ui/mmlayoutpage/MMLayoutPage");
break;
}
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index da1fef364351..7ded7e7b9fc9 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -52,8 +52,8 @@ using namespace ::com::sun::star::sdb;
using namespace ::com::sun::star::sdbc;
using namespace ::com::sun::star::sdbcx;
-SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage(SwMailMergeWizard* pWizard, TabPageParent pParent)
- : vcl::OWizardPage(pParent, "modules/swriter/ui/mmaddressblockpage.ui", "MMAddressBlockPage")
+SwMailMergeAddressBlockPage::SwMailMergeAddressBlockPage(weld::Container* pPage, SwMailMergeWizard* pWizard)
+ : vcl::OWizardPage(pPage, pWizard, "modules/swriter/ui/mmaddressblockpage.ui", "MMAddressBlockPage")
, m_pWizard(pWizard)
, m_xAddressListPB(m_xBuilder->weld_button("addresslist"))
, m_xCurrentAddressFI(m_xBuilder->weld_label("currentaddress"))
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index 0e76558d1c90..f48c3e117846 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -82,7 +82,7 @@ class SwMailMergeAddressBlockPage : public vcl::OWizardPage
virtual bool canAdvance() const override;
public:
- SwMailMergeAddressBlockPage(SwMailMergeWizard* pWizard, TabPageParent pParent);
+ SwMailMergeAddressBlockPage(weld::Container* pPage, SwMailMergeWizard* pWizard);
virtual ~SwMailMergeAddressBlockPage() override;
SwMailMergeWizard* GetWizard() { return m_pWizard; }
};
diff --git a/sw/source/ui/dbui/mmdocselectpage.cxx b/sw/source/ui/dbui/mmdocselectpage.cxx
index 80cb8403a337..21d0f96d74f9 100644
--- a/sw/source/ui/dbui/mmdocselectpage.cxx
+++ b/sw/source/ui/dbui/mmdocselectpage.cxx
@@ -42,8 +42,8 @@ using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
using namespace svt;
-SwMailMergeDocSelectPage::SwMailMergeDocSelectPage(SwMailMergeWizard* pWizard, TabPageParent pParent)
- : vcl::OWizardPage(pParent, "modules/swriter/ui/mmselectpage.ui", "MMSelectPage")
+SwMailMergeDocSelectPage::SwMailMergeDocSelectPage(weld::Container* pPage, SwMailMergeWizard* pWizard)
+ : vcl::OWizardPage(pPage, pWizard, "modules/swriter/ui/mmselectpage.ui", "MMSelectPage")
, m_pWizard(pWizard)
, m_xCurrentDocRB(m_xBuilder->weld_radio_button("currentdoc"))
, m_xNewDocRB(m_xBuilder->weld_radio_button("newdoc"))
diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx
index ef35e5c8f2e4..0930caf03982 100644
--- a/sw/source/ui/dbui/mmdocselectpage.hxx
+++ b/sw/source/ui/dbui/mmdocselectpage.hxx
@@ -46,7 +46,7 @@ class SwMailMergeDocSelectPage : public vcl::OWizardPage
virtual bool commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) override;
public:
- SwMailMergeDocSelectPage(SwMailMergeWizard* pWizard, TabPageParent pParent);
+ SwMailMergeDocSelectPage(weld::Container* pPage, SwMailMergeWizard* pWizard);
virtual ~SwMailMergeDocSelectPage() override;
};
diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx
index 83509f31d788..7e51b1645ccd 100644
--- a/sw/source/ui/dbui/mmgreetingspage.cxx
+++ b/sw/source/ui/dbui/mmgreetingspage.cxx
@@ -196,8 +196,8 @@ void SwGreetingsHandler::Contains(bool bContainsGreeting)
m_xNeutralCB->set_sensitive(bContainsGreeting);
}
-SwMailMergeGreetingsPage::SwMailMergeGreetingsPage(SwMailMergeWizard* pWizard, TabPageParent pParent)
- : vcl::OWizardPage(pParent, "modules/swriter/ui/mmsalutationpage.ui", "MMSalutationPage")
+SwMailMergeGreetingsPage::SwMailMergeGreetingsPage(weld::Container* pPage, SwMailMergeWizard* pWizard)
+ : vcl::OWizardPage(pPage, pWizard, "modules/swriter/ui/mmsalutationpage.ui", "MMSalutationPage")
, SwGreetingsHandler(pWizard->GetConfigItem(), *m_xBuilder)
, m_xPreview(new SwAddressPreview(m_xBuilder->weld_scrolled_window("previewwin")))
, m_xPreviewFI(m_xBuilder->weld_label("previewft"))
diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx
index 576fb98ea1bc..14284d3224dd 100644
--- a/sw/source/ui/dbui/mmgreetingspage.hxx
+++ b/sw/source/ui/dbui/mmgreetingspage.hxx
@@ -106,7 +106,7 @@ class SwMailMergeGreetingsPage : public vcl::OWizardPage
virtual void Activate() override;
virtual bool commitPage( ::vcl::WizardTypes::CommitPageReason _eReason ) override;
public:
- SwMailMergeGreetingsPage(SwMailMergeWizard* pWizard, TabPageParent pParent);
+ SwMailMergeGreetingsPage(weld::Container* pPage, SwMailMergeWizard* pWizard);
virtual ~SwMailMergeGreetingsPage() override;
};
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx
index bcf40f8b8ea0..ad2c452eae3b 100644
--- a/sw/source/ui/dbui/mmlayoutpage.cxx
+++ b/sw/source/ui/dbui/mmlayoutpage.cxx
@@ -75,8 +75,8 @@ using namespace ::com::sun::star::view;
#define DEFAULT_ADDRESS_WIDTH (MM50*15)// 7,5 cm
#define DEFAULT_ADDRESS_HEIGHT (MM50*7) // 3,5cm
-SwMailMergeLayoutPage::SwMailMergeLayoutPage(SwMailMergeWizard* pWizard, TabPageParent pParent)
- : vcl::OWizardPage(pParent, "modules/swriter/ui/mmlayoutpage.ui", "MMLayoutPage")
+SwMailMergeLayoutPage::SwMailMergeLayoutPage(weld::Container* pPage, SwMailMergeWizard* pWizard)
+ : vcl::OWizardPage(pPage, pWizard, "modules/swriter/ui/mmlayoutpage.ui", "MMLayoutPage")
, m_pExampleWrtShell(nullptr)
, m_pAddressBlockFormat(nullptr)
, m_bIsGreetingInserted(false)
diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx
index 5ebff3e1db9a..6bacb3c5518c 100644
--- a/sw/source/ui/dbui/mmlayoutpage.hxx
+++ b/sw/source/ui/dbui/mmlayoutpage.hxx
@@ -73,7 +73,7 @@ class SwMailMergeLayoutPage : public vcl::OWizardPage
virtual void Activate() override;
virtual bool commitPage(::vcl::WizardTypes::CommitPageReason _eReason) override;
public:
- SwMailMergeLayoutPage(SwMailMergeWizard* pWizard, TabPageParent pParent);
+ SwMailMergeLayoutPage(weld::Container* pPage, SwMailMergeWizard* pWizard);
virtual ~SwMailMergeLayoutPage() override;
static SwFrameFormat* InsertAddressAndGreeting(SwView const * pView,
diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index d74a7a0c85b1..83685a6692ea 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -40,8 +40,8 @@
using namespace ::com::sun::star;
-SwMailMergeOutputTypePage::SwMailMergeOutputTypePage(SwMailMergeWizard* pWizard, TabPageParent pParent)
- : vcl::OWizardPage(pParent, "modules/swriter/ui/mmoutputtypepage.ui", "MMOutputTypePage")
+SwMailMergeOutputTypePage::SwMailMergeOutputTypePage(weld::Container* pPage, SwMailMergeWizard* pWizard)
+ : vcl::OWizardPage(pPage, pWizard, "modules/swriter/ui/mmoutputtypepage.ui", "MMOutputTypePage")
, m_pWizard(pWizard)
, m_xLetterRB(m_xBuilder->weld_radio_button("letter"))
, m_xMailRB(m_xBuilder->weld_radio_button("email"))
diff --git a/sw/source/ui/dbui/mmoutputtypepage.hxx b/sw/source/ui/dbui/mmoutputtypepage.hxx
index 73346dfe8bde..92a60da30941 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.hxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.hxx
@@ -35,7 +35,7 @@ class SwMailMergeOutputTypePage : public vcl::OWizardPage
DECL_LINK(TypeHdl_Impl, weld::ToggleButton&, void);
public:
- SwMailMergeOutputTypePage(SwMailMergeWizard* pWizard, TabPageParent pParent);
+ SwMailMergeOutputTypePage(weld::Container* pPage, SwMailMergeWizard* pWizard);
virtual ~SwMailMergeOutputTypePage() override;
};
#endif
diff --git a/sw/source/ui/dialog/addrdlg.cxx b/sw/source/ui/dialog/addrdlg.cxx
index 940f7f5d2646..839c084e93e1 100644
--- a/sw/source/ui/dialog/addrdlg.cxx
+++ b/sw/source/ui/dialog/addrdlg.cxx
@@ -29,8 +29,7 @@ SwAddrDlg::SwAddrDlg(weld::Window* pParent, const SfxItemSet& rSet)
if ( fnCreatePage )
{
// create TabPage
- TabPageParent aParent(get_content_area(), this);
- SetTabPage(fnCreatePage(aParent, &rSet));
+ SetTabPage(fnCreatePage(get_content_area(), this, &rSet));
}
}
diff --git a/sw/source/ui/dialog/docstdlg.cxx b/sw/source/ui/dialog/docstdlg.cxx
index 5aab6a714cc4..5dc9c1dfafa1 100644
--- a/sw/source/ui/dialog/docstdlg.cxx
+++ b/sw/source/ui/dialog/docstdlg.cxx
@@ -35,13 +35,13 @@
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
-std::unique_ptr<SfxTabPage> SwDocStatPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
+std::unique_ptr<SfxTabPage> SwDocStatPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet)
{
- return std::make_unique<SwDocStatPage>(pParent, *rSet);
+ return std::make_unique<SwDocStatPage>(pPage, pController, *rSet);
}
-SwDocStatPage::SwDocStatPage(TabPageParent pParent, const SfxItemSet &rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/statisticsinfopage.ui", "StatisticsInfoPage", &rSet)
+SwDocStatPage::SwDocStatPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/statisticsinfopage.ui", "StatisticsInfoPage", &rSet)
, m_xPageNo(m_xBuilder->weld_label("nopages"))
, m_xTableNo(m_xBuilder->weld_label("notables"))
, m_xGrfNo(m_xBuilder->weld_label("nogrfs"))
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 1099f63c8ac9..ad94bc3e7026 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -1473,8 +1473,8 @@ short SwInsertSectionTabDialog::Ok()
return nRet;
}
-SwInsertSectionTabPage::SwInsertSectionTabPage(TabPageParent pParent, const SfxItemSet &rAttrSet)
- : SfxTabPage(pParent, "modules/swriter/ui/sectionpage.ui", "SectionPage", &rAttrSet)
+SwInsertSectionTabPage::SwInsertSectionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rAttrSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/sectionpage.ui", "SectionPage", &rAttrSet)
, m_pWrtSh(nullptr)
, m_xCurName(m_xBuilder->weld_entry_tree_view("sectionnames", "sectionnames-entry",
"sectionnames-list"))
@@ -1615,10 +1615,10 @@ void SwInsertSectionTabPage::Reset( const SfxItemSet* )
{
}
-std::unique_ptr<SfxTabPage> SwInsertSectionTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SwInsertSectionTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet)
{
- return std::make_unique<SwInsertSectionTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SwInsertSectionTabPage>(pPage, pController, *rAttrSet);
}
IMPL_LINK(SwInsertSectionTabPage, ChangeHideHdl, weld::ToggleButton&, rBox, void)
@@ -1776,8 +1776,8 @@ IMPL_LINK( SwInsertSectionTabPage, DlgClosedHdl, sfx2::FileDialogHelper *, _pFil
}
}
-SwSectionFootnoteEndTabPage::SwSectionFootnoteEndTabPage(TabPageParent pParent, const SfxItemSet &rAttrSet)
- : SfxTabPage(pParent, "modules/swriter/ui/footnotesendnotestabpage.ui", "FootnotesEndnotesTabPage", &rAttrSet)
+SwSectionFootnoteEndTabPage::SwSectionFootnoteEndTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rAttrSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/footnotesendnotestabpage.ui", "FootnotesEndnotesTabPage", &rAttrSet)
, m_xFootnoteNtAtTextEndCB(m_xBuilder->weld_check_button("ftnntattextend"))
, m_xFootnoteNtNumCB(m_xBuilder->weld_check_button("ftnntnum"))
, m_xFootnoteOffsetLbl(m_xBuilder->weld_label("ftnoffset_label"))
@@ -1953,10 +1953,10 @@ void SwSectionFootnoteEndTabPage::Reset( const SfxItemSet* rSet )
ResetState( false, rSet->Get( RES_END_AT_TXTEND, false ));
}
-std::unique_ptr<SfxTabPage> SwSectionFootnoteEndTabPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SwSectionFootnoteEndTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet)
{
- return std::make_unique<SwSectionFootnoteEndTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SwSectionFootnoteEndTabPage>(pPage, pController, *rAttrSet);
}
IMPL_LINK( SwSectionFootnoteEndTabPage, FootEndHdl, weld::ToggleButton&, rBox, void )
@@ -2058,8 +2058,8 @@ void SwSectionPropertyTabDialog::PageCreated(const OString& rId, SfxTabPage &rPa
static_cast<SwSectionIndentTabPage&>(rPage).SetWrtShell(rWrtSh);
}
-SwSectionIndentTabPage::SwSectionIndentTabPage(TabPageParent pParent, const SfxItemSet &rAttrSet)
- : SfxTabPage(pParent, "modules/swriter/ui/indentpage.ui", "IndentPage", &rAttrSet)
+SwSectionIndentTabPage::SwSectionIndentTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rAttrSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/indentpage.ui", "IndentPage", &rAttrSet)
, m_xBeforeMF(m_xBuilder->weld_metric_spin_button("before", FieldUnit::CM))
, m_xAfterMF(m_xBuilder->weld_metric_spin_button("after", FieldUnit::CM))
, m_xPreviewWin(new weld::CustomWeld(*m_xBuilder, "preview", m_aPreviewWin))
@@ -2111,9 +2111,9 @@ void SwSectionIndentTabPage::Reset( const SfxItemSet* rSet)
IndentModifyHdl(*m_xBeforeMF);
}
-std::unique_ptr<SfxTabPage> SwSectionIndentTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> SwSectionIndentTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
{
- return std::make_unique<SwSectionIndentTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SwSectionIndentTabPage>(pPage, pController, *rAttrSet);
}
void SwSectionIndentTabPage::SetWrtShell(SwWrtShell const & rSh)
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 12a3cd8a881e..9e01b25df43c 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -116,8 +116,8 @@ namespace {
static long lUserW = 5669; // 10 cm
static long lUserH = 5669; // 10 cm
-SwEnvFormatPage::SwEnvFormatPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/envformatpage.ui", "EnvFormatPage", &rSet)
+SwEnvFormatPage::SwEnvFormatPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/envformatpage.ui", "EnvFormatPage", &rSet)
, m_pDialog(nullptr)
, m_xAddrLeftField(m_xBuilder->weld_metric_spin_button("leftaddr", FieldUnit::CM))
, m_xAddrTopField(m_xBuilder->weld_metric_spin_button("topaddr", FieldUnit::CM))
@@ -412,9 +412,9 @@ void SwEnvFormatPage::SetMinMax()
100 * (getfieldval(*m_xAddrTopField ) - 2 * 566), FieldUnit::TWIP);
}
-std::unique_ptr<SfxTabPage> SwEnvFormatPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SwEnvFormatPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
- return std::make_unique<SwEnvFormatPage>(pParent, *rSet);
+ return std::make_unique<SwEnvFormatPage>(pPage, pController, *rSet);
}
void SwEnvFormatPage::ActivatePage(const SfxItemSet& rSet)
diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx
index 531e3401a8ea..28da3d63d07d 100644
--- a/sw/source/ui/envelp/envfmt.hxx
+++ b/sw/source/ui/envelp/envfmt.hxx
@@ -55,11 +55,11 @@ class SwEnvFormatPage : public SfxTabPage
SwEnvDlg *GetParentSwEnvDlg() { return m_pDialog; }
public:
- SwEnvFormatPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SwEnvFormatPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
void Init(SwEnvDlg* pDialog);
virtual ~SwEnvFormatPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet);
virtual void 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 bf1871882cbc..23117247e948 100644
--- a/sw/source/ui/envelp/envlop1.cxx
+++ b/sw/source/ui/envelp/envlop1.cxx
@@ -180,8 +180,8 @@ short SwEnvDlg::Ok()
return nRet;
}
-SwEnvPage::SwEnvPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/envaddresspage.ui", "EnvAddressPage", &rSet)
+SwEnvPage::SwEnvPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/envaddresspage.ui", "EnvAddressPage", &rSet)
, m_pDialog(nullptr)
, m_pSh(nullptr)
, m_xAddrEdit(m_xBuilder->weld_text_view("addredit"))
@@ -297,9 +297,9 @@ void SwEnvPage::InitDatabaseBox()
}
}
-std::unique_ptr<SfxTabPage> SwEnvPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SwEnvPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
- return std::make_unique<SwEnvPage>(pParent, *rSet);
+ return std::make_unique<SwEnvPage>(pPage, pController, *rSet);
}
void SwEnvPage::ActivatePage(const SfxItemSet& rSet)
diff --git a/sw/source/ui/envelp/envprt.cxx b/sw/source/ui/envelp/envprt.cxx
index fdfca438189e..5e4c74864eae 100644
--- a/sw/source/ui/envelp/envprt.cxx
+++ b/sw/source/ui/envelp/envprt.cxx
@@ -29,8 +29,8 @@
#include <bitmaps.hlst>
-SwEnvPrtPage::SwEnvPrtPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/envprinterpage.ui", "EnvPrinterPage", &rSet)
+SwEnvPrtPage::SwEnvPrtPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/envprinterpage.ui", "EnvPrinterPage", &rSet)
, m_xUpper(m_xBuilder->weld_widget("upper"))
, m_xLower(m_xBuilder->weld_widget("lower"))
, m_xTopButton(m_xBuilder->weld_radio_button("top"))
@@ -127,9 +127,9 @@ IMPL_LINK(SwEnvPrtPage, ButtonHdl, weld::Button&, rBtn, void)
}
}
-std::unique_ptr<SfxTabPage> SwEnvPrtPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SwEnvPrtPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
- return std::make_unique<SwEnvPrtPage>(pParent, *rSet);
+ return std::make_unique<SwEnvPrtPage>(pPage, pController, *rSet);
}
void SwEnvPrtPage::ActivatePage(const SfxItemSet&)
diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx
index e86c0df1a582..89f86a9c3b7f 100644
--- a/sw/source/ui/envelp/envprt.hxx
+++ b/sw/source/ui/envelp/envprt.hxx
@@ -54,10 +54,10 @@ class SwEnvPrtPage : public SfxTabPage
SwEnvDlg* GetParentSwEnvDlg() {return static_cast<SwEnvDlg*>(GetDialogController()); }
public:
- SwEnvPrtPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SwEnvPrtPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SwEnvPrtPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet);
virtual void 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 1a64abb75f99..da4e0c5ffdc4 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -220,8 +220,8 @@ Printer *SwLabDlg::GetPrt()
return nullptr;
}
-SwLabPage::SwLabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/cardmediumpage.ui", "CardMediumPage", &rSet)
+SwLabPage::SwLabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/cardmediumpage.ui", "CardMediumPage", &rSet)
, pDBManager(nullptr)
, aItem(static_cast<const SwLabItem&>(rSet.Get(FN_LABEL)))
, m_xAddressFrame(m_xBuilder->weld_widget("addressframe"))
@@ -238,7 +238,7 @@ SwLabPage::SwLabPage(TabPageParent pParent, const SfxItemSet& rSet)
, m_xHiddenSortTypeBox(m_xBuilder->weld_combo_box("hiddentype"))
, m_xFormatInfo(m_xBuilder->weld_label("formatinfo"))
{
- WaitObject aWait(pParent.pParent);
+ weld::WaitObject aWait(GetDialogFrameWeld());
m_xWritingEdit->set_size_request(m_xWritingEdit->get_approximate_digit_width() * 30,
m_xWritingEdit->get_height_rows(10));
@@ -446,9 +446,9 @@ void SwLabPage::InitDatabaseBox()
}
}
-std::unique_ptr<SfxTabPage> SwLabPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SwLabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
- return std::make_unique<SwLabPage>(pParent, *rSet);
+ return std::make_unique<SwLabPage>(pPage, pController, *rSet);
}
void SwLabPage::ActivatePage(const SfxItemSet& rSet)
@@ -546,8 +546,8 @@ void SwLabPage::Reset(const SfxItemSet* rSet)
m_xSheetButton->set_active(true);
}
-SwPrivateDataPage::SwPrivateDataPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/privateuserpage.ui", "PrivateUserPage", &rSet)
+SwPrivateDataPage::SwPrivateDataPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/privateuserpage.ui", "PrivateUserPage", &rSet)
, m_xFirstNameED(m_xBuilder->weld_entry("firstname"))
, m_xNameED(m_xBuilder->weld_entry("lastname"))
, m_xShortCutED(m_xBuilder->weld_entry("shortname"))
@@ -574,9 +574,9 @@ SwPrivateDataPage::~SwPrivateDataPage()
{
}
-std::unique_ptr<SfxTabPage> SwPrivateDataPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SwPrivateDataPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
- return std::make_unique<SwPrivateDataPage>(pParent, *rSet);
+ return std::make_unique<SwPrivateDataPage>(pPage, pController, *rSet);
}
void SwPrivateDataPage::ActivatePage(const SfxItemSet& rSet)
@@ -643,8 +643,8 @@ void SwPrivateDataPage::Reset(const SfxItemSet* rSet)
m_xMailED->set_text(aItem.m_aPrivMail);
}
-SwBusinessDataPage::SwBusinessDataPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/businessdatapage.ui", "BusinessDataPage", &rSet)
+SwBusinessDataPage::SwBusinessDataPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/businessdatapage.ui", "BusinessDataPage", &rSet)
, m_xCompanyED(m_xBuilder->weld_entry("company"))
, m_xCompanyExtED(m_xBuilder->weld_entry("company2"))
, m_xSloganED(m_xBuilder->weld_entry("slogan"))
@@ -667,9 +667,9 @@ SwBusinessDataPage::~SwBusinessDataPage()
{
}
-std::unique_ptr<SfxTabPage> SwBusinessDataPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SwBusinessDataPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
- return std::make_unique<SwBusinessDataPage>(pParent, *rSet);
+ return std::make_unique<SwBusinessDataPage>(pPage, pController, *rSet);
}
void SwBusinessDataPage::ActivatePage(const SfxItemSet& rSet)
diff --git a/sw/source/ui/envelp/labfmt.cxx b/sw/source/ui/envelp/labfmt.cxx
index 91442147431e..e1bd1dc63130 100644
--- a/sw/source/ui/envelp/labfmt.cxx
+++ b/sw/source/ui/envelp/labfmt.cxx
@@ -284,8 +284,8 @@ void SwLabPreview::UpdateItem(const SwLabItem& rItem)
Invalidate();
}
-SwLabFormatPage::SwLabFormatPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/labelformatpage.ui", "LabelFormatPage", &rSet)
+SwLabFormatPage::SwLabFormatPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/labelformatpage.ui", "LabelFormatPage", &rSet)
, aPreviewIdle("SwLabFormatPage Preview")
, aItem(static_cast<const SwLabItem&>( rSet.Get(FN_LABEL) ))
, bModified(false)
@@ -403,9 +403,9 @@ void SwLabFormatPage::ChangeMinMax()
m_xPHeightField->set_range(long(100) * lMinPHeight, long(100) * lMax, FieldUnit::TWIP);
}
-std::unique_ptr<SfxTabPage> SwLabFormatPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SwLabFormatPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
- return std::make_unique<SwLabFormatPage>(pParent, *rSet);
+ return std::make_unique<SwLabFormatPage>(pPage, pController, *rSet);
}
void SwLabFormatPage::ActivatePage(const SfxItemSet& rSet)
diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx
index f4d55963cec1..d11e4a193f79 100644
--- a/sw/source/ui/envelp/labfmt.hxx
+++ b/sw/source/ui/envelp/labfmt.hxx
@@ -96,10 +96,10 @@ class SwLabFormatPage : public SfxTabPage
void ChangeMinMax();
public:
- SwLabFormatPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SwLabFormatPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SwLabFormatPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet);
virtual void 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 cefe4136f3c8..7edfa3167fe9 100644
--- a/sw/source/ui/envelp/labprt.cxx
+++ b/sw/source/ui/envelp/labprt.cxx
@@ -27,8 +27,8 @@
#include <cmdid.h>
-SwLabPrtPage::SwLabPrtPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/labeloptionspage.ui", "LabelOptionsPage", &rSet)
+SwLabPrtPage::SwLabPrtPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/labeloptionspage.ui", "LabelOptionsPage", &rSet)
, pPrinter(nullptr)
, m_xPageButton(m_xBuilder->weld_radio_button("entirepage"))
, m_xSingleButton(m_xBuilder->weld_radio_button("singlelabel"))
@@ -86,9 +86,9 @@ IMPL_LINK( SwLabPrtPage, CountHdl, weld::Button&, rButton, void )
}
}
-std::unique_ptr<SfxTabPage> SwLabPrtPage::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> SwLabPrtPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet)
{
- return std::make_unique<SwLabPrtPage>(pParent, *rSet );
+ return std::make_unique<SwLabPrtPage>(pPage, pController, *rSet );
}
void SwLabPrtPage::ActivatePage( const SfxItemSet& rSet )
diff --git a/sw/source/ui/envelp/labprt.hxx b/sw/source/ui/envelp/labprt.hxx
index 8c35033ded01..c69d44ea4514 100644
--- a/sw/source/ui/envelp/labprt.hxx
+++ b/sw/source/ui/envelp/labprt.hxx
@@ -45,10 +45,10 @@ class SwLabPrtPage : public SfxTabPage
SwLabDlg* GetParentSwLabDlg() {return static_cast<SwLabDlg*>(GetDialogController());}
public:
- SwLabPrtPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SwLabPrtPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SwLabPrtPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet);
virtual void 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 ff81d3bfe17e..5634b4c2c5eb 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -55,11 +55,11 @@ class SwLabPage : public SfxTabPage
SwLabRec* GetSelectedEntryPos();
public:
- SwLabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SwLabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SwLabPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override;
@@ -98,10 +98,10 @@ class SwPrivateDataPage : public SfxTabPage
std::unique_ptr<weld::Entry> m_xMailED;
public:
- SwPrivateDataPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SwPrivateDataPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SwPrivateDataPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet);
virtual void ActivatePage(const SfxItemSet& rSet) override;
virtual DeactivateRC DeactivatePage(SfxItemSet* pSet) override;
@@ -127,10 +127,10 @@ class SwBusinessDataPage : public SfxTabPage
std::unique_ptr<weld::Entry> m_xMailED;
public:
- SwBusinessDataPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SwBusinessDataPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SwBusinessDataPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet);
virtual void 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 e8b959ee3ed3..d6e49e76c847 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -33,8 +33,8 @@
#define USER_DATA_VERSION_1 "1"
#define USER_DATA_VERSION USER_DATA_VERSION_1
-SwFieldDBPage::SwFieldDBPage(TabPageParent pParent, const SfxItemSet *const pCoreSet)
- : SwFieldPage(pParent, "modules/swriter/ui/flddbpage.ui", "FieldDbPage", pCoreSet)
+SwFieldDBPage::SwFieldDBPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *const pCoreSet)
+ : SwFieldPage(pPage, pController, "modules/swriter/ui/flddbpage.ui", "FieldDbPage", pCoreSet)
, m_nOldFormat(0)
, m_nOldSubType(0)
, m_xTypeLB(m_xBuilder->weld_tree_view("type"))
@@ -255,10 +255,10 @@ bool SwFieldDBPage::FillItemSet(SfxItemSet* )
return false;
}
-std::unique_ptr<SfxTabPage> SwFieldDBPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SwFieldDBPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet *const pAttrSet )
{
- return std::make_unique<SwFieldDBPage>( pParent, pAttrSet );
+ return std::make_unique<SwFieldDBPage>( pPage, pController, pAttrSet );
}
sal_uInt16 SwFieldDBPage::GetGroup()
diff --git a/sw/source/ui/fldui/flddb.hxx b/sw/source/ui/fldui/flddb.hxx
index aac2b5fa31e8..ad16a62863bf 100644
--- a/sw/source/ui/fldui/flddb.hxx
+++ b/sw/source/ui/fldui/flddb.hxx
@@ -61,11 +61,11 @@ protected:
virtual sal_uInt16 GetGroup() override;
public:
- SwFieldDBPage(TabPageParent pParent, const SfxItemSet* rSet);
+ SwFieldDBPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet);
virtual ~SwFieldDBPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index e077868cb552..92d263a6efd1 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -51,8 +51,8 @@ void FillFieldSelect(weld::TreeView& rListBox)
rListBox.append_text(SwResId(FLD_SELECT[i]));
}
-SwFieldDokInfPage::SwFieldDokInfPage(TabPageParent pParent, const SfxItemSet *const pCoreSet)
- : SwFieldPage(pParent, "modules/swriter/ui/flddocinfopage.ui", "FieldDocInfoPage", pCoreSet)
+SwFieldDokInfPage::SwFieldDokInfPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *const pCoreSet)
+ : SwFieldPage(pPage, pController, "modules/swriter/ui/flddocinfopage.ui", "FieldDocInfoPage", pCoreSet)
, nOldSel(0)
, nOldFormat(0)
, m_xTypeTLB(m_xBuilder->weld_tree_view("type"))
@@ -443,10 +443,10 @@ bool SwFieldDokInfPage::FillItemSet(SfxItemSet* )
return false;
}
-std::unique_ptr<SfxTabPage> SwFieldDokInfPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SwFieldDokInfPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet *const pAttrSet)
{
- return std::make_unique<SwFieldDokInfPage>(pParent, pAttrSet);
+ return std::make_unique<SwFieldDokInfPage>(pPage, pController, pAttrSet);
}
sal_uInt16 SwFieldDokInfPage::GetGroup()
diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx
index 15c09d9084c5..826f5b562627 100644
--- a/sw/source/ui/fldui/flddinf.hxx
+++ b/sw/source/ui/fldui/flddinf.hxx
@@ -52,10 +52,10 @@ protected:
virtual sal_uInt16 GetGroup() override;
public:
- SwFieldDokInfPage(TabPageParent pWindow, const SfxItemSet* pSet);
+ SwFieldDokInfPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* pSet);
virtual ~SwFieldDokInfPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index d1d04e96457b..01346a4b94d8 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -32,8 +32,8 @@
#define USER_DATA_VERSION_1 "1"
#define USER_DATA_VERSION USER_DATA_VERSION_1
-SwFieldDokPage::SwFieldDokPage(TabPageParent pParent, const SfxItemSet *const pCoreSet)
- : SwFieldPage(pParent, "modules/swriter/ui/flddocumentpage.ui",
+SwFieldDokPage::SwFieldDokPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *const pCoreSet)
+ : SwFieldPage(pPage, pController, "modules/swriter/ui/flddocumentpage.ui",
"FieldDocumentPage", pCoreSet)
, nOldSel(0)
, nOldFormat(0)
@@ -608,10 +608,10 @@ bool SwFieldDokPage::FillItemSet(SfxItemSet* )
return false;
}
-std::unique_ptr<SfxTabPage> SwFieldDokPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SwFieldDokPage::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet *const pAttrSet)
{
- return std::make_unique<SwFieldDokPage>(pParent, pAttrSet);
+ return std::make_unique<SwFieldDokPage>(pPage, pController, pAttrSet);
}
sal_uInt16 SwFieldDokPage::GetGroup()
diff --git a/sw/source/ui/fldui/flddok.hxx b/sw/source/ui/fldui/flddok.hxx
index 2fd437d7e4b9..ce61dd15e695 100644
--- a/sw/source/ui/fldui/flddok.hxx
+++ b/sw/source/ui/fldui/flddok.hxx
@@ -55,11 +55,11 @@ protected:
virtual sal_uInt16 GetGroup() override;
public:
- SwFieldDokPage(TabPageParent pWindow, const SfxItemSet * pSet);
+ SwFieldDokPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet * pSet);
virtual ~SwFieldDokPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index 8cd8577920d9..72caa96ec481 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -175,21 +175,19 @@ void SwFieldEditDlg::Init()
SfxTabPage* SwFieldEditDlg::CreatePage(sal_uInt16 nGroup)
{
- TabPageParent pPageParent(get_content_area(), this);
-
// create TabPage
std::unique_ptr<SfxTabPage> xTabPage;
switch (nGroup)
{
case GRP_DOC:
- xTabPage = SwFieldDokPage::Create(pPageParent, nullptr);
+ xTabPage = SwFieldDokPage::Create(get_content_area(), this, nullptr);
break;
case GRP_FKT:
- xTabPage = SwFieldFuncPage::Create(pPageParent, nullptr);
+ xTabPage = SwFieldFuncPage::Create(get_content_area(), this, nullptr);
break;
case GRP_REF:
- xTabPage = SwFieldRefPage::Create(pPageParent, nullptr);
+ xTabPage = SwFieldRefPage::Create(get_content_area(), this, nullptr);
break;
case GRP_REG:
{
@@ -204,17 +202,17 @@ SfxTabPage* SwFieldEditDlg::CreatePage(sal_uInt16 nGroup)
xDocProps->getUserDefinedProperties(),
uno::UNO_QUERY_THROW);
pSet->Put( SfxUnoAnyItem( SID_DOCINFO, uno::makeAny(xUDProps) ) );
- xTabPage = SwFieldDokInfPage::Create(pPageParent, pSet);
+ xTabPage = SwFieldDokInfPage::Create(get_content_area(), this, pSet);
break;
}
#if HAVE_FEATURE_DBCONNECTIVITY
case GRP_DB:
- xTabPage = SwFieldDBPage::Create(pPageParent, nullptr);
+ xTabPage = SwFieldDBPage::Create(get_content_area(), this, nullptr);
static_cast<SwFieldDBPage*>(xTabPage.get())->SetWrtShell(*pSh);
break;
#endif
case GRP_VAR:
- xTabPage = SwFieldVarPage::Create(pPageParent, nullptr);
+ xTabPage = SwFieldVarPage::Create(get_content_area(), this, nullptr);
break;
}
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index f140b30dd201..ab0f4cc95a92 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -38,8 +38,8 @@
using namespace ::com::sun::star;
-SwFieldFuncPage::SwFieldFuncPage(TabPageParent pParent, const SfxItemSet *const pCoreSet)
- : SwFieldPage(pParent, "modules/swriter/ui/fldfuncpage.ui", "FieldFuncPage", pCoreSet)
+SwFieldFuncPage::SwFieldFuncPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *const pCoreSet)
+ : SwFieldPage(pPage, pController, "modules/swriter/ui/fldfuncpage.ui", "FieldFuncPage", pCoreSet)
, nOldFormat(0)
, bDropDownLBChanged(false)
, m_xTypeLB(m_xBuilder->weld_tree_view("type"))
@@ -575,10 +575,10 @@ bool SwFieldFuncPage::FillItemSet(SfxItemSet* )
return false;
}
-std::unique_ptr<SfxTabPage> SwFieldFuncPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SwFieldFuncPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet *const pAttrSet)
{
- return std::make_unique<SwFieldFuncPage>(pParent, pAttrSet);
+ return std::make_unique<SwFieldFuncPage>(pPage, pController, pAttrSet);
}
sal_uInt16 SwFieldFuncPage::GetGroup()
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index 78588ad65cb4..43632c0241d9 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -79,10 +79,10 @@ protected:
virtual sal_uInt16 GetGroup() override;
public:
- SwFieldFuncPage(TabPageParent pParent, const SfxItemSet* pSet);
+ SwFieldFuncPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* pSet);
virtual ~SwFieldFuncPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index ba7673cf367d..a55a97e3c90c 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -42,9 +42,9 @@
using namespace ::com::sun::star;
// note: pAttrSet may be null if the dialog is restored on startup
-SwFieldPage::SwFieldPage(TabPageParent pParent, const OUString& rUIXMLDescription,
+SwFieldPage::SwFieldPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription,
const OString& rID, const SfxItemSet *pAttrSet)
- : SfxTabPage(pParent, rUIXMLDescription, rID, pAttrSet)
+ : SfxTabPage(pPage, pController, rUIXMLDescription, rID, pAttrSet)
, m_pCurField(nullptr)
, m_pWrtShell(nullptr)
, m_nTypeSel(-1)
diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx
index 98cfd6760be9..178465d981fb 100644
--- a/sw/source/ui/fldui/fldpage.hxx
+++ b/sw/source/ui/fldui/fldpage.hxx
@@ -71,7 +71,7 @@ protected:
bool bIsAutomaticLanguage = true);
public:
- SwFieldPage(TabPageParent pParent, const OUString& rUIXMLDescription,
+ SwFieldPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription,
const OString& rID, const SfxItemSet *pAttrSet);
virtual ~SwFieldPage() override;
diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx
index e41c9d7c1599..2c9064dbf8bc 100644
--- a/sw/source/ui/fldui/fldref.cxx
+++ b/sw/source/ui/fldui/fldref.cxx
@@ -51,8 +51,8 @@ static sal_uInt16 nFieldDlgFormatSel = 0;
#define USER_DATA_VERSION_1 "1"
#define USER_DATA_VERSION USER_DATA_VERSION_1
-SwFieldRefPage::SwFieldRefPage(TabPageParent pParent, const SfxItemSet *const pCoreSet )
- : SwFieldPage(pParent, "modules/swriter/ui/fldrefpage.ui", "FieldRefPage", pCoreSet)
+SwFieldRefPage::SwFieldRefPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *const pCoreSet )
+ : SwFieldPage(pPage, pController, "modules/swriter/ui/fldrefpage.ui", "FieldRefPage", pCoreSet)
, maOutlineNodes()
, maNumItems()
, mpSavedSelectedTextNode(nullptr)
@@ -1084,10 +1084,10 @@ bool SwFieldRefPage::FillItemSet(SfxItemSet* )
return false;
}
-std::unique_ptr<SfxTabPage> SwFieldRefPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SwFieldRefPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet *const pAttrSet)
{
- return std::make_unique<SwFieldRefPage>(pParent, pAttrSet);
+ return std::make_unique<SwFieldRefPage>(pPage, pController, pAttrSet);
}
sal_uInt16 SwFieldRefPage::GetGroup()
diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx
index d578e109ac87..8dc9a311bcfe 100644
--- a/sw/source/ui/fldui/fldref.hxx
+++ b/sw/source/ui/fldui/fldref.hxx
@@ -77,10 +77,10 @@ protected:
virtual sal_uInt16 GetGroup() override;
public:
- SwFieldRefPage(TabPageParent pParent, const SfxItemSet* pSet);
+ SwFieldRefPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* pSet);
virtual ~SwFieldRefPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index b5aa075a6544..99d6b1b8dcc4 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -39,8 +39,8 @@
#define USER_DATA_VERSION_1 "1"
#define USER_DATA_VERSION USER_DATA_VERSION_1
-SwFieldVarPage::SwFieldVarPage(TabPageParent pParent, const SfxItemSet *const pCoreSet )
- : SwFieldPage(pParent, "modules/swriter/ui/fldvarpage.ui", "FieldVarPage", pCoreSet)
+SwFieldVarPage::SwFieldVarPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *const pCoreSet )
+ : SwFieldPage(pPage, pController, "modules/swriter/ui/fldvarpage.ui", "FieldVarPage", pCoreSet)
, m_xTypeLB(m_xBuilder->weld_tree_view("type"))
, m_xSelection(m_xBuilder->weld_widget("selectframe"))
, m_xSelectionLB(m_xBuilder->weld_tree_view("select"))
@@ -1203,10 +1203,10 @@ bool SwFieldVarPage::FillItemSet(SfxItemSet* )
return false;
}
-std::unique_ptr<SfxTabPage> SwFieldVarPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SwFieldVarPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet *const pAttrSet)
{
- return std::make_unique<SwFieldVarPage>( pParent, pAttrSet );
+ return std::make_unique<SwFieldVarPage>( pPage, pController, pAttrSet );
}
sal_uInt16 SwFieldVarPage::GetGroup()
diff --git a/sw/source/ui/fldui/fldvar.hxx b/sw/source/ui/fldui/fldvar.hxx
index d47d3f819da8..f6f0c570a107 100644
--- a/sw/source/ui/fldui/fldvar.hxx
+++ b/sw/source/ui/fldui/fldvar.hxx
@@ -69,8 +69,8 @@ protected:
virtual sal_uInt16 GetGroup() override;
public:
- SwFieldVarPage(TabPageParent pParent, const SfxItemSet* pSet);
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
+ SwFieldVarPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* pSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet);
virtual ~SwFieldVarPage() override;
virtual bool FillItemSet( SfxItemSet* rSet ) override;
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 6e27d1d7dcd1..e90d25598b0a 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -167,7 +167,7 @@ SwColumnDlg::SwColumnDlg(weld::Window* pParent, SwWrtShell& rSh)
assert(pColPgSet);
// create TabPage
- m_xTabPage = std::make_unique<SwColumnPage>(TabPageParent(m_xContentArea.get(), this), *pColPgSet);
+ m_xTabPage = std::make_unique<SwColumnPage>(m_xContentArea.get(), this, *pColPgSet);
m_xTabPage->GetApplyLabel()->show();
weld::ComboBox* pApplyToLB = m_xTabPage->GetApplyComboBox();
pApplyToLB->show();
@@ -382,8 +382,8 @@ void SwColumnPage::ResetColWidth()
constexpr sal_uInt16 g_nMinWidth(MINLAY);
// Now as TabPage
-SwColumnPage::SwColumnPage(TabPageParent pParent, const SfxItemSet &rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/columnpage.ui", "ColumnPage", &rSet)
+SwColumnPage::SwColumnPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/columnpage.ui", "ColumnPage", &rSet)
, m_nFirstVis(0)
, m_pModifiedField(nullptr)
, m_bFormat(false)
@@ -408,7 +408,7 @@ SwColumnPage::SwColumnPage(TabPageParent pParent, const SfxItemSet &rSet)
, m_xLinePosDLB(m_xBuilder->weld_combo_box("lineposlb"))
, m_xTextDirectionFT(m_xBuilder->weld_label("textdirectionft"))
, m_xTextDirectionLB(new svx::FrameDirectionListBox(m_xBuilder->weld_combo_box("textdirectionlb")))
- , m_xLineColorDLB(new ColorListBox(m_xBuilder->weld_menu_button("colorlb"), pParent.GetFrameWeld()))
+ , m_xLineColorDLB(new ColorListBox(m_xBuilder->weld_menu_button("colorlb"), pController->getDialog()))
, m_xLineTypeDLB(new SvtLineListBox(m_xBuilder->weld_menu_button("linestylelb")))
, m_xEd1(new SwPercentField(m_xBuilder->weld_metric_spin_button("width1mf", FieldUnit::CM)))
, m_xEd2(new SwPercentField(m_xBuilder->weld_metric_spin_button("width2mf", FieldUnit::CM)))
@@ -598,9 +598,9 @@ void SwColumnPage::Reset(const SfxItemSet *rSet)
}
// create TabPage
-std::unique_ptr<SfxTabPage> SwColumnPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
+std::unique_ptr<SfxTabPage> SwColumnPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet)
{
- return std::make_unique<SwColumnPage>(pParent, *rSet);
+ return std::make_unique<SwColumnPage>(pPage, pController, *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 9add39674904..60fd1f2660b3 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -608,8 +608,8 @@ namespace
}
}
-SwFramePage::SwFramePage(TabPageParent pParent, const SfxItemSet &rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/frmtypepage.ui", "FrameTypePage", &rSet)
+SwFramePage::SwFramePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/frmtypepage.ui", "FrameTypePage", &rSet)
, m_bAtHorzPosModified(false)
, m_bAtVertPosModified(false)
, m_bFormat(false)
@@ -820,9 +820,9 @@ void SwFramePage::setOptimalRelWidth()
m_xHoriRelationLB->clear();
}
-std::unique_ptr<SfxTabPage> SwFramePage::Create(TabPageParent pParent, const SfxItemSet *rSet)
+std::unique_ptr<SfxTabPage> SwFramePage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet)
{
- return std::make_unique<SwFramePage>(pParent, *rSet);
+ return std::make_unique<SwFramePage>(pPage, pController, *rSet);
}
void SwFramePage::EnableGraficMode()
@@ -2288,8 +2288,8 @@ void SwFramePage::EnableVerticalPositioning( bool bEnable )
m_xVertRelationLB->set_sensitive( bEnable );
}
-SwGrfExtPage::SwGrfExtPage(TabPageParent pParent, const SfxItemSet &rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/picturepage.ui", "PicturePage", &rSet)
+SwGrfExtPage::SwGrfExtPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/picturepage.ui", "PicturePage", &rSet)
, m_bHtmlMode(false)
, m_xMirror(m_xBuilder->weld_widget("flipframe"))
, m_xMirrorVertBox(m_xBuilder->weld_check_button("vert"))
@@ -2323,9 +2323,9 @@ SwGrfExtPage::~SwGrfExtPage()
m_xGrfDlg.reset();
}
-std::unique_ptr<SfxTabPage> SwGrfExtPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
+std::unique_ptr<SfxTabPage> SwGrfExtPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet)
{
- return std::make_unique<SwGrfExtPage>(pParent, *rSet);
+ return std::make_unique<SwGrfExtPage>(pPage, pController, *rSet);
}
void SwGrfExtPage::Reset(const SfxItemSet *rSet)
@@ -2658,8 +2658,8 @@ void BmpWindow::SetBitmapEx(const BitmapEx& rBmp)
}
// set URL and ImageMap at frames
-SwFrameURLPage::SwFrameURLPage(TabPageParent pParent, const SfxItemSet &rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/frmurlpage.ui", "FrameURLPage", &rSet)
+SwFrameURLPage::SwFrameURLPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/frmurlpage.ui", "FrameURLPage", &rSet)
, m_xURLED(m_xBuilder->weld_entry("url"))
, m_xSearchPB(m_xBuilder->weld_button("search"))
, m_xNameED(m_xBuilder->weld_entry("name"))
@@ -2747,9 +2747,9 @@ bool SwFrameURLPage::FillItemSet(SfxItemSet *rSet)
return bModified;
}
-std::unique_ptr<SfxTabPage> SwFrameURLPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
+std::unique_ptr<SfxTabPage> SwFrameURLPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet)
{
- return std::make_unique<SwFrameURLPage>(pParent, *rSet);
+ return std::make_unique<SwFrameURLPage>(pPage, pController, *rSet);
}
IMPL_LINK_NOARG(SwFrameURLPage, InsertFileHdl, weld::Button&, void)
@@ -2771,8 +2771,8 @@ IMPL_LINK_NOARG(SwFrameURLPage, InsertFileHdl, weld::Button&, void)
}
}
-SwFrameAddPage::SwFrameAddPage(TabPageParent pParent, const SfxItemSet &rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/frmaddpage.ui", "FrameAddPage", &rSet)
+SwFrameAddPage::SwFrameAddPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/frmaddpage.ui", "FrameAddPage", &rSet)
, m_pWrtSh(nullptr)
, m_bHtmlMode(false)
, m_bFormat(false)
@@ -2814,9 +2814,9 @@ SwFrameAddPage::~SwFrameAddPage()
m_xTextFlowLB.reset();
}
-std::unique_ptr<SfxTabPage> SwFrameAddPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
+std::unique_ptr<SfxTabPage> SwFrameAddPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet)
{
- return std::make_unique<SwFrameAddPage>(pParent, *rSet);
+ return std::make_unique<SwFrameAddPage>(pPage, pController, *rSet);
}
void SwFrameAddPage::Reset(const SfxItemSet *rSet )
diff --git a/sw/source/ui/frmdlg/pattern.cxx b/sw/source/ui/frmdlg/pattern.cxx
index 5459ff96b1ca..2fccc5172b32 100644
--- a/sw/source/ui/frmdlg/pattern.cxx
+++ b/sw/source/ui/frmdlg/pattern.cxx
@@ -31,10 +31,7 @@ SwBackgroundDlg::SwBackgroundDlg(weld::Window* pParent, const SfxItemSet& rSet)
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND );
if ( fnCreatePage )
- {
- TabPageParent pPageParent(get_content_area(), this);
- SetTabPage((*fnCreatePage)(pPageParent, &rSet));
- }
+ SetTabPage((*fnCreatePage)(get_content_area(), this, &rSet));
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/frmdlg/uiborder.cxx b/sw/source/ui/frmdlg/uiborder.cxx
index 06d99bb2a78d..c65945628d95 100644
--- a/sw/source/ui/frmdlg/uiborder.cxx
+++ b/sw/source/ui/frmdlg/uiborder.cxx
@@ -39,8 +39,7 @@ SwBorderDlg::SwBorderDlg(weld::Window* pParent, SfxItemSet& rSet, SwBorderModes
if (fnCreatePage)
{
- TabPageParent pPageParent(get_content_area(), this);
- std::unique_ptr<SfxTabPage> xNewPage = (*fnCreatePage)(pPageParent, &rSet);
+ std::unique_ptr<SfxTabPage> xNewPage = (*fnCreatePage)(get_content_area(), this, &rSet);
SfxAllItemSet aSet(*(rSet.GetPool()));
aSet.Put (SfxUInt16Item(SID_SWMODE_TYPE, static_cast<sal_uInt16>(nType)));
if(SwBorderModes::TABLE == nType)
diff --git a/sw/source/ui/frmdlg/wrap.cxx b/sw/source/ui/frmdlg/wrap.cxx
index 3b3f5909768a..46deb3d0f602 100644
--- a/sw/source/ui/frmdlg/wrap.cxx
+++ b/sw/source/ui/frmdlg/wrap.cxx
@@ -58,16 +58,15 @@ SwWrapDlg::SwWrapDlg(weld::Window* pParent, SfxItemSet& rSet, SwWrtShell* pWrtSh
: SfxSingleTabDialogController(pParent, &rSet, "modules/swriter/ui/wrapdialog.ui", "WrapDialog")
{
// create TabPage
- TabPageParent pPageParent(get_content_area(), this);
- auto xNewPage = SwWrapTabPage::Create(pPageParent, &rSet);
+ auto xNewPage = SwWrapTabPage::Create(get_content_area(), this, &rSet);
SwWrapTabPage* pWrapPage = static_cast<SwWrapTabPage*>(xNewPage.get());
pWrapPage->SetFormatUsed(false, bDrawMode);
pWrapPage->SetShell(pWrtShell);
SetTabPage(std::move(xNewPage));
}
-SwWrapTabPage::SwWrapTabPage(TabPageParent pParent, const SfxItemSet &rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/wrappage.ui", "WrapPage", &rSet)
+SwWrapTabPage::SwWrapTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/wrappage.ui", "WrapPage", &rSet)
, m_nAnchorId(RndStdIds::FLY_AT_PARA)
, m_nHtmlMode(0)
, m_pWrtSh(nullptr)
@@ -115,9 +114,9 @@ SwWrapTabPage::~SwWrapTabPage()
{
}
-std::unique_ptr<SfxTabPage> SwWrapTabPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
+std::unique_ptr<SfxTabPage> SwWrapTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet)
{
- return std::make_unique<SwWrapTabPage>(pParent, *rSet);
+ return std::make_unique<SwWrapTabPage>(pPage, pController, *rSet);
}
void SwWrapTabPage::Reset(const SfxItemSet *rSet)
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index a23cf50987b2..3afac2a604ce 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -699,8 +699,8 @@ IMPL_LINK(SwAddStylesDlg_Impl, LeftRightHdl, weld::Button&, rBtn, void)
}
}
-SwTOXSelectTabPage::SwTOXSelectTabPage(TabPageParent pParent, const SfxItemSet& rAttrSet)
- : SfxTabPage(pParent, "modules/swriter/ui/tocindexpage.ui", "TocIndexPage", &rAttrSet)
+SwTOXSelectTabPage::SwTOXSelectTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/tocindexpage.ui", "TocIndexPage", &rAttrSet)
, sAutoMarkType(SwResId(STR_AUTOMARK_TYPE))
, m_bWaitingInitialSettings(true)
, m_xTitleED(m_xBuilder->weld_entry("title"))
@@ -1173,9 +1173,9 @@ DeactivateRC SwTOXSelectTabPage::DeactivatePage(SfxItemSet* _pSet)
return DeactivateRC::LeavePage;
}
-std::unique_ptr<SfxTabPage> SwTOXSelectTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> SwTOXSelectTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
{
- return std::make_unique<SwTOXSelectTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SwTOXSelectTabPage>(pPage, pController, *rAttrSet);
}
IMPL_LINK(SwTOXSelectTabPage, TOXTypeHdl, weld::ComboBox&, rBox, void)
@@ -1770,8 +1770,8 @@ namespace
};
}
-SwTOXEntryTabPage::SwTOXEntryTabPage(TabPageParent pParent, const SfxItemSet& rAttrSet)
- : SfxTabPage(pParent, "modules/swriter/ui/tocentriespage.ui", "TocEntriesPage", &rAttrSet)
+SwTOXEntryTabPage::SwTOXEntryTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/tocentriespage.ui", "TocEntriesPage", &rAttrSet)
, sDelimStr(SwResId(STR_DELIM))
, sNoCharStyle(SwResId(STR_NO_CHAR_STYLE))
, m_pCurrentForm(nullptr)
@@ -2112,9 +2112,9 @@ DeactivateRC SwTOXEntryTabPage::DeactivatePage( SfxItemSet* /*pSet*/)
return DeactivateRC::LeavePage;
}
-std::unique_ptr<SfxTabPage> SwTOXEntryTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> SwTOXEntryTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
{
- return std::make_unique<SwTOXEntryTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SwTOXEntryTabPage>(pPage, pController, *rAttrSet);
}
IMPL_LINK_NOARG(SwTOXEntryTabPage, EditStyleHdl, weld::Button&, void)
@@ -3348,8 +3348,8 @@ sal_uInt32 SwTokenWindow::GetControlIndex(FormTokenType eType) const
return nIndex;
}
-SwTOXStylesTabPage::SwTOXStylesTabPage(TabPageParent pParent, const SfxItemSet& rAttrSet)
- : SfxTabPage(pParent, "modules/swriter/ui/tocstylespage.ui", "TocStylesPage", &rAttrSet)
+SwTOXStylesTabPage::SwTOXStylesTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/tocstylespage.ui", "TocStylesPage", &rAttrSet)
, m_xLevelLB(m_xBuilder->weld_tree_view("levels"))
, m_xAssignBT(m_xBuilder->weld_button("assign"))
, m_xParaLayLB(m_xBuilder->weld_tree_view("styles"))
@@ -3459,10 +3459,10 @@ DeactivateRC SwTOXStylesTabPage::DeactivatePage( SfxItemSet* /*pSet*/ )
return DeactivateRC::LeavePage;
}
-std::unique_ptr<SfxTabPage> SwTOXStylesTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SwTOXStylesTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet)
{
- return std::make_unique<SwTOXStylesTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SwTOXStylesTabPage>(pPage, pController, *rAttrSet);
}
IMPL_LINK_NOARG(SwTOXStylesTabPage, EditStyleHdl, weld::Button&, void)
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 081ad7fb7f03..0265fb6fef9d 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -63,9 +63,9 @@ IMPL_LINK(SwFootNoteOptionDlg, OkHdl, weld::Button&, rBtn, void)
SfxTabDialogController::OkHdl(rBtn);
}
-SwEndNoteOptionPage::SwEndNoteOptionPage(TabPageParent pParent, bool bEN,
+SwEndNoteOptionPage::SwEndNoteOptionPage(weld::Container* pPage, weld::DialogController* pController, bool bEN,
const SfxItemSet &rSet)
- : SfxTabPage(pParent,
+ : SfxTabPage(pPage, pController,
bEN ? OUString("modules/swriter/ui/endnotepage.ui") : OUString("modules/swriter/ui/footnotepage.ui"),
bEN ? OString("EndnotePage") : OString("FootnotePage"),
&rSet)
@@ -209,9 +209,9 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet* )
m_xPageTemplBox->set_active_text(pInf->GetPageDesc(*pSh->GetDoc())->GetName());
}
-std::unique_ptr<SfxTabPage> SwEndNoteOptionPage::Create( TabPageParent pParent, const SfxItemSet *rSet )
+std::unique_ptr<SfxTabPage> SwEndNoteOptionPage::Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet )
{
- return std::make_unique<SwEndNoteOptionPage>(pParent, true, *rSet);
+ return std::make_unique<SwEndNoteOptionPage>(pPage, pController, true, *rSet);
}
// Different kinds of numbering; because the Listbox has varying numbers of
@@ -369,8 +369,8 @@ bool SwEndNoteOptionPage::FillItemSet( SfxItemSet * )
return true;
}
-SwFootNoteOptionPage::SwFootNoteOptionPage(TabPageParent pParent, const SfxItemSet &rSet)
- : SwEndNoteOptionPage(pParent, false, rSet)
+SwFootNoteOptionPage::SwFootNoteOptionPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet)
+ : SwEndNoteOptionPage(pPage, pController, false, rSet)
{
}
@@ -378,9 +378,9 @@ SwFootNoteOptionPage::~SwFootNoteOptionPage()
{
}
-std::unique_ptr<SfxTabPage> SwFootNoteOptionPage::Create(TabPageParent pParent, const SfxItemSet *rSet )
+std::unique_ptr<SfxTabPage> SwFootNoteOptionPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet )
{
- return std::make_unique<SwFootNoteOptionPage>(pParent, *rSet);
+ return std::make_unique<SwFootNoteOptionPage>(pPage, pController, *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 fb02e5732773..1feac619dc97 100644
--- a/sw/source/ui/misc/impfnote.hxx
+++ b/sw/source/ui/misc/impfnote.hxx
@@ -61,10 +61,10 @@ class SwEndNoteOptionPage : public SfxTabPage
DECL_LINK(NumCountHdl, weld::ComboBox&, void);
public:
- SwEndNoteOptionPage(TabPageParent pParent, bool bEndNote, const SfxItemSet &rSet);
+ SwEndNoteOptionPage(weld::Container* pPage, weld::DialogController* pController, bool bEndNote, const SfxItemSet &rSet);
virtual ~SwEndNoteOptionPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet);
virtual bool FillItemSet(SfxItemSet *rSet) override;
virtual void Reset( const SfxItemSet* ) override;
@@ -74,8 +74,8 @@ public:
class SwFootNoteOptionPage : public SwEndNoteOptionPage
{
public:
- SwFootNoteOptionPage(TabPageParent pParent, const SfxItemSet &rSet );
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
+ SwFootNoteOptionPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet );
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet);
virtual ~SwFootNoteOptionPage() override;
};
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index a11e639f3797..ae637765fbe5 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -55,8 +55,8 @@ static bool bLastRelative = false;
//dialog to this one, except with a different preview window impl.
//TODO, determine if SwNumPositionTabPage and SvxNumPositionTabPage can be
//merged
-SwNumPositionTabPage::SwNumPositionTabPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/outlinepositionpage.ui", "OutlinePositionPage", &rSet)
+SwNumPositionTabPage::SwNumPositionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/outlinepositionpage.ui", "OutlinePositionPage", &rSet)
, pSaveNum(nullptr)
, pWrtSh(nullptr)
, pOutlineDlg(nullptr)
@@ -491,10 +491,10 @@ void SwNumPositionTabPage::ShowControlsDependingOnPosAndSpaceMode()
m_xIndentAtMF->set_visible( bLabelAlignmentPosAndSpaceModeActive );
}
-std::unique_ptr<SfxTabPage> SwNumPositionTabPage::Create( TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SwNumPositionTabPage::Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet)
{
- return std::make_unique<SwNumPositionTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SwNumPositionTabPage>(pPage, pController, *rAttrSet);
}
void SwNumPositionTabPage::SetWrtShell(SwWrtShell* pSh)
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 88353b9025a3..5336288fe9a1 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -383,9 +383,9 @@ short SwOutlineTabDialog::Ok()
return RET_OK;
}
-SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(TabPageParent pPage,
+SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rSet)
- : SfxTabPage(pPage, "modules/swriter/ui/outlinenumberingpage.ui", "OutlineNumberingPage", &rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/outlinenumberingpage.ui", "OutlineNumberingPage", &rSet)
, aNoFormatName(SwResId(SW_STR_NONE))
, pSh(nullptr)
, pNumRule(nullptr)
@@ -801,10 +801,10 @@ void SwOutlineSettingsTabPage::Reset( const SfxItemSet* rSet )
ActivatePage(*rSet);
}
-std::unique_ptr<SfxTabPage> SwOutlineSettingsTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SwOutlineSettingsTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet)
{
- return std::make_unique<SwOutlineSettingsTabPage>(pParent, *rAttrSet);
+ return std::make_unique<SwOutlineSettingsTabPage>(pPage, pController, *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 e4004b3c3ae4..910bccd1c7f6 100644
--- a/sw/source/ui/misc/pgfnote.cxx
+++ b/sw/source/ui/misc/pgfnote.cxx
@@ -105,8 +105,8 @@ IMPL_LINK(SwFootNotePage, LineColorSelected_Impl, ColorListBox&, rColorBox, void
m_xLineTypeBox->SetColor(rColorBox.GetSelectEntryColor());
}
-SwFootNotePage::SwFootNotePage(TabPageParent pParent, const SfxItemSet &rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/footnoteareapage.ui", "FootnoteAreaPage", &rSet)
+SwFootNotePage::SwFootNotePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/footnoteareapage.ui", "FootnoteAreaPage", &rSet)
, lMaxHeight(0)
, m_xMaxHeightPageBtn(m_xBuilder->weld_radio_button("maxheightpage"))
, m_xMaxHeightBtn(m_xBuilder->weld_radio_button("maxheight"))
@@ -115,7 +115,7 @@ SwFootNotePage::SwFootNotePage(TabPageParent pParent, const SfxItemSet &rSet)
, m_xLinePosBox(m_xBuilder->weld_combo_box("position"))
, m_xLineTypeBox(new SvtLineListBox(m_xBuilder->weld_menu_button("style")))
, m_xLineWidthEdit(m_xBuilder->weld_metric_spin_button("thickness", FieldUnit::POINT))
- , m_xLineColorBox(new ColorListBox(m_xBuilder->weld_menu_button("color"), pParent.GetFrameWeld()))
+ , m_xLineColorBox(new ColorListBox(m_xBuilder->weld_menu_button("color"), pController->getDialog()))
, m_xLineLengthEdit(m_xBuilder->weld_metric_spin_button("length", FieldUnit::PERCENT))
, m_xLineDistEdit(m_xBuilder->weld_metric_spin_button("spacingtocontents", FieldUnit::CM))
{
@@ -135,9 +135,9 @@ SwFootNotePage::~SwFootNotePage()
m_xLineTypeBox.reset();
}
-std::unique_ptr<SfxTabPage> SwFootNotePage::Create(TabPageParent pParent, const SfxItemSet *rSet)
+std::unique_ptr<SfxTabPage> SwFootNotePage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet)
{
- return std::make_unique<SwFootNotePage>(pParent, *rSet);
+ return std::make_unique<SwFootNotePage>(pPage, pController, *rSet);
}
void SwFootNotePage::Reset(const SfxItemSet *rSet)
diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx
index 334550268531..8eec83f45d8e 100644
--- a/sw/source/ui/misc/pggrid.cxx
+++ b/sw/source/ui/misc/pggrid.cxx
@@ -42,8 +42,8 @@
#include <swmodule.hxx>
#include <view.hxx>
-SwTextGridPage::SwTextGridPage(TabPageParent pParent, const SfxItemSet &rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/textgridpage.ui", "TextGridPage", &rSet)
+SwTextGridPage::SwTextGridPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/textgridpage.ui", "TextGridPage", &rSet)
, m_nRubyUserValue(0)
, m_bRubyUserValue(false)
, m_aPageSize(MM50, MM50)
@@ -71,7 +71,7 @@ SwTextGridPage::SwTextGridPage(TabPageParent pParent, const SfxItemSet &rSet)
, m_xDisplayFL(m_xBuilder->weld_widget("frameFL_DISPLAY"))
, m_xDisplayCB(m_xBuilder->weld_check_button("checkCB_DISPLAY"))
, m_xPrintCB(m_xBuilder->weld_check_button("checkCB_PRINT"))
- , m_xColorLB(new ColorListBox(m_xBuilder->weld_menu_button("listLB_COLOR"), pParent.GetFrameWeld()))
+ , m_xColorLB(new ColorListBox(m_xBuilder->weld_menu_button("listLB_COLOR"), pController->getDialog()))
{
Link<weld::SpinButton&,void> aLink = LINK(this, SwTextGridPage, CharorLineChangedHdl);
m_xCharsPerLineNF->connect_value_changed(aLink);
@@ -129,9 +129,9 @@ SwTextGridPage::~SwTextGridPage()
m_xColorLB.reset();
}
-std::unique_ptr<SfxTabPage> SwTextGridPage::Create(TabPageParent pParent, const SfxItemSet *rSet)
+std::unique_ptr<SfxTabPage> SwTextGridPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet)
{
- return std::make_unique<SwTextGridPage>(pParent, *rSet);
+ return std::make_unique<SwTextGridPage>(pPage, pController, *rSet);
}
bool SwTextGridPage::FillItemSet(SfxItemSet *rSet)
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index a990769bde37..09062a61ee17 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -64,8 +64,8 @@
using namespace ::com::sun::star;
-SwFormatTablePage::SwFormatTablePage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/formattablepage.ui", "FormatTablePage", &rSet)
+SwFormatTablePage::SwFormatTablePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/formattablepage.ui", "FormatTablePage", &rSet)
, pTableData(nullptr)
, nSaveWidth(0)
, nMinTableWidth(MINLAY)
@@ -366,9 +366,9 @@ void SwFormatTablePage::ModifyHdl(const weld::MetricSpinButton& rEdit)
bModified = true;
}
-std::unique_ptr<SfxTabPage> SwFormatTablePage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> SwFormatTablePage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
{
- return std::make_unique<SwFormatTablePage>(pParent, *rAttrSet);
+ return std::make_unique<SwFormatTablePage>(pPage, pController, *rAttrSet);
}
bool SwFormatTablePage::FillItemSet( SfxItemSet* rCoreSet )
@@ -699,8 +699,8 @@ DeactivateRC SwFormatTablePage::DeactivatePage( SfxItemSet* _pSet )
}
//Description: Page column configuration
-SwTableColumnPage::SwTableColumnPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/tablecolumnpage.ui", "TableColumnPage", &rSet)
+SwTableColumnPage::SwTableColumnPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/tablecolumnpage.ui", "TableColumnPage", &rSet)
, pTableData(nullptr)
, m_pSizeHdlEvent(nullptr)
, nTableWidth(0)
@@ -774,9 +774,9 @@ SwTableColumnPage::~SwTableColumnPage()
}
}
-std::unique_ptr<SfxTabPage> SwTableColumnPage::Create(TabPageParent pParent, const SfxItemSet* rAttrSet)
+std::unique_ptr<SfxTabPage> SwTableColumnPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet)
{
- return std::make_unique<SwTableColumnPage>(pParent, *rAttrSet);
+ return std::make_unique<SwTableColumnPage>(pPage, pController, *rAttrSet);
}
void SwTableColumnPage::Reset( const SfxItemSet* )
@@ -1224,8 +1224,8 @@ void SwTableTabDlg::PageCreated(const OString& rId, SfxTabPage& rPage)
}
}
-SwTextFlowPage::SwTextFlowPage(TabPageParent pParent, const SfxItemSet& rSet)
- : SfxTabPage(pParent, "modules/swriter/ui/tabletextflowpage.ui", "TableTextFlowPage", &rSet)
+SwTextFlowPage::SwTextFlowPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet)
+ : SfxTabPage(pPage, pController, "modules/swriter/ui/tabletextflowpage.ui", "TableTextFlowPage", &rSet)
, pShell(nullptr)
, bPageBreak(true)
, bHtmlMode(false)
@@ -1280,10 +1280,10 @@ SwTextFlowPage::~SwTextFlowPage()
{
}
-std::unique_ptr<SfxTabPage> SwTextFlowPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SwTextFlowPage::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet)
{
- return std::make_unique<SwTextFlowPage>(pParent, *rAttrSet);
+ return std::make_unique<SwTextFlowPage>(pPage, pController, *rAttrSet);
}
bool SwTextFlowPage::FillItemSet( SfxItemSet* rSet )
diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx
index 196465f731cb..9c7e24592014 100644
--- a/sw/source/uibase/app/appopt.cxx
+++ b/sw/source/uibase/app/appopt.cxx
@@ -404,7 +404,7 @@ void SwModule::ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet )
ApplyUsrPref( aViewOpt, pAppView, bTextDialog? SvViewOpt::DestText : SvViewOpt::DestWeb);
}
-std::unique_ptr<SfxTabPage> SwModule::CreateTabPage( sal_uInt16 nId, TabPageParent pParent, const SfxItemSet& rSet )
+std::unique_ptr<SfxTabPage> SwModule::CreateTabPage( sal_uInt16 nId, weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet )
{
std::unique_ptr<SfxTabPage> xRet;
SfxAllItemSet aSet(*(rSet.GetPool()));
@@ -415,12 +415,12 @@ std::unique_ptr<SfxTabPage> SwModule::CreateTabPage( sal_uInt16 nId, TabPagePare
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( nId );
- xRet = (*fnCreatePage)( pParent, &rSet );
+ xRet = (*fnCreatePage)( pPage, pController, &rSet );
break;
}
case RID_SW_TP_HTML_OPTGRID_PAGE:
case RID_SVXPAGE_GRID:
- xRet = SvxGridTabPage::Create(pParent, rSet);
+ xRet = SvxGridTabPage::Create(pPage, pController, rSet);
break;
case RID_SW_TP_STD_FONT:
@@ -429,7 +429,7 @@ std::unique_ptr<SfxTabPage> SwModule::CreateTabPage( sal_uInt16 nId, TabPagePare
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( nId );
- xRet = (*fnCreatePage)( pParent, &rSet );
+ xRet = (*fnCreatePage)( pPage, pController, &rSet );
if(RID_SW_TP_STD_FONT != nId)
{
aSet.Put (SfxUInt16Item(SID_FONTMODE_TYPE, RID_SW_TP_STD_FONT_CJK == nId ? FONT_GROUP_CJK : FONT_GROUP_CTL));
@@ -442,7 +442,7 @@ std::unique_ptr<SfxTabPage> SwModule::CreateTabPage( sal_uInt16 nId, TabPagePare
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( nId );
- xRet = (*fnCreatePage)( pParent, &rSet );
+ xRet = (*fnCreatePage)( pPage, pController, &rSet );
aSet.Put (SfxBoolItem(SID_FAX_LIST, true));
xRet->PageCreated(aSet);
}
@@ -452,7 +452,7 @@ std::unique_ptr<SfxTabPage> SwModule::CreateTabPage( sal_uInt16 nId, TabPagePare
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( nId );
- xRet = (*fnCreatePage)( pParent, &rSet );
+ xRet = (*fnCreatePage)( pPage, pController, &rSet );
SwView* pCurrView = GetView();
if(pCurrView)
{
@@ -477,7 +477,7 @@ std::unique_ptr<SfxTabPage> SwModule::CreateTabPage( sal_uInt16 nId, TabPagePare
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( nId );
- xRet = (*fnCreatePage)( pParent, &rSet );
+ xRet = (*fnCreatePage)( pPage, pController, &rSet );
if (nId == RID_SW_TP_OPTSHDWCRSR || nId == RID_SW_TP_HTML_OPTSHDWCRSR)
{
SwView* pCurrView = GetView();
@@ -493,21 +493,21 @@ std::unique_ptr<SfxTabPage> SwModule::CreateTabPage( sal_uInt16 nId, TabPagePare
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( nId );
- xRet = (*fnCreatePage)( pParent, &rSet );
+ xRet = (*fnCreatePage)( pPage, pController, &rSet );
break;
}
case RID_SW_TP_BACKGROUND:
{
SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_BACKGROUND );
- xRet = (*fnCreatePage)( pParent, &rSet );
+ xRet = (*fnCreatePage)( pPage, pController, &rSet );
break;
}
case RID_SW_TP_OPTCAPTION_PAGE:
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SW_TP_OPTCAPTION_PAGE );
- xRet = (*fnCreatePage)( pParent, &rSet );
+ xRet = (*fnCreatePage)( pPage, pController, &rSet );
}
break;
}
diff --git a/sw/source/uibase/inc/chrdlg.hxx b/sw/source/uibase/inc/chrdlg.hxx
index 58067ee3fe2a..660d60da0723 100644
--- a/sw/source/uibase/inc/chrdlg.hxx
+++ b/sw/source/uibase/inc/chrdlg.hxx
@@ -59,10 +59,10 @@ class SwCharURLPage : public SfxTabPage
DECL_LINK(EventHdl, weld::Button&, void);
public:
- SwCharURLPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SwCharURLPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SwCharURLPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx
index 8b339c8aa48e..c2f05d96fec6 100644
--- a/sw/source/uibase/inc/column.hxx
+++ b/sw/source/uibase/inc/column.hxx
@@ -168,10 +168,10 @@ class SwColumnPage : public SfxTabPage
static const sal_uInt16 aPageRg[];
public:
- SwColumnPage(TabPageParent pParent, const SfxItemSet &rSet);
+ SwColumnPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet);
virtual ~SwColumnPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet);
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 86c4a018412b..56119d057fbd 100644
--- a/sw/source/uibase/inc/docstdlg.hxx
+++ b/sw/source/uibase/inc/docstdlg.hxx
@@ -26,10 +26,10 @@
class SwDocStatPage final : public SfxTabPage
{
public:
- SwDocStatPage(TabPageParent pParent, const SfxItemSet &rSet);
+ SwDocStatPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet);
virtual ~SwDocStatPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet);
private:
virtual bool FillItemSet( SfxItemSet *rSet) override;
diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx
index 140f43347056..ca1420493fb2 100644
--- a/sw/source/uibase/inc/drpcps.hxx
+++ b/sw/source/uibase/inc/drpcps.hxx
@@ -147,10 +147,10 @@ friend class SwDropCapsPict;
static const sal_uInt16 aPageRg[];
public:
- SwDropCapsPage(TabPageParent pParent, const SfxItemSet &rSet);
+ SwDropCapsPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet);
virtual ~SwDropCapsPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet);
static const sal_uInt16* GetRanges() { return aPageRg; }
diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx
index d62fd85f7477..7455d35791a0 100644
--- a/sw/source/uibase/inc/envlop.hxx
+++ b/sw/source/uibase/inc/envlop.hxx
@@ -104,11 +104,11 @@ class SwEnvPage : public SfxTabPage
SwEnvDlg* GetParentSwEnvDlg() { return m_pDialog; }
public:
- SwEnvPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SwEnvPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
void Init(SwEnvDlg* pDialog);
virtual ~SwEnvPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rSet);
virtual void 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 34c76fa25500..01fe977ee6c7 100644
--- a/sw/source/uibase/inc/frmpage.hxx
+++ b/sw/source/uibase/inc/frmpage.hxx
@@ -176,10 +176,10 @@ class SwFramePage: public SfxTabPage
static const sal_uInt16 aPageRg[];
public:
- SwFramePage(TabPageParent pParent, const SfxItemSet &rSet);
+ SwFramePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet);
virtual ~SwFramePage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet);
static const sal_uInt16* GetRanges() { return aPageRg; }
virtual bool FillItemSet(SfxItemSet *rSet) override;
@@ -229,8 +229,8 @@ class SwGrfExtPage : public SfxTabPage
virtual void ActivatePage(const SfxItemSet& rSet) override;
public:
- SwGrfExtPage(TabPageParent pParent, const SfxItemSet &rSet);
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
+ SwGrfExtPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet);
virtual ~SwGrfExtPage() override;
virtual bool FillItemSet(SfxItemSet *rSet) override;
@@ -253,10 +253,10 @@ class SwFrameURLPage : public SfxTabPage
DECL_LINK(InsertFileHdl, weld::Button&, void);
public:
- SwFrameURLPage(TabPageParent pParent, const SfxItemSet &rSet);
+ SwFrameURLPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet);
virtual ~SwFrameURLPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet);
virtual bool FillItemSet(SfxItemSet *rSet) override;
virtual void Reset(const SfxItemSet *rSet) override;
@@ -303,10 +303,10 @@ class SwFrameAddPage : public SfxTabPage
static const sal_uInt16 aAddPgRg[];
public:
- SwFrameAddPage(TabPageParent pParent, const SfxItemSet &rSet);
+ SwFrameAddPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet);
virtual ~SwFrameAddPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet);
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 651589229c93..be6dfe137c15 100644
--- a/sw/source/uibase/inc/mailconfigpage.hxx
+++ b/sw/source/uibase/inc/mailconfigpage.hxx
@@ -48,10 +48,10 @@ class SwMailConfigPage : public SfxTabPage
DECL_LINK(SecureHdl, weld::ToggleButton&, void);
public:
- SwMailConfigPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SwMailConfigPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SwMailConfigPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx
index ed1844fd9dcb..9d536066915c 100644
--- a/sw/source/uibase/inc/num.hxx
+++ b/sw/source/uibase/inc/num.hxx
@@ -92,7 +92,7 @@ class SwNumPositionTabPage : public SfxTabPage
public:
- SwNumPositionTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SwNumPositionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SwNumPositionTabPage() override;
virtual void ActivatePage(const SfxItemSet& rSet) override;
@@ -100,7 +100,7 @@ public:
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
void SetOutlineTabDialog(SwOutlineTabDialog* pDlg){pOutlineDlg = pDlg;}
diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx
index fe2d66e5530d..1589220e6b8b 100644
--- a/sw/source/uibase/inc/numpara.hxx
+++ b/sw/source/uibase/inc/numpara.hxx
@@ -62,10 +62,10 @@ class SwParagraphNumTabPage final : public SfxTabPage
SfxStyleFamily nFamily );
public:
- SwParagraphNumTabPage(TabPageParent pParent, const SfxItemSet& rSet );
+ SwParagraphNumTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet );
virtual ~SwParagraphNumTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
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 e19f10f8aa68..d0b565aae4b2 100644
--- a/sw/source/uibase/inc/optcomp.hxx
+++ b/sw/source/uibase/inc/optcomp.hxx
@@ -65,10 +65,10 @@ private:
void WriteOptions();
public:
- SwCompatibilityOptPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SwCompatibilityOptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SwCompatibilityOptPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx
index 2c3461eab7d4..2a6a8a498aac 100644
--- a/sw/source/uibase/inc/optload.hxx
+++ b/sw/source/uibase/inc/optload.hxx
@@ -81,10 +81,10 @@ private:
DECL_LINK(StandardizedPageCountCheckHdl, weld::Button&, void);
public:
- SwLoadOptPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SwLoadOptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SwLoadOptPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
@@ -183,10 +183,10 @@ private:
void InvalidatePreview();
public:
- SwCaptionOptPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SwCaptionOptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SwCaptionOptPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index 2778ea6ae131..0abb5f29b6db 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.hxx
@@ -59,10 +59,10 @@ class SwContentOptPage : public SfxTabPage
DECL_LINK(VertRulerHdl, weld::ToggleButton&, void);
public:
- SwContentOptPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SwContentOptPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SwContentOptPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet);
virtual bool FillItemSet(SfxItemSet* rSet) override;
virtual void Reset(const SfxItemSet* rSet) override;
@@ -103,10 +103,10 @@ class SwAddPrinterTabPage : public SfxTabPage
DECL_LINK(SelectHdl, weld::ComboBox&, void);
public:
- SwAddPrinterTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SwAddPrinterTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SwAddPrinterTabPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet);
virtual bool FillItemSet(SfxItemSet* rSet) override;
virtual void Reset(const SfxItemSet* rSet) override;
@@ -166,8 +166,8 @@ class SwStdFontTabPage : public SfxTabPage
DECL_LINK(LoseFocusHdl, weld::Widget&, void );
public:
- SwStdFontTabPage(TabPageParent pParent, const SfxItemSet& rSet);
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
+ SwStdFontTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet);
virtual ~SwStdFontTabPage() override;
virtual bool FillItemSet(SfxItemSet* rSet) override;
@@ -203,10 +203,10 @@ class SwTableOptionsTabPage : public SfxTabPage
DECL_LINK(CheckBoxHdl, weld::Button&, void);
public:
- SwTableOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SwTableOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SwTableOptionsTabPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet);
virtual bool FillItemSet(SfxItemSet* rSet) override;
virtual void Reset(const SfxItemSet* rSet) override;
@@ -244,10 +244,10 @@ class SwShdwCursorOptionsTabPage : public SfxTabPage
std::unique_ptr<weld::CheckButton> m_xMathBaselineAlignmentCB;
public:
- SwShdwCursorOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SwShdwCursorOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SwShdwCursorOptionsTabPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
@@ -317,10 +317,10 @@ class SwRedlineOptionsTabPage : public SfxTabPage
static void InitFontStyle(FontPrevWindow& rExampleWin, const OUString& rText);
public:
- SwRedlineOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SwRedlineOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SwRedlineOptionsTabPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
@@ -333,10 +333,10 @@ public:
class SwTestTabPage : public SfxTabPage
{
public:
- SwTestTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SwTestTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SwTestTabPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
@@ -374,10 +374,10 @@ class SwCompareOptionsTabPage : public SfxTabPage
DECL_LINK(IgnoreHdl, weld::Button&, void);
public:
- SwCompareOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ SwCompareOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
virtual ~SwCompareOptionsTabPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet );
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx
index 76bc778c3d80..58f2383936fe 100644
--- a/sw/source/uibase/inc/outline.hxx
+++ b/sw/source/uibase/inc/outline.hxx
@@ -99,8 +99,8 @@ class SwOutlineSettingsTabPage : public SfxTabPage
void CheckForStartValue_Impl(sal_uInt16 nNumberingType);
public:
- SwOutlineSettingsTabPage(TabPageParent pParent, const SfxItemSet& rSet);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
+ SwOutlineSettingsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
virtual ~SwOutlineSettingsTabPage() override;
diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx
index b74e522f8a9d..c174aee48b01 100644
--- a/sw/source/uibase/inc/pgfnote.hxx
+++ b/sw/source/uibase/inc/pgfnote.hxx
@@ -29,8 +29,8 @@ class SwFootNotePage: public SfxTabPage
{
static const sal_uInt16 aPageRg[];
public:
- SwFootNotePage(TabPageParent pParent, const SfxItemSet &rSet);
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
+ SwFootNotePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet);
virtual ~SwFootNotePage() override;
static const sal_uInt16* GetRanges() { return aPageRg; }
diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx
index 826c67f44c2f..a43aee7b4686 100644
--- a/sw/source/uibase/inc/pggrid.hxx
+++ b/sw/source/uibase/inc/pggrid.hxx
@@ -73,10 +73,10 @@ class SwTextGridPage: public SfxTabPage
DECL_LINK(DisplayGridHdl, weld::ToggleButton&, void);
public:
- SwTextGridPage(TabPageParent pParent, const SfxItemSet &rSet);
+ SwTextGridPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet);
virtual ~SwTextGridPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet);
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 4d1414efe362..711d5d9faf6e 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 std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(TabPageParent pParent, const SfxItemSet &rOptions) override;
+ SAL_DLLPRIVATE virtual std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController, 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 f4597d9f1f33..fe800e41ca26 100644
--- a/sw/source/uibase/inc/regionsw.hxx
+++ b/sw/source/uibase/inc/regionsw.hxx
@@ -157,7 +157,7 @@ class SwInsertSectionTabPage : public SfxTabPage
DECL_LINK( DlgClosedHdl, sfx2::FileDialogHelper*, void );
public:
- SwInsertSectionTabPage(TabPageParent pParent, const SfxItemSet &rAttrSet);
+ SwInsertSectionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rAttrSet);
virtual ~SwInsertSectionTabPage() override;
void SetWrtShell(SwWrtShell& rSh);
@@ -165,7 +165,7 @@ public:
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet* ) override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
};
@@ -196,13 +196,13 @@ class SwSectionFootnoteEndTabPage : public SfxTabPage
void ResetState( bool bFootnote, const SwFormatFootnoteEndAtTextEnd& );
public:
- SwSectionFootnoteEndTabPage(TabPageParent pParent, const SfxItemSet &rAttrSet);
+ SwSectionFootnoteEndTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rAttrSet);
virtual ~SwSectionFootnoteEndTabPage() override;
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet* ) override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
};
@@ -215,13 +215,13 @@ class SwSectionIndentTabPage : public SfxTabPage
DECL_LINK(IndentModifyHdl, weld::MetricSpinButton&, void);
public:
- SwSectionIndentTabPage(TabPageParent pParent, const SfxItemSet &rAttrSet);
+ SwSectionIndentTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rAttrSet);
virtual ~SwSectionIndentTabPage() override;
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet* ) override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet);
void SetWrtShell(SwWrtShell const & rSh);
};
diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx
index a00b7c354def..7e8093540fba 100644
--- a/sw/source/uibase/inc/swuiccoll.hxx
+++ b/sw/source/uibase/inc/swuiccoll.hxx
@@ -56,10 +56,10 @@ class SwCondCollPage : public SfxTabPage
static const sal_uInt16 m_aPageRg[];
public:
- SwCondCollPage(TabPageParent pParent, const SfxItemSet &rSet);
+ SwCondCollPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet);
virtual ~SwCondCollPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet);
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 a0e3da23cd54..20eb82bf8631 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -204,7 +204,7 @@ class SwTOXSelectTabPage : public SfxTabPage
void FillTOXDescription();
public:
- SwTOXSelectTabPage(TabPageParent pParent, const SfxItemSet& rAttrSet);
+ SwTOXSelectTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet);
virtual ~SwTOXSelectTabPage() override;
virtual bool FillItemSet( SfxItemSet* ) override;
@@ -213,7 +213,7 @@ public:
virtual void ActivatePage( const SfxItemSet& ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
void SelectType(TOXTypes eSet); //preset TOXType, GlobalDoc
@@ -382,7 +382,7 @@ class SwTOXEntryTabPage : public SfxTabPage
DECL_LINK(ModifyClickHdl, weld::ToggleButton&, void);
public:
- SwTOXEntryTabPage(TabPageParent pParent, const SfxItemSet& rAttrSet);
+ SwTOXEntryTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet);
virtual ~SwTOXEntryTabPage() override;
virtual bool FillItemSet( SfxItemSet* ) override;
@@ -390,7 +390,7 @@ public:
virtual void ActivatePage( const SfxItemSet& ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
void SetWrtShell(SwWrtShell& rSh);
@@ -422,7 +422,7 @@ class SwTOXStylesTabPage : public SfxTabPage
}
public:
- SwTOXStylesTabPage(TabPageParent pParent, const SfxItemSet& rAttrSet);
+ SwTOXStylesTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rAttrSet);
virtual ~SwTOXStylesTabPage() override;
virtual bool FillItemSet( SfxItemSet* ) override;
@@ -431,7 +431,7 @@ public:
virtual void ActivatePage( const SfxItemSet& ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rAttrSet);
};
diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx
index 4abeca2a4fa6..60313ffd4da6 100644
--- a/sw/source/uibase/inc/wrap.hxx
+++ b/sw/source/uibase/inc/wrap.hxx
@@ -79,8 +79,8 @@ class SwWrapTabPage: public SfxTabPage
static const sal_uInt16 m_aWrapPageRg[];
public:
- SwWrapTabPage(TabPageParent pParent, const SfxItemSet &rSet);
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet *rSet);
+ SwWrapTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet &rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet *rSet);
virtual ~SwWrapTabPage() override;
virtual bool FillItemSet(SfxItemSet *rSet) override;
diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx
index 6aea6553c59f..92a02e734f87 100644
--- a/sw/source/uibase/table/tablepg.hxx
+++ b/sw/source/uibase/table/tablepg.hxx
@@ -74,8 +74,8 @@ class SwFormatTablePage : public SfxTabPage
DECL_LINK(ValueChangedHdl, weld::MetricSpinButton&, void);
public:
- SwFormatTablePage(TabPageParent pParent, const SfxItemSet& rSet );
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet);
+ SwFormatTablePage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet);
virtual ~SwFormatTablePage() override;
virtual bool FillItemSet( SfxItemSet* rSet ) override;
@@ -122,8 +122,8 @@ class SwTableColumnPage : public SfxTabPage
DECL_LINK(SizeHdl, void*, void);
public:
- SwTableColumnPage(TabPageParent pParent, const SfxItemSet& rSet);
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rAttrSet);
+ SwTableColumnPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet);
virtual ~SwTableColumnPage() override;
virtual bool FillItemSet( SfxItemSet* rSet ) override;
@@ -166,8 +166,8 @@ class SwTextFlowPage : public SfxTabPage
DECL_LINK(HeadLineCBClickHdl, weld::ToggleButton&, void);
public:
- SwTextFlowPage(TabPageParent pParent, const SfxItemSet& rSet);
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet);
+ SwTextFlowPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrSet);
virtual ~SwTextFlowPage() override;
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 7306f7560795..e40ee2807de4 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -1696,10 +1696,10 @@ bool SwPagePreview::HasPrintOptionsPage() const
return true;
}
-std::unique_ptr<SfxTabPage> SwPagePreview::CreatePrintOptionsPage(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SwPagePreview::CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet &rOptions)
{
- return ::CreatePrintOptionsPage(pParent, rOptions, !m_bNormalPrint);
+ return ::CreatePrintOptionsPage(pPage, pController, 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 52f82f0ab69a..98ddeefbeec3 100644
--- a/sw/source/uibase/uiview/viewprt.cxx
+++ b/sw/source/uibase/uiview/viewprt.cxx
@@ -174,10 +174,10 @@ namespace
// TabPage for application-specific print options
-std::unique_ptr<SfxTabPage> SwView::CreatePrintOptionsPage(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SwView::CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet& rSet)
{
- return ::CreatePrintOptionsPage(pParent, rSet, false);
+ return ::CreatePrintOptionsPage(pPage, pController, rSet, false);
}
// Print dispatcher
@@ -307,7 +307,7 @@ void SwView::NotifyCursor(SfxViewShell* pViewShell) const
// Create page printer/additions for SwView and SwPagePreview
-std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet &rOptions,
bool bPreview)
{
@@ -318,7 +318,7 @@ std::unique_ptr<SfxTabPage> CreatePrintOptionsPage(TabPageParent pParent,
if (!fnCreatePage)
return nullptr;
- std::unique_ptr<SfxTabPage> xSfxPage = fnCreatePage(pParent, &rOptions);
+ std::unique_ptr<SfxTabPage> xSfxPage = fnCreatePage(pPage, pController, &rOptions);
OSL_ENSURE(xSfxPage, "No page");
if (!xSfxPage)
return nullptr;
diff --git a/vcl/source/control/wizardmachine.cxx b/vcl/source/control/wizardmachine.cxx
index 41cb6b6dd045..5936b0b52bf4 100644
--- a/vcl/source/control/wizardmachine.cxx
+++ b/vcl/source/control/wizardmachine.cxx
@@ -38,8 +38,8 @@
namespace vcl
{
//= WizardPageImplData
- OWizardPage::OWizardPage(TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rID)
- : BuilderPage(pParent.pPage, pParent.pController, rUIXMLDescription, rID)
+ OWizardPage::OWizardPage(weld::Container* pPage, weld::DialogController* pController, const OUString& rUIXMLDescription, const OString& rID)
+ : BuilderPage(pPage, pController, rUIXMLDescription, rID)
{
}
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 6a47243a6073..9fa871612aa6 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -35,6 +35,7 @@
#include <vcl/scrbar.hxx>
#include <vcl/settings.hxx>
+#include <vcl/weld.hxx>
#include <osl/diagnose.h>
class ImpVclMEdit : public SfxListener
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 387e47df0f1b..1748abd0272a 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -51,6 +51,7 @@
#include <vcl/mnemonic.hxx>
#include <vcl/dialog.hxx>
#include <vcl/settings.hxx>
+#include <vcl/weld.hxx>
#include <vcl/uitest/uiobject.hxx>
#include <vcl/uitest/logger.hxx>
#include <vcl/IDialogRenderable.hxx>
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 2a33b81c71d9..a0cb34f6d936 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -55,6 +55,7 @@
#include <brdwin.hxx>
#include <helpwin.hxx>
+#include <com/sun/star/accessibility/AccessibleRelation.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
#include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>