[Libreoffice-commits] core.git: chart2/source cui/source dbaccess/source extensions/source filter/source include/sfx2 include/svx include/vcl sc/inc sc/source sd/inc sd/source sfx2/source starmath/inc starmath/source svtools/source svx/source sw/inc sw/source vcl/inc vcl/Library_vcl.mk vcl/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Thu Sep 26 07:58:24 UTC 2019
chart2/source/controller/dialogs/dlg_ChartType.cxx | 7
chart2/source/controller/dialogs/dlg_CreationWizard.cxx | 57 ++---
chart2/source/controller/dialogs/dlg_DataSource.cxx | 34 +--
chart2/source/controller/dialogs/dlg_NumberFormat.cxx | 4
chart2/source/controller/dialogs/tp_AxisLabel.cxx | 10
chart2/source/controller/dialogs/tp_AxisLabel.hxx | 3
chart2/source/controller/dialogs/tp_AxisPositions.cxx | 5
chart2/source/controller/dialogs/tp_AxisPositions.hxx | 3
chart2/source/controller/dialogs/tp_ChartType.cxx | 8
chart2/source/controller/dialogs/tp_ChartType.hxx | 1
chart2/source/controller/dialogs/tp_DataLabel.cxx | 4
chart2/source/controller/dialogs/tp_DataLabel.hxx | 2
chart2/source/controller/dialogs/tp_DataSource.cxx | 12 -
chart2/source/controller/dialogs/tp_DataSource.hxx | 4
chart2/source/controller/dialogs/tp_ErrorBars.cxx | 12 -
chart2/source/controller/dialogs/tp_ErrorBars.hxx | 4
chart2/source/controller/dialogs/tp_LegendPosition.cxx | 11 -
chart2/source/controller/dialogs/tp_LegendPosition.hxx | 3
chart2/source/controller/dialogs/tp_PointGeometry.cxx | 10
chart2/source/controller/dialogs/tp_PointGeometry.hxx | 3
chart2/source/controller/dialogs/tp_PolarOptions.cxx | 10
chart2/source/controller/dialogs/tp_PolarOptions.hxx | 3
chart2/source/controller/dialogs/tp_RangeChooser.cxx | 13 -
chart2/source/controller/dialogs/tp_RangeChooser.hxx | 4
chart2/source/controller/dialogs/tp_Scale.cxx | 7
chart2/source/controller/dialogs/tp_Scale.hxx | 3
chart2/source/controller/dialogs/tp_SeriesToAxis.cxx | 5
chart2/source/controller/dialogs/tp_SeriesToAxis.hxx | 2
chart2/source/controller/dialogs/tp_TitleRotation.cxx | 14 -
chart2/source/controller/dialogs/tp_TitleRotation.hxx | 5
chart2/source/controller/dialogs/tp_Trendline.cxx | 12 -
chart2/source/controller/dialogs/tp_Trendline.hxx | 3
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx | 1
chart2/source/controller/inc/TabPageNotifiable.hxx | 6
chart2/source/controller/inc/dlg_ChartType.hxx | 2
chart2/source/controller/inc/dlg_CreationWizard.hxx | 6
chart2/source/controller/inc/dlg_DataSource.hxx | 10
cui/source/customize/SvxMenuConfigPage.cxx | 13 -
cui/source/customize/SvxNotebookbarConfigPage.cxx | 2
cui/source/customize/SvxToolbarConfigPage.cxx | 11 -
cui/source/customize/acccfg.cxx | 7
cui/source/customize/cfg.cxx | 33 +--
cui/source/customize/eventdlg.cxx | 1
cui/source/customize/macropg.cxx | 9
cui/source/dialogs/SpellDialog.cxx | 4
cui/source/dialogs/cuigaldlg.cxx | 44 +---
cui/source/inc/SvxMenuConfigPage.hxx | 1
cui/source/inc/SvxToolbarConfigPage.hxx | 1
cui/source/inc/acccfg.hxx | 1
cui/source/inc/align.hxx | 9
cui/source/inc/autocdlg.hxx | 48 +---
cui/source/inc/backgrnd.hxx | 17 -
cui/source/inc/border.hxx | 10
cui/source/inc/cfg.hxx | 2
cui/source/inc/chardlg.hxx | 45 ----
cui/source/inc/connect.hxx | 3
cui/source/inc/cuigaldlg.hxx | 13 -
cui/source/inc/cuioptgenrl.hxx | 3
cui/source/inc/cuisrchdlg.hxx | 2
cui/source/inc/cuitabarea.hxx | 50 ----
cui/source/inc/cuitabline.hxx | 21 -
cui/source/inc/dbregister.hxx | 3
cui/source/inc/dstribut.hxx | 2
cui/source/inc/grfpage.hxx | 13 -
cui/source/inc/labdlg.hxx | 4
cui/source/inc/macroass.hxx | 4
cui/source/inc/macropg.hxx | 1
cui/source/inc/measure.hxx | 3
cui/source/inc/numfmt.hxx | 12 -
cui/source/inc/numpages.hxx | 36 ---
cui/source/inc/optasian.hxx | 2
cui/source/inc/optlingu.hxx | 9
cui/source/inc/optpath.hxx | 4
cui/source/inc/page.hxx | 14 -
cui/source/inc/paragrph.hxx | 33 ---
cui/source/inc/swpossizetabpage.hxx | 5
cui/source/inc/tabstpge.hxx | 9
cui/source/inc/textanim.hxx | 2
cui/source/inc/textattr.hxx | 2
cui/source/inc/transfrm.hxx | 12 -
cui/source/options/connpooloptions.cxx | 4
cui/source/options/connpooloptions.hxx | 4
cui/source/options/cuisrchdlg.cxx | 13 -
cui/source/options/dbregister.cxx | 10
cui/source/options/fontsubs.cxx | 4
cui/source/options/fontsubs.hxx | 5
cui/source/options/optaccessibility.cxx | 4
cui/source/options/optaccessibility.hxx | 2
cui/source/options/optasian.cxx | 4
cui/source/options/optbasic.cxx | 4
cui/source/options/optbasic.hxx | 2
cui/source/options/optchart.cxx | 10
cui/source/options/optchart.hxx | 3
cui/source/options/optcolor.cxx | 10
cui/source/options/optcolor.hxx | 5
cui/source/options/optctl.cxx | 4
cui/source/options/optctl.hxx | 2
cui/source/options/optfltr.cxx | 8
cui/source/options/optfltr.hxx | 7
cui/source/options/optgdlg.cxx | 12 -
cui/source/options/optgdlg.hxx | 7
cui/source/options/optgenrl.cxx | 5
cui/source/options/opthtml.cxx | 4
cui/source/options/opthtml.hxx | 2
cui/source/options/optinet2.cxx | 12 -
cui/source/options/optinet2.hxx | 14 -
cui/source/options/optjava.cxx | 11 -
cui/source/options/optjava.hxx | 3
cui/source/options/optjsearch.cxx | 5
cui/source/options/optjsearch.hxx | 2
cui/source/options/optlingu.cxx | 10
cui/source/options/optopencl.cxx | 4
cui/source/options/optopencl.hxx | 3
cui/source/options/optpath.cxx | 10
cui/source/options/optsave.cxx | 4
cui/source/options/optsave.hxx | 2
cui/source/options/optupdt.cxx | 5
cui/source/options/optupdt.hxx | 3
cui/source/options/personalization.cxx | 5
cui/source/options/personalization.hxx | 4
cui/source/options/treeopt.cxx | 96 +++-----
cui/source/tabpages/align.cxx | 19 -
cui/source/tabpages/autocdlg.cxx | 63 +----
cui/source/tabpages/backgrnd.cxx | 21 -
cui/source/tabpages/border.cxx | 18 -
cui/source/tabpages/chardlg.cxx | 28 --
cui/source/tabpages/connect.cxx | 22 --
cui/source/tabpages/dstribut.cxx | 4
cui/source/tabpages/grfpage.cxx | 14 -
cui/source/tabpages/labdlg.cxx | 17 -
cui/source/tabpages/macroass.cxx | 20 -
cui/source/tabpages/measure.cxx | 19 -
cui/source/tabpages/numfmt.cxx | 10
cui/source/tabpages/numpages.cxx | 60 +----
cui/source/tabpages/page.cxx | 10
cui/source/tabpages/paragrph.cxx | 16 -
cui/source/tabpages/swpossizetabpage.cxx | 10
cui/source/tabpages/tabstpge.cxx | 10
cui/source/tabpages/textanim.cxx | 4
cui/source/tabpages/textattr.cxx | 4
cui/source/tabpages/tparea.cxx | 53 ++--
cui/source/tabpages/tpbitmap.cxx | 26 +-
cui/source/tabpages/tpcolor.cxx | 10
cui/source/tabpages/tpgradnt.cxx | 10
cui/source/tabpages/tphatch.cxx | 20 -
cui/source/tabpages/tpline.cxx | 21 -
cui/source/tabpages/tplnedef.cxx | 23 --
cui/source/tabpages/tplneend.cxx | 23 --
cui/source/tabpages/tppattern.cxx | 12 -
cui/source/tabpages/tpshadow.cxx | 10
cui/source/tabpages/tptrans.cxx | 4
cui/source/tabpages/transfrm.cxx | 12 -
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 48 ++--
dbaccess/source/ui/dlg/ConnectionHelper.hxx | 1
dbaccess/source/ui/dlg/ConnectionPage.cxx | 7
dbaccess/source/ui/dlg/ConnectionPage.hxx | 7
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 21 -
dbaccess/source/ui/dlg/ConnectionPageSetup.hxx | 16 -
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 63 ++---
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 22 --
dbaccess/source/ui/dlg/DriverSettings.hxx | 24 +-
dbaccess/source/ui/dlg/TablesSingleDlg.cxx | 6
dbaccess/source/ui/dlg/UserAdmin.cxx | 12 -
dbaccess/source/ui/dlg/UserAdmin.hxx | 8
dbaccess/source/ui/dlg/adminpages.cxx | 16 -
dbaccess/source/ui/dlg/adminpages.hxx | 5
dbaccess/source/ui/dlg/advancedsettings.cxx | 2
dbaccess/source/ui/dlg/advancedsettings.hxx | 8
dbaccess/source/ui/dlg/dbwiz.cxx | 44 +---
dbaccess/source/ui/dlg/dbwizsetup.cxx | 62 ++---
dbaccess/source/ui/dlg/detailpages.cxx | 75 ++-----
dbaccess/source/ui/dlg/detailpages.hxx | 5
dbaccess/source/ui/dlg/generalpage.cxx | 2
dbaccess/source/ui/dlg/tablespage.cxx | 6
dbaccess/source/ui/dlg/tablespage.hxx | 2
dbaccess/source/ui/inc/WCPage.hxx | 2
dbaccess/source/ui/inc/WColumnSelect.hxx | 3
dbaccess/source/ui/inc/WCopyTable.hxx | 4
dbaccess/source/ui/inc/WExtendPages.hxx | 4
dbaccess/source/ui/inc/WNameMatch.hxx | 2
dbaccess/source/ui/inc/WTabPage.hxx | 7
dbaccess/source/ui/inc/WTypeSelect.hxx | 12 -
dbaccess/source/ui/inc/dbu_dlg.hxx | 9
dbaccess/source/ui/inc/dbwiz.hxx | 5
dbaccess/source/ui/inc/dbwizsetup.hxx | 10
dbaccess/source/ui/misc/WCPage.cxx | 4
dbaccess/source/ui/misc/WColumnSelect.cxx | 13 -
dbaccess/source/ui/misc/WCopyTable.cxx | 32 +-
dbaccess/source/ui/misc/WNameMatch.cxx | 2
dbaccess/source/ui/misc/WTypeSelect.cxx | 45 +---
extensions/source/abpilot/abpfinalpage.cxx | 14 -
extensions/source/abpilot/abpfinalpage.hxx | 7
extensions/source/abpilot/abspage.cxx | 8
extensions/source/abpilot/abspage.hxx | 6
extensions/source/abpilot/abspilot.cxx | 16 -
extensions/source/abpilot/abspilot.hxx | 2
extensions/source/abpilot/admininvokationpage.cxx | 4
extensions/source/abpilot/admininvokationpage.hxx | 6
extensions/source/abpilot/fieldmappingpage.cxx | 4
extensions/source/abpilot/fieldmappingpage.hxx | 4
extensions/source/abpilot/tableselectionpage.cxx | 4
extensions/source/abpilot/tableselectionpage.hxx | 4
extensions/source/abpilot/typeselectionpage.cxx | 14 -
extensions/source/abpilot/typeselectionpage.hxx | 7
extensions/source/dbpilots/commonpagesdbp.cxx | 13 -
extensions/source/dbpilots/commonpagesdbp.hxx | 8
extensions/source/dbpilots/controlwizard.cxx | 8
extensions/source/dbpilots/controlwizard.hxx | 3
extensions/source/dbpilots/gridwizard.cxx | 12 -
extensions/source/dbpilots/gridwizard.hxx | 6
extensions/source/dbpilots/groupboxwiz.cxx | 24 +-
extensions/source/dbpilots/groupboxwiz.hxx | 14 -
extensions/source/dbpilots/listcombowizard.cxx | 26 +-
extensions/source/dbpilots/listcombowizard.hxx | 14 -
extensions/source/propctrlr/formcomponenthandler.cxx | 3
filter/source/pdf/impdialog.cxx | 24 +-
filter/source/pdf/impdialog.hxx | 12 -
include/sfx2/basedlgs.hxx | 4
include/sfx2/dinfdlg.hxx | 22 --
include/sfx2/mgetempl.hxx | 9
include/sfx2/module.hxx | 2
include/sfx2/printopt.hxx | 3
include/sfx2/prnmon.hxx | 2
include/sfx2/securitypage.hxx | 2
include/sfx2/tabdlg.hxx | 17 -
include/sfx2/viewsh.hxx | 2
include/svx/dlgctrl.hxx | 4
include/svx/hdft.hxx | 7
include/svx/optgrid.hxx | 5
include/vcl/builderpage.hxx | 51 ++++
include/vcl/wizardmachine.hxx | 34 +--
sc/inc/scmod.hxx | 2
sc/source/ui/app/scmod.cxx | 28 +-
sc/source/ui/attrdlg/tabpages.cxx | 5
sc/source/ui/dbgui/tpsort.cxx | 14 -
sc/source/ui/dbgui/tpsubt.cxx | 18 -
sc/source/ui/dbgui/validate.cxx | 20 -
sc/source/ui/docshell/tpstat.cxx | 4
sc/source/ui/inc/opredlin.hxx | 4
sc/source/ui/inc/prevwsh.hxx | 2
sc/source/ui/inc/scuitphfedit.hxx | 20 -
sc/source/ui/inc/tabpages.hxx | 13 -
sc/source/ui/inc/tabvwsh.hxx | 2
sc/source/ui/inc/tpcalc.hxx | 11 -
sc/source/ui/inc/tpcompatibility.hxx | 10
sc/source/ui/inc/tpdefaults.hxx | 10
sc/source/ui/inc/tpformula.hxx | 9
sc/source/ui/inc/tphf.hxx | 17 -
sc/source/ui/inc/tpprint.hxx | 7
sc/source/ui/inc/tpsort.hxx | 11 -
sc/source/ui/inc/tpstat.hxx | 8
sc/source/ui/inc/tpsubt.hxx | 33 +--
sc/source/ui/inc/tptable.hxx | 11 -
sc/source/ui/inc/tpusrlst.hxx | 12 -
sc/source/ui/inc/tpview.hxx | 19 -
sc/source/ui/inc/validate.hxx | 14 -
sc/source/ui/optdlg/opredlin.cxx | 10
sc/source/ui/optdlg/tpcalc.cxx | 4
sc/source/ui/optdlg/tpcompatibility.cxx | 4
sc/source/ui/optdlg/tpdefaults.cxx | 4
sc/source/ui/optdlg/tpformula.cxx | 4
sc/source/ui/optdlg/tpprint.cxx | 4
sc/source/ui/optdlg/tpusrlst.cxx | 4
sc/source/ui/optdlg/tpview.cxx | 22 --
sc/source/ui/pagedlg/scuitphfedit.cxx | 17 -
sc/source/ui/pagedlg/tphf.cxx | 22 --
sc/source/ui/pagedlg/tptable.cxx | 12 -
sc/source/ui/view/prevwsh.cxx | 4
sc/source/ui/view/tabvwsh4.cxx | 4
sd/inc/sdmod.hxx | 2
sd/source/ui/app/sdmod2.cxx | 22 +-
sd/source/ui/dlg/paragr.cxx | 6
sd/source/ui/dlg/prntopts.cxx | 4
sd/source/ui/dlg/tpaction.cxx | 10
sd/source/ui/dlg/tpoption.cxx | 12 -
sd/source/ui/inc/prntopts.hxx | 3
sd/source/ui/inc/tpaction.hxx | 5
sd/source/ui/inc/tpoption.hxx | 11 -
sfx2/source/appl/module.cxx | 4
sfx2/source/dialog/basedlgs.cxx | 9
sfx2/source/dialog/dinfdlg.cxx | 34 +--
sfx2/source/dialog/documentfontsdialog.cxx | 4
sfx2/source/dialog/mgetempl.cxx | 16 -
sfx2/source/dialog/printopt.cxx | 4
sfx2/source/dialog/securitypage.cxx | 10
sfx2/source/dialog/tabdlg.cxx | 101 ++++-----
sfx2/source/inc/documentfontsdialog.hxx | 2
sfx2/source/view/printer.cxx | 19 -
sfx2/source/view/viewprn.cxx | 8
starmath/inc/dialog.hxx | 2
starmath/inc/smmod.hxx | 2
starmath/inc/view.hxx | 4
starmath/source/dialog.cxx | 4
starmath/source/smmod.cxx | 9
starmath/source/view.cxx | 2
svtools/source/uno/wizard/wizardpagecontroller.cxx | 39 ---
svtools/source/uno/wizard/wizardpagecontroller.hxx | 5
svtools/source/uno/wizard/wizardshell.cxx | 40 ++-
svtools/source/uno/wizard/wizardshell.hxx | 9
svx/source/dialog/hdft.cxx | 12 -
svx/source/dialog/optgrid.cxx | 5
svx/source/tbxctrls/grafctrl.cxx | 7
sw/inc/swmodule.hxx | 2
sw/inc/view.hxx | 4
sw/source/ui/chrdlg/chardlg.cxx | 12 -
sw/source/ui/chrdlg/drpcps.cxx | 11 -
sw/source/ui/chrdlg/numpara.cxx | 4
sw/source/ui/chrdlg/swuiccoll.cxx | 5
sw/source/ui/chrdlg/tblnumfm.cxx | 4
sw/source/ui/config/mailconfigpage.cxx | 12 -
sw/source/ui/config/optcomp.cxx | 4
sw/source/ui/config/optload.cxx | 14 -
sw/source/ui/config/optpage.cxx | 44 +---
sw/source/ui/dbui/addresslistdialog.cxx | 12 -
sw/source/ui/dbui/addresslistdialog.hxx | 2
sw/source/ui/dbui/mailmergewizard.cxx | 21 -
sw/source/ui/dbui/mmaddressblockpage.cxx | 9
sw/source/ui/dbui/mmaddressblockpage.hxx | 3
sw/source/ui/dbui/mmgreetingspage.cxx | 8
sw/source/ui/dbui/mmgreetingspage.hxx | 3
sw/source/ui/dbui/mmlayoutpage.cxx | 8
sw/source/ui/dbui/mmlayoutpage.hxx | 3
sw/source/ui/dialog/docstdlg.cxx | 7
sw/source/ui/dialog/uiregionsw.cxx | 13 -
sw/source/ui/envelp/envfmt.cxx | 5
sw/source/ui/envelp/envfmt.hxx | 5
sw/source/ui/envelp/envlop1.cxx | 5
sw/source/ui/envelp/envprt.cxx | 6
sw/source/ui/envelp/envprt.hxx | 10
sw/source/ui/envelp/label1.cxx | 20 -
sw/source/ui/envelp/labfmt.cxx | 4
sw/source/ui/envelp/labfmt.hxx | 5
sw/source/ui/envelp/labprt.cxx | 12 -
sw/source/ui/envelp/labprt.hxx | 6
sw/source/ui/envelp/swuilabimp.hxx | 15 -
sw/source/ui/fldui/flddb.cxx | 11 -
sw/source/ui/fldui/flddb.hxx | 3
sw/source/ui/fldui/flddinf.cxx | 5
sw/source/ui/fldui/flddinf.hxx | 2
sw/source/ui/fldui/flddok.cxx | 5
sw/source/ui/fldui/flddok.hxx | 2
sw/source/ui/fldui/fldedt.cxx | 40 +--
sw/source/ui/fldui/fldfunc.cxx | 5
sw/source/ui/fldui/fldfunc.hxx | 2
sw/source/ui/fldui/fldpage.cxx | 2
sw/source/ui/fldui/fldpage.hxx | 4
sw/source/ui/fldui/fldref.cxx | 5
sw/source/ui/fldui/fldref.hxx | 2
sw/source/ui/fldui/fldvar.cxx | 5
sw/source/ui/fldui/fldvar.hxx | 4
sw/source/ui/frmdlg/column.cxx | 37 +--
sw/source/ui/frmdlg/frmpage.cxx | 36 +--
sw/source/ui/frmdlg/uiborder.cxx | 4
sw/source/ui/frmdlg/wrap.cxx | 13 -
sw/source/ui/index/cnttab.cxx | 24 --
sw/source/ui/misc/docfnote.cxx | 9
sw/source/ui/misc/impfnote.hxx | 8
sw/source/ui/misc/num.cxx | 10
sw/source/ui/misc/outline.cxx | 4
sw/source/ui/misc/pgfnote.cxx | 10
sw/source/ui/misc/pggrid.cxx | 10
sw/source/ui/table/tabledlg.cxx | 20 -
sw/source/uibase/app/appopt.cxx | 34 +--
sw/source/uibase/inc/chrdlg.hxx | 3
sw/source/uibase/inc/column.hxx | 8
sw/source/uibase/inc/docstdlg.hxx | 2
sw/source/uibase/inc/drpcps.hxx | 7
sw/source/uibase/inc/envlop.hxx | 5
sw/source/uibase/inc/fldedt.hxx | 2
sw/source/uibase/inc/frmpage.hxx | 22 --
sw/source/uibase/inc/label.hxx | 2
sw/source/uibase/inc/mailconfigpage.hxx | 3
sw/source/uibase/inc/mailmergewizard.hxx | 2
sw/source/uibase/inc/num.hxx | 6
sw/source/uibase/inc/numpara.hxx | 2
sw/source/uibase/inc/optcomp.hxx | 2
sw/source/uibase/inc/optload.hxx | 5
sw/source/uibase/inc/optpage.hxx | 22 --
sw/source/uibase/inc/outline.hxx | 7
sw/source/uibase/inc/pgfnote.hxx | 12 -
sw/source/uibase/inc/pggrid.hxx | 6
sw/source/uibase/inc/pview.hxx | 2
sw/source/uibase/inc/regionsw.hxx | 6
sw/source/uibase/inc/swuiccoll.hxx | 8
sw/source/uibase/inc/swuicnttab.hxx | 19 -
sw/source/uibase/inc/wrap.hxx | 9
sw/source/uibase/table/tablepg.hxx | 13 -
sw/source/uibase/uiview/pview.cxx | 2
sw/source/uibase/uiview/viewprt.cxx | 14 -
vcl/Library_vcl.mk | 1
vcl/inc/wizdlg.hxx | 8
vcl/source/app/salvtables.cxx | 82 -------
vcl/source/app/weldutils.cxx | 107 ++++++++++
vcl/source/control/roadmapwizard.cxx | 2
vcl/source/control/wizardmachine.cxx | 99 +++------
vcl/source/control/wizimpldata.hxx | 6
396 files changed, 1776 insertions(+), 2970 deletions(-)
New commits:
commit a37e559ed123789f6bc8f7972242d6461ce692ab
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Sep 20 20:29:36 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Sep 26 09:54:18 2019 +0200
disinherit OWizardPage and SfxTabPage from vcl TabPage
Now that there's no need to support weld/unwelded mixes of
pages in dialog any more.
inherit from a BuilderPage which contains a Builder and
Toplevel container
BuilderPage Activate and Deactivate replace TabPage ActivatePage and
DeactivatePage, allowing disambiguation wrt SfxTabPage ActivatePage and
DeactivatePage.
Change-Id: I5706e50fd92f712a25328ee9791e054bb9ad9812
Reviewed-on: https://gerrit.libreoffice.org/79317
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx
index 8848bc2787c4..cde483390e73 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx
@@ -34,18 +34,17 @@ ChartTypeDialog::ChartTypeDialog(weld::Window* pParent,
, m_xContentArea(m_xDialog->weld_content_area())
{
TabPageParent aParent(m_xContentArea.get(), this);
- m_xChartTypeTabPage = VclPtr<ChartTypeTabPage>::Create(
+ m_xChartTypeTabPage = std::make_unique<ChartTypeTabPage>(
aParent,
uno::Reference<XChartDocument>::query(m_xChartModel),
false/*don't show title description*/);
m_xChartTypeTabPage->initializePage();
- m_xChartTypeTabPage->Show();
- }
+}
ChartTypeDialog::~ChartTypeDialog()
{
- m_xChartTypeTabPage.disposeAndClear();
+ m_xChartTypeTabPage.reset();
}
} //namespace chart
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index adf1a52cdb70..228bcdbadba6 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -84,9 +84,9 @@ CreationWizard::CreationWizard(weld::Window* pParent, const uno::Reference<frame
CreationWizard::~CreationWizard() = default;
-VclPtr<TabPage> CreationWizard::createPage(WizardState nState)
+std::unique_ptr<BuilderPage> CreationWizard::createPage(WizardState nState)
{
- VclPtr<vcl::OWizardPage> pRet;
+ std::unique_ptr<vcl::OWizardPage> xRet;
OString sIdent(OString::number(nState));
weld::Container* pPageContainer = m_xAssistant->append_page(sIdent);
@@ -95,42 +95,41 @@ VclPtr<TabPage> CreationWizard::createPage(WizardState nState)
switch( nState )
{
- case STATE_CHARTTYPE:
+ case STATE_CHARTTYPE:
{
- m_aTimerTriggeredControllerLock.startTimer();
- VclPtrInstance<ChartTypeTabPage> pChartTypeTabPage(aParent, m_xChartModel);
- pRet = pChartTypeTabPage;
- m_pTemplateProvider = pChartTypeTabPage;
- if (m_pDialogModel)
- m_pDialogModel->setTemplate( m_pTemplateProvider->getCurrentTemplate());
+ m_aTimerTriggeredControllerLock.startTimer();
+ xRet = std::make_unique<ChartTypeTabPage>(aParent, m_xChartModel);
+ m_pTemplateProvider = static_cast<ChartTypeTabPage*>(xRet.get());
+ if (m_pDialogModel)
+ m_pDialogModel->setTemplate( m_pTemplateProvider->getCurrentTemplate());
+ break;
}
- break;
- case STATE_SIMPLE_RANGE:
+ case STATE_SIMPLE_RANGE:
{
- m_aTimerTriggeredControllerLock.startTimer();
- pRet = VclPtr<RangeChooserTabPage>::Create(aParent, *m_pDialogModel, m_pTemplateProvider, this);
+ m_aTimerTriggeredControllerLock.startTimer();
+ xRet = std::make_unique<RangeChooserTabPage>(aParent, *m_pDialogModel, m_pTemplateProvider, this);
+ break;
}
- break;
- case STATE_DATA_SERIES:
+ case STATE_DATA_SERIES:
{
- m_aTimerTriggeredControllerLock.startTimer();
- pRet = VclPtr<DataSourceTabPage>::Create(aParent, *m_pDialogModel, m_pTemplateProvider, this);
+ m_aTimerTriggeredControllerLock.startTimer();
+ xRet = std::make_unique<DataSourceTabPage>(aParent, *m_pDialogModel, m_pTemplateProvider, this);
+ break;
}
- break;
- case STATE_OBJECTS:
+ case STATE_OBJECTS:
{
- pRet = VclPtr<TitlesAndObjectsTabPage>::Create(aParent, m_xChartModel, m_xComponentContext);
- m_aTimerTriggeredControllerLock.startTimer();
+ xRet = std::make_unique<TitlesAndObjectsTabPage>(aParent, m_xChartModel, m_xComponentContext);
+ m_aTimerTriggeredControllerLock.startTimer();
+ break;
}
- break;
- default:
- break;
+ default:
+ break;
}
- if (pRet)
- pRet->SetText(OUString()); //remove title of pages to not get them in the wizard title
+ if (xRet)
+ xRet->SetPageTitle(OUString()); //remove title of pages to not get them in the wizard title
- return pRet;
+ return xRet;
}
bool CreationWizard::leaveState( WizardState /*_nState*/ )
@@ -159,12 +158,12 @@ void CreationWizard::enterState(WizardState nState)
vcl::RoadmapWizardMachine::enterState(nState);
}
-void CreationWizard::setInvalidPage( TabPage * /* pTabPage */ )
+void CreationWizard::setInvalidPage( BuilderPage * /* pTabPage */ )
{
m_bCanTravel = false;
}
-void CreationWizard::setValidPage( TabPage * /* pTabPage */ )
+void CreationWizard::setValidPage( BuilderPage * /* pTabPage */ )
{
m_bCanTravel = true;
}
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index 4bd826466bff..bb377bdbaa11 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -82,8 +82,6 @@ DataSourceDialog::DataSourceDialog(weld::Window * pParent,
"DataRangeDialog")
, m_apDocTemplateProvider(new DocumentChartTypeTemplateProvider(xChartDocument))
, m_apDialogModel(new DialogModel(xChartDocument, xContext))
- , m_pRangeChooserTabPage(nullptr)
- , m_pDataSourceTabPage(nullptr)
, m_bRangeChooserTabIsValid(true)
, m_bDataSourceTabIsValid(true)
, m_bTogglingEnabled(true)
@@ -91,10 +89,10 @@ DataSourceDialog::DataSourceDialog(weld::Window * pParent,
, m_xBtnOK(m_xBuilder->weld_button("ok"))
{
TabPageParent aRangeParent(m_xTabControl->get_page("range"), this);
- m_pRangeChooserTabPage = VclPtr<RangeChooserTabPage>::Create(aRangeParent, *(m_apDialogModel.get()),
+ m_xRangeChooserTabPage = std::make_unique<RangeChooserTabPage>(aRangeParent, *(m_apDialogModel.get()),
m_apDocTemplateProvider.get(), true /* bHideDescription */ );
TabPageParent aSeriesParent(m_xTabControl->get_page("series"), this);
- m_pDataSourceTabPage = VclPtr<DataSourceTabPage>::Create(aSeriesParent, *(m_apDialogModel.get()),
+ m_xDataSourceTabPage = std::make_unique<DataSourceTabPage>(aSeriesParent, *(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));
@@ -108,8 +106,8 @@ DataSourceDialog::DataSourceDialog(weld::Window * pParent,
DataSourceDialog::~DataSourceDialog()
{
- m_pRangeChooserTabPage.disposeAndClear();
- m_pDataSourceTabPage.disposeAndClear();
+ m_xRangeChooserTabPage.reset();
+ m_xDataSourceTabPage.reset();
m_nLastPageId = m_xTabControl->get_current_page();
}
@@ -118,10 +116,10 @@ short DataSourceDialog::run()
short nResult = GenericDialogController::run();
if( nResult == RET_OK )
{
- if( m_pRangeChooserTabPage )
- m_pRangeChooserTabPage->commitPage();
- if( m_pDataSourceTabPage )
- m_pDataSourceTabPage->commitPage();
+ if( m_xRangeChooserTabPage )
+ m_xRangeChooserTabPage->commitPage();
+ if( m_xDataSourceTabPage )
+ m_xDataSourceTabPage->commitPage();
}
return nResult;
}
@@ -129,9 +127,9 @@ short DataSourceDialog::run()
IMPL_LINK(DataSourceDialog, ActivatePageHdl, const OString&, rPage, void)
{
if (rPage == "range")
- m_pRangeChooserTabPage->ActivatePage();
+ m_xRangeChooserTabPage->Activate();
else if (rPage == "series")
- m_pDataSourceTabPage->ActivatePage();
+ m_xDataSourceTabPage->Activate();
}
// allow/disallow user to leave page
@@ -150,11 +148,11 @@ void DataSourceDialog::EnableTabToggling()
m_bTogglingEnabled = true;
}
-void DataSourceDialog::setInvalidPage( TabPage * pTabPage )
+void DataSourceDialog::setInvalidPage(BuilderPage* pTabPage)
{
- if (pTabPage == m_pRangeChooserTabPage)
+ if (pTabPage == m_xRangeChooserTabPage.get())
m_bRangeChooserTabIsValid = false;
- else if (pTabPage == m_pDataSourceTabPage)
+ else if (pTabPage == m_xDataSourceTabPage.get())
m_bDataSourceTabIsValid = false;
if (!(m_bRangeChooserTabIsValid && m_bDataSourceTabIsValid))
@@ -171,11 +169,11 @@ void DataSourceDialog::setInvalidPage( TabPage * pTabPage )
}
}
-void DataSourceDialog::setValidPage( TabPage * pTabPage )
+void DataSourceDialog::setValidPage(BuilderPage* pTabPage)
{
- if( pTabPage == m_pRangeChooserTabPage )
+ if( pTabPage == m_xRangeChooserTabPage.get() )
m_bRangeChooserTabIsValid = true;
- else if( pTabPage == m_pDataSourceTabPage )
+ else if( pTabPage == m_xDataSourceTabPage.get() )
m_bDataSourceTabIsValid = true;
if (m_bRangeChooserTabIsValid && m_bDataSourceTabIsValid)
diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
index 49bdc304610a..9be881594068 100644
--- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
+++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
@@ -37,9 +37,9 @@ NumberFormatDialog::NumberFormatDialog(weld::Window* pParent, SfxItemSet& rSet)
if (fnCreatePage)
{
TabPageParent pPageParent(get_content_area(), this);
- VclPtr<SfxTabPage> xTabPage = (*fnCreatePage)(pPageParent, &rSet);
+ std::unique_ptr<SfxTabPage> xTabPage = (*fnCreatePage)(pPageParent, &rSet);
xTabPage->PageCreated(rSet);
- SetTabPage(xTabPage);
+ SetTabPage(std::move(xTabPage));
}
}
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 36062526cdd4..2edb5a56e447 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -69,19 +69,13 @@ SchAxisLabelTabPage::SchAxisLabelTabPage(TabPageParent pParent, const SfxItemSet
SchAxisLabelTabPage::~SchAxisLabelTabPage()
{
- disposeOnce();
-}
-
-void SchAxisLabelTabPage::dispose()
-{
m_xCtrlDial.reset();
m_xLbTextDirection.reset();
- SfxTabPage::dispose();
}
-VclPtr<SfxTabPage> SchAxisLabelTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrs)
+std::unique_ptr<SfxTabPage> SchAxisLabelTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrs)
{
- return VclPtr<SchAxisLabelTabPage>::Create(pParent, *rAttrs);
+ return std::make_unique<SchAxisLabelTabPage>(pParent, *rAttrs);
}
bool SchAxisLabelTabPage::FillItemSet( SfxItemSet* rOutAttrs )
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
index 47d52c449843..1cfc7db169c6 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
@@ -71,9 +71,8 @@ private:
public:
SchAxisLabelTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
virtual ~SchAxisLabelTabPage() override;
- virtual void dispose() override;
- static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
virtual void Reset( const SfxItemSet* rInAttrs ) override;
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 1a6248b83565..7dd6bebcb108 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -63,12 +63,11 @@ AxisPositionsTabPage::AxisPositionsTabPage(TabPageParent pWindow,const SfxItemSe
AxisPositionsTabPage::~AxisPositionsTabPage()
{
- disposeOnce();
}
-VclPtr<SfxTabPage> AxisPositionsTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> AxisPositionsTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
{
- return VclPtr<AxisPositionsTabPage>::Create(pParent, *rOutAttrs);
+ return std::make_unique<AxisPositionsTabPage>(pParent, *rOutAttrs);
}
bool AxisPositionsTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
index 1b4f2e0b816d..3e20edcb6e67 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
@@ -30,10 +30,9 @@ public:
AxisPositionsTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
virtual ~AxisPositionsTabPage() override;
- static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
virtual void Reset( const SfxItemSet* rInAttrs ) override;
- using TabPage::DeactivatePage;
virtual DeactivateRC DeactivatePage( SfxItemSet* pItemSet ) override;
void SetNumFormatter( SvNumberFormatter* pFormatter );
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 0d2e833c7cc9..2decb778dac5 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -631,7 +631,7 @@ ChartTypeTabPage::ChartTypeTabPage(TabPageParent pParent , const uno::Reference<
m_xFT_ChooseType->hide();
}
- SetText( SchResId(STR_PAGE_CHARTTYPE) );
+ SetPageTitle(SchResId(STR_PAGE_CHARTTYPE));
m_xMainTypeList->connect_changed(LINK(this, ChartTypeTabPage, SelectMainTypeHdl));
m_xSubTypeList->SetSelectHdl( LINK( this, ChartTypeTabPage, SelectSubTypeHdl ) );
@@ -691,11 +691,6 @@ ChartTypeTabPage::ChartTypeTabPage(TabPageParent pParent , const uno::Reference<
ChartTypeTabPage::~ChartTypeTabPage()
{
- disposeOnce();
-}
-
-void ChartTypeTabPage::dispose()
-{
//delete all dialog controller
m_aChartTypeDialogControllerList.clear();
@@ -707,7 +702,6 @@ void ChartTypeTabPage::dispose()
m_pSortByXValuesResourceGroup.reset();
m_xSubTypeListWin.reset();
m_xSubTypeList.reset();
- vcl::OWizardPage::dispose();
}
ChartTypeParameter ChartTypeTabPage::getCurrentParamter() const
diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx
index 9d299fd009ab..8035cf7a0b54 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.hxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.hxx
@@ -49,7 +49,6 @@ public:
, const css::uno::Reference< css::chart2::XChartDocument >& xChartModel
, bool bShowDescription = true );
virtual ~ChartTypeTabPage() override;
- virtual void dispose() override;
virtual void initializePage() override;
virtual bool commitPage( ::vcl::WizardTypes::CommitPageReason eReason ) override;
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx b/chart2/source/controller/dialogs/tp_DataLabel.cxx
index e64e5d4ed385..6a611a8af5cf 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx
@@ -28,9 +28,9 @@ DataLabelsTabPage::DataLabelsTabPage(TabPageParent pWindow, const SfxItemSet& rI
{
}
-VclPtr<SfxTabPage> DataLabelsTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> DataLabelsTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
{
- return VclPtr<DataLabelsTabPage>::Create(pParent, *rOutAttrs);
+ return std::make_unique<DataLabelsTabPage>(pParent, *rOutAttrs);
}
bool DataLabelsTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.hxx b/chart2/source/controller/dialogs/tp_DataLabel.hxx
index 48a7fbcaeeec..d5be8a13641f 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.hxx
@@ -32,7 +32,7 @@ class DataLabelsTabPage : public SfxTabPage
public:
DataLabelsTabPage(TabPageParent pWindow, const SfxItemSet& rInAttrs);
- static VclPtr<SfxTabPage> Create(TabPageParent pWindow, const SfxItemSet* rInAttrs);
+ static std::unique_ptr<SfxTabPage> Create(TabPageParent pWindow, 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 e1ce453af530..fdb8147f438a 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -192,7 +192,7 @@ DataSourceTabPage::DataSourceTabPage(TabPageParent pParent, DialogModel & rDialo
m_xFT_CAPTION->set_visible(!bHideDescription);
m_aFixedTextRange = m_xFT_RANGE->get_label();
- SetText( SchResId( STR_OBJECT_DATASERIES_PLURAL ) );
+ SetPageTitle(SchResId(STR_OBJECT_DATASERIES_PLURAL));
// set handlers
m_xLB_SERIES->connect_changed(LINK(this, DataSourceTabPage, SeriesSelectionChangedHdl));
@@ -237,9 +237,9 @@ DataSourceTabPage::~DataSourceTabPage()
{
}
-void DataSourceTabPage::ActivatePage()
+void DataSourceTabPage::Activate()
{
- OWizardPage::ActivatePage();
+ OWizardPage::Activate();
updateControlsFromDialogModel();
m_xLB_SERIES->grab_focus();
}
@@ -248,10 +248,10 @@ void DataSourceTabPage::initializePage()
{
}
-void DataSourceTabPage::DeactivatePage()
+void DataSourceTabPage::Deactivate()
{
commitPage();
- vcl::OWizardPage::DeactivatePage();
+ vcl::OWizardPage::Deactivate();
}
void DataSourceTabPage::commitPage()
@@ -699,8 +699,6 @@ void DataSourceTabPage::listeningFinished(
m_rDialogModel.getRangeSelectionHelper()->stopRangeListening();
// change edit field
- ToTop();
- GrabFocus();
if( m_pCurrentRangeChoosingField )
{
m_pCurrentRangeChoosingField->set_text(aRange);
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx
index 5386ae1b4fba..d899f76eab80 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.hxx
@@ -57,7 +57,7 @@ public:
bool bHideDescription = false);
virtual ~DataSourceTabPage() override;
- virtual void ActivatePage() override;
+ virtual void Activate() override;
void commitPage();
@@ -66,7 +66,7 @@ private:
virtual bool commitPage( ::vcl::WizardTypes::CommitPageReason eReason ) override;
//TabPage
- virtual void DeactivatePage() override;
+ virtual void Deactivate() override;
virtual void initializePage() override;
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
index e99452c790a0..1b7800b09fea 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
@@ -32,9 +32,9 @@ ErrorBarsTabPage::ErrorBarsTabPage(TabPageParent pParent, const SfxItemSet& rInA
{
}
-VclPtr<SfxTabPage> ErrorBarsTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> ErrorBarsTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
{
- return VclPtr<ErrorBarsTabPage>::Create(pParent, *rOutAttrs);
+ return std::make_unique<ErrorBarsTabPage>(pParent, *rOutAttrs);
}
bool ErrorBarsTabPage::FillItemSet( SfxItemSet* rOutAttrs )
@@ -48,14 +48,6 @@ void ErrorBarsTabPage::Reset( const SfxItemSet* rInAttrs )
m_aErrorBarResources.Reset( *rInAttrs );
}
-void ErrorBarsTabPage::DataChanged( const DataChangedEvent& rDCEvt )
-{
- SfxTabPage::DataChanged( rDCEvt );
-
- if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
- m_aErrorBarResources.FillValueSets();
-}
-
void ErrorBarsTabPage::SetAxisMinorStepWidthForErrorBarDecimals( double fMinorStepWidth )
{
m_aErrorBarResources.SetAxisMinorStepWidthForErrorBarDecimals( fMinorStepWidth );
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.hxx b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
index 337b58f4691d..e74aac0a2d5b 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.hxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
@@ -36,12 +36,10 @@ public:
void SetChartDocumentForRangeChoosing(
const css::uno::Reference< css::chart2::XChartDocument > & xChartDocument );
- static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
virtual void Reset( const SfxItemSet* rInAttrs ) override;
- virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
-
private:
ErrorBarResources m_aErrorBarResources;
};
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index efd8a29c790e..e7a855c1258f 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -35,19 +35,12 @@ SchLegendPosTabPage::SchLegendPosTabPage(TabPageParent pWindow, const SfxItemSet
SchLegendPosTabPage::~SchLegendPosTabPage()
{
- disposeOnce();
-}
-
-void SchLegendPosTabPage::dispose()
-{
m_xLbTextDirection.reset();
- SfxTabPage::dispose();
}
-
-VclPtr<SfxTabPage> SchLegendPosTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> SchLegendPosTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
{
- return VclPtr<SchLegendPosTabPage>::Create(pParent, *rOutAttrs);
+ return std::make_unique<SchLegendPosTabPage>(pParent, *rOutAttrs);
}
bool SchLegendPosTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.hxx b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
index 3e48cd9d5530..4414be65bed4 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
@@ -38,9 +38,8 @@ private:
public:
SchLegendPosTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
virtual ~SchLegendPosTabPage() override;
- virtual void dispose() override;
- static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
+ static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
virtual void Reset(const SfxItemSet* rInAttrs) override;
};
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index 2cbfe653e576..6e667b9c89b8 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -36,18 +36,12 @@ SchLayoutTabPage::SchLayoutTabPage(TabPageParent pParent, const SfxItemSet& rInA
SchLayoutTabPage::~SchLayoutTabPage()
{
- disposeOnce();
-}
-
-void SchLayoutTabPage::dispose()
-{
m_pGeometryResources.reset();
- SfxTabPage::dispose();
}
-VclPtr<SfxTabPage> SchLayoutTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> SchLayoutTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
{
- return VclPtr<SchLayoutTabPage>::Create(pParent, *rOutAttrs);
+ return std::make_unique<SchLayoutTabPage>(pParent, *rOutAttrs);
}
bool SchLayoutTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.hxx b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
index 4690a1fd1c31..680f330b6a9b 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
@@ -30,9 +30,8 @@ class SchLayoutTabPage : public SfxTabPage
public:
SchLayoutTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
virtual ~SchLayoutTabPage() override;
- virtual void dispose() override;
- static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
+ static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
virtual void Reset(const SfxItemSet* rInAttrs) override;
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index 0cd66b00a26c..f98fc072e54a 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -40,18 +40,12 @@ PolarOptionsTabPage::PolarOptionsTabPage(TabPageParent pWindow, const SfxItemSet
PolarOptionsTabPage::~PolarOptionsTabPage()
{
- disposeOnce();
-}
-
-void PolarOptionsTabPage::dispose()
-{
m_xAngleDial.reset();
- SfxTabPage::dispose();
}
-VclPtr<SfxTabPage> PolarOptionsTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> PolarOptionsTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
{
- return VclPtr<PolarOptionsTabPage>::Create(pParent, *rOutAttrs);
+ return std::make_unique<PolarOptionsTabPage>(pParent, *rOutAttrs);
}
bool PolarOptionsTabPage::FillItemSet( SfxItemSet* rOutAttrs )
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hxx b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
index a789c4ffc9c5..f962f94694f2 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.hxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
@@ -38,9 +38,8 @@ class PolarOptionsTabPage : public SfxTabPage
public:
PolarOptionsTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
virtual ~PolarOptionsTabPage() override;
- virtual void dispose() override;
- static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
+ static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
virtual void Reset(const SfxItemSet* rInAttrs) override;
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index e0f03383492b..ecbc658cdf28 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -87,7 +87,7 @@ RangeChooserTabPage::RangeChooserTabPage(TabPageParent pParent, DialogModel & rD
{
m_xFT_Caption->set_visible(!bHideDescription);
- SetText(m_xFTTitle->get_label());// OH:remove later with dialog
+ SetPageTitle(m_xFTTitle->get_label());// OH:remove later with dialog
// set defaults as long as DetectArguments does not work
m_xRB_Columns->set_active(true);
@@ -126,9 +126,9 @@ RangeChooserTabPage::~RangeChooserTabPage()
{
}
-void RangeChooserTabPage::ActivatePage()
+void RangeChooserTabPage::Activate()
{
- OWizardPage::ActivatePage();
+ OWizardPage::Activate();
initControlsFromModel();
m_xED_Range->grab_focus();
}
@@ -163,10 +163,10 @@ void RangeChooserTabPage::initControlsFromModel()
m_nChangingControlCalls--;
}
-void RangeChooserTabPage::DeactivatePage()
+void RangeChooserTabPage::Deactivate()
{
commitPage();
- vcl::OWizardPage::DeactivatePage();
+ vcl::OWizardPage::Deactivate();
}
void RangeChooserTabPage::commitPage()
@@ -357,8 +357,6 @@ void RangeChooserTabPage::listeningFinished( const OUString & rNewRange )
m_rDialogModel.getRangeSelectionHelper()->stopRangeListening();
//update dialog state
- ToTop();
- GrabFocus();
m_xED_Range->set_text(aRange);
m_xED_Range->grab_focus();
@@ -368,6 +366,7 @@ void RangeChooserTabPage::listeningFinished( const OUString & rNewRange )
lcl_enableRangeChoosing( false, m_pParentController );
}
+
void RangeChooserTabPage::disposingRangeSelection()
{
m_rDialogModel.getRangeSelectionHelper()->stopRangeListening( false );
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
index d630fc59f109..41ae6f19e460 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
@@ -46,7 +46,7 @@ public:
virtual void listeningFinished( const OUString & rNewRange ) override;
virtual void disposingRangeSelection() override;
- virtual void ActivatePage() override;
+ virtual void Activate() override;
void commitPage();
@@ -56,7 +56,7 @@ private:
virtual bool commitPage( ::vcl::WizardTypes::CommitPageReason eReason ) override;
//TabPage
- virtual void DeactivatePage() override;
+ virtual void Deactivate() override;
void initControlsFromModel();
void changeDialogModelAccordingToControls();
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index 100b11548a95..e7f5837fb9d5 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -111,7 +111,6 @@ ScaleTabPage::ScaleTabPage(TabPageParent pWindow,const SfxItemSet& rInAttrs)
ScaleTabPage::~ScaleTabPage()
{
- disposeOnce();
}
void ScaleTabPage::EnableControls()
@@ -214,9 +213,9 @@ IMPL_LINK_NOARG(ScaleTabPage, SelectAxisTypeHdl, weld::ComboBox&, void)
SetNumFormat();
}
-VclPtr<SfxTabPage> ScaleTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> ScaleTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
{
- return VclPtr<ScaleTabPage>::Create(pParent, *rOutAttrs);
+ return std::make_unique<ScaleTabPage>(pParent, *rOutAttrs);
}
bool ScaleTabPage::FillItemSet(SfxItemSet* rOutAttrs)
@@ -559,7 +558,7 @@ bool ScaleTabPage::ShowWarning(const char* pResIdMessage, weld::Widget* pControl
if (pResIdMessage == nullptr)
return false;
- std::unique_ptr<weld::MessageDialog> xWarn(Application::CreateMessageDialog(GetFrameWeld(),
+ std::unique_ptr<weld::MessageDialog> xWarn(Application::CreateMessageDialog(GetDialogFrameWeld(),
VclMessageType::Warning, VclButtonsType::Ok,
SchResId(pResIdMessage)));
xWarn->run();
diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx
index a44c12c91232..09c47af57d57 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hxx
+++ b/chart2/source/controller/dialogs/tp_Scale.hxx
@@ -30,10 +30,9 @@ public:
ScaleTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
virtual ~ScaleTabPage() override;
- static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
virtual void Reset( const SfxItemSet* rInAttrs ) override;
- using TabPage::DeactivatePage;
virtual DeactivateRC DeactivatePage( SfxItemSet* pItemSet ) override;
void SetNumFormatter( SvNumberFormatter* pFormatter );
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index b84ee44db192..db5a0cf5241f 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -58,7 +58,6 @@ SchOptionTabPage::SchOptionTabPage(TabPageParent pWindow,const SfxItemSet& rInAt
SchOptionTabPage::~SchOptionTabPage()
{
- disposeOnce();
}
IMPL_LINK_NOARG(SchOptionTabPage, EnableHdl, weld::ToggleButton&, void)
@@ -69,10 +68,10 @@ IMPL_LINK_NOARG(SchOptionTabPage, EnableHdl, weld::ToggleButton&, void)
m_xCBAxisSideBySide->set_sensitive( m_xRbtAxis1->get_active());
}
-VclPtr<SfxTabPage> SchOptionTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SchOptionTabPage::Create(TabPageParent pParent,
const SfxItemSet* rOutAttrs)
{
- return VclPtr<SchOptionTabPage>::Create(pParent, *rOutAttrs);
+ return std::make_unique<SchOptionTabPage>(pParent, *rOutAttrs);
}
bool SchOptionTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
index 7ffbed77ca9d..2538a6b8071d 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.hxx
@@ -38,7 +38,7 @@ public:
SchOptionTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
virtual ~SchOptionTabPage() override;
- static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
+ static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
virtual void Reset(const SfxItemSet* rInAttrs) override;
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index b9d73f337cc0..f8748a087b2c 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -69,26 +69,20 @@ IMPL_LINK_NOARG(SchAlignmentTabPage, StackedToggleHdl, weld::ToggleButton&, void
SchAlignmentTabPage::~SchAlignmentTabPage()
{
- disposeOnce();
-}
-
-void SchAlignmentTabPage::dispose()
-{
m_xCtrlDial.reset();
m_xLbTextDirection.reset();
- SfxTabPage::dispose();
}
-VclPtr<SfxTabPage> SchAlignmentTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SchAlignmentTabPage::Create(TabPageParent pParent,
const SfxItemSet* rInAttrs)
{
- return VclPtr<SchAlignmentTabPage>::Create(pParent, *rInAttrs);
+ return std::make_unique<SchAlignmentTabPage>(pParent, *rInAttrs);
}
-VclPtr<SfxTabPage> SchAlignmentTabPage::CreateWithoutRotation(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SchAlignmentTabPage::CreateWithoutRotation(TabPageParent pParent,
const SfxItemSet* rInAttrs)
{
- return VclPtr<SchAlignmentTabPage>::Create(pParent, *rInAttrs, false);
+ return std::make_unique<SchAlignmentTabPage>(pParent, *rInAttrs, false);
}
bool SchAlignmentTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.hxx b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
index 9368a41e4c24..ae1e398fd5e4 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.hxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.hxx
@@ -51,10 +51,9 @@ private:
public:
SchAlignmentTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs, bool bWithRotation = true);
virtual ~SchAlignmentTabPage() override;
- virtual void dispose() override;
- static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
- static VclPtr<SfxTabPage> CreateWithoutRotation(TabPageParent pParent, const SfxItemSet* rInAttrs);
+ static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
+ static std::unique_ptr<SfxTabPage> CreateWithoutRotation(TabPageParent pParent, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
virtual void Reset(const SfxItemSet* rInAttrs) override;
};
diff --git a/chart2/source/controller/dialogs/tp_Trendline.cxx b/chart2/source/controller/dialogs/tp_Trendline.cxx
index fcbecd9ba749..f21ca365b810 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.cxx
+++ b/chart2/source/controller/dialogs/tp_Trendline.cxx
@@ -30,9 +30,9 @@ TrendlineTabPage::TrendlineTabPage(TabPageParent pParent, const SfxItemSet& rInA
{
}
-VclPtr<SfxTabPage> TrendlineTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> TrendlineTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
{
- return VclPtr<TrendlineTabPage>::Create(pParent, *rOutAttrs);
+ return std::make_unique<TrendlineTabPage>(pParent, *rOutAttrs);
}
bool TrendlineTabPage::FillItemSet( SfxItemSet* rOutAttrs )
@@ -46,14 +46,6 @@ void TrendlineTabPage::Reset( const SfxItemSet* rInAttrs )
m_aTrendlineResources.Reset( *rInAttrs );
}
-void TrendlineTabPage::DataChanged( const DataChangedEvent& rDCEvt )
-{
- SfxTabPage::DataChanged( rDCEvt );
-
- if ( (rDCEvt.GetType() == DataChangedEventType::SETTINGS) && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
- m_aTrendlineResources.FillValueSets();
-}
-
void TrendlineTabPage::SetNumFormatter( SvNumberFormatter* pNumFormatter )
{
m_aTrendlineResources.SetNumFormatter( pNumFormatter );
diff --git a/chart2/source/controller/dialogs/tp_Trendline.hxx b/chart2/source/controller/dialogs/tp_Trendline.hxx
index 03dd251cb91e..2d825be32f51 100644
--- a/chart2/source/controller/dialogs/tp_Trendline.hxx
+++ b/chart2/source/controller/dialogs/tp_Trendline.hxx
@@ -31,11 +31,10 @@ class TrendlineTabPage : public SfxTabPage
public:
TrendlineTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
- static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
virtual void Reset( const SfxItemSet* rInAttrs ) override;
- virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
void SetNumFormatter( SvNumberFormatter* pFormatter );
void SetNbPoints( sal_Int32 nNbPoints );
diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index 24b6d50026fb..c8a2ee1ff3db 100644
--- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -54,7 +54,6 @@ TitlesAndObjectsTabPage::TitlesAndObjectsTabPage(TabPageParent pParent,
TitlesAndObjectsTabPage::~TitlesAndObjectsTabPage()
{
- disposeOnce();
}
void TitlesAndObjectsTabPage::initializePage()
diff --git a/chart2/source/controller/inc/TabPageNotifiable.hxx b/chart2/source/controller/inc/TabPageNotifiable.hxx
index 01e7b490d5a3..d9ba555887fd 100644
--- a/chart2/source/controller/inc/TabPageNotifiable.hxx
+++ b/chart2/source/controller/inc/TabPageNotifiable.hxx
@@ -24,7 +24,7 @@
// color to use as background for an invalid range
#define RANGE_SELECTION_INVALID_RANGE_BACKGROUND_COLOR Color(0xff6563)
-class TabPage;
+class BuilderPage;
namespace chart
{
@@ -32,8 +32,8 @@ namespace chart
class TabPageNotifiable
{
public:
- virtual void setInvalidPage( TabPage * pTabPage ) = 0;
- virtual void setValidPage( TabPage * pTabPage ) = 0;
+ virtual void setInvalidPage( BuilderPage * pTabPage ) = 0;
+ virtual void setValidPage( BuilderPage * pTabPage ) = 0;
protected:
~TabPageNotifiable() {}
diff --git a/chart2/source/controller/inc/dlg_ChartType.hxx b/chart2/source/controller/inc/dlg_ChartType.hxx
index 7483dcd84118..3b01f54b76af 100644
--- a/chart2/source/controller/inc/dlg_ChartType.hxx
+++ b/chart2/source/controller/inc/dlg_ChartType.hxx
@@ -37,7 +37,7 @@ public:
private:
css::uno::Reference<css::frame::XModel> m_xChartModel;
std::unique_ptr<weld::Container> m_xContentArea;
- VclPtr<ChartTypeTabPage> m_xChartTypeTabPage;
+ std::unique_ptr<ChartTypeTabPage> m_xChartTypeTabPage;
};
} //namespace chart
diff --git a/chart2/source/controller/inc/dlg_CreationWizard.hxx b/chart2/source/controller/inc/dlg_CreationWizard.hxx
index ae5067503bef..e6051054d257 100644
--- a/chart2/source/controller/inc/dlg_CreationWizard.hxx
+++ b/chart2/source/controller/inc/dlg_CreationWizard.hxx
@@ -50,8 +50,8 @@ public:
virtual ~CreationWizard() override;
// TabPageNotifiable
- virtual void setInvalidPage(TabPage * pTabPage) override;
- virtual void setValidPage(TabPage * pTabPage) override;
+ virtual void setInvalidPage(BuilderPage * pTabPage) override;
+ virtual void setValidPage(BuilderPage * pTabPage) override;
protected:
virtual bool leaveState( WizardState _nState ) override;
@@ -61,7 +61,7 @@ protected:
virtual OUString getStateDisplayName(WizardState nState) const override;
private:
- virtual VclPtr<TabPage> createPage(WizardState nState) override;
+ virtual std::unique_ptr<BuilderPage> createPage(WizardState nState) override;
css::uno::Reference<css::chart2::XChartDocument> m_xChartModel;
css::uno::Reference<css::uno::XComponentContext> m_xComponentContext;
diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx
index b708a2c97a8d..680256d1db53 100644
--- a/chart2/source/controller/inc/dlg_DataSource.hxx
+++ b/chart2/source/controller/inc/dlg_DataSource.hxx
@@ -29,7 +29,7 @@ namespace com { namespace sun { namespace star { namespace uno { class XComponen
#include <memory>
-class TabPage;
+class BuilderPage;
namespace chart
{
@@ -54,8 +54,8 @@ public:
virtual short run() override;
// TabPageNotifiable
- virtual void setInvalidPage( TabPage * pTabPage ) override;
- virtual void setValidPage( TabPage * pTabPage ) override;
+ virtual void setInvalidPage( BuilderPage * pTabPage ) override;
+ virtual void setValidPage( BuilderPage * pTabPage ) override;
private:
void DisableTabToggling();
@@ -67,8 +67,8 @@ private:
std::unique_ptr< ChartTypeTemplateProvider > m_apDocTemplateProvider;
std::unique_ptr< DialogModel > m_apDialogModel;
- VclPtr<RangeChooserTabPage> m_pRangeChooserTabPage;
- VclPtr<DataSourceTabPage> m_pDataSourceTabPage;
+ std::unique_ptr<RangeChooserTabPage> m_xRangeChooserTabPage;
+ std::unique_ptr<DataSourceTabPage> m_xDataSourceTabPage;
bool m_bRangeChooserTabIsValid;
bool m_bDataSourceTabIsValid;
bool m_bTogglingEnabled;
diff --git a/cui/source/customize/SvxMenuConfigPage.cxx b/cui/source/customize/SvxMenuConfigPage.cxx
index d68582f7da5f..08fb276030be 100644
--- a/cui/source/customize/SvxMenuConfigPage.cxx
+++ b/cui/source/customize/SvxMenuConfigPage.cxx
@@ -134,7 +134,9 @@ IMPL_LINK(SvxMenuConfigPage, MenuEntriesSizeAllocHdl, const Size&, rSize, void)
SvxMenuConfigPage::~SvxMenuConfigPage()
{
- disposeOnce();
+ for (int i = 0, nCount = m_xSaveInListBox->get_count(); i < nCount; ++i)
+ delete reinterpret_cast<SaveInData*>(m_xSaveInListBox->get_id(i).toInt64());
+ m_xSaveInListBox->clear();
}
// Populates the Menu combo box
@@ -156,15 +158,6 @@ void SvxMenuConfigPage::Init()
m_xCommandCategoryListBox->categorySelected(m_xFunctions.get(), OUString(), GetSaveInData());
}
-void SvxMenuConfigPage::dispose()
-{
- for (int i = 0, nCount = m_xSaveInListBox->get_count(); i < nCount; ++i)
- delete reinterpret_cast<SaveInData*>(m_xSaveInListBox->get_id(i).toInt64());
- m_xSaveInListBox->clear();
-
- SvxConfigPage::dispose();
-}
-
IMPL_LINK_NOARG(SvxMenuConfigPage, SelectMenuEntry, weld::TreeView&, void)
{
UpdateButtonStates();
diff --git a/cui/source/customize/SvxNotebookbarConfigPage.cxx b/cui/source/customize/SvxNotebookbarConfigPage.cxx
index 521aafcfa67e..5c439ab8182b 100644
--- a/cui/source/customize/SvxNotebookbarConfigPage.cxx
+++ b/cui/source/customize/SvxNotebookbarConfigPage.cxx
@@ -152,7 +152,7 @@ SvxNotebookbarConfigPage::SvxNotebookbarConfigPage(TabPageParent pParent, const
rTreeView.show();
}
-SvxNotebookbarConfigPage::~SvxNotebookbarConfigPage() { disposeOnce(); }
+SvxNotebookbarConfigPage::~SvxNotebookbarConfigPage() {}
void SvxNotebookbarConfigPage::DeleteSelectedTopLevel() {}
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx b/cui/source/customize/SvxToolbarConfigPage.cxx
index ff63843fb261..39de9ba9f08d 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -156,11 +156,6 @@ IMPL_LINK_NOARG(SvxToolbarConfigPage, ListModifiedHdl, weld::TreeView&, void)
SvxToolbarConfigPage::~SvxToolbarConfigPage()
{
- disposeOnce();
-}
-
-void SvxToolbarConfigPage::dispose()
-{
for (int i = 0, nCount = m_xSaveInListBox->get_count(); i < nCount; ++i)
{
ToolbarSaveInData* pData =
@@ -168,8 +163,6 @@ void SvxToolbarConfigPage::dispose()
delete pData;
}
m_xSaveInListBox->clear();
-
- SvxConfigPage::dispose();
}
void SvxToolbarConfigPage::DeleteSelectedTopLevel()
@@ -860,10 +853,10 @@ void SvxToolbarEntriesListBox::ChangedVisibility(int nRow)
{
pEntryData->SetVisible(m_xControl->get_toggle(nRow, 0) == TRISTATE_TRUE);
- SvxConfigEntry* pToolbar = pPage->GetTopLevelSelection();
+ SvxConfigEntry* pToolbar = m_pPage->GetTopLevelSelection();
ToolbarSaveInData* pToolbarSaveInData = static_cast<ToolbarSaveInData*>(
- pPage->GetSaveInData() );
+ m_pPage->GetSaveInData() );
pToolbarSaveInData->ApplyToolbar( pToolbar );
}
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 3437ca718166..2cdca489eb75 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -906,11 +906,6 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage(TabPageParent pParent, const
SfxAcceleratorConfigPage::~SfxAcceleratorConfigPage()
{
- disposeOnce();
-}
-
-void SfxAcceleratorConfigPage::dispose()
-{
m_aFillGroupIdle.Stop();
// free memory - remove all dynamic user data
@@ -919,8 +914,6 @@ void SfxAcceleratorConfigPage::dispose()
TAccInfo* pUserData = reinterpret_cast<TAccInfo*>(m_xEntriesBox->get_id(i).toInt64());
delete pUserData;
}
-
- SfxTabPage::dispose();
}
void SfxAcceleratorConfigPage::InitAccCfg()
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index def983911b70..0246f66d82a8 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 VclPtr<SfxTabPage> CreateSvxMenuConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
+static std::unique_ptr<SfxTabPage> CreateSvxMenuConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
{
- return VclPtr<SvxMenuConfigPage>::Create(pParent, *rSet);
+ return std::make_unique<SvxMenuConfigPage>(pParent, *rSet);
}
-static VclPtr<SfxTabPage> CreateSvxContextMenuConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
+static std::unique_ptr<SfxTabPage> CreateSvxContextMenuConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
{
- return VclPtr<SvxMenuConfigPage>::Create(pParent, *rSet, false);
+ return std::make_unique<SvxMenuConfigPage>(pParent, *rSet, false);
}
-static VclPtr<SfxTabPage> CreateKeyboardConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
+static std::unique_ptr<SfxTabPage> CreateKeyboardConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
{
- return VclPtr<SfxAcceleratorConfigPage>::Create(pParent, *rSet);
+ return std::make_unique<SfxAcceleratorConfigPage>(pParent, *rSet);
}
-static VclPtr<SfxTabPage> CreateSvxNotebookbarConfigPage(TabPageParent pParent,
+static std::unique_ptr<SfxTabPage> CreateSvxNotebookbarConfigPage(TabPageParent pParent,
const SfxItemSet* rSet)
{
- return VclPtr<SvxNotebookbarConfigPage>::Create(pParent, *rSet);
+ return std::make_unique<SvxNotebookbarConfigPage>(pParent, *rSet);
}
-static VclPtr<SfxTabPage> CreateSvxToolbarConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
+static std::unique_ptr<SfxTabPage> CreateSvxToolbarConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
{
- return VclPtr<SvxToolbarConfigPage>::Create(pParent, *rSet);
+ return std::make_unique<SvxToolbarConfigPage>(pParent, *rSet);
}
-static VclPtr<SfxTabPage> CreateSvxEventConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
+static std::unique_ptr<SfxTabPage> CreateSvxEventConfigPage( TabPageParent pParent, const SfxItemSet* rSet )
{
- return VclPtr<SvxEventConfigPage>::Create(pParent, *rSet, SvxEventConfigPage::EarlyInit());
+ return std::make_unique<SvxEventConfigPage>(pParent, *rSet, SvxEventConfigPage::EarlyInit());
}
/******************************************************************************
@@ -927,7 +927,7 @@ void SvxMenuEntriesListBox::CreateDropDown()
SvxMenuEntriesListBox::SvxMenuEntriesListBox(std::unique_ptr<weld::TreeView> xControl, SvxConfigPage* pPg)
: m_xControl(std::move(xControl))
, m_xDropDown(m_xControl->create_virtual_device())
- , pPage(pPg)
+ , m_pPage(pPg)
{
CreateDropDown();
m_xControl->connect_key_press(LINK(this, SvxMenuEntriesListBox, KeyInputHdl));
@@ -944,16 +944,16 @@ IMPL_LINK(SvxMenuEntriesListBox, KeyInputHdl, const KeyEvent&, rKeyEvent, bool)
// support DELETE for removing the current entry
if ( keycode == KEY_DELETE )
{
- pPage->DeleteSelectedContent();
+ m_pPage->DeleteSelectedContent();
}
// support CTRL+UP and CTRL+DOWN for moving selected entries
else if ( keycode.GetCode() == KEY_UP && keycode.IsMod1() )
{
- pPage->MoveEntry( true );
+ m_pPage->MoveEntry( true );
}
else if ( keycode.GetCode() == KEY_DOWN && keycode.IsMod1() )
{
- pPage->MoveEntry( false );
+ m_pPage->MoveEntry( false );
}
else
{
@@ -1019,7 +1019,6 @@ IMPL_LINK_NOARG(SvxConfigPage, SelectElementHdl, weld::ComboBox&, void)
SvxConfigPage::~SvxConfigPage()
{
- disposeOnce();
}
void SvxConfigPage::Reset( const SfxItemSet* )
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index 44ff4f9e9137..155708aba3ce 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -74,7 +74,6 @@ void SvxEventConfigPage::LateInit( const uno::Reference< frame::XFrame >& _rxFra
SvxEventConfigPage::~SvxEventConfigPage()
{
- disposeOnce();
}
void SvxEventConfigPage::ImplInitDocument()
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 4a608f6c9883..d7d005487832 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -84,13 +84,7 @@ SvxMacroTabPage_::SvxMacroTabPage_(TabPageParent pParent, const OUString& rUIXML
SvxMacroTabPage_::~SvxMacroTabPage_()
{
- disposeOnce();
-}
-
-void SvxMacroTabPage_::dispose()
-{
mpImpl.reset();
- SfxTabPage::dispose();
}
void SvxMacroTabPage_::InitResources()
@@ -622,8 +616,7 @@ SvxMacroAssignDlg::SvxMacroAssignDlg(weld::Window* pParent, const Reference< fra
: SvxMacroAssignSingleTabDialog(pParent, rSet)
{
TabPageParent pPageParent(get_content_area(), this);
- auto pPage = VclPtr<SvxMacroTabPage>::Create(pPageParent, _rxDocumentFrame, rSet, xNameReplace, nSelectedIndex);
- SetTabPage(pPage);
+ SetTabPage(std::make_unique<SvxMacroTabPage>(pPageParent, _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 d5043281cfac..360effa6dc5f 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -455,9 +455,9 @@ void SpellDialog::StartSpellOptDlg_Impl()
SfxSingleTabDialogController aDlg(m_xDialog.get(), &aSet, "cui/ui/spelloptionsdialog.ui", "SpellOptionsDialog");
TabPageParent aParent(aDlg.get_content_area(), &aDlg);
- VclPtr<SfxTabPage> xPage = SvxLinguTabPage::Create(aParent, &aSet);
+ std::unique_ptr<SfxTabPage> xPage = SvxLinguTabPage::Create(aParent, &aSet);
static_cast<SvxLinguTabPage*>(xPage.get())->HideGroups( GROUP_MODULES );
- aDlg.SetTabPage(xPage);
+ aDlg.SetTabPage(std::move(xPage));
if (RET_OK == aDlg.run())
{
InitUserDicts();
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 54d7894d4fe9..b7fdc641da19 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -189,7 +189,7 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL,
SearchProgress::SearchProgress(weld::Window* pParent, TPGalleryThemeProperties* pTabPage, const INetURLObject& rStartURL)
: GenericDialogController(pParent, "cui/ui/gallerysearchprogress.ui", "GallerySearchProgress")
, startUrl_(rStartURL)
- , m_xTabPage(pTabPage)
+ , m_pTabPage(pTabPage)
, m_xFtSearchDir(m_xBuilder->weld_label("dir"))
, m_xFtSearchType(m_xBuilder->weld_label("file"))
, m_xBtnCancel(m_xBuilder->weld_button("cancel"))
@@ -219,7 +219,7 @@ IMPL_LINK_NOARG(SearchProgress, CleanUpHdl, void*, void)
void SearchProgress::LaunchThread()
{
assert(!m_aSearchThread.is());
- m_aSearchThread = new SearchThread(this, m_xTabPage, startUrl_);
+ m_aSearchThread = new SearchThread(this, m_pTabPage, startUrl_);
m_aSearchThread->launch();
}
@@ -291,7 +291,7 @@ TakeProgress::TakeProgress(weld::Window* pParent, TPGalleryThemeProperties* pTab
: GenericDialogController(pParent, "cui/ui/galleryapplyprogress.ui",
"GalleryApplyProgress")
, m_pParent(pParent)
- , m_xTabPage(pTabPage)
+ , m_pTabPage(pTabPage)
, m_xFtTakeFile(m_xBuilder->weld_label("file"))
, m_xBtnCancel(m_xBuilder->weld_button("cancel"))
{
@@ -314,14 +314,14 @@ IMPL_LINK_NOARG(TakeProgress, CleanUpHdl, void*, void)
if (maTakeThread.is())
maTakeThread->join();
- std::vector<bool, std::allocator<bool> > aRemoveEntries(m_xTabPage->aFoundList.size(), false);
+ std::vector<bool, std::allocator<bool> > aRemoveEntries(m_pTabPage->aFoundList.size(), false);
std::vector< OUString > aRemainingVector;
sal_uInt32 i, nCount;
std::unique_ptr<weld::WaitObject> xWait(new weld::WaitObject(m_pParent));
- m_xTabPage->m_xLbxFound->select(-1);
- m_xTabPage->m_xLbxFound->freeze();
+ m_pTabPage->m_xLbxFound->select(-1);
+ m_pTabPage->m_xLbxFound->freeze();
// mark all taken positions in aRemoveEntries
for( i = 0, nCount = maTakenList.size(); i < nCount; ++i )
@@ -331,29 +331,29 @@ IMPL_LINK_NOARG(TakeProgress, CleanUpHdl, void*, void)
// refill found list
for( i = 0, nCount = aRemoveEntries.size(); i < nCount; ++i )
if( !aRemoveEntries[ i ] )
- aRemainingVector.push_back( m_xTabPage->aFoundList[i] );
+ aRemainingVector.push_back( m_pTabPage->aFoundList[i] );
- m_xTabPage->aFoundList.clear();
+ m_pTabPage->aFoundList.clear();
for( i = 0, nCount = aRemainingVector.size(); i < nCount; ++i )
- m_xTabPage->aFoundList.push_back( aRemainingVector[ i ] );
+ m_pTabPage->aFoundList.push_back( aRemainingVector[ i ] );
aRemainingVector.clear();
// refill list box
for( i = 0, nCount = aRemoveEntries.size(); i < nCount; ++i )
if( !aRemoveEntries[ i ] )
- aRemainingVector.push_back(m_xTabPage->m_xLbxFound->get_text(i));
+ aRemainingVector.push_back(m_pTabPage->m_xLbxFound->get_text(i));
- m_xTabPage->m_xLbxFound->clear();
+ m_pTabPage->m_xLbxFound->clear();
for( i = 0, nCount = aRemainingVector.size(); i < nCount; ++i )
- m_xTabPage->m_xLbxFound->append_text(aRemainingVector[i]);
+ m_pTabPage->m_xLbxFound->append_text(aRemainingVector[i]);
aRemainingVector.clear();
- m_xTabPage->m_xLbxFound->thaw();
- m_xTabPage->SelectFoundHdl( *m_xTabPage->m_xLbxFound );
+ m_pTabPage->m_xLbxFound->thaw();
+ m_pTabPage->SelectFoundHdl( *m_pTabPage->m_xLbxFound );
xWait.reset();
@@ -363,7 +363,7 @@ IMPL_LINK_NOARG(TakeProgress, CleanUpHdl, void*, void)
void TakeProgress::LaunchThread()
{
assert(!maTakeThread.is());
- maTakeThread = new TakeThread(this, m_xTabPage, maTakenList);
+ maTakeThread = new TakeThread(this, m_pTabPage, maTakenList);
maTakeThread->launch();
}
@@ -574,9 +574,9 @@ bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet* /*rSet*/ )
return true;
}
-VclPtr<SfxTabPage> TPGalleryThemeGeneral::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> TPGalleryThemeGeneral::Create(TabPageParent pParent, const SfxItemSet* rSet)
{
- return VclPtr<TPGalleryThemeGeneral>::Create(pParent, *rSet);
+ return std::make_unique<TPGalleryThemeGeneral>(pParent, *rSet);
}
TPGalleryThemeProperties::TPGalleryThemeProperties(TabPageParent pWindow, const SfxItemSet& rSet)
@@ -636,20 +636,14 @@ void TPGalleryThemeProperties::StartSearchFiles( const OUString& _rFolderURL, sh
TPGalleryThemeProperties::~TPGalleryThemeProperties()
{
- disposeOnce();
-}
-
-void TPGalleryThemeProperties::dispose()
-{
xMediaPlayer.clear();
xDialogListener.clear();
aFilterEntryList.clear();
- SfxTabPage::dispose();
}
-VclPtr<SfxTabPage> TPGalleryThemeProperties::Create(TabPageParent pParent, const SfxItemSet* rSet)
+std::unique_ptr<SfxTabPage> TPGalleryThemeProperties::Create(TabPageParent pParent, const SfxItemSet* rSet)
{
- return VclPtr<TPGalleryThemeProperties>::Create(pParent, *rSet);
+ return std::make_unique<TPGalleryThemeProperties>(pParent, *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 309428d41c2a..78061d9fd562 100644
--- a/cui/source/inc/SvxMenuConfigPage.hxx
+++ b/cui/source/inc/SvxMenuConfigPage.hxx
@@ -58,7 +58,6 @@ private:
public:
SvxMenuConfigPage(TabPageParent pParent, const SfxItemSet& rItemSet, bool bIsMenuBar = true);
virtual ~SvxMenuConfigPage() override;
- virtual void dispose() override;
SaveInData* CreateSaveInData(
const css::uno::Reference <
diff --git a/cui/source/inc/SvxToolbarConfigPage.hxx b/cui/source/inc/SvxToolbarConfigPage.hxx
index c7e86e6a34df..a4998e9862d6 100644
--- a/cui/source/inc/SvxToolbarConfigPage.hxx
+++ b/cui/source/inc/SvxToolbarConfigPage.hxx
@@ -57,7 +57,6 @@ private:
public:
SvxToolbarConfigPage(TabPageParent pParent, const SfxItemSet& rItemSet);
virtual ~SvxToolbarConfigPage() override;
- virtual void dispose() override;
void AddFunction(int nTarget = -1);
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index e61fe5199832..c351274dc281 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -141,7 +141,6 @@ private:
public:
SfxAcceleratorConfigPage(TabPageParent pParent, const SfxItemSet& rItemSet);
virtual ~SfxAcceleratorConfigPage() override;
- virtual void dispose() override;
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet* ) override;
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index 063d5b1f59f5..69ae8ead2e82 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -46,25 +46,20 @@ namespace svx {
class AlignmentTabPage : public SfxTabPage
{
- using TabPage::DeactivatePage;
- friend class VclPtr<AlignmentTabPage>;
static const sal_uInt16 s_pRanges[];
public:
virtual ~AlignmentTabPage() override;
- virtual void dispose() override;
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+ explicit AlignmentTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet);
- static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
static const sal_uInt16* GetRanges() { return s_pRanges; }
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
- virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
private:
- explicit AlignmentTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet);
-
void InitVsRefEgde();
void UpdateEnableControls();
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 8d2c9ea1c0d9..61a239b968bf 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -51,8 +51,6 @@ public:
class OfaAutocorrOptionsPage : public SfxTabPage
{
- using TabPage::ActivatePage;
-
private:
OUString m_sInput;
OUString m_sDoubleCaps;
@@ -71,7 +69,7 @@ public:
OfaAutocorrOptionsPage(TabPageParent pParent, const SfxItemSet& rSet);
virtual ~OfaAutocorrOptionsPage() override;
- static VclPtr<SfxTabPage> Create( TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
@@ -84,9 +82,6 @@ public:
class OfaSwAutoFmtOptionsPage : public SfxTabPage
{
- friend class VclPtr<OfaSwAutoFmtOptionsPage>;
- using TabPage::ActivatePage;
-
OUString sDeleteEmptyPara;
OUString sUseReplaceTbl;
OUString sCapitalStartWord;
@@ -123,13 +118,12 @@ 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,
+ const SfxItemSet* rAttrSet);
virtual ~OfaSwAutoFmtOptionsPage() override;
- virtual void dispose() override;
-public:
- static VclPtr<SfxTabPage> Create( TabPageParent pParent,
- const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
virtual void ActivatePage( const SfxItemSet& ) override;
@@ -156,9 +150,6 @@ typedef std::map<LanguageType, StringChangeList> StringChangeTable;
class OfaAutocorrReplacePage : public SfxTabPage
{
- using TabPage::ActivatePage;
- using TabPage::DeactivatePage;
-
private:
StringChangeTable aChangesTable;
@@ -201,9 +192,8 @@ private:
public:
OfaAutocorrReplacePage(TabPageParent pParent, const SfxItemSet& rSet);
virtual ~OfaAutocorrReplacePage() override;
- virtual void dispose() override;
- static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet);
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
@@ -228,9 +218,6 @@ typedef std::map<LanguageType, StringsArrays> StringsTable;
class OfaAutocorrExceptPage : public SfxTabPage
{
- using TabPage::ActivatePage;
- using TabPage::DeactivatePage;
-
private:
StringsTable aStringsTable;
std::unique_ptr<CollatorWrapper> pCompareClass;
@@ -260,9 +247,8 @@ private:
public:
OfaAutocorrExceptPage(TabPageParent pParent, const SfxItemSet& rSet);
virtual ~OfaAutocorrExceptPage() override;
- virtual void dispose() override;
- static VclPtr<SfxTabPage> Create( TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
@@ -277,9 +263,6 @@ public:
class OfaQuoteTabPage : public SfxTabPage
{
- friend class VclPtr<OfaQuoteTabPage>;
- using TabPage::ActivatePage;
-
private:
OUString sNonBrkSpace;
OUString sOrdinal;
@@ -317,12 +300,11 @@ private:
static void CreateEntry(weld::TreeView& rLstBox, const OUString& rTxt,
sal_uInt16 nCol, sal_uInt16 nTextCol);
- OfaQuoteTabPage(TabPageParent pParent, const SfxItemSet& rSet);
public:
- virtual ~OfaQuoteTabPage() override;
-
- static VclPtr<SfxTabPage> Create(TabPageParent pParent,
+ OfaQuoteTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent,
const SfxItemSet* rAttrSet);
+ virtual ~OfaQuoteTabPage() override;
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
@@ -333,9 +315,7 @@ public:
class OfaAutoCompleteTabPage : public SfxTabPage
{
- friend class VclPtr<OfaAutoCompleteTabPage>;
private:
- using TabPage::ActivatePage;
editeng::SortedAutoCompleteStrings* m_pAutoCompleteList;
sal_uInt16 m_nAutoCmpltListCnt;
@@ -355,11 +335,11 @@ private:
DECL_LINK(CheckHdl, weld::ToggleButton&, void);
DECL_LINK(KeyReleaseHdl, const KeyEvent&, bool);
- OfaAutoCompleteTabPage(TabPageParent pParent, const SfxItemSet& rSet);
public:
- virtual ~OfaAutoCompleteTabPage() override;
- static VclPtr<SfxTabPage> Create(TabPageParent pParent,
+ OfaAutoCompleteTabPage(TabPageParent pParent, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent,
const SfxItemSet* rAttrSet);
+ virtual ~OfaAutoCompleteTabPage() override;
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
@@ -377,8 +357,6 @@ public:
*/
class OfaSmartTagOptionsTabPage : public SfxTabPage
{
- using TabPage::ActivatePage;
-
private:
// controls
@@ -423,7 +401,7 @@ public:
OfaSmartTagOptionsTabPage(TabPageParent pParent, const SfxItemSet& rSet);
virtual ~OfaSmartTagOptionsTabPage() override;
- static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet);
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet);
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 099997775374..86d52da29511 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -42,11 +42,12 @@ class SvxBrushItem;
class SvxBackgroundTabPage : public SvxTabPage
{
- using TabPage::DeactivatePage;
- friend class VclPtr<SvxBackgroundTabPage>;
static const sal_uInt16 pPageRanges[];
public:
- static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+ SvxBackgroundTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet);
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+ virtual ~SvxBackgroundTabPage() override;
+
// returns the area of the which-values
static const sal_uInt16* GetRanges() { return pPageRanges; }
@@ -65,10 +66,6 @@ protected:
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
private:
- SvxBackgroundTabPage(TabPageParent pParent, const SfxItemSet& rCoreSet);
- virtual ~SvxBackgroundTabPage() override;
- virtual void dispose() override;
-
// DDListBox for Writer -------------------------------
Color aBgdColor;
@@ -166,14 +163,10 @@ class SvxBkgTabPage : public SvxAreaTabPage
DECL_LINK(TblDestinationHdl_Impl, weld::ComboBox&, void);
public:
- using SvxAreaTabPage::ActivatePage;
- using SvxAreaTabPage::DeactivatePage;
-
SvxBkgTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
virtual ~SvxBkgTabPage() override;
- virtual void dispose() override;
- static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent, 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 92790ea285e5..30e2ad5318df 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -76,15 +76,12 @@ private:
class SvxBorderTabPage : public SfxTabPage
{
- friend class VclPtr<SvxBorderTabPage>;
- using TabPage::DeactivatePage;
-
static const sal_uInt16 pRanges[];
public:
+ SvxBorderTabPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
virtual ~SvxBorderTabPage() override;
- virtual void dispose() override;
- static VclPtr<SfxTabPage> Create( TabPageParent pParent,
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet);
static const sal_uInt16* GetRanges() { return pRanges; }
@@ -97,11 +94,8 @@ public:
void SetTableMode();
protected:
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
- virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
private:
- SvxBorderTabPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
-
std::vector<Image> m_aShadowImgVec;
std::vector<Image> m_aBorderImgVec;
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 4b4e308803bd..eeb7644049b8 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -318,7 +318,7 @@ class SvxMenuEntriesListBox
protected:
std::unique_ptr<weld::TreeView> m_xControl;
ScopedVclPtr<VirtualDevice> m_xDropDown;
- VclPtr<SvxConfigPage> pPage;
+ SvxConfigPage* m_pPage;
public:
SvxMenuEntriesListBox(std::unique_ptr<weld::TreeView> xControl, SvxConfigPage* pPage);
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 68e6879e92e0..8d98176d3bfc 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -52,11 +52,7 @@ protected:
public:
virtual ~SvxCharBasePage() override;
- using SfxTabPage::ActivatePage;
- using SfxTabPage::DeactivatePage;
-
virtual void ActivatePage( const SfxItemSet& rSet ) override;
-
};
// class SvxCharNamePage -------------------------------------------------
@@ -65,8 +61,6 @@ struct SvxCharNamePage_Impl;
class SvxCharNamePage : public SvxCharBasePage
{
- friend class VclPtr<SvxCharNamePage>;
-
private:
static const sal_uInt16 pNameRanges[];
@@ -108,8 +102,6 @@ private:
std::unique_ptr<weld::Label> m_xCTLFontTypeFT;
std::unique_ptr<weld::Button> m_xCTLFontFeaturesButton;
- SvxCharNamePage(TabPageParent pParent, const SfxItemSet& rSet);
-
void Initialize();
const FontList* GetFontList() const;
void UpdatePreview_Impl();
@@ -142,17 +134,14 @@ private:
void FontModifyHdl_Impl(const weld::Widget&);
public:
- using SfxTabPage::ActivatePage;
- using SfxTabPage::DeactivatePage;
-
virtual void ActivatePage( const SfxItemSet& rSet ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
public:
- virtual ~SvxCharNamePage() override;
- virtual void dispose() override;
+ SvxCharNamePage(TabPageParent pParent, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+ virtual ~SvxCharNamePage() override;
- static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges() { return pNameRanges; }
virtual void Reset( const SfxItemSet* rSet ) override;
@@ -171,8 +160,6 @@ public:
class SvxCharEffectsPage : public SvxCharBasePage
{
- friend class VclPtr<SvxCharEffectsPage>;
-
private:
static const sal_uInt16 pEffectsRanges[];
bool m_bOrigFontColor;
@@ -206,8 +193,6 @@ private:
std::unique_ptr<weld::ComboBox> m_xPositionLB;
std::unique_ptr<weld::Label> m_xA11yWarningFT;
- SvxCharEffectsPage(TabPageParent pParent, const SfxItemSet& rSet);
-
void Initialize();
void UpdatePreview_Impl();
void SetCaseMap_Impl( SvxCaseMap eCaseMap );
@@ -224,14 +209,13 @@ 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 );
virtual ~SvxCharEffectsPage() override;
- virtual void dispose() override;
- using SfxTabPage::DeactivatePage;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
public:
- static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges() { return pEffectsRanges; }
virtual void Reset( const SfxItemSet* rSet ) override;
@@ -243,11 +227,8 @@ public:
};
// class SvxCharPositionPage ---------------------------------------------
-
-
class SvxCharPositionPage : public SvxCharBasePage
{
- friend class VclPtr<SvxCharPositionPage>;
static const sal_uInt16 pPositionRanges[];
private:
@@ -283,8 +264,6 @@ private:
std::unique_ptr<weld::MetricSpinButton> m_xKerningMF;
std::unique_ptr<weld::CheckButton> m_xPairKerningBtn;
- SvxCharPositionPage(TabPageParent pParent, const SfxItemSet& rSet);
-
void Initialize();
void UpdatePreview_Impl( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc );
void SetEscapement_Impl( SvxEscapement nEsc );
@@ -300,14 +279,13 @@ private:
void FontModifyHdl_Impl();
public:
+ SvxCharPositionPage(TabPageParent pParent, const SfxItemSet& rSet);
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
virtual ~SvxCharPositionPage() override;
- using SfxTabPage::DeactivatePage;
-
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
public:
- static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges() { return pPositionRanges; }
virtual void Reset( const SfxItemSet* rSet ) override;
@@ -321,7 +299,6 @@ public:
class SvxCharTwoLinesPage : public SvxCharBasePage
{
- friend class VclPtr<SvxCharTwoLinesPage>;
private:
static const sal_uInt16 pTwoLinesRanges[];
sal_uInt16 m_nStartBracketPosition;
@@ -332,8 +309,6 @@ private:
std::unique_ptr<weld::TreeView> m_xStartBracketLB;
std::unique_ptr<weld::TreeView> m_xEndBracketLB;
- SvxCharTwoLinesPage(TabPageParent pParent, const SfxItemSet& rSet);
-
void UpdatePreview_Impl();
void Initialize();
void SelectCharacter(weld::TreeView* pBox);
@@ -343,15 +318,13 @@ 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 );
virtual ~SvxCharTwoLinesPage() override;
- using SfxTabPage::ActivatePage;
- using SfxTabPage::DeactivatePage;
-
virtual void ActivatePage( const SfxItemSet& rSet ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pSet ) override;
- static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
static const sal_uInt16* GetRanges() { return pTwoLinesRanges; }
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx
index 70e54e6fd8f4..d89fa4521676 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -60,9 +60,8 @@ public:
SvxConnectionPage(TabPageParent pWindow, const SfxItemSet& rInAttrs);
virtual ~SvxConnectionPage() override;
- virtual void dispose() override;
- static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 064bc660bb2e..751557c850fa 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -50,7 +50,7 @@ class SearchThread: public salhelper::Thread
private:
SearchProgress* mpProgress;
- VclPtr<TPGalleryThemeProperties> mpBrowser;
+ TPGalleryThemeProperties* mpBrowser;
INetURLObject maStartURL;
void ImplSearch( const INetURLObject& rStartURL,
@@ -71,7 +71,7 @@ class SearchProgress : public weld::GenericDialogController
{
private:
INetURLObject startUrl_;
- VclPtr<TPGalleryThemeProperties> m_xTabPage;
+ TPGalleryThemeProperties* m_pTabPage;
rtl::Reference< SearchThread > m_aSearchThread;
std::unique_ptr<weld::Label> m_xFtSearchDir;
std::unique_ptr<weld::Label> m_xFtSearchType;
@@ -95,7 +95,7 @@ class TakeThread: public salhelper::Thread
private:
TakeProgress* mpProgress;
- VclPtr<TPGalleryThemeProperties> mpBrowser;
+ TPGalleryThemeProperties* mpBrowser;
TokenList_impl& mrTakenList;
virtual ~TakeThread() override;
@@ -114,7 +114,7 @@ class TakeProgress : public weld::GenericDialogController
{
private:
weld::Window* m_pParent;
- VclPtr<TPGalleryThemeProperties> m_xTabPage;
+ TPGalleryThemeProperties* m_pTabPage;
rtl::Reference< TakeThread > maTakeThread;
TokenList_impl maTakenList;
std::unique_ptr<weld::Label> m_xFtTakeFile;
@@ -205,7 +205,7 @@ private:
public:
TPGalleryThemeGeneral(TabPageParent pParent, const SfxItemSet& rSet);
void SetXChgData( ExchangeData* pData );
- static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
};
class TPGalleryThemeProperties : public SfxTabPage
@@ -263,14 +263,13 @@ class TPGalleryThemeProperties : public SfxTabPage
public:
TPGalleryThemeProperties(TabPageParent pWindow, const SfxItemSet& rSet);
virtual ~TPGalleryThemeProperties() override;
- virtual void dispose() override;
void SetXChgData( ExchangeData* pData );
const ExchangeData* GetXChgData() const { return pData; }
void StartSearchFiles( const OUString& _rFolderURL, short _nDlgResult );
- static VclPtr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
+ static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rSet);
};
#endif // INCLUDED_CUI_SOURCE_INC_CUIGALDLG_HXX
diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index 204cab1e90c7..64c152699315 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -30,7 +30,6 @@
class SvxGeneralTabPage : public SfxTabPage
{
- using TabPage::DeactivatePage;
private:
// the "Use data for document properties" checkbox
std::unique_ptr<weld::CheckButton> m_xUseDataCB;
@@ -64,7 +63,7 @@ public:
SvxGeneralTabPage(TabPageParent pParent, const SfxItemSet& rSet);
virtual ~SvxGeneralTabPage() override;
- static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx
index 08b18187f30f..fc16a4a10d51 100644
--- a/cui/source/inc/cuisrchdlg.hxx
+++ b/cui/source/inc/cuisrchdlg.hxx
@@ -26,7 +26,7 @@ class SvxJSearchOptionsPage;
class SvxJSearchOptionsDialog : public SfxSingleTabDialogController
{
- VclPtr<SvxJSearchOptionsPage> m_xPage;
+ SvxJSearchOptionsPage* m_pPage;
SvxJSearchOptionsDialog( const SvxJSearchOptionsDialog & ) = delete;
SvxJSearchOptionsDialog & operator == ( const SvxJSearchOptionsDialog & ) = delete;
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 652e38b59d07..368090dc14bf 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -128,8 +128,6 @@ public:
class SvxTransparenceTabPage : public SfxTabPage
{
- using TabPage::ActivatePage;
- using TabPage::DeactivatePage;
static const sal_uInt16 pTransparenceRanges[];
const SfxItemSet& rOutAttrs;
@@ -191,7 +189,7 @@ public:
SvxTransparenceTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
virtual ~SvxTransparenceTabPage() override;
- static VclPtr<SfxTabPage> Create(TabPageParent, const SfxItemSet*);
+ static std::unique_ptr<SfxTabPage> Create(TabPageParent, const SfxItemSet*);
static const sal_uInt16* GetRanges() { return pTransparenceRanges; }
virtual bool FillItemSet(SfxItemSet*) override;
@@ -211,7 +209,7 @@ class SvxAreaTabPage : public SfxTabPage
{
static const sal_uInt16 pAreaRanges[];
private:
- ScopedVclPtr<SfxTabPage> m_pFillTabPage;
+ std::unique_ptr<SfxTabPage> m_xFillTabPage;
ButtonBox maBox;
XColorListRef m_pColorList;
@@ -249,7 +247,7 @@ protected:
void SetOptimalSize(weld::DialogController* pController);
void SelectFillType( weld::ToggleButton& rButton, const SfxItemSet* _pSet = nullptr );
- SfxTabPage* GetFillTabPage() { return m_pFillTabPage; }
+ SfxTabPage* GetFillTabPage() { return m_xFillTabPage.get(); }
bool IsBtnClicked() const { return m_bBtnClicked; }
@@ -264,14 +262,10 @@ private:
DeactivateRC DeactivatePage_Impl( SfxItemSet* pSet );
public:
- using TabPage::ActivatePage;
- using TabPage::DeactivatePage;
-
SvxAreaTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
virtual ~SvxAreaTabPage() override;
- virtual void dispose() override;
- static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pAreaRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
@@ -298,8 +292,6 @@ public:
class SvxShadowTabPage : public SvxTabPage
{
- using TabPage::ActivatePage;
- using TabPage::DeactivatePage;
static const sal_uInt16 pShadowRanges[];
private:
@@ -331,9 +323,8 @@ private:
public:
SvxShadowTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
virtual ~SvxShadowTabPage() override;
- virtual void dispose() override;
- static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pShadowRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
@@ -353,9 +344,6 @@ public:
class SvxGradientTabPage : public SfxTabPage
{
- using TabPage::ActivatePage;
- using TabPage::DeactivatePage;
-
private:
const SfxItemSet& m_rOutAttrs;
@@ -410,11 +398,10 @@ private:
public:
SvxGradientTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
virtual ~SvxGradientTabPage() override;
- virtual void dispose() override;
void Construct();
- static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
@@ -432,9 +419,6 @@ public:
class SvxHatchTabPage : public SfxTabPage
{
- using TabPage::ActivatePage;
- using TabPage::DeactivatePage;
-
private:
const SfxItemSet& m_rOutAttrs;
@@ -482,11 +466,10 @@ private:
public:
SvxHatchTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
virtual ~SvxHatchTabPage() override;
- virtual void dispose() override;
void Construct();
- static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
@@ -499,16 +482,12 @@ public:
void SetHtchChgd( ChangeType* pIn ) { m_pnHatchingListState = pIn; }
void SetColorChgd( ChangeType* pIn ) { m_pnColorListState = pIn; }
-
- virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
};
/************************************************************************/
class SvxBitmapTabPage : public SfxTabPage
{
- using TabPage::ActivatePage;
- using TabPage::DeactivatePage;
static const sal_uInt16 pBitmapRanges[];
private:
@@ -567,11 +546,10 @@ private:
public:
SvxBitmapTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
virtual ~SvxBitmapTabPage() override;
- virtual void dispose() override;
void Construct();
- static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
@@ -586,9 +564,6 @@ public:
class SvxPatternTabPage : public SvxTabPage
{
- using TabPage::ActivatePage;
- using TabPage::DeactivatePage;
-
private:
const SfxItemSet& m_rOutAttrs;
@@ -625,11 +600,10 @@ private:
public:
SvxPatternTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
virtual ~SvxPatternTabPage() override;
- virtual void dispose() override;
void Construct();
- static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
@@ -655,9 +629,6 @@ enum class ColorModel
class SvxColorTabPage : public SfxTabPage
{
- using TabPage::ActivatePage;
- using TabPage::DeactivatePage;
-
private:
const SfxItemSet& rOutAttrs;
@@ -743,11 +714,10 @@ private:
public:
SvxColorTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
virtual ~SvxColorTabPage() override;
- virtual void dispose() override;
void Construct();
- static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 305c6b3d3f90..ae42ecc947bb 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -87,8 +87,6 @@ struct SvxBmpItemInfo
class SvxLineTabPage : public SfxTabPage
{
- using TabPage::ActivatePage;
- using TabPage::DeactivatePage;
static const sal_uInt16 pLineRanges[];
private:
//#58425# symbols on a line (e. g. StarChart) ->
@@ -204,11 +202,10 @@ public:
SvxLineTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
virtual ~SvxLineTabPage() override;
- virtual void dispose() override;
void Construct();
- static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pLineRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
@@ -233,15 +230,12 @@ public:
void SetColorChgd( ChangeType* pIn ) { m_pnColorListState = pIn; }
virtual void PageCreated(const SfxAllItemSet& aSet) override;
- virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
};
/*************************************************************************/
class SvxLineDefTabPage : public SfxTabPage
{
- using TabPage::ActivatePage;
- using TabPage::DeactivatePage;
private:
const SfxItemSet& rOutAttrs;
XDash aDash;
@@ -299,11 +293,10 @@ private:
public:
SvxLineDefTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
virtual ~SvxLineDefTabPage() override;
- virtual void dispose() override;
void Construct();
- static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
@@ -317,17 +310,12 @@ public:
void SetPosDashLb( sal_Int32* pInPos ) { pPosDashLb = pInPos; }
void SetDashChgd( ChangeType* pIn ) { pnDashListState = pIn; }
-
- virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
};
/*************************************************************************/
class SvxLineEndDefTabPage : public SfxTabPage
{
- using TabPage::ActivatePage;
- using TabPage::DeactivatePage;
-
private:
const SfxItemSet& rOutAttrs;
const SdrObject* pPolyObj;
@@ -365,11 +353,10 @@ private:
public:
SvxLineEndDefTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
virtual ~SvxLineEndDefTabPage() override;
- virtual void dispose() override;
void Construct();
- static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
virtual bool FillItemSet( SfxItemSet* ) override;
virtual void Reset( const SfxItemSet * ) override;
@@ -384,8 +371,6 @@ public:
void SetPosLineEndLb( sal_Int32* pInPos ) { pPosLineEndLb = pInPos; }
void SetLineEndChgd( ChangeType* pIn ) { pnLineEndListState = pIn; }
-
- virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
};
#endif // INCLUDED_CUI_SOURCE_INC_CUITABLINE_HXX
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index b177fb3b0de2..dc3d9d17b232 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -70,9 +70,8 @@ namespace svx
public:
DbRegistrationOptionsPage(TabPageParent pParent, const SfxItemSet& rSet);
virtual ~DbRegistrationOptionsPage() override;
- virtual void dispose() override;
- static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rSet );
virtual bool FillItemSet( SfxItemSet* rSet ) override;
virtual void Reset( const SfxItemSet* rSet ) override;
diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx
index f1e7dbe6f718..7e3987a795e1 100644
--- a/cui/source/inc/dstribut.hxx
+++ b/cui/source/inc/dstribut.hxx
@@ -54,7 +54,7 @@ public:
class SvxDistributeDialog : public SfxSingleTabDialogController
{
- VclPtr<SvxDistributePage> mpPage;
+ SvxDistributePage* mpPage;
public:
SvxDistributeDialog(weld::Window* pParent, const SfxItemSet& rAttr,
diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index 9843e32387e4..1294c2cbab77 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -49,9 +49,6 @@ public:
class SvxGrfCropPage : public SfxTabPage
{
friend class VclPtr<SvxGrfCropPage>;
- using Window::CalcZoom;
- using TabPage::ActivatePage;
- using TabPage::DeactivatePage;
OUString aGraphicName;
Size aOrigSize;
@@ -86,10 +83,6 @@ class SvxGrfCropPage : public SfxTabPage
// Example
std::unique_ptr<weld::CustomWeld> m_xExampleWN;
- SvxGrfCropPage(TabPageParent pParent, const SfxItemSet &rSet);
- virtual ~SvxGrfCropPage() override;
- virtual void dispose() override;
-
DECL_LINK(ZoomHdl, weld::MetricSpinButton&, void);
DECL_LINK(SizeHdl, weld::MetricSpinButton&, void);
DECL_LINK(CropModifyHdl, weld::MetricSpinButton&, void);
@@ -100,9 +93,11 @@ class SvxGrfCropPage : public SfxTabPage
void GraphicHasChanged(bool bFound);
virtual void ActivatePage(const SfxItemSet& rSet) override;
- Size GetGrfOrigSize( const Graphic& ) const;
+ static Size GetGrfOrigSize(const Graphic&);
public:
- static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet *rSet );
+ SvxGrfCropPage(TabPageParent pParent, const SfxItemSet &rSet);
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet *rSet );
+ virtual ~SvxGrfCropPage() override;
virtual bool FillItemSet( SfxItemSet *rSet ) override;
virtual void Reset( const SfxItemSet *rSet ) override;
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 07d802a730b3..267d4b8f9233 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -80,9 +80,8 @@ private:
public:
SvxCaptionTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
virtual ~SvxCaptionTabPage() override;
- virtual void dispose() override;
- static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pCaptionRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
@@ -91,7 +90,6 @@ public:
void SetView( const SdrView* pSdrView )
{ pView = pSdrView; }
- virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
void FillValueSet();
};
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index 0ad8c4816bd2..07ed15d2108a 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -57,13 +57,11 @@ public:
);
virtual ~SfxMacroTabPage() override;
- virtual void dispose() override;
void AddEvent( const OUString & rEventName, SvMacroItemId nEventId );
void ScriptChanged();
virtual void PageCreated (const SfxAllItemSet& aSet) override;
- using TabPage::ActivatePage; // FIXME WTF is this nonsense?
virtual void ActivatePage( const SfxItemSet& ) override;
void LaunchFillGroup();
@@ -74,7 +72,7 @@ public:
bool IsReadOnly() const override;
// --------- inherit from the base -------------
- static VclPtr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rAttrSet );
};
class SfxMacroAssignDlg : public SfxSingleTabDialogController
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index 8cb4e5466b19..145463fadea5 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -79,7 +79,6 @@ protected:
public:
virtual ~SvxMacroTabPage_() override;
- virtual void dispose() override;
void InitResources();
void InitAndSetHandler( const css::uno::Reference< css::container::XNameReplace >& xAppEvents, const css::uno::Reference< css::container::XNameReplace >& xDocEvents, const css::uno::Reference< css::util::XModifiable >& xModifiable );
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index 9cca6a37199f..58a38e822f2b 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -69,9 +69,8 @@ public:
SvxMeasurePage(TabPageParent pWindow, const SfxItemSet& rInAttrs);
virtual ~SvxMeasurePage() override;
- virtual void dispose() override;
- static VclPtr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent, const SfxItemSet* );
static const sal_uInt16* GetRanges() { return pRanges; }
virtual bool FillItemSet( SfxItemSet* ) override;
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index cbce3ffbb1b1..b822cd369f9b 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -57,16 +57,13 @@ public:
class SvxNumberFormatTabPage : public SfxTabPage
{
- friend class VclPtr<SvxNumberFormatTabPage>;
- using SfxTabPage::DeactivatePage;
static const sal_uInt16 pRanges[];
public:
- virtual ~SvxNumberFormatTabPage() override;
- virtual void dispose() override;
-
- static VclPtr<SfxTabPage> Create( TabPageParent pParent,
+ SvxNumberFormatTabPage(TabPageParent pParent, const SfxItemSet& rCoreAttrs);
+ static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent,
const SfxItemSet* rAttrSet );
+ virtual ~SvxNumberFormatTabPage() override;
// Returns area information.
static const sal_uInt16* GetRanges() { return pRanges; }
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list