[Libreoffice-commits] core.git: 2 commits - basctl/source chart2/inc chart2/source cui/source dbaccess/source desktop/source editeng/source extensions/source filter/source include/sfx2 include/svtools include/svx include/vcl reportdesign/inc reportdesign/source 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/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Thu Sep 26 07:59:22 UTC 2019
basctl/source/basicide/baside2.cxx | 1
chart2/inc/pch/precompiled_chartcontroller.hxx | 47 +----
chart2/source/controller/dialogs/dlg_ChartType.cxx | 3
chart2/source/controller/dialogs/dlg_CreationWizard.cxx | 10 -
chart2/source/controller/dialogs/dlg_DataSource.cxx | 8
chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx | 2
chart2/source/controller/dialogs/dlg_NumberFormat.cxx | 3
chart2/source/controller/dialogs/res_ErrorBar.cxx | 26 +-
chart2/source/controller/dialogs/tp_AxisLabel.cxx | 8
chart2/source/controller/dialogs/tp_AxisLabel.hxx | 4
chart2/source/controller/dialogs/tp_AxisPositions.cxx | 8
chart2/source/controller/dialogs/tp_AxisPositions.hxx | 4
chart2/source/controller/dialogs/tp_ChartType.cxx | 16 -
chart2/source/controller/dialogs/tp_ChartType.hxx | 2
chart2/source/controller/dialogs/tp_DataLabel.cxx | 10 -
chart2/source/controller/dialogs/tp_DataLabel.hxx | 4
chart2/source/controller/dialogs/tp_DataSource.cxx | 14 -
chart2/source/controller/dialogs/tp_DataSource.hxx | 3
chart2/source/controller/dialogs/tp_ErrorBars.cxx | 10 -
chart2/source/controller/dialogs/tp_ErrorBars.hxx | 4
chart2/source/controller/dialogs/tp_LegendPosition.cxx | 8
chart2/source/controller/dialogs/tp_LegendPosition.hxx | 4
chart2/source/controller/dialogs/tp_PointGeometry.cxx | 8
chart2/source/controller/dialogs/tp_PointGeometry.hxx | 4
chart2/source/controller/dialogs/tp_PolarOptions.cxx | 8
chart2/source/controller/dialogs/tp_PolarOptions.hxx | 4
chart2/source/controller/dialogs/tp_RangeChooser.cxx | 11 -
chart2/source/controller/dialogs/tp_RangeChooser.hxx | 3
chart2/source/controller/dialogs/tp_Scale.cxx | 8
chart2/source/controller/dialogs/tp_Scale.hxx | 4
chart2/source/controller/dialogs/tp_SeriesToAxis.cxx | 8
chart2/source/controller/dialogs/tp_SeriesToAxis.hxx | 4
chart2/source/controller/dialogs/tp_TitleRotation.cxx | 12 -
chart2/source/controller/dialogs/tp_TitleRotation.hxx | 6
chart2/source/controller/dialogs/tp_Trendline.cxx | 8
chart2/source/controller/dialogs/tp_Trendline.hxx | 4
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx | 4
chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.hxx | 2
chart2/source/controller/inc/res_ErrorBar.hxx | 6
cui/source/customize/SvxMenuConfigPage.cxx | 4
cui/source/customize/SvxNotebookbarConfigPage.cxx | 6
cui/source/customize/SvxToolbarConfigPage.cxx | 4
cui/source/customize/acccfg.cxx | 4
cui/source/customize/cfg.cxx | 28 +--
cui/source/customize/eventdlg.cxx | 4
cui/source/customize/eventdlg.hxx | 2
cui/source/customize/macropg.cxx | 11 -
cui/source/dialogs/SpellDialog.cxx | 3
cui/source/dialogs/cuigaldlg.cxx | 16 -
cui/source/inc/SvxMenuConfigPage.hxx | 2
cui/source/inc/SvxNotebookbarConfigPage.hxx | 3
cui/source/inc/SvxToolbarConfigPage.hxx | 2
cui/source/inc/acccfg.hxx | 2
cui/source/inc/align.hxx | 4
cui/source/inc/autocdlg.hxx | 28 +--
cui/source/inc/backgrnd.hxx | 8
cui/source/inc/border.hxx | 4
cui/source/inc/cfg.hxx | 2
cui/source/inc/chardlg.hxx | 18 +-
cui/source/inc/connect.hxx | 4
cui/source/inc/cuigaldlg.hxx | 8
cui/source/inc/cuioptgenrl.hxx | 4
cui/source/inc/cuitabarea.hxx | 32 +--
cui/source/inc/cuitabline.hxx | 12 -
cui/source/inc/dbregister.hxx | 4
cui/source/inc/dstribut.hxx | 2
cui/source/inc/grfpage.hxx | 4
cui/source/inc/labdlg.hxx | 4
cui/source/inc/macroass.hxx | 4
cui/source/inc/macropg.hxx | 4
cui/source/inc/measure.hxx | 4
cui/source/inc/numfmt.hxx | 4
cui/source/inc/numpages.hxx | 24 +-
cui/source/inc/optasian.hxx | 4
cui/source/inc/optlingu.hxx | 4
cui/source/inc/optpath.hxx | 4
cui/source/inc/page.hxx | 4
cui/source/inc/paragrph.hxx | 16 -
cui/source/inc/swpossizetabpage.hxx | 4
cui/source/inc/tabstpge.hxx | 4
cui/source/inc/textanim.hxx | 4
cui/source/inc/textattr.hxx | 4
cui/source/inc/transfrm.hxx | 12 -
cui/source/inc/treeopt.hxx | 2
cui/source/options/connpooloptions.cxx | 8
cui/source/options/connpooloptions.hxx | 4
cui/source/options/cuisrchdlg.cxx | 3
cui/source/options/dbregister.cxx | 11 -
cui/source/options/fontsubs.cxx | 8
cui/source/options/fontsubs.hxx | 4
cui/source/options/optaccessibility.cxx | 8
cui/source/options/optaccessibility.hxx | 4
cui/source/options/optasian.cxx | 8
cui/source/options/optbasic.cxx | 8
cui/source/options/optbasic.hxx | 4
cui/source/options/optchart.cxx | 8
cui/source/options/optchart.hxx | 4
cui/source/options/optcolor.cxx | 10 -
cui/source/options/optcolor.hxx | 4
cui/source/options/optctl.cxx | 8
cui/source/options/optctl.hxx | 4
cui/source/options/optfltr.cxx | 16 -
cui/source/options/optfltr.hxx | 8
cui/source/options/optgdlg.cxx | 24 +-
cui/source/options/optgdlg.hxx | 12 -
cui/source/options/optgenrl.cxx | 9 -
cui/source/options/opthtml.cxx | 8
cui/source/options/opthtml.hxx | 4
cui/source/options/optinet2.cxx | 24 +-
cui/source/options/optinet2.hxx | 12 -
cui/source/options/optjava.cxx | 8
cui/source/options/optjava.hxx | 4
cui/source/options/optjsearch.cxx | 8
cui/source/options/optjsearch.hxx | 4
cui/source/options/optlingu.cxx | 8
cui/source/options/optopencl.cxx | 8
cui/source/options/optopencl.hxx | 4
cui/source/options/optpath.cxx | 8
cui/source/options/optsave.cxx | 8
cui/source/options/optsave.hxx | 4
cui/source/options/optupdt.cxx | 8
cui/source/options/optupdt.hxx | 4
cui/source/options/personalization.cxx | 12 -
cui/source/options/personalization.hxx | 6
cui/source/options/treeopt.cxx | 12 -
cui/source/tabpages/align.cxx | 8
cui/source/tabpages/autocdlg.cxx | 56 +++---
cui/source/tabpages/backgrnd.cxx | 18 +-
cui/source/tabpages/border.cxx | 12 -
cui/source/tabpages/chardlg.cxx | 42 ++--
cui/source/tabpages/connect.cxx | 11 -
cui/source/tabpages/dstribut.cxx | 7
cui/source/tabpages/grfpage.cxx | 8
cui/source/tabpages/labdlg.cxx | 8
cui/source/tabpages/macroass.cxx | 15 -
cui/source/tabpages/measure.cxx | 11 -
cui/source/tabpages/numfmt.cxx | 8
cui/source/tabpages/numpages.cxx | 50 ++---
cui/source/tabpages/page.cxx | 8
cui/source/tabpages/paragrph.cxx | 32 +--
cui/source/tabpages/swpossizetabpage.cxx | 8
cui/source/tabpages/tabstpge.cxx | 8
cui/source/tabpages/textanim.cxx | 10 -
cui/source/tabpages/textattr.cxx | 8
cui/source/tabpages/tparea.cxx | 29 +--
cui/source/tabpages/tpbitmap.cxx | 8
cui/source/tabpages/tpcolor.cxx | 8
cui/source/tabpages/tpgradnt.cxx | 12 -
cui/source/tabpages/tphatch.cxx | 12 -
cui/source/tabpages/tpline.cxx | 10 -
cui/source/tabpages/tplnedef.cxx | 8
cui/source/tabpages/tplneend.cxx | 8
cui/source/tabpages/tppattern.cxx | 12 -
cui/source/tabpages/tpshadow.cxx | 10 -
cui/source/tabpages/tptrans.cxx | 8
cui/source/tabpages/transfrm.cxx | 24 +-
dbaccess/source/ui/control/ColumnControlWindow.cxx | 2
dbaccess/source/ui/control/FieldDescControl.cxx | 8
dbaccess/source/ui/dlg/ConnectionHelper.cxx | 4
dbaccess/source/ui/dlg/ConnectionHelper.hxx | 2
dbaccess/source/ui/dlg/ConnectionPage.cxx | 8
dbaccess/source/ui/dlg/ConnectionPage.hxx | 4
dbaccess/source/ui/dlg/ConnectionPageSetup.cxx | 24 +-
dbaccess/source/ui/dlg/ConnectionPageSetup.hxx | 12 -
dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx | 76 ++++----
dbaccess/source/ui/dlg/DBSetupConnectionPages.hxx | 38 ++--
dbaccess/source/ui/dlg/DriverSettings.hxx | 24 +-
dbaccess/source/ui/dlg/TablesSingleDlg.cxx | 3
dbaccess/source/ui/dlg/UserAdmin.cxx | 8
dbaccess/source/ui/dlg/UserAdmin.hxx | 4
dbaccess/source/ui/dlg/adminpages.cxx | 4
dbaccess/source/ui/dlg/adminpages.hxx | 2
dbaccess/source/ui/dlg/advancedsettings.cxx | 8
dbaccess/source/ui/dlg/advancedsettings.hxx | 4
dbaccess/source/ui/dlg/dbwiz.cxx | 26 +-
dbaccess/source/ui/dlg/dbwizsetup.cxx | 36 +---
dbaccess/source/ui/dlg/detailpages.cxx | 88 +++++-----
dbaccess/source/ui/dlg/detailpages.hxx | 20 +-
dbaccess/source/ui/dlg/generalpage.cxx | 12 -
dbaccess/source/ui/dlg/generalpage.hxx | 6
dbaccess/source/ui/dlg/tablespage.cxx | 7
dbaccess/source/ui/dlg/tablespage.hxx | 2
dbaccess/source/ui/inc/FieldDescControl.hxx | 2
dbaccess/source/ui/inc/WCPage.hxx | 2
dbaccess/source/ui/inc/WColumnSelect.hxx | 2
dbaccess/source/ui/inc/WCopyTable.hxx | 2
dbaccess/source/ui/inc/WExtendPages.hxx | 16 -
dbaccess/source/ui/inc/WNameMatch.hxx | 2
dbaccess/source/ui/inc/WTabPage.hxx | 2
dbaccess/source/ui/inc/WTypeSelect.hxx | 6
dbaccess/source/ui/misc/WCPage.cxx | 4
dbaccess/source/ui/misc/WColumnSelect.cxx | 8
dbaccess/source/ui/misc/WCopyTable.cxx | 20 +-
dbaccess/source/ui/misc/WNameMatch.cxx | 4
dbaccess/source/ui/misc/WTypeSelect.cxx | 10 -
dbaccess/source/ui/tabledesign/TableFieldControl.cxx | 3
desktop/source/lib/lokclipboard.cxx | 1
editeng/source/editeng/editview.cxx | 1
extensions/source/abpilot/abpfinalpage.cxx | 8
extensions/source/abpilot/abpfinalpage.hxx | 2
extensions/source/abpilot/abspage.cxx | 10 -
extensions/source/abpilot/abspage.hxx | 2
extensions/source/abpilot/abspilot.cxx | 13 -
extensions/source/abpilot/admininvokationpage.cxx | 4
extensions/source/abpilot/admininvokationpage.hxx | 2
extensions/source/abpilot/fieldmappingpage.cxx | 4
extensions/source/abpilot/fieldmappingpage.hxx | 2
extensions/source/abpilot/tableselectionpage.cxx | 4
extensions/source/abpilot/tableselectionpage.hxx | 2
extensions/source/abpilot/typeselectionpage.cxx | 4
extensions/source/abpilot/typeselectionpage.hxx | 2
extensions/source/bibliography/bibshortcuthandler.hxx | 1
extensions/source/bibliography/datman.cxx | 2
extensions/source/bibliography/framectr.cxx | 2
extensions/source/bibliography/framectr.hxx | 2
extensions/source/dbpilots/commonpagesdbp.cxx | 12 -
extensions/source/dbpilots/commonpagesdbp.hxx | 6
extensions/source/dbpilots/controlwizard.cxx | 7
extensions/source/dbpilots/controlwizard.hxx | 2
extensions/source/dbpilots/gridwizard.cxx | 11 -
extensions/source/dbpilots/gridwizard.hxx | 6
extensions/source/dbpilots/groupboxwiz.cxx | 33 +--
extensions/source/dbpilots/groupboxwiz.hxx | 14 -
extensions/source/dbpilots/listcombowizard.cxx | 29 +--
extensions/source/dbpilots/listcombowizard.hxx | 14 -
extensions/source/propctrlr/browserview.cxx | 1
extensions/source/propctrlr/formcomponenthandler.cxx | 3
extensions/source/propctrlr/propcontroller.cxx | 1
extensions/source/propctrlr/propertyeditor.hxx | 2
filter/source/pdf/impdialog.cxx | 48 ++---
filter/source/pdf/impdialog.hxx | 24 +-
include/sfx2/dinfdlg.hxx | 16 -
include/sfx2/mgetempl.hxx | 4
include/sfx2/module.hxx | 7
include/sfx2/printopt.hxx | 4
include/sfx2/securitypage.hxx | 4
include/sfx2/tabdlg.hxx | 5
include/sfx2/viewsh.hxx | 9 -
include/svtools/genericunodialog.hxx | 2
include/svx/dlgctrl.hxx | 4
include/svx/hdft.hxx | 10 -
include/svx/optgrid.hxx | 4
include/vcl/tabpage.hxx | 26 --
include/vcl/wizardmachine.hxx | 3
reportdesign/inc/pch/precompiled_rptui.hxx | 41 +---
reportdesign/source/ui/inc/DesignView.hxx | 1
sc/inc/pch/precompiled_sc.hxx | 52 +----
sc/inc/scmod.hxx | 2
sc/source/core/data/global.cxx | 3
sc/source/ui/app/scmod.cxx | 22 +-
sc/source/ui/attrdlg/tabpages.cxx | 8
sc/source/ui/dbgui/tpsort.cxx | 16 -
sc/source/ui/dbgui/tpsubt.cxx | 36 ++--
sc/source/ui/dbgui/validate.cxx | 24 +-
sc/source/ui/docshell/tpstat.cxx | 8
sc/source/ui/inc/opredlin.hxx | 4
sc/source/ui/inc/prevwsh.hxx | 3
sc/source/ui/inc/scuitphfedit.hxx | 18 +-
sc/source/ui/inc/tabpages.hxx | 4
sc/source/ui/inc/tabvwsh.hxx | 2
sc/source/ui/inc/tpcalc.hxx | 4
sc/source/ui/inc/tpcompatibility.hxx | 4
sc/source/ui/inc/tpdefaults.hxx | 4
sc/source/ui/inc/tpformula.hxx | 4
sc/source/ui/inc/tphf.hxx | 10 -
sc/source/ui/inc/tpprint.hxx | 4
sc/source/ui/inc/tpsort.hxx | 8
sc/source/ui/inc/tpstat.hxx | 4
sc/source/ui/inc/tpsubt.hxx | 18 +-
sc/source/ui/inc/tptable.hxx | 4
sc/source/ui/inc/tpusrlst.hxx | 4
sc/source/ui/inc/tpview.hxx | 8
sc/source/ui/inc/validate.hxx | 12 -
sc/source/ui/optdlg/opredlin.cxx | 16 -
sc/source/ui/optdlg/tpcalc.cxx | 8
sc/source/ui/optdlg/tpcompatibility.cxx | 8
sc/source/ui/optdlg/tpdefaults.cxx | 8
sc/source/ui/optdlg/tpformula.cxx | 8
sc/source/ui/optdlg/tpprint.cxx | 8
sc/source/ui/optdlg/tpusrlst.cxx | 8
sc/source/ui/optdlg/tpview.cxx | 18 +-
sc/source/ui/pagedlg/scuitphfedit.cxx | 42 ++--
sc/source/ui/pagedlg/tphf.cxx | 29 +--
sc/source/ui/pagedlg/tptable.cxx | 8
sc/source/ui/unoobj/TablePivotCharts.cxx | 2
sc/source/ui/unoobj/chartuno.cxx | 2
sc/source/ui/view/prevwsh.cxx | 4
sc/source/ui/view/tabvwsh4.cxx | 4
sd/inc/pch/precompiled_sdui.hxx | 58 +++---
sd/inc/sdmod.hxx | 3
sd/source/ui/app/sdmod2.cxx | 12 -
sd/source/ui/dlg/paragr.cxx | 12 -
sd/source/ui/dlg/prntopts.cxx | 8
sd/source/ui/dlg/tpaction.cxx | 11 -
sd/source/ui/dlg/tpoption.cxx | 24 +-
sd/source/ui/inc/prntopts.hxx | 4
sd/source/ui/inc/tpaction.hxx | 4
sd/source/ui/inc/tpoption.hxx | 12 -
sd/source/ui/view/FormShellManager.cxx | 1
sd/source/ui/view/ViewShellManager.cxx | 2
sd/source/ui/view/tabcontr.cxx | 1
sfx2/source/appl/module.cxx | 2
sfx2/source/appl/openuriexternally.cxx | 1
sfx2/source/dialog/dinfdlg.cxx | 35 +--
sfx2/source/dialog/documentfontsdialog.cxx | 8
sfx2/source/dialog/mgetempl.cxx | 10 -
sfx2/source/dialog/printopt.cxx | 8
sfx2/source/dialog/securitypage.cxx | 8
sfx2/source/dialog/tabdlg.cxx | 11 -
sfx2/source/inc/documentfontsdialog.hxx | 4
sfx2/source/view/lokhelper.cxx | 1
sfx2/source/view/printer.cxx | 2
sfx2/source/view/viewprn.cxx | 2
starmath/inc/dialog.hxx | 4
starmath/inc/smmod.hxx | 2
starmath/inc/view.hxx | 2
starmath/source/dialog.cxx | 8
starmath/source/smmod.cxx | 4
starmath/source/view.cxx | 4
svtools/source/uno/genericunodialog.cxx | 2
svx/source/dialog/hdft.cxx | 20 +-
svx/source/dialog/optgrid.cxx | 8
svx/source/tbxctrls/grafctrl.cxx | 3
svx/source/toolbars/fontworkbar.cxx | 1
sw/inc/pch/precompiled_sw.hxx | 25 --
sw/inc/pch/precompiled_swui.hxx | 39 +---
sw/inc/swmodule.hxx | 2
sw/inc/view.hxx | 4
sw/source/ui/chrdlg/chardlg.cxx | 8
sw/source/ui/chrdlg/drpcps.cxx | 11 -
sw/source/ui/chrdlg/numpara.cxx | 8
sw/source/ui/chrdlg/swuiccoll.cxx | 8
sw/source/ui/chrdlg/tblnumfm.cxx | 3
sw/source/ui/config/mailconfigpage.cxx | 11 -
sw/source/ui/config/optcomp.cxx | 8
sw/source/ui/config/optload.cxx | 19 +-
sw/source/ui/config/optpage.cxx | 72 ++++----
sw/source/ui/dbui/mailmergewizard.cxx | 12 -
sw/source/ui/dbui/mmaddressblockpage.cxx | 4
sw/source/ui/dbui/mmaddressblockpage.hxx | 2
sw/source/ui/dbui/mmdocselectpage.cxx | 4
sw/source/ui/dbui/mmdocselectpage.hxx | 2
sw/source/ui/dbui/mmgreetingspage.cxx | 4
sw/source/ui/dbui/mmgreetingspage.hxx | 2
sw/source/ui/dbui/mmlayoutpage.cxx | 4
sw/source/ui/dbui/mmlayoutpage.hxx | 2
sw/source/ui/dbui/mmoutputtypepage.cxx | 4
sw/source/ui/dbui/mmoutputtypepage.hxx | 2
sw/source/ui/dialog/addrdlg.cxx | 3
sw/source/ui/dialog/docstdlg.cxx | 8
sw/source/ui/dialog/uiregionsw.cxx | 24 +-
sw/source/ui/envelp/envfmt.cxx | 8
sw/source/ui/envelp/envfmt.hxx | 4
sw/source/ui/envelp/envlop1.cxx | 8
sw/source/ui/envelp/envprt.cxx | 8
sw/source/ui/envelp/envprt.hxx | 4
sw/source/ui/envelp/label1.cxx | 26 +-
sw/source/ui/envelp/labfmt.cxx | 8
sw/source/ui/envelp/labfmt.hxx | 4
sw/source/ui/envelp/labprt.cxx | 8
sw/source/ui/envelp/labprt.hxx | 4
sw/source/ui/envelp/swuilabimp.hxx | 12 -
sw/source/ui/fldui/flddb.cxx | 8
sw/source/ui/fldui/flddb.hxx | 4
sw/source/ui/fldui/flddinf.cxx | 8
sw/source/ui/fldui/flddinf.hxx | 4
sw/source/ui/fldui/flddok.cxx | 8
sw/source/ui/fldui/flddok.hxx | 4
sw/source/ui/fldui/fldedt.cxx | 14 -
sw/source/ui/fldui/fldfunc.cxx | 8
sw/source/ui/fldui/fldfunc.hxx | 4
sw/source/ui/fldui/fldpage.cxx | 4
sw/source/ui/fldui/fldpage.hxx | 2
sw/source/ui/fldui/fldref.cxx | 8
sw/source/ui/fldui/fldref.hxx | 4
sw/source/ui/fldui/fldvar.cxx | 8
sw/source/ui/fldui/fldvar.hxx | 4
sw/source/ui/frmdlg/column.cxx | 12 -
sw/source/ui/frmdlg/frmpage.cxx | 32 +--
sw/source/ui/frmdlg/pattern.cxx | 5
sw/source/ui/frmdlg/uiborder.cxx | 3
sw/source/ui/frmdlg/wrap.cxx | 11 -
sw/source/ui/index/cnttab.cxx | 24 +-
sw/source/ui/misc/docfnote.cxx | 16 -
sw/source/ui/misc/impfnote.hxx | 8
sw/source/ui/misc/num.cxx | 8
sw/source/ui/misc/outline.cxx | 8
sw/source/ui/misc/pgfnote.cxx | 10 -
sw/source/ui/misc/pggrid.cxx | 10 -
sw/source/ui/table/tabledlg.cxx | 24 +-
sw/source/uibase/app/appopt.cxx | 20 +-
sw/source/uibase/inc/chrdlg.hxx | 4
sw/source/uibase/inc/column.hxx | 4
sw/source/uibase/inc/docstdlg.hxx | 4
sw/source/uibase/inc/drpcps.hxx | 4
sw/source/uibase/inc/envlop.hxx | 4
sw/source/uibase/inc/frmpage.hxx | 16 -
sw/source/uibase/inc/mailconfigpage.hxx | 4
sw/source/uibase/inc/num.hxx | 4
sw/source/uibase/inc/numpara.hxx | 4
sw/source/uibase/inc/optcomp.hxx | 4
sw/source/uibase/inc/optload.hxx | 8
sw/source/uibase/inc/optpage.hxx | 32 +--
sw/source/uibase/inc/outline.hxx | 4
sw/source/uibase/inc/pgfnote.hxx | 4
sw/source/uibase/inc/pggrid.hxx | 4
sw/source/uibase/inc/pview.hxx | 2
sw/source/uibase/inc/regionsw.hxx | 12 -
sw/source/uibase/inc/swuiccoll.hxx | 4
sw/source/uibase/inc/swuicnttab.hxx | 12 -
sw/source/uibase/inc/wrap.hxx | 4
sw/source/uibase/table/tablepg.hxx | 12 -
sw/source/uibase/uiview/pview.cxx | 4
sw/source/uibase/uiview/viewprt.cxx | 8
vcl/inc/wizdlg.hxx | 1
vcl/source/control/wizardmachine.cxx | 4
vcl/source/edit/vclmedit.cxx | 1
vcl/source/window/dialog.cxx | 1
vcl/source/window/window.cxx | 1
419 files changed, 1905 insertions(+), 2080 deletions(-)
New commits:
commit 468729d6490f033a2d955edbc0fd6ef932bb11a9
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Sep 25 11:05:51 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Sep 26 09:55:44 2019 +0200
drop unnecessary includes and update pch
Change-Id: Id7fa7d5b95c32fdc738a18208eb95eaec102d937
Reviewed-on: https://gerrit.libreoffice.org/79523
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx
index 8e17a864f1fe..335a51f1d918 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -51,6 +51,7 @@
#include <svl/visitem.hxx>
#include <svl/whiter.hxx>
#include <svx/svxids.hrc>
+#include <vcl/dialog.hxx>
#include <vcl/event.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx
index a6519d6dac8c..a55adf8f574c 100644
--- a/chart2/inc/pch/precompiled_chartcontroller.hxx
+++ b/chart2/inc/pch/precompiled_chartcontroller.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2019-06-06 21:24:00 using:
+ Generated on 2019-09-25 11:00:52 using:
./bin/update_pch chart2 chartcontroller --cutoff=6 --exclude:system --include:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -72,7 +72,6 @@
#include <rtl/ustrbuf.hxx>
#include <rtl/ustring.h>
#include <rtl/ustring.hxx>
-#include <rtl/uuid.h>
#include <sal/config.h>
#include <sal/detail/log.h>
#include <sal/log.hxx>
@@ -83,7 +82,8 @@
#include <vcl/EnumContext.hxx>
#include <vcl/GraphicExternalLink.hxx>
#include <vcl/GraphicObject.hxx>
-#include <vcl/IContext.hxx>
+#include <vcl/NotebookBarAddonsMerger.hxx>
+#include <vcl/Scanline.hxx>
#include <vcl/abstdlg.hxx>
#include <vcl/alpha.hxx>
#include <vcl/animate/Animation.hxx>
@@ -94,17 +94,14 @@
#include <vcl/button.hxx>
#include <vcl/cairo.hxx>
#include <vcl/checksum.hxx>
-#include <vcl/combobox.hxx>
#include <vcl/ctrl.hxx>
#include <vcl/customweld.hxx>
#include <vcl/devicecoordinate.hxx>
-#include <vcl/dialog.hxx>
#include <vcl/dllapi.h>
#include <vcl/dndhelp.hxx>
#include <vcl/dockwin.hxx>
#include <vcl/edit.hxx>
#include <vcl/errcode.hxx>
-#include <vcl/field.hxx>
#include <vcl/floatwin.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>
@@ -113,27 +110,22 @@
#include <vcl/graph.hxx>
#include <vcl/idle.hxx>
#include <vcl/image.hxx>
-#include <vcl/jobset.hxx>
#include <vcl/keycod.hxx>
#include <vcl/keycodes.hxx>
-#include <vcl/lstbox.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
#include <vcl/metaactiontypes.hxx>
#include <vcl/outdev.hxx>
#include <vcl/outdevmap.hxx>
#include <vcl/outdevstate.hxx>
-#include <vcl/prntypes.hxx>
#include <vcl/region.hxx>
-#include <vcl/salgtype.hxx>
#include <vcl/salnativewidgets.hxx>
#include <vcl/scopedbitmapaccess.hxx>
#include <vcl/settings.hxx>
-#include <vcl/spinfld.hxx>
#include <vcl/svapp.hxx>
#include <vcl/syswin.hxx>
-#include <vcl/tabpage.hxx>
#include <vcl/task.hxx>
+#include <vcl/textfilter.hxx>
#include <vcl/timer.hxx>
#include <vcl/vclenum.hxx>
#include <vcl/vclevent.hxx>
@@ -156,11 +148,8 @@
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <basegfx/range/b2drange.hxx>
-#include <basegfx/range/b2irange.hxx>
-#include <basegfx/range/b2irectangle.hxx>
#include <basegfx/range/basicrange.hxx>
#include <basegfx/tuple/b2dtuple.hxx>
-#include <basegfx/tuple/b2i64tuple.hxx>
#include <basegfx/tuple/b2ituple.hxx>
#include <basegfx/tuple/b3dtuple.hxx>
#include <basegfx/vector/b2dsize.hxx>
@@ -171,7 +160,6 @@
#include <com/sun/star/awt/GradientStyle.hpp>
#include <com/sun/star/awt/Key.hpp>
#include <com/sun/star/awt/KeyGroup.hpp>
-#include <com/sun/star/awt/XControlContainer.hpp>
#include <com/sun/star/beans/Property.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/PropertyState.hpp>
@@ -191,20 +179,17 @@
#include <com/sun/star/chart2/XChartTypeContainer.hpp>
#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>
#include <com/sun/star/chart2/XRegressionCurveContainer.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/container/XIndexReplace.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp>
#include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
#include <com/sun/star/drawing/DashStyle.hpp>
-#include <com/sun/star/drawing/FillStyle.hpp>
#include <com/sun/star/drawing/HatchStyle.hpp>
#include <com/sun/star/drawing/LineCap.hpp>
-#include <com/sun/star/drawing/LineStyle.hpp>
#include <com/sun/star/drawing/TextFitToSizeType.hpp>
-#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/embed/XStorage.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/frame/XStatusListener.hpp>
#include <com/sun/star/graphic/XPrimitive2D.hpp>
@@ -221,7 +206,6 @@
#include <com/sun/star/i18n/reservedWords.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/EventObject.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
@@ -252,7 +236,6 @@
#include <com/sun/star/util/Time.hpp>
#include <com/sun/star/util/XAccounting.hpp>
#include <com/sun/star/util/XModifyBroadcaster.hpp>
-#include <com/sun/star/view/PrintableState.hpp>
#include <com/sun/star/view/XSelectionSupplier.hpp>
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/comphelperdllapi.h>
@@ -288,6 +271,7 @@
#include <editeng/editview.hxx>
#include <editeng/eedata.hxx>
#include <editeng/eeitem.hxx>
+#include <editeng/flditem.hxx>
#include <editeng/forbiddencharacterstable.hxx>
#include <editeng/macros.hxx>
#include <editeng/outliner.hxx>
@@ -297,8 +281,6 @@
#include <i18nlangtag/i18nlangtagdllapi.h>
#include <i18nlangtag/lang.h>
#include <i18nlangtag/languagetag.hxx>
-#include <i18nutil/i18nutildllapi.h>
-#include <i18nutil/paper.hxx>
#include <i18nutil/transliteration.hxx>
#include <o3tl/cow_wrapper.hxx>
#include <o3tl/deleter.hxx>
@@ -308,8 +290,8 @@
#include <o3tl/strong_int.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <o3tl/underlyingenumvalue.hxx>
-#include <sfx2/basedlgs.hxx>
#include <sfx2/dllapi.h>
+#include <sfx2/shell.hxx>
#include <sot/formats.hxx>
#include <sot/sotdllapi.h>
#include <svl/SfxBroadcaster.hxx>
@@ -331,18 +313,17 @@
#include <svtools/optionsdrawinglayer.hxx>
#include <svtools/svtdllapi.h>
#include <svx/ActionDescriptionProvider.hxx>
+#include <svx/DiagramDataInterface.hxx>
#include <svx/XPropertyEntry.hxx>
#include <svx/chrtitem.hxx>
-#include <svx/grfcrop.hxx>
#include <svx/ipolypolygoneditorcontroller.hxx>
#include <svx/itextprovider.hxx>
-#include <svx/pageitem.hxx>
-#include <svx/sdgcpitm.hxx>
#include <svx/sdr/animation/scheduler.hxx>
#include <svx/sdr/overlay/overlayobject.hxx>
#include <svx/sdr/overlay/overlayobjectlist.hxx>
+#include <svx/sdr/properties/defaultproperties.hxx>
+#include <svx/sdr/properties/properties.hxx>
#include <svx/sdrobjectuser.hxx>
-#include <svx/sdrpageuser.hxx>
#include <svx/sdtaditm.hxx>
#include <svx/sdtaitm.hxx>
#include <svx/sdtakitm.hxx>
@@ -364,7 +345,6 @@
#include <svx/svdobj.hxx>
#include <svx/svdoedge.hxx>
#include <svx/svdotext.hxx>
-#include <svx/svdpagv.hxx>
#include <svx/svdpntv.hxx>
#include <svx/svdpoev.hxx>
#include <svx/svdsnpv.hxx>
@@ -376,20 +356,13 @@
#include <svx/svxdllapi.h>
#include <svx/xdash.hxx>
#include <svx/xdef.hxx>
-#include <svx/xenum.hxx>
-#include <svx/xfillit0.hxx>
-#include <svx/xflasit.hxx>
#include <svx/xgrad.hxx>
#include <svx/xhatch.hxx>
#include <svx/xit.hxx>
-#include <svx/xlineit0.hxx>
-#include <svx/xlnasit.hxx>
#include <svx/xpoly.hxx>
#include <svx/xtable.hxx>
-#include <svx/xtextit0.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/color.hxx>
-#include <tools/contnr.hxx>
#include <tools/date.hxx>
#include <tools/datetime.hxx>
#include <tools/diagnose_ex.h>
diff --git a/chart2/source/controller/inc/res_ErrorBar.hxx b/chart2/source/controller/inc/res_ErrorBar.hxx
index 3204b35ef11b..18fc12362663 100644
--- a/chart2/source/controller/inc/res_ErrorBar.hxx
+++ b/chart2/source/controller/inc/res_ErrorBar.hxx
@@ -23,7 +23,6 @@
#include <tools/link.hxx>
#include <svl/itemset.hxx>
#include <svx/chrtitem.hxx>
-#include <vcl/tabpage.hxx>
#include "RangeSelectionListener.hxx"
namespace com { namespace sun { namespace star { namespace chart2 { class XChartDocument; } } } }
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index a70e984bb3c1..aa6f7f5b0a02 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -26,8 +26,6 @@
#include <sfx2/basedlgs.hxx>
#include <svtools/restartdialog.hxx>
-#include <vcl/tabpage.hxx>
-#include <vcl/treelistbox.hxx>
class SfxModule;
class SfxShell;
diff --git a/desktop/source/lib/lokclipboard.cxx b/desktop/source/lib/lokclipboard.cxx
index d0bd9a57e684..c80e70b11f56 100644
--- a/desktop/source/lib/lokclipboard.cxx
+++ b/desktop/source/lib/lokclipboard.cxx
@@ -11,6 +11,7 @@
#include <unordered_map>
#include <vcl/lazydelete.hxx>
#include <sfx2/lokhelper.hxx>
+#include <sal/log.hxx>
#include <cppuhelper/supportsservice.hxx>
using namespace css;
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 641a920d7ba2..5e16a43fe095 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -20,6 +20,7 @@
#include <memory>
#include <sal/macros.h>
+#include <vcl/builder.hxx>
#include <vcl/image.hxx>
#include <com/sun/star/i18n/WordType.hpp>
diff --git a/extensions/source/abpilot/abspage.cxx b/extensions/source/abpilot/abspage.cxx
index 774ed245e0b0..ee36cee27ab1 100644
--- a/extensions/source/abpilot/abspage.cxx
+++ b/extensions/source/abpilot/abspage.cxx
@@ -22,7 +22,6 @@
namespace abp
{
- using namespace ::svt;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx
index e6e16d118076..b106212d6d5d 100644
--- a/extensions/source/abpilot/abspilot.cxx
+++ b/extensions/source/abpilot/abspilot.cxx
@@ -50,7 +50,6 @@ namespace abp
#define PATH_NO_FIELDS 3
#define PATH_NO_SETTINGS_NO_FIELDS 4
- using namespace ::svt;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
diff --git a/extensions/source/bibliography/bibshortcuthandler.hxx b/extensions/source/bibliography/bibshortcuthandler.hxx
index 1e9099dd039d..e9e397cd5fd7 100644
--- a/extensions/source/bibliography/bibshortcuthandler.hxx
+++ b/extensions/source/bibliography/bibshortcuthandler.hxx
@@ -22,7 +22,6 @@
#include <vcl/window.hxx>
#include <vcl/splitwin.hxx>
-#include <vcl/tabpage.hxx>
// additional classes to handle shortcuts
// code in bibcont.cxx
diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx
index 740c821571b2..59ce90acbe7d 100644
--- a/extensions/source/dbpilots/controlwizard.cxx
+++ b/extensions/source/dbpilots/controlwizard.cxx
@@ -61,7 +61,6 @@ namespace dbp
using namespace ::com::sun::star::sheet;
using namespace ::com::sun::star::form;
using namespace ::com::sun::star::task;
- using namespace ::svt;
using namespace ::comphelper;
using namespace ::dbtools;
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx
index aba9a1f46506..f64897ca534c 100644
--- a/extensions/source/dbpilots/gridwizard.cxx
+++ b/extensions/source/dbpilots/gridwizard.cxx
@@ -47,7 +47,6 @@ namespace dbp
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::form;
using namespace ::com::sun::star::awt;
- using namespace ::svt;
OGridWizard::OGridWizard(weld::Window* _pParent,
const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext )
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index 4ea1fc2ec369..97bf0273da38 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -38,7 +38,6 @@ namespace dbp
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::form;
- using namespace ::svt;
OGroupBoxWizard::OGroupBoxWizard(weld::Window* _pParent,
const Reference< XPropertySet >& _rxObjectModel, const Reference< XComponentContext >& _rxContext )
diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx
index f7be36c12af3..8192180e9c1a 100644
--- a/extensions/source/dbpilots/listcombowizard.cxx
+++ b/extensions/source/dbpilots/listcombowizard.cxx
@@ -43,7 +43,6 @@ namespace dbp
using namespace ::com::sun::star::sdbcx;
using namespace ::com::sun::star::container;
using namespace ::com::sun::star::form;
- using namespace ::svt;
using namespace ::dbtools;
OListComboWizard::OListComboWizard(weld::Window* _pParent,
diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx
index 821e7c6b9eb5..2b7f003bf54e 100644
--- a/extensions/source/propctrlr/browserview.cxx
+++ b/extensions/source/propctrlr/browserview.cxx
@@ -22,7 +22,6 @@
#include <helpids.h>
#include <propctrlr.h>
#include <vcl/event.hxx>
-#include <vcl/tabpage.hxx>
#include <memory>
namespace pcr
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index 862f76c4154e..739f83aa4a63 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -46,7 +46,6 @@
#include <comphelper/property.hxx>
#include <vcl/weld.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/tabpage.hxx>
#include <osl/mutex.hxx>
#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/component_context.hxx>
diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx
index ada9db6f1261..39b416fc2c49 100644
--- a/extensions/source/propctrlr/propertyeditor.hxx
+++ b/extensions/source/propctrlr/propertyeditor.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/inspection/XPropertyControl.hpp>
#include <vcl/tabctrl.hxx>
-#include <vcl/vclptr.hxx>
+#include <vcl/tabpage.hxx>
#include <map>
namespace pcr
diff --git a/include/sfx2/module.hxx b/include/sfx2/module.hxx
index 6278b7f0a8bf..6f9777aca7cb 100644
--- a/include/sfx2/module.hxx
+++ b/include/sfx2/module.hxx
@@ -24,7 +24,6 @@
#include <sfx2/dllapi.h>
#include <sfx2/shell.hxx>
#include <sfx2/styfitem.hxx>
-#include <vcl/tabpage.hxx>
#include <sal/types.h>
#include <tools/fldunit.hxx>
#include <com/sun/star/uno/Reference.hxx>
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index 3d0176fe3964..0245ff6bbd6c 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -25,7 +25,6 @@
#include <sfx2/basedlgs.hxx>
#include <sal/types.h>
#include <vcl/builderpage.hxx>
-#include <vcl/tabpage.hxx>
#include <svl/itempool.hxx>
#include <svl/itemset.hxx>
#include <o3tl/typed_flags_set.hxx>
diff --git a/include/sfx2/viewsh.hxx b/include/sfx2/viewsh.hxx
index 8e781d2d1611..4fb019a43132 100644
--- a/include/sfx2/viewsh.hxx
+++ b/include/sfx2/viewsh.hxx
@@ -31,7 +31,6 @@
#include <vcl/errcode.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <vcl/vclptr.hxx>
-#include <vcl/tabpage.hxx>
#include <LibreOfficeKit/LibreOfficeKitTypes.h>
#include <editeng/outliner.hxx>
#include <functional>
diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx
index 298d488d0d23..1c1e2d246148 100644
--- a/include/svtools/genericunodialog.hxx
+++ b/include/svtools/genericunodialog.hxx
@@ -31,8 +31,6 @@
#include <comphelper/propertycontainer.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <tools/link.hxx>
-#include <vcl/dialog.hxx>
-#include <vcl/vclptr.hxx>
#include <vcl/weld.hxx>
namespace com :: sun :: star :: awt { class XWindow; }
diff --git a/include/vcl/wizardmachine.hxx b/include/vcl/wizardmachine.hxx
index 6fb6adf3390f..8b37a5d10ac2 100644
--- a/include/vcl/wizardmachine.hxx
+++ b/include/vcl/wizardmachine.hxx
@@ -23,7 +23,6 @@
#include <vcl/dllapi.h>
#include <vcl/builderpage.hxx>
#include <vcl/idle.hxx>
-#include <vcl/tabpage.hxx>
namespace weld {
class Builder;
diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx
index 0c85969347da..e1fb7ce9b2b2 100644
--- a/reportdesign/inc/pch/precompiled_rptui.hxx
+++ b/reportdesign/inc/pch/precompiled_rptui.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2019-06-06 09:42:49 using:
+ Generated on 2019-09-25 10:59:58 using:
./bin/update_pch reportdesign rptui --cutoff=4 --exclude:system --include:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -97,8 +97,9 @@
#include <vcl/EnumContext.hxx>
#include <vcl/GraphicExternalLink.hxx>
#include <vcl/GraphicObject.hxx>
-#include <vcl/IContext.hxx>
#include <vcl/IDialogRenderable.hxx>
+#include <vcl/NotebookBarAddonsMerger.hxx>
+#include <vcl/Scanline.hxx>
#include <vcl/abstdlg.hxx>
#include <vcl/alpha.hxx>
#include <vcl/animate/Animation.hxx>
@@ -106,9 +107,9 @@
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/builder.hxx>
+#include <vcl/builderpage.hxx>
#include <vcl/cairo.hxx>
#include <vcl/checksum.hxx>
-#include <vcl/combobox.hxx>
#include <vcl/ctrl.hxx>
#include <vcl/customweld.hxx>
#include <vcl/devicecoordinate.hxx>
@@ -119,7 +120,6 @@
#include <vcl/edit.hxx>
#include <vcl/errcode.hxx>
#include <vcl/event.hxx>
-#include <vcl/field.hxx>
#include <vcl/floatwin.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>
@@ -129,7 +129,6 @@
#include <vcl/headbar.hxx>
#include <vcl/idle.hxx>
#include <vcl/image.hxx>
-#include <vcl/jobset.hxx>
#include <vcl/keycod.hxx>
#include <vcl/keycodes.hxx>
#include <vcl/lstbox.hxx>
@@ -139,17 +138,15 @@
#include <vcl/outdev.hxx>
#include <vcl/outdevmap.hxx>
#include <vcl/outdevstate.hxx>
-#include <vcl/prntypes.hxx>
#include <vcl/region.hxx>
#include <vcl/salnativewidgets.hxx>
#include <vcl/scopedbitmapaccess.hxx>
#include <vcl/settings.hxx>
-#include <vcl/spinfld.hxx>
#include <vcl/status.hxx>
#include <vcl/svapp.hxx>
#include <vcl/syswin.hxx>
-#include <vcl/tabpage.hxx>
#include <vcl/task.hxx>
+#include <vcl/textfilter.hxx>
#include <vcl/timer.hxx>
#include <vcl/transfer.hxx>
#include <vcl/treelistentries.hxx>
@@ -185,12 +182,10 @@
#include <basegfx/vector/b3dvector.hxx>
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
-#include <com/sun/star/awt/FontDescriptor.hpp>
#include <com/sun/star/awt/FontSlant.hpp>
#include <com/sun/star/awt/GradientStyle.hpp>
#include <com/sun/star/awt/Key.hpp>
#include <com/sun/star/awt/KeyGroup.hpp>
-#include <com/sun/star/awt/XControlContainer.hpp>
#include <com/sun/star/beans/Property.hpp>
#include <com/sun/star/beans/PropertyState.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
@@ -204,11 +199,11 @@
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/beans/XVetoableChangeListener.hpp>
#include <com/sun/star/container/XContainerListener.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/container/XIndexReplace.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/datatransfer/DataFlavor.hpp>
#include <com/sun/star/datatransfer/XTransferable2.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
#include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp>
@@ -217,14 +212,13 @@
#include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
#include <com/sun/star/drawing/DashStyle.hpp>
-#include <com/sun/star/drawing/FillStyle.hpp>
#include <com/sun/star/drawing/HatchStyle.hpp>
#include <com/sun/star/drawing/LineCap.hpp>
-#include <com/sun/star/drawing/LineStyle.hpp>
#include <com/sun/star/drawing/TextFitToSizeType.hpp>
#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/embed/Aspects.hpp>
#include <com/sun/star/embed/XStorage.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XStatusListener.hpp>
#include <com/sun/star/frame/XStatusbarController.hpp>
#include <com/sun/star/frame/XTerminateListener.hpp>
@@ -235,12 +229,10 @@
#include <com/sun/star/i18n/WordType.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/EventObject.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/lang/NullPointerException.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
@@ -268,7 +260,6 @@
#include <com/sun/star/util/Time.hpp>
#include <com/sun/star/util/XAccounting.hpp>
#include <com/sun/star/util/XUpdatable.hpp>
-#include <com/sun/star/view/PrintableState.hpp>
#include <com/sun/star/view/XSelectionChangeListener.hpp>
#include <comphelper/broadcasthelper.hxx>
#include <comphelper/comphelperdllapi.h>
@@ -313,13 +304,13 @@
#include <editeng/editstat.hxx>
#include <editeng/editview.hxx>
#include <editeng/eedata.hxx>
+#include <editeng/flditem.hxx>
#include <editeng/forbiddencharacterstable.hxx>
#include <editeng/macros.hxx>
#include <editeng/outliner.hxx>
#include <editeng/paragraphdata.hxx>
#include <editeng/svxenum.hxx>
#include <editeng/svxfont.hxx>
-#include <editeng/unoipset.hxx>
#include <formula/compiler.hxx>
#include <formula/formuladllapi.h>
#include <formula/opcode.hxx>
@@ -328,8 +319,6 @@
#include <i18nlangtag/i18nlangtagdllapi.h>
#include <i18nlangtag/lang.h>
#include <i18nlangtag/mslangid.hxx>
-#include <i18nutil/i18nutildllapi.h>
-#include <i18nutil/paper.hxx>
#include <o3tl/cow_wrapper.hxx>
#include <o3tl/deleter.hxx>
#include <o3tl/enumarray.hxx>
@@ -371,16 +360,16 @@
#include <svtools/svtdllapi.h>
#include <svtools/toolboxcontroller.hxx>
#include <svtools/valueset.hxx>
+#include <svx/DiagramDataInterface.hxx>
#include <svx/Palette.hxx>
#include <svx/XPropertyEntry.hxx>
-#include <svx/grfcrop.hxx>
#include <svx/ipolypolygoneditorcontroller.hxx>
#include <svx/itextprovider.hxx>
-#include <svx/pageitem.hxx>
-#include <svx/sdgcpitm.hxx>
#include <svx/sdr/animation/scheduler.hxx>
#include <svx/sdr/overlay/overlayobject.hxx>
#include <svx/sdr/overlay/overlayobjectlist.hxx>
+#include <svx/sdr/properties/defaultproperties.hxx>
+#include <svx/sdr/properties/properties.hxx>
#include <svx/sdrobjectuser.hxx>
#include <svx/sdrpageuser.hxx>
#include <svx/sdtaditm.hxx>
@@ -406,7 +395,6 @@
#include <svx/svdoattr.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdoedge.hxx>
-#include <svx/svdorect.hxx>
#include <svx/svdotext.hxx>
#include <svx/svdpagv.hxx>
#include <svx/svdpntv.hxx>
@@ -422,17 +410,11 @@
#include <svx/xcolit.hxx>
#include <svx/xdash.hxx>
#include <svx/xdef.hxx>
-#include <svx/xenum.hxx>
-#include <svx/xfillit0.hxx>
-#include <svx/xflasit.hxx>
#include <svx/xgrad.hxx>
#include <svx/xhatch.hxx>
#include <svx/xit.hxx>
-#include <svx/xlineit0.hxx>
-#include <svx/xlnasit.hxx>
#include <svx/xpoly.hxx>
#include <svx/xtable.hxx>
-#include <svx/xtextit0.hxx>
#include <toolkit/dllapi.h>
#include <toolkit/helper/convert.hxx>
#include <toolkit/helper/vclunohelper.hxx>
@@ -454,7 +436,6 @@
#include <tools/poly.hxx>
#include <tools/ref.hxx>
#include <tools/solar.h>
-#include <tools/stream.hxx>
#include <tools/time.hxx>
#include <tools/toolsdllapi.h>
#include <tools/weakbase.h>
diff --git a/reportdesign/source/ui/inc/DesignView.hxx b/reportdesign/source/ui/inc/DesignView.hxx
index 904c733f1659..5a5adf9ab8ef 100644
--- a/reportdesign/source/ui/inc/DesignView.hxx
+++ b/reportdesign/source/ui/inc/DesignView.hxx
@@ -35,7 +35,6 @@
#include "ReportDefines.hxx"
#include <svtools/colorcfg.hxx>
#include <svx/svdedtv.hxx>
-#include <vcl/tabpage.hxx>
#include <vcl/splitwin.hxx>
#include "MarkedSection.hxx"
#include "ScrollHelper.hxx"
diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx
index b964b8a8fcd5..747ed1b57eb4 100644
--- a/sc/inc/pch/precompiled_sc.hxx
+++ b/sc/inc/pch/precompiled_sc.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2019-05-12 16:57:13 using:
+ Generated on 2019-09-25 10:58:26 using:
./bin/update_pch sc sc --cutoff=12 --exclude:system --include:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -65,6 +65,7 @@
#include <osl/module.hxx>
#include <osl/mutex.h>
#include <osl/mutex.hxx>
+#include <osl/security.h>
#include <osl/security.hxx>
#include <osl/thread.h>
#include <osl/time.h>
@@ -98,8 +99,9 @@
#include <vcl/EnumContext.hxx>
#include <vcl/GraphicExternalLink.hxx>
#include <vcl/GraphicObject.hxx>
-#include <vcl/IContext.hxx>
#include <vcl/IDialogRenderable.hxx>
+#include <vcl/NotebookBarAddonsMerger.hxx>
+#include <vcl/Scanline.hxx>
#include <vcl/abstdlg.hxx>
#include <vcl/alpha.hxx>
#include <vcl/animate/Animation.hxx>
@@ -107,17 +109,13 @@
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/builder.hxx>
-#include <vcl/button.hxx>
#include <vcl/checksum.hxx>
-#include <vcl/combobox.hxx>
#include <vcl/ctrl.hxx>
#include <vcl/dialog.hxx>
#include <vcl/dllapi.h>
#include <vcl/dndhelp.hxx>
-#include <vcl/dockwin.hxx>
#include <vcl/edit.hxx>
#include <vcl/errcode.hxx>
-#include <vcl/field.hxx>
#include <vcl/floatwin.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>
@@ -133,13 +131,11 @@
#include <vcl/region.hxx>
#include <vcl/scopedbitmapaccess.hxx>
#include <vcl/settings.hxx>
-#include <vcl/spinfld.hxx>
#include <vcl/svapp.hxx>
#include <vcl/syswin.hxx>
-#include <vcl/tabpage.hxx>
#include <vcl/task.hxx>
+#include <vcl/textfilter.hxx>
#include <vcl/timer.hxx>
-#include <vcl/toolbox.hxx>
#include <vcl/uitest/factory.hxx>
#include <vcl/vclenum.hxx>
#include <vcl/vclevent.hxx>
@@ -147,7 +143,6 @@
#include <vcl/vclreferencebase.hxx>
#include <vcl/vectorgraphicdata.hxx>
#include <vcl/virdev.hxx>
-#include <vcl/waitobj.hxx>
#include <vcl/weld.hxx>
#include <vcl/window.hxx>
#endif // PCH_LEVEL >= 2
@@ -176,7 +171,6 @@
#include <com/sun/star/awt/GradientStyle.hpp>
#include <com/sun/star/awt/Key.hpp>
#include <com/sun/star/awt/KeyGroup.hpp>
-#include <com/sun/star/awt/XControlContainer.hpp>
#include <com/sun/star/beans/Property.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/PropertyState.hpp>
@@ -191,32 +185,23 @@
#include <com/sun/star/beans/XVetoableChangeListener.hpp>
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/datatransfer/DataFlavor.hpp>
-#include <com/sun/star/datatransfer/XTransferable2.hpp>
-#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
-#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
-#include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp>
-#include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp>
#include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp>
#include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
#include <com/sun/star/drawing/DashStyle.hpp>
-#include <com/sun/star/drawing/FillStyle.hpp>
#include <com/sun/star/drawing/HatchStyle.hpp>
-#include <com/sun/star/drawing/LineStyle.hpp>
#include <com/sun/star/drawing/TextFitToSizeType.hpp>
-#include <com/sun/star/embed/Aspects.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/embed/XStorage.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XStatusListener.hpp>
-#include <com/sun/star/frame/XTerminateListener.hpp>
#include <com/sun/star/frame/XToolbarController.hpp>
#include <com/sun/star/graphic/XPrimitive2D.hpp>
#include <com/sun/star/i18n/ForbiddenCharacters.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/EventObject.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
+#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -300,10 +285,10 @@
#include <editeng/forbiddencharacterstable.hxx>
#include <editeng/justifyitem.hxx>
#include <editeng/langitem.hxx>
+#include <editeng/lineitem.hxx>
#include <editeng/outliner.hxx>
#include <editeng/paragraphdata.hxx>
#include <editeng/postitem.hxx>
-#include <editeng/sizeitem.hxx>
#include <editeng/svxenum.hxx>
#include <editeng/svxfont.hxx>
#include <editeng/wghtitem.hxx>
@@ -334,7 +319,6 @@
#include <sfx2/request.hxx>
#include <sfx2/tbxctrl.hxx>
#include <sfx2/viewfrm.hxx>
-#include <sot/exchange.hxx>
#include <sot/formats.hxx>
#include <sot/sotdllapi.h>
#include <svl/SfxBroadcaster.hxx>
@@ -348,7 +332,6 @@
#include <svl/lstner.hxx>
#include <svl/poolitem.hxx>
#include <svl/sharedstringpool.hxx>
-#include <svl/srchitem.hxx>
#include <svl/stritem.hxx>
#include <svl/style.hxx>
#include <svl/stylesheetuser.hxx>
@@ -364,21 +347,18 @@
#include <svtools/toolboxcontroller.hxx>
#include <svx/XPropertyEntry.hxx>
#include <svx/algitem.hxx>
-#include <svx/grfcrop.hxx>
-#include <svx/ipolypolygoneditorcontroller.hxx>
#include <svx/itextprovider.hxx>
-#include <svx/pageitem.hxx>
-#include <svx/sdgcpitm.hxx>
#include <svx/sdr/animation/scheduler.hxx>
#include <svx/sdr/overlay/overlayobject.hxx>
#include <svx/sdr/overlay/overlayobjectlist.hxx>
+#include <svx/sdr/properties/defaultproperties.hxx>
+#include <svx/sdr/properties/properties.hxx>
#include <svx/sdrobjectuser.hxx>
#include <svx/sdtaditm.hxx>
#include <svx/sdtaitm.hxx>
#include <svx/sdtakitm.hxx>
#include <svx/svddef.hxx>
#include <svx/svddrag.hxx>
-#include <svx/svdedtv.hxx>
#include <svx/svdglue.hxx>
#include <svx/svdhdl.hxx>
#include <svx/svdhlpln.hxx>
@@ -391,7 +371,6 @@
#include <svx/svdobj.hxx>
#include <svx/svdocapt.hxx>
#include <svx/svdoedge.hxx>
-#include <svx/svdograf.hxx>
#include <svx/svdoole2.hxx>
#include <svx/svdotext.hxx>
#include <svx/svdouno.hxx>
@@ -408,35 +387,25 @@
#include <svx/svxdllapi.h>
#include <svx/xdash.hxx>
#include <svx/xdef.hxx>
-#include <svx/xenum.hxx>
-#include <svx/xfillit0.hxx>
-#include <svx/xflasit.hxx>
#include <svx/xgrad.hxx>
#include <svx/xhatch.hxx>
#include <svx/xit.hxx>
-#include <svx/xlineit0.hxx>
-#include <svx/xlnasit.hxx>
#include <svx/xpoly.hxx>
#include <svx/xtable.hxx>
-#include <svx/xtextit0.hxx>
#include <tools/color.hxx>
-#include <tools/contnr.hxx>
#include <tools/date.hxx>
#include <tools/datetime.hxx>
-#include <tools/debug.hxx>
#include <tools/fldunit.hxx>
#include <tools/fontenum.hxx>
#include <tools/fract.hxx>
#include <tools/gen.hxx>
#include <tools/globname.hxx>
#include <tools/helpers.hxx>
-#include <tools/lineend.hxx>
#include <tools/link.hxx>
#include <tools/mapunit.hxx>
#include <tools/poly.hxx>
#include <tools/ref.hxx>
#include <tools/solar.h>
-#include <tools/stream.hxx>
#include <tools/time.hxx>
#include <tools/toolsdllapi.h>
#include <tools/urlobj.hxx>
@@ -502,7 +471,6 @@
#include <formula/token.hxx>
#include <formula/vectortoken.hxx>
#include <formulacell.hxx>
-#include <funcdesc.hxx>
#include <global.hxx>
#include <globalnames.hxx>
#include <hints.hxx>
diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 19722265ce67..14c16fde8e33 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <vcl/svapp.hxx>
#include <scitems.hxx>
#include <svx/algitem.hxx>
#include <editeng/brushitem.hxx>
@@ -34,8 +33,10 @@
#include <svl/stritem.hxx>
#include <svl/zforlist.hxx>
#include <svl/zformat.hxx>
+#include <vcl/keycodes.hxx>
#include <vcl/virdev.hxx>
#include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
#include <unotools/charclass.hxx>
#include <unotools/securityoptions.hxx>
#include <osl/diagnose.h>
diff --git a/sc/source/ui/inc/prevwsh.hxx b/sc/source/ui/inc/prevwsh.hxx
index 9ea577b4f622..6c9ab3ac0b59 100644
--- a/sc/source/ui/inc/prevwsh.hxx
+++ b/sc/source/ui/inc/prevwsh.hxx
@@ -25,6 +25,7 @@
#include <sfx2/viewsh.hxx>
#include <sfx2/zoomitem.hxx>
+#include <vcl/syswin.hxx>
#include <shellids.hxx>
diff --git a/sc/source/ui/unoobj/TablePivotCharts.cxx b/sc/source/ui/unoobj/TablePivotCharts.cxx
index a15250afdb62..9c896e27fa97 100644
--- a/sc/source/ui/unoobj/TablePivotCharts.cxx
+++ b/sc/source/ui/unoobj/TablePivotCharts.cxx
@@ -119,7 +119,7 @@ void SAL_CALL TablePivotCharts::addNewByName(OUString const & rName,
sal_Int64 nAspect(embed::Aspects::MSOLE_CONTENT);
MapUnit aMapUnit(VCLUnoHelper::UnoEmbed2VCLMapUnit(xObject->getMapUnit(nAspect)));
Size aSize(aInsRect.GetSize());
- aSize = vcl::Window::LogicToLogic(aSize, MapMode(MapUnit::Map100thMM), MapMode(aMapUnit));
+ aSize = OutputDevice::LogicToLogic(aSize, MapMode(MapUnit::Map100thMM), MapMode(aMapUnit));
awt::Size aAwtSize;
aAwtSize.Width = aSize.Width();
aAwtSize.Height = aSize.Height();
diff --git a/sc/source/ui/unoobj/chartuno.cxx b/sc/source/ui/unoobj/chartuno.cxx
index f158fd0c7686..c3b7e4f47380 100644
--- a/sc/source/ui/unoobj/chartuno.cxx
+++ b/sc/source/ui/unoobj/chartuno.cxx
@@ -192,7 +192,7 @@ void SAL_CALL ScChartsObj::addNewByName( const OUString& rName,
sal_Int64 nAspect(embed::Aspects::MSOLE_CONTENT);
MapUnit aMapUnit(VCLUnoHelper::UnoEmbed2VCLMapUnit( xObj->getMapUnit( nAspect ) ));
Size aSize(aInsRect.GetSize());
- aSize = vcl::Window::LogicToLogic( aSize, MapMode( MapUnit::Map100thMM ), MapMode( aMapUnit ) );
+ aSize = OutputDevice::LogicToLogic( aSize, MapMode( MapUnit::Map100thMM ), MapMode( aMapUnit ) );
awt::Size aSz;
aSz.Width = aSize.Width();
aSz.Height = aSize.Height();
diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx
index 8b1ff61d9710..5db0c8f19ca1 100644
--- a/sd/inc/pch/precompiled_sdui.hxx
+++ b/sd/inc/pch/precompiled_sdui.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2019-05-12 16:57:18 using:
+ Generated on 2019-09-25 10:58:48 using:
./bin/update_pch sd sdui --cutoff=4 --exclude:system --include:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -34,6 +34,7 @@
#include <limits.h>
#include <limits>
#include <list>
+#include <map>
#include <math.h>
#include <memory>
#include <new>
@@ -87,9 +88,9 @@
#include <vcl/EnumContext.hxx>
#include <vcl/GraphicExternalLink.hxx>
#include <vcl/GraphicObject.hxx>
-#include <vcl/IContext.hxx>
#include <vcl/IDialogRenderable.hxx>
-#include <vcl/NotebookbarContextControl.hxx>
+#include <vcl/NotebookBarAddonsMerger.hxx>
+#include <vcl/Scanline.hxx>
#include <vcl/abstdlg.hxx>
#include <vcl/alpha.hxx>
#include <vcl/animate/Animation.hxx>
@@ -97,10 +98,8 @@
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/builder.hxx>
-#include <vcl/button.hxx>
#include <vcl/cairo.hxx>
#include <vcl/checksum.hxx>
-#include <vcl/combobox.hxx>
#include <vcl/ctrl.hxx>
#include <vcl/customweld.hxx>
#include <vcl/devicecoordinate.hxx>
@@ -110,7 +109,6 @@
#include <vcl/dockwin.hxx>
#include <vcl/edit.hxx>
#include <vcl/errcode.hxx>
-#include <vcl/field.hxx>
#include <vcl/floatwin.hxx>
#include <vcl/fntstyle.hxx>
#include <vcl/font.hxx>
@@ -118,25 +116,26 @@
#include <vcl/graph.hxx>
#include <vcl/idle.hxx>
#include <vcl/image.hxx>
+#include <vcl/imapobj.hxx>
#include <vcl/keycod.hxx>
#include <vcl/keycodes.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
#include <vcl/metaactiontypes.hxx>
+#include <vcl/metric.hxx>
#include <vcl/outdev.hxx>
#include <vcl/outdevmap.hxx>
#include <vcl/outdevstate.hxx>
#include <vcl/region.hxx>
+#include <vcl/salgtype.hxx>
#include <vcl/salnativewidgets.hxx>
#include <vcl/scopedbitmapaccess.hxx>
-#include <vcl/spinfld.hxx>
#include <vcl/svapp.hxx>
#include <vcl/syswin.hxx>
-#include <vcl/tabpage.hxx>
#include <vcl/task.hxx>
+#include <vcl/textfilter.hxx>
#include <vcl/timer.hxx>
-#include <vcl/toolbox.hxx>
#include <vcl/uitest/factory.hxx>
#include <vcl/vclenum.hxx>
#include <vcl/vclevent.hxx>
@@ -156,8 +155,6 @@
#include <basegfx/polygon/b2dpolygon.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <basegfx/range/b2drange.hxx>
-#include <basegfx/range/b2irange.hxx>
-#include <basegfx/range/b2irectangle.hxx>
#include <basegfx/range/basicrange.hxx>
#include <basegfx/tuple/b2dtuple.hxx>
#include <basegfx/tuple/b2i64tuple.hxx>
@@ -170,23 +167,32 @@
#include <com/sun/star/awt/GradientStyle.hpp>
#include <com/sun/star/awt/Key.hpp>
#include <com/sun/star/awt/KeyGroup.hpp>
-#include <com/sun/star/awt/XControlContainer.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/datatransfer/DataFlavor.hpp>
+#include <com/sun/star/datatransfer/XTransferable2.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
+#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
+#include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp>
#include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp>
#include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
#include <com/sun/star/drawing/DashStyle.hpp>
-#include <com/sun/star/drawing/FillStyle.hpp>
#include <com/sun/star/drawing/HatchStyle.hpp>
#include <com/sun/star/drawing/LineCap.hpp>
-#include <com/sun/star/drawing/LineStyle.hpp>
#include <com/sun/star/drawing/TextFitToSizeType.hpp>
+#include <com/sun/star/embed/Aspects.hpp>
#include <com/sun/star/embed/XStorage.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
+#include <com/sun/star/frame/XTerminateListener.hpp>
#include <com/sun/star/graphic/XPrimitive2D.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/EventObject.hpp>
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/style/NumberingType.hpp>
@@ -235,6 +241,7 @@
#include <editeng/editstat.hxx>
#include <editeng/eedata.hxx>
#include <editeng/eeitem.hxx>
+#include <editeng/flstitem.hxx>
#include <editeng/outliner.hxx>
#include <editeng/paragraphdata.hxx>
#include <editeng/svxenum.hxx>
@@ -255,11 +262,11 @@
#include <sfx2/linksrc.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/shell.hxx>
+#include <sot/exchange.hxx>
#include <sot/formats.hxx>
+#include <sot/sotdllapi.h>
#include <svl/SfxBroadcaster.hxx>
#include <svl/aeitem.hxx>
-#include <svl/cenumitm.hxx>
-#include <svl/custritm.hxx>
#include <svl/eitem.hxx>
#include <svl/hint.hxx>
#include <svl/intitem.hxx>
@@ -267,6 +274,7 @@
#include <svl/itemset.hxx>
#include <svl/languageoptions.hxx>
#include <svl/lstner.hxx>
+#include <svl/macitem.hxx>
#include <svl/poolitem.hxx>
#include <svl/stritem.hxx>
#include <svl/style.hxx>
@@ -275,41 +283,33 @@
#include <svl/typedwhich.hxx>
#include <svl/undo.hxx>
#include <svtools/svtdllapi.h>
+#include <svtools/unitconv.hxx>
#include <svtools/valueset.hxx>
-#include <svx/SvxColorValueSet.hxx>
+#include <svx/DiagramDataInterface.hxx>
#include <svx/XPropertyEntry.hxx>
#include <svx/drawitem.hxx>
#include <svx/flagsdef.hxx>
#include <svx/itextprovider.hxx>
+#include <svx/sdr/properties/defaultproperties.hxx>
+#include <svx/sdr/properties/properties.hxx>
#include <svx/sdtaditm.hxx>
#include <svx/sdtaitm.hxx>
#include <svx/sdtakitm.hxx>
#include <svx/shapeproperty.hxx>
#include <svx/svddef.hxx>
-#include <svx/svdhlpln.hxx>
#include <svx/svdoattr.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdotext.hxx>
-#include <svx/svdpagv.hxx>
-#include <svx/svdsob.hxx>
#include <svx/svdtext.hxx>
#include <svx/svdtrans.hxx>
#include <svx/svdtypes.hxx>
#include <svx/svxdllapi.h>
#include <svx/xdash.hxx>
#include <svx/xdef.hxx>
-#include <svx/xenum.hxx>
-#include <svx/xfillit0.hxx>
-#include <svx/xflasit.hxx>
#include <svx/xgrad.hxx>
#include <svx/xhatch.hxx>
-#include <svx/xlineit0.hxx>
-#include <svx/xlnasit.hxx>
-#include <svx/xpoly.hxx>
#include <svx/xtable.hxx>
-#include <svx/xtextit0.hxx>
#include <tools/color.hxx>
-#include <tools/contnr.hxx>
#include <tools/date.hxx>
#include <tools/datetime.hxx>
#include <tools/debug.hxx>
@@ -317,6 +317,7 @@
#include <tools/fontenum.hxx>
#include <tools/fract.hxx>
#include <tools/gen.hxx>
+#include <tools/globname.hxx>
#include <tools/helpers.hxx>
#include <tools/lineend.hxx>
#include <tools/link.hxx>
@@ -340,6 +341,7 @@
#include <unotools/configitem.hxx>
#include <unotools/fontdefs.hxx>
#include <unotools/options.hxx>
+#include <unotools/pathoptions.hxx>
#include <unotools/resmgr.hxx>
#include <unotools/syslocale.hxx>
#include <unotools/unotoolsdllapi.h>
diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx
index 2a336f5a8289..f37b79771f3e 100644
--- a/sd/inc/sdmod.hxx
+++ b/sd/inc/sdmod.hxx
@@ -42,6 +42,7 @@ class SvNumberFormatter;
class SfxErrorHandler;
class SfxFrame;
struct SfxItemPropertyMapEntry;
+class VclSimpleEvent;
namespace svtools { class ColorConfig; }
namespace com { namespace sun { namespace star { namespace frame {
diff --git a/sfx2/source/appl/openuriexternally.cxx b/sfx2/source/appl/openuriexternally.cxx
index 5d1b13df8234..c0a14425ebc8 100644
--- a/sfx2/source/appl/openuriexternally.cxx
+++ b/sfx2/source/appl/openuriexternally.cxx
@@ -22,6 +22,7 @@
#include <sfx2/app.hxx>
#include <sfx2/sfxresid.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/window.hxx>
#include <vcl/weld.hxx>
#include <openuriexternally.hxx>
#include <comphelper/lok.hxx>
diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx
index 5aa3316c4c3f..39e0bc1f9899 100644
--- a/sfx2/source/view/lokhelper.cxx
+++ b/sfx2/source/view/lokhelper.cxx
@@ -15,6 +15,7 @@
#include <vcl/lok.hxx>
#include <vcl/svapp.hxx>
#include <vcl/commandevent.hxx>
+#include <sal/log.hxx>
#include <sfx2/app.hxx>
#include <sfx2/viewsh.hxx>
#include <sfx2/request.hxx>
diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx
index e4e61c2d52cd..8157fd390622 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -17,9 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <svtools/genericunodialog.hxx>
+#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index 419835f56a2c..8ca8a1c33f7e 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -25,6 +25,7 @@
#include <svx/unoapi.hxx>
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp>
+#include <sal/log.hxx>
#include <svx/dialmgr.hxx>
#include <svx/svdoashp.hxx>
#include <svx/strings.hrc>
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 7df68dcae221..d370a419866c 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2019-06-11 16:11:59 using:
+ Generated on 2019-09-25 10:57:48 using:
./bin/update_pch sw sw --cutoff=7 --exclude:system --exclude:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -41,7 +41,6 @@
#include <string.h>
#include <type_traits>
#include <unordered_map>
-#include <unordered_set>
#include <utility>
#include <vector>
#include <boost/circular_buffer.hpp>
@@ -51,7 +50,6 @@
#endif // PCH_LEVEL >= 1
#if PCH_LEVEL >= 2
#include <osl/diagnose.h>
-#include <osl/diagnose.hxx>
#include <osl/doublecheckedlocking.h>
#include <osl/endian.h>
#include <osl/file.hxx>
@@ -68,7 +66,6 @@
#include <rtl/ref.hxx>
#include <rtl/strbuf.hxx>
#include <rtl/string.h>
-#include <rtl/string.hxx>
#include <rtl/stringutils.hxx>
#include <rtl/tencinfo.h>
#include <rtl/textcvt.h>
@@ -85,11 +82,11 @@
#include <sal/types.h>
#include <sal/typesizes.h>
#include <vcl/EnumContext.hxx>
+#include <vcl/Scanline.hxx>
#include <vcl/alpha.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/button.hxx>
-#include <vcl/checksum.hxx>
#include <vcl/commandevent.hxx>
#include <vcl/ctrl.hxx>
#include <vcl/dialog.hxx>
@@ -110,18 +107,13 @@
#include <vcl/imap.hxx>
#include <vcl/imapobj.hxx>
#include <vcl/keycod.hxx>
-#include <vcl/keycodes.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
#include <vcl/metric.hxx>
#include <vcl/outdev.hxx>
-#include <vcl/region.hxx>
-#include <vcl/scopedbitmapaccess.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
#include <vcl/syswin.hxx>
-#include <vcl/tabpage.hxx>
+#include <vcl/textfilter.hxx>
#include <vcl/vclenum.hxx>
#include <vcl/vclevent.hxx>
#include <vcl/vclptr.hxx>
@@ -152,8 +144,6 @@
#include <com/sun/star/accessibility/AccessibleEventId.hpp>
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <com/sun/star/accessibility/AccessibleStateType.hpp>
-#include <com/sun/star/awt/Key.hpp>
-#include <com/sun/star/awt/KeyGroup.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -197,8 +187,6 @@
#include <com/sun/star/uno/Type.h>
#include <com/sun/star/uno/TypeClass.hdl>
#include <com/sun/star/uno/XInterface.hpp>
-#include <com/sun/star/util/Date.hpp>
-#include <com/sun/star/util/Time.hpp>
#include <com/sun/star/util/XAccounting.hpp>
#include <com/sun/star/xml/sax/XFastContextHandler.hpp>
#include <comphelper/classids.hxx>
@@ -247,6 +235,7 @@
#include <editeng/emphasismarkitem.hxx>
#include <editeng/escapementitem.hxx>
#include <editeng/fhgtitem.hxx>
+#include <editeng/flditem.hxx>
#include <editeng/flstitem.hxx>
#include <editeng/fontitem.hxx>
#include <editeng/formatbreakitem.hxx>
@@ -273,6 +262,7 @@
#include <editeng/sizeitem.hxx>
#include <editeng/spltitem.hxx>
#include <editeng/svxacorr.hxx>
+#include <editeng/svxenum.hxx>
#include <editeng/tstpitem.hxx>
#include <editeng/twolinesitem.hxx>
#include <editeng/udlnitem.hxx>
@@ -290,7 +280,6 @@
#include <o3tl/cow_wrapper.hxx>
#include <o3tl/deleter.hxx>
#include <o3tl/safeint.hxx>
-#include <o3tl/sorted_vector.hxx>
#include <o3tl/strong_int.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <o3tl/underlyingenumvalue.hxx>
@@ -395,14 +384,12 @@
#include <svx/unomid.hxx>
#include <svx/xbtmpit.hxx>
#include <svx/xdef.hxx>
-#include <svx/xenum.hxx>
#include <svx/xfillit0.hxx>
#include <svx/xflclit.hxx>
#include <svx/xoutbmp.hxx>
#include <svx/xtable.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/color.hxx>
-#include <tools/date.hxx>
#include <tools/datetime.hxx>
#include <tools/datetimeutils.hxx>
#include <tools/diagnose_ex.h>
@@ -416,7 +403,6 @@
#include <tools/ref.hxx>
#include <tools/solar.h>
#include <tools/stream.hxx>
-#include <tools/time.hxx>
#include <tools/toolsdllapi.h>
#include <tools/urlobj.hxx>
#include <typelib/typedescription.h>
@@ -527,6 +513,7 @@
#include <fmtruby.hxx>
#include <fmtsrnd.hxx>
#include <fmturl.hxx>
+#include <fmtwrapinfluenceonobjpos.hxx>
#include <frmatr.hxx>
#include <frmfmt.hxx>
#include <ftnidx.hxx>
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index e33be09fd4d2..464997c48a58 100644
--- a/sw/inc/pch/precompiled_swui.hxx
+++ b/sw/inc/pch/precompiled_swui.hxx
@@ -13,7 +13,7 @@
manual changes will be rewritten by the next run of update_pch.sh (which presumably
also fixes all possible problems, so it's usually better to use it).
- Generated on 2019-05-12 16:57:52 using:
+ Generated on 2019-09-25 10:57:13 using:
./bin/update_pch sw swui --cutoff=3 --exclude:system --include:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
@@ -45,7 +45,6 @@
#include <stack>
#include <stddef.h>
#include <string.h>
-#include <string_view>
#include <type_traits>
#include <typeinfo>
#include <utility>
@@ -77,6 +76,7 @@
#include <rtl/ustrbuf.hxx>
#include <rtl/ustring.h>
#include <rtl/ustring.hxx>
+#include <rtl/uuid.h>
#include <sal/config.h>
#include <sal/detail/log.h>
#include <sal/log.hxx>
@@ -90,9 +90,9 @@
#include <vcl/GestureEvent.hxx>
#include <vcl/GraphicExternalLink.hxx>
#include <vcl/GraphicObject.hxx>
-#include <vcl/IContext.hxx>
#include <vcl/IDialogRenderable.hxx>
-#include <vcl/NotebookbarContextControl.hxx>
+#include <vcl/NotebookBarAddonsMerger.hxx>
+#include <vcl/Scanline.hxx>
#include <vcl/abstdlg.hxx>
#include <vcl/accel.hxx>
#include <vcl/accessibletableprovider.hxx>
@@ -102,12 +102,10 @@
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/builder.hxx>
-#include <vcl/builderfactory.hxx>
#include <vcl/button.hxx>
#include <vcl/cairo.hxx>
#include <vcl/checksum.hxx>
#include <vcl/combobox.hxx>
-#include <vcl/commandevent.hxx>
#include <vcl/ctrl.hxx>
#include <vcl/customweld.hxx>
#include <vcl/devicecoordinate.hxx>
@@ -117,7 +115,6 @@
#include <vcl/edit.hxx>
#include <vcl/errcode.hxx>
#include <vcl/event.hxx>
-#include <vcl/field.hxx>
#include <vcl/fixed.hxx>
#include <vcl/floatwin.hxx>
#include <vcl/fntstyle.hxx>
@@ -131,7 +128,6 @@
#include <vcl/image.hxx>
#include <vcl/keycod.hxx>
#include <vcl/keycodes.hxx>
-#include <vcl/layout.hxx>
#include <vcl/lstbox.hxx>
#include <vcl/mapmod.hxx>
#include <vcl/menu.hxx>
@@ -152,19 +148,17 @@
#include <vcl/spinfld.hxx>
#include <vcl/status.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/svtabbx.hxx>
#include <vcl/syswin.hxx>
-#include <vcl/tabpage.hxx>
#include <vcl/task.hxx>
+#include <vcl/textfilter.hxx>
#include <vcl/timer.hxx>
-#include <vcl/toolbox.hxx>
#include <vcl/transfer.hxx>
#include <vcl/treelist.hxx>
#include <vcl/treelistbox.hxx>
#include <vcl/treelistentries.hxx>
-#include <vcl/treelistentry.hxx>
#include <vcl/uitest/factory.hxx>
#include <vcl/vclenum.hxx>
+#include <vcl/vclevent.hxx>
#include <vcl/vclmedit.hxx>
#include <vcl/vclptr.hxx>
#include <vcl/vclreferencebase.hxx>
@@ -202,6 +196,7 @@
#include <com/sun/star/awt/Key.hpp>
#include <com/sun/star/awt/KeyGroup.hpp>
#include <com/sun/star/awt/SystemPointer.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/container/XEnumeration.hpp>
@@ -209,6 +204,7 @@
#include <com/sun/star/datatransfer/DataFlavor.hpp>
#include <com/sun/star/datatransfer/XTransferable.hpp>
#include <com/sun/star/datatransfer/XTransferable2.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
#include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp>
@@ -226,12 +222,14 @@
#include <com/sun/star/document/XEventBroadcaster.hpp>
#include <com/sun/star/document/XEventsSupplier.hpp>
#include <com/sun/star/document/XScriptInvocationContext.hpp>
+#include <com/sun/star/document/XShapeEventBroadcaster.hpp>
#include <com/sun/star/document/XStorageBasedDocument.hpp>
#include <com/sun/star/document/XUndoManagerSupplier.hpp>
#include <com/sun/star/document/XViewDataSupplier.hpp>
#include <com/sun/star/drawing/LineCap.hpp>
#include <com/sun/star/embed/Aspects.hpp>
#include <com/sun/star/embed/XVisualObject.hpp>
+#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XLoadable.hpp>
#include <com/sun/star/frame/XModel2.hpp>
#include <com/sun/star/frame/XModule.hpp>
@@ -261,7 +259,6 @@
#include <com/sun/star/script/XStarBasicAccess.hpp>
#include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>
#include <com/sun/star/style/NumberingType.hpp>
-#include <com/sun/star/table/BorderLine2.hpp>
#include <com/sun/star/table/BorderLineStyle.hpp>
#include <com/sun/star/text/HoriOrientation.hpp>
#include <com/sun/star/text/PositionLayoutDir.hpp>
@@ -300,6 +297,7 @@
#include <com/sun/star/view/XPrintable.hpp>
#include <comphelper/comphelperdllapi.h>
#include <comphelper/processfactory.hxx>
+#include <comphelper/servicehelper.hxx>
#include <comphelper/string.hxx>
#include <cppu/cppudllapi.h>
#include <cppu/unotype.hxx>
@@ -320,15 +318,12 @@
#include <drawinglayer/drawinglayerdllapi.h>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <editeng/borderline.hxx>
+#include <editeng/boxitem.hxx>
#include <editeng/brushitem.hxx>
-#include <editeng/colritem.hxx>
-#include <editeng/contouritem.hxx>
-#include <editeng/crossedoutitem.hxx>
#include <editeng/editdata.hxx>
#include <editeng/editengdllapi.h>
#include <editeng/editstat.hxx>
#include <editeng/eedata.hxx>
-#include <editeng/fhgtitem.hxx>
#include <editeng/flstitem.hxx>
#include <editeng/fontitem.hxx>
#include <editeng/frmdiritem.hxx>
@@ -338,16 +333,12 @@
#include <editeng/numitem.hxx>
#include <editeng/outliner.hxx>
#include <editeng/paragraphdata.hxx>
-#include <editeng/postitem.hxx>
#include <editeng/scripttypeitem.hxx>
-#include <editeng/shdditem.hxx>
#include <editeng/sizeitem.hxx>
#include <editeng/svxenum.hxx>
#include <editeng/svxfont.hxx>
-#include <editeng/udlnitem.hxx>
#include <editeng/ulspitem.hxx>
#include <editeng/unolingu.hxx>
-#include <editeng/wghtitem.hxx>
#include <i18nlangtag/i18nlangtagdllapi.h>
#include <i18nlangtag/lang.h>
#include <i18nlangtag/languagetag.hxx>
@@ -373,6 +364,7 @@
#include <sfx2/linksrc.hxx>
#include <sfx2/lnkbase.hxx>
#include <sfx2/objsh.hxx>
+#include <sfx2/printer.hxx>
#include <sfx2/request.hxx>
#include <sfx2/shell.hxx>
#include <sfx2/tabdlg.hxx>
@@ -393,7 +385,6 @@
#include <svl/languageoptions.hxx>
#include <svl/lstner.hxx>
#include <svl/macitem.hxx>
-#include <svl/memberid.h>
#include <svl/nfkeytab.hxx>
#include <svl/ondemand.hxx>
#include <svl/poolitem.hxx>
@@ -423,7 +414,6 @@
#include <svx/svxdllapi.h>
#include <svx/unomod.hxx>
#include <svx/xdef.hxx>
-#include <svx/xenum.hxx>
#include <svx/xtable.hxx>
#include <tools/color.hxx>
#include <tools/contnr.hxx>
@@ -444,7 +434,6 @@
#include <tools/solar.h>
#include <tools/time.hxx>
#include <tools/toolsdllapi.h>
-#include <tools/weakbase.h>
#include <tools/wintypes.hxx>
#include <typelib/typeclass.h>
#include <typelib/typedescription.h>
@@ -454,7 +443,6 @@
#include <uno/sequence2.h>
#include <unotools/calendarwrapper.hxx>
#include <unotools/charclass.hxx>
-#include <unotools/collatorwrapper.hxx>
#include <unotools/configitem.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/fontcvt.hxx>
@@ -503,6 +491,7 @@
#include <index.hxx>
#include <modcfg.hxx>
#include <ndarr.hxx>
+#include <ndhints.hxx>
#include <ndindex.hxx>
#include <ndtxt.hxx>
#include <ndtyp.hxx>
diff --git a/vcl/inc/wizdlg.hxx b/vcl/inc/wizdlg.hxx
index d07ca12500d7..fc979912b866 100644
--- a/vcl/inc/wizdlg.hxx
+++ b/vcl/inc/wizdlg.hxx
@@ -24,6 +24,7 @@
#include <vcl/button.hxx>
#include <vcl/dialog.hxx>
#include <vcl/roadmapwizard.hxx>
+#include <vcl/tabpage.hxx>
struct ImplWizPageData
{
commit deb37c44ecfb8f6aa7c2ceec4771b0505fa7b6bb
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Sep 24 14:10:48 2019 +0100
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Sep 26 09:54:49 2019 +0200
now drop TabPageParent intermediate
Change-Id: I47328f76342ac023628d9042bdfa8213a1c93d0c
Reviewed-on: https://gerrit.libreoffice.org/79469
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 cde483390e73..d1c2acc3c14d 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx
@@ -33,9 +33,8 @@ ChartTypeDialog::ChartTypeDialog(weld::Window* pParent,
, m_xChartModel(xChartModel)
, m_xContentArea(m_xDialog->weld_content_area())
{
- TabPageParent aParent(m_xContentArea.get(), this);
m_xChartTypeTabPage = std::make_unique<ChartTypeTabPage>(
- aParent,
+ m_xContentArea.get(), this,
uno::Reference<XChartDocument>::query(m_xChartModel),
false/*don't show title description*/);
diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index 228bcdbadba6..ef67bf7fe568 100644
--- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -90,15 +90,13 @@ std::unique_ptr<BuilderPage> CreationWizard::createPage(WizardState nState)
OString sIdent(OString::number(nState));
weld::Container* pPageContainer = m_xAssistant->append_page(sIdent);
- // TODO eventually pass DialogController as distinct argument instead of bundling into TabPageParent
- TabPageParent aParent(pPageContainer, this);
switch( nState )
{
case STATE_CHARTTYPE:
{
m_aTimerTriggeredControllerLock.startTimer();
- xRet = std::make_unique<ChartTypeTabPage>(aParent, m_xChartModel);
+ xRet = std::make_unique<ChartTypeTabPage>(pPageContainer, this, m_xChartModel);
m_pTemplateProvider = static_cast<ChartTypeTabPage*>(xRet.get());
if (m_pDialogModel)
m_pDialogModel->setTemplate( m_pTemplateProvider->getCurrentTemplate());
@@ -107,18 +105,18 @@ std::unique_ptr<BuilderPage> CreationWizard::createPage(WizardState nState)
case STATE_SIMPLE_RANGE:
{
m_aTimerTriggeredControllerLock.startTimer();
- xRet = std::make_unique<RangeChooserTabPage>(aParent, *m_pDialogModel, m_pTemplateProvider, this);
+ xRet = std::make_unique<RangeChooserTabPage>(pPageContainer, this, *m_pDialogModel, m_pTemplateProvider);
break;
}
case STATE_DATA_SERIES:
{
m_aTimerTriggeredControllerLock.startTimer();
- xRet = std::make_unique<DataSourceTabPage>(aParent, *m_pDialogModel, m_pTemplateProvider, this);
+ xRet = std::make_unique<DataSourceTabPage>(pPageContainer, this, *m_pDialogModel, m_pTemplateProvider);
break;
}
case STATE_OBJECTS:
{
- xRet = std::make_unique<TitlesAndObjectsTabPage>(aParent, m_xChartModel, m_xComponentContext);
+ xRet = std::make_unique<TitlesAndObjectsTabPage>(pPageContainer, this, m_xChartModel, m_xComponentContext);
m_aTimerTriggeredControllerLock.startTimer();
break;
}
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index bb377bdbaa11..cb0b31b7a986 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -88,11 +88,11 @@ DataSourceDialog::DataSourceDialog(weld::Window * pParent,
, m_xTabControl(m_xBuilder->weld_notebook("notebook"))
, m_xBtnOK(m_xBuilder->weld_button("ok"))
{
- TabPageParent aRangeParent(m_xTabControl->get_page("range"), this);
- m_xRangeChooserTabPage = std::make_unique<RangeChooserTabPage>(aRangeParent, *(m_apDialogModel.get()),
+ m_xRangeChooserTabPage = std::make_unique<RangeChooserTabPage>(m_xTabControl->get_page("range"), this,
+ *(m_apDialogModel.get()),
m_apDocTemplateProvider.get(), true /* bHideDescription */ );
- TabPageParent aSeriesParent(m_xTabControl->get_page("series"), this);
- m_xDataSourceTabPage = std::make_unique<DataSourceTabPage>(aSeriesParent, *(m_apDialogModel.get()),
+ m_xDataSourceTabPage = std::make_unique<DataSourceTabPage>(m_xTabControl->get_page("series"), this,
+ *(m_apDialogModel.get()),
m_apDocTemplateProvider.get(), true /* bHideDescription */ );
m_xTabControl->connect_enter_page(LINK(this, DataSourceDialog, ActivatePageHdl));
m_xTabControl->connect_leave_page(LINK(this, DataSourceDialog, DeactivatePageHdl));
diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
index 634840e367b6..7acd590c6ed1 100644
--- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
+++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
@@ -42,7 +42,7 @@ InsertErrorBarsDialog::InsertErrorBarsDialog(
ErrorBarResources::tErrorBarType eType /* = ErrorBarResources::ERROR_BAR_Y */ )
: GenericDialogController(pParent, "modules/schart/ui/dlg_InsertErrorBars.ui", "dlg_InsertErrorBars")
, m_apErrorBarResources( new ErrorBarResources(
- m_xBuilder.get(), TabPageParent(m_xDialog.get(), nullptr), rMyAttrs,
+ m_xBuilder.get(), this, rMyAttrs,
/* bNoneAvailable = */ true, eType ))
{
ObjectType objType = eType == ErrorBarResources::ERROR_BAR_Y ? OBJECTTYPE_DATA_ERRORS_Y : OBJECTTYPE_DATA_ERRORS_X;
diff --git a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
index 9be881594068..d91b545cd027 100644
--- a/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
+++ b/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
@@ -36,8 +36,7 @@ NumberFormatDialog::NumberFormatDialog(weld::Window* pParent, SfxItemSet& rSet)
::CreateTabPage fnCreatePage = pFact->GetTabPageCreatorFunc( RID_SVXPAGE_NUMBERFORMAT );
if (fnCreatePage)
{
- TabPageParent pPageParent(get_content_area(), this);
- std::unique_ptr<SfxTabPage> xTabPage = (*fnCreatePage)(pPageParent, &rSet);
+ std::unique_ptr<SfxTabPage> xTabPage = (*fnCreatePage)(get_content_area(), this, &rSet);
xTabPage->PageCreated(rSet);
SetTabPage(std::move(xTabPage));
}
diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index bb9f78f85134..46407f7cc732 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -23,7 +23,7 @@
#include <helpids.h>
#include <chartview/ChartSfxItemIds.hxx>
#include <com/sun/star/chart2/XChartDocument.hpp>
-#include <vcl/dialog.hxx>
+#include <vcl/weld.hxx>
#include <rtl/math.hxx>
#include <sal/log.hxx>
@@ -40,19 +40,11 @@ using namespace ::com::sun::star;
namespace
{
-void lcl_enableRangeChoosing(bool bEnable, TabPageParent pParent)
+void lcl_enableRangeChoosing(bool bEnable, weld::DialogController* pController)
{
- if (weld::DialogController* pController = pParent.pController)
- {
- weld::Window* pWeldDialog = pController->getDialog();
- pWeldDialog->set_modal(!bEnable);
- pWeldDialog->set_visible(!bEnable);
- }
- else if (::Dialog* pVCLDialog = pParent.pParent ? pParent.pParent->GetParentDialog() : nullptr)
- {
- pVCLDialog->Show(!bEnable);
- pVCLDialog->SetModalInputMode(!bEnable);
- }
+ weld::Window* pWeldDialog = pController->getDialog();
+ pWeldDialog->set_modal(!bEnable);
+ pWeldDialog->set_visible(!bEnable);
}
sal_uInt16 lcl_getLbEntryPosByErrorKind( SvxChartKindError eErrorKind )
@@ -87,7 +79,7 @@ sal_uInt16 lcl_getLbEntryPosByErrorKind( SvxChartKindError eErrorKind )
namespace chart
{
-ErrorBarResources::ErrorBarResources(weld::Builder* pParent, TabPageParent pParentDialog,
+ErrorBarResources::ErrorBarResources(weld::Builder* pParent, weld::DialogController* pController,
const SfxItemSet& rInAttrs, bool bNoneAvailable,
tErrorBarType eType /* = ERROR_BAR_Y */ )
: m_eErrorKind( SvxChartKindError::NONE )
@@ -101,7 +93,7 @@ ErrorBarResources::ErrorBarResources(weld::Builder* pParent, TabPageParent pPare
, m_nConstSpinSize( 1 )
, m_fPlusValue(0.0)
, m_fMinusValue(0.0)
- , m_pParentDialog( pParentDialog )
+ , m_pController(pController)
, m_pCurrentRangeChoosingField( nullptr )
, m_bHasInternalDataProvider( true )
, m_bEnableDataTableDialog( true )
@@ -456,7 +448,7 @@ IMPL_LINK(ErrorBarResources, ChooseRange, weld::Button&, rButton, void)
aUIString = m_xUIStringNeg->get_label();
}
- lcl_enableRangeChoosing( true, m_pParentDialog );
+ lcl_enableRangeChoosing(true, m_pController);
m_apRangeSelectionHelper->chooseRange(
m_pCurrentRangeChoosingField->get_text(),
aUIString, *this );
@@ -695,7 +687,7 @@ void ErrorBarResources::listeningFinished(
m_pCurrentRangeChoosingField = nullptr;
UpdateControlStates();
- lcl_enableRangeChoosing( false, m_pParentDialog );
+ lcl_enableRangeChoosing(false, m_pController);
}
void ErrorBarResources::disposingRangeSelection()
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 2edb5a56e447..dfc6bf887878 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -30,8 +30,8 @@
namespace chart
{
-SchAxisLabelTabPage::SchAxisLabelTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage(pParent, "modules/schart/ui/tp_axisLabel.ui", "AxisLabelTabPage", &rInAttrs)
+SchAxisLabelTabPage::SchAxisLabelTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "modules/schart/ui/tp_axisLabel.ui", "AxisLabelTabPage", &rInAttrs)
, m_bShowStaggeringControls( true )
, m_nInitialDegrees( 0 )
, m_bHasInitialDegrees( true )
@@ -73,9 +73,9 @@ SchAxisLabelTabPage::~SchAxisLabelTabPage()
m_xLbTextDirection.reset();
}
-std::unique_ptr<SfxTabPage> SchAxisLabelTabPage::Create(TabPageParent pParent, const SfxItemSet* rAttrs)
+std::unique_ptr<SfxTabPage> SchAxisLabelTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rAttrs)
{
- return std::make_unique<SchAxisLabelTabPage>(pParent, *rAttrs);
+ return std::make_unique<SchAxisLabelTabPage>(pPage, pController, *rAttrs);
}
bool SchAxisLabelTabPage::FillItemSet( SfxItemSet* rOutAttrs )
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
index 1cfc7db169c6..3816d1ba81f7 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx
@@ -69,10 +69,10 @@ private:
DECL_LINK(ToggleShowLabel, weld::ToggleButton&, void);
public:
- SchAxisLabelTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ SchAxisLabelTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SchAxisLabelTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
virtual void Reset( const SfxItemSet* rInAttrs ) override;
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 7dd6bebcb108..b3b49fa02df8 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -31,8 +31,8 @@ using namespace ::com::sun::star;
namespace chart
{
-AxisPositionsTabPage::AxisPositionsTabPage(TabPageParent pWindow,const SfxItemSet& rInAttrs)
- : SfxTabPage(pWindow ,"modules/schart/ui/tp_AxisPositions.ui" ,"tp_AxisPositions" , &rInAttrs)
+AxisPositionsTabPage::AxisPositionsTabPage(weld::Container* pPage, weld::DialogController* pController,const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "modules/schart/ui/tp_AxisPositions.ui", "tp_AxisPositions", &rInAttrs)
, m_pNumFormatter(nullptr)
, m_bCrossingAxisIsCategoryAxis(false)
, m_aCategories()
@@ -65,9 +65,9 @@ AxisPositionsTabPage::~AxisPositionsTabPage()
{
}
-std::unique_ptr<SfxTabPage> AxisPositionsTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> AxisPositionsTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
{
- return std::make_unique<AxisPositionsTabPage>(pParent, *rOutAttrs);
+ return std::make_unique<AxisPositionsTabPage>(pPage, pController, *rOutAttrs);
}
bool AxisPositionsTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
index 3e20edcb6e67..fc5164b895cc 100644
--- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx
+++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx
@@ -27,10 +27,10 @@ namespace chart
class AxisPositionsTabPage : public SfxTabPage
{
public:
- AxisPositionsTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ AxisPositionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~AxisPositionsTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
virtual void Reset( const SfxItemSet* rInAttrs ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pItemSet ) override;
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 2decb778dac5..1391230ad55f 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -398,7 +398,7 @@ void SteppedPropertiesDialog::fillParameter( ChartTypeParameter& rParameter, boo
class SplineResourceGroup : public ChangingResource
{
public:
- explicit SplineResourceGroup(weld::Builder* pBuilder, TabPageParent pParent);
+ explicit SplineResourceGroup(weld::Builder* pBuilder, weld::Window* pParent);
void showControls( bool bShow );
@@ -413,7 +413,7 @@ private:
SteppedPropertiesDialog& getSteppedPropertiesDialog();
private:
- TabPageParent m_pParent;
+ weld::Window* m_pParent;
std::unique_ptr<weld::Label> m_xFT_LineType;
std::unique_ptr<weld::ComboBox> m_xLB_LineType;
std::unique_ptr<weld::Button> m_xPB_DetailsDialog;
@@ -421,7 +421,7 @@ private:
std::unique_ptr<SteppedPropertiesDialog> m_xSteppedPropertiesDialog;
};
-SplineResourceGroup::SplineResourceGroup(weld::Builder* pBuilder, TabPageParent pParent)
+SplineResourceGroup::SplineResourceGroup(weld::Builder* pBuilder, weld::Window* pParent)
: ChangingResource()
, m_pParent(pParent)
, m_xFT_LineType(pBuilder->weld_label("linetypeft"))
@@ -435,7 +435,7 @@ SplinePropertiesDialog& SplineResourceGroup::getSplinePropertiesDialog()
{
if (!m_xSplinePropertiesDialog)
{
- m_xSplinePropertiesDialog.reset(new SplinePropertiesDialog(m_pParent.GetFrameWeld()));
+ m_xSplinePropertiesDialog.reset(new SplinePropertiesDialog(m_pParent));
}
return *m_xSplinePropertiesDialog;
}
@@ -444,7 +444,7 @@ SteppedPropertiesDialog& SplineResourceGroup::getSteppedPropertiesDialog()
{
if (!m_xSteppedPropertiesDialog)
{
- m_xSteppedPropertiesDialog.reset(new SteppedPropertiesDialog(m_pParent.GetFrameWeld()));
+ m_xSteppedPropertiesDialog.reset(new SteppedPropertiesDialog(m_pParent));
}
return *m_xSteppedPropertiesDialog;
}
@@ -601,12 +601,12 @@ IMPL_LINK_NOARG(GeometryResourceGroup, GeometryChangeHdl, weld::TreeView&, void)
m_pChangeListener->stateChanged(this);
}
-ChartTypeTabPage::ChartTypeTabPage(TabPageParent pParent , const uno::Reference< XChartDocument >& xChartModel,
+ChartTypeTabPage::ChartTypeTabPage(weld::Container* pPage, weld::DialogController* pController, const uno::Reference< XChartDocument >& xChartModel,
bool bShowDescription)
- : OWizardPage(pParent, "modules/schart/ui/tp_ChartType.ui", "tp_ChartType")
+ : OWizardPage(pPage, pController, "modules/schart/ui/tp_ChartType.ui", "tp_ChartType")
, m_pDim3DLookResourceGroup( new Dim3DLookResourceGroup(m_xBuilder.get()) )
, m_pStackingResourceGroup( new StackingResourceGroup(m_xBuilder.get()) )
- , m_pSplineResourceGroup( new SplineResourceGroup(m_xBuilder.get(), pParent) )
+ , m_pSplineResourceGroup( new SplineResourceGroup(m_xBuilder.get(), pController->getDialog()) )
, m_pGeometryResourceGroup( new GeometryResourceGroup(m_xBuilder.get()) )
, m_pSortByXValuesResourceGroup( new SortByXValuesResourceGroup(m_xBuilder.get()) )
, m_xChartModel( xChartModel )
diff --git a/chart2/source/controller/dialogs/tp_ChartType.hxx b/chart2/source/controller/dialogs/tp_ChartType.hxx
index 8035cf7a0b54..fadeee06e5a8 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.hxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.hxx
@@ -45,7 +45,7 @@ class SortByXValuesResourceGroup;
class ChartTypeTabPage final : public ResourceChangeListener, public vcl::OWizardPage, public ChartTypeTemplateProvider
{
public:
- ChartTypeTabPage( TabPageParent pParent
+ ChartTypeTabPage( weld::Container* pPage, weld::DialogController* pController
, const css::uno::Reference< css::chart2::XChartDocument >& xChartModel
, bool bShowDescription = true );
virtual ~ChartTypeTabPage() override;
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.cxx b/chart2/source/controller/dialogs/tp_DataLabel.cxx
index 6a611a8af5cf..3594e3e8ffeb 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.cxx
@@ -22,15 +22,15 @@
namespace chart
{
-DataLabelsTabPage::DataLabelsTabPage(TabPageParent pWindow, const SfxItemSet& rInAttrs)
- : SfxTabPage(pWindow , "modules/schart/ui/tp_DataLabel.ui", "tp_DataLabel", &rInAttrs)
- , m_aDataLabelResources(m_xBuilder.get(), pWindow.GetFrameWeld(), rInAttrs)
+DataLabelsTabPage::DataLabelsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "modules/schart/ui/tp_DataLabel.ui", "tp_DataLabel", &rInAttrs)
+ , m_aDataLabelResources(m_xBuilder.get(), pController->getDialog(), rInAttrs)
{
}
-std::unique_ptr<SfxTabPage> DataLabelsTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> DataLabelsTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
{
- return std::make_unique<DataLabelsTabPage>(pParent, *rOutAttrs);
+ return std::make_unique<DataLabelsTabPage>(pPage, pController, *rOutAttrs);
}
bool DataLabelsTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_DataLabel.hxx b/chart2/source/controller/dialogs/tp_DataLabel.hxx
index d5be8a13641f..e7d052728b4b 100644
--- a/chart2/source/controller/dialogs/tp_DataLabel.hxx
+++ b/chart2/source/controller/dialogs/tp_DataLabel.hxx
@@ -30,9 +30,9 @@ namespace chart
class DataLabelsTabPage : public SfxTabPage
{
public:
- DataLabelsTabPage(TabPageParent pWindow, const SfxItemSet& rInAttrs);
+ DataLabelsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pWindow, const SfxItemSet* rInAttrs);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs);
void SetNumberFormatter( SvNumberFormatter* pFormatter );
diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx
index fdb8147f438a..4c1285a81163 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -158,16 +158,16 @@ Reference< chart2::data::XLabeledDataSequence > lcl_findLSequenceWithOnlyLabel(
namespace chart
{
-DataSourceTabPage::DataSourceTabPage(TabPageParent pParent, DialogModel & rDialogModel,
+DataSourceTabPage::DataSourceTabPage(weld::Container* pPage, weld::DialogController* pController,
+ DialogModel & rDialogModel,
ChartTypeTemplateProvider* pTemplateProvider,
bool bHideDescription /* = false */)
- : ::vcl::OWizardPage(pParent, "modules/schart/ui/tp_DataSource.ui", "tp_DataSource")
+ : ::vcl::OWizardPage(pPage, pController, "modules/schart/ui/tp_DataSource.ui", "tp_DataSource")
, m_pTemplateProvider(pTemplateProvider)
, m_rDialogModel(rDialogModel)
, m_pCurrentRangeChoosingField( nullptr )
, m_bIsDirty( false )
- , m_pParentController(pParent.pController)
- , m_pTabPageNotifiable(dynamic_cast<TabPageNotifiable*>(m_pParentController))
+ , m_pTabPageNotifiable(dynamic_cast<TabPageNotifiable*>(pController))
, m_xFT_CAPTION(m_xBuilder->weld_label("FT_CAPTION_FOR_WIZARD"))
, m_xFT_SERIES(m_xBuilder->weld_label("FT_SERIES"))
, m_xLB_SERIES(m_xBuilder->weld_tree_view("LB_SERIES"))
@@ -529,7 +529,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, MainRangeButtonClickedHdl, weld::Button&, voi
m_xLB_SERIES->get_text(nEntry));
}
- lcl_enableRangeChoosing( true, m_pParentController );
+ lcl_enableRangeChoosing(true, m_pDialogController);
m_rDialogModel.getRangeSelectionHelper()->chooseRange( aSelectedRolesRange, aUIStr, *this );
}
else
@@ -545,7 +545,7 @@ IMPL_LINK_NOARG(DataSourceTabPage, CategoriesRangeButtonClickedHdl, weld::Button
return;
OUString aStr(SchResId(m_xFT_CATEGORIES->get_visible() ? STR_DATA_SELECT_RANGE_FOR_CATEGORIES : STR_DATA_SELECT_RANGE_FOR_DATALABELS));
- lcl_enableRangeChoosing(true, m_pParentController);
+ lcl_enableRangeChoosing(true, m_pDialogController);
m_rDialogModel.getRangeSelectionHelper()->chooseRange(
m_rDialogModel.getCategoriesRange(), aStr, *this );
}
@@ -723,7 +723,7 @@ void DataSourceTabPage::listeningFinished(
m_pCurrentRangeChoosingField = nullptr;
updateControlState();
- lcl_enableRangeChoosing(false, m_pParentController);
+ lcl_enableRangeChoosing(false, m_pDialogController);
}
void DataSourceTabPage::disposingRangeSelection()
diff --git a/chart2/source/controller/dialogs/tp_DataSource.hxx b/chart2/source/controller/dialogs/tp_DataSource.hxx
index d899f76eab80..4c3ecf300cc7 100644
--- a/chart2/source/controller/dialogs/tp_DataSource.hxx
+++ b/chart2/source/controller/dialogs/tp_DataSource.hxx
@@ -51,7 +51,7 @@ class DataSourceTabPage final :
public RangeSelectionListenerParent
{
public:
- explicit DataSourceTabPage(TabPageParent pParent,
+ explicit DataSourceTabPage(weld::Container* pPage, weld::DialogController* pController,
DialogModel & rDialogModel,
ChartTypeTemplateProvider* pTemplateProvider,
bool bHideDescription = false);
@@ -121,7 +121,6 @@ private:
weld::Entry* m_pCurrentRangeChoosingField;
bool m_bIsDirty;
- weld::DialogController* m_pParentController;
TabPageNotifiable * m_pTabPageNotifiable;
std::unique_ptr<weld::Label> m_xFT_CAPTION;
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
index 1b7800b09fea..addaf99281ce 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.cxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.cxx
@@ -26,15 +26,15 @@ using namespace ::com::sun::star;
namespace chart
{
-ErrorBarsTabPage::ErrorBarsTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage(pParent, "modules/schart/ui/tp_ErrorBars.ui", "tp_ErrorBars", &rInAttrs)
- , m_aErrorBarResources(m_xBuilder.get(), pParent, rInAttrs, /* bNoneAvailable = */ false)
+ErrorBarsTabPage::ErrorBarsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "modules/schart/ui/tp_ErrorBars.ui", "tp_ErrorBars", &rInAttrs)
+ , m_aErrorBarResources(m_xBuilder.get(), pController, rInAttrs, /* bNoneAvailable = */ false)
{
}
-std::unique_ptr<SfxTabPage> ErrorBarsTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> ErrorBarsTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
{
- return std::make_unique<ErrorBarsTabPage>(pParent, *rOutAttrs);
+ return std::make_unique<ErrorBarsTabPage>(pPage, pController, *rOutAttrs);
}
bool ErrorBarsTabPage::FillItemSet( SfxItemSet* rOutAttrs )
diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.hxx b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
index e74aac0a2d5b..2ce941a1d5b9 100644
--- a/chart2/source/controller/dialogs/tp_ErrorBars.hxx
+++ b/chart2/source/controller/dialogs/tp_ErrorBars.hxx
@@ -29,14 +29,14 @@ namespace chart
class ErrorBarsTabPage : public SfxTabPage
{
public:
- ErrorBarsTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ ErrorBarsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
void SetAxisMinorStepWidthForErrorBarDecimals( double fMinorStepWidth );
void SetErrorBarType( ErrorBarResources::tErrorBarType eNewType );
void SetChartDocumentForRangeChoosing(
const css::uno::Reference< css::chart2::XChartDocument > & xChartDocument );
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
virtual void Reset( const SfxItemSet* rInAttrs ) override;
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index e7a855c1258f..87275ce999ce 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -26,8 +26,8 @@
namespace chart
{
-SchLegendPosTabPage::SchLegendPosTabPage(TabPageParent pWindow, const SfxItemSet& rInAttrs)
- : SfxTabPage(pWindow, "modules/schart/ui/tp_LegendPosition.ui", "tp_LegendPosition", &rInAttrs)
+SchLegendPosTabPage::SchLegendPosTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "modules/schart/ui/tp_LegendPosition.ui", "tp_LegendPosition", &rInAttrs)
, m_aLegendPositionResources(*m_xBuilder)
, m_xLbTextDirection(new TextDirectionListBox(m_xBuilder->weld_combo_box("LB_LEGEND_TEXTDIR")))
{
@@ -38,9 +38,9 @@ SchLegendPosTabPage::~SchLegendPosTabPage()
m_xLbTextDirection.reset();
}
-std::unique_ptr<SfxTabPage> SchLegendPosTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> SchLegendPosTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
{
- return std::make_unique<SchLegendPosTabPage>(pParent, *rOutAttrs);
+ return std::make_unique<SchLegendPosTabPage>(pPage, pController, *rOutAttrs);
}
bool SchLegendPosTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.hxx b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
index 4414be65bed4..178c91ddf717 100644
--- a/chart2/source/controller/dialogs/tp_LegendPosition.hxx
+++ b/chart2/source/controller/dialogs/tp_LegendPosition.hxx
@@ -36,10 +36,10 @@ private:
std::unique_ptr<TextDirectionListBox> m_xLbTextDirection;
public:
- SchLegendPosTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ SchLegendPosTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SchLegendPosTabPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
virtual void Reset(const SfxItemSet* rInAttrs) override;
};
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index 6e667b9c89b8..8dd7584a2745 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -28,8 +28,8 @@
namespace chart
{
-SchLayoutTabPage::SchLayoutTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs)
- : SfxTabPage(pParent, "modules/schart/ui/tp_ChartType.ui", "tp_ChartType", &rInAttrs)
+SchLayoutTabPage::SchLayoutTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "modules/schart/ui/tp_ChartType.ui", "tp_ChartType", &rInAttrs)
{
m_pGeometryResources.reset(new BarGeometryResources(m_xBuilder.get()));
}
@@ -39,9 +39,9 @@ SchLayoutTabPage::~SchLayoutTabPage()
m_pGeometryResources.reset();
}
-std::unique_ptr<SfxTabPage> SchLayoutTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> SchLayoutTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
{
- return std::make_unique<SchLayoutTabPage>(pParent, *rOutAttrs);
+ return std::make_unique<SchLayoutTabPage>(pPage, pController, *rOutAttrs);
}
bool SchLayoutTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.hxx b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
index 680f330b6a9b..2438ce898b8b 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.hxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.hxx
@@ -28,10 +28,10 @@ class BarGeometryResources;
class SchLayoutTabPage : public SfxTabPage
{
public:
- SchLayoutTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ SchLayoutTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~SchLayoutTabPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
virtual void Reset(const SfxItemSet* rInAttrs) override;
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index f98fc072e54a..74f8d12d14a5 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -26,8 +26,8 @@
namespace chart
{
-PolarOptionsTabPage::PolarOptionsTabPage(TabPageParent pWindow, const SfxItemSet& rInAttrs)
- : SfxTabPage(pWindow, "modules/schart/ui/tp_PolarOptions.ui", "tp_PolarOptions", &rInAttrs)
+PolarOptionsTabPage::PolarOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "modules/schart/ui/tp_PolarOptions.ui", "tp_PolarOptions", &rInAttrs)
, m_xCB_Clockwise(m_xBuilder->weld_check_button("CB_CLOCKWISE"))
, m_xFL_StartingAngle(m_xBuilder->weld_frame("frameANGLE"))
, m_xNF_StartingAngle(m_xBuilder->weld_spin_button("NF_STARTING_ANGLE"))
@@ -43,9 +43,9 @@ PolarOptionsTabPage::~PolarOptionsTabPage()
m_xAngleDial.reset();
}
-std::unique_ptr<SfxTabPage> PolarOptionsTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> PolarOptionsTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
{
- return std::make_unique<PolarOptionsTabPage>(pParent, *rOutAttrs);
+ return std::make_unique<PolarOptionsTabPage>(pPage, pController, *rOutAttrs);
}
bool PolarOptionsTabPage::FillItemSet( SfxItemSet* rOutAttrs )
diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.hxx b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
index f962f94694f2..c1a5add984fe 100644
--- a/chart2/source/controller/dialogs/tp_PolarOptions.hxx
+++ b/chart2/source/controller/dialogs/tp_PolarOptions.hxx
@@ -36,10 +36,10 @@ class PolarOptionsTabPage : public SfxTabPage
{
public:
- PolarOptionsTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ PolarOptionsTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~PolarOptionsTabPage() override;
- static std::unique_ptr<SfxTabPage> Create(TabPageParent pParent, const SfxItemSet* rInAttrs);
+ static std::unique_ptr<SfxTabPage> Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs);
virtual bool FillItemSet(SfxItemSet* rOutAttrs) override;
virtual void Reset(const SfxItemSet* rInAttrs) override;
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index ecbc658cdf28..77dc2145178f 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -58,17 +58,16 @@ using namespace ::com::sun::star::chart2;
using ::com::sun::star::uno::Sequence;
-RangeChooserTabPage::RangeChooserTabPage(TabPageParent pParent, DialogModel & rDialogModel,
+RangeChooserTabPage::RangeChooserTabPage(weld::Container* pPage, weld::DialogController* pController, DialogModel & rDialogModel,
ChartTypeTemplateProvider* pTemplateProvider,
bool bHideDescription /* = false */)
- : OWizardPage(pParent, "modules/schart/ui/tp_RangeChooser.ui", "tp_RangeChooser")
+ : OWizardPage(pPage, pController, "modules/schart/ui/tp_RangeChooser.ui", "tp_RangeChooser")
, m_nChangingControlCalls(0)
, m_bIsDirty(false)
, m_aLastValidRangeString()
, m_pTemplateProvider(pTemplateProvider)
, m_rDialogModel( rDialogModel )
- , m_pParentController(pParent.pController)
- , m_pTabPageNotifiable(dynamic_cast<TabPageNotifiable*>(m_pParentController))
+ , m_pTabPageNotifiable(dynamic_cast<TabPageNotifiable*>(pController))
, m_xFT_Caption(m_xBuilder->weld_label("FT_CAPTION_FOR_WIZARD"))
, m_xFT_Range(m_xBuilder->weld_label("FT_RANGE"))
, m_xED_Range(m_xBuilder->weld_entry("ED_RANGE"))
@@ -340,7 +339,7 @@ IMPL_LINK_NOARG(RangeChooserTabPage, ChooseRangeHdl, weld::Button&, void)
OUString aRange = m_xED_Range->get_text();
OUString aTitle = m_xFTTitle->get_label();
- lcl_enableRangeChoosing( true, m_pParentController );
+ lcl_enableRangeChoosing(true, m_pDialogController);
m_rDialogModel.getRangeSelectionHelper()->chooseRange( aRange, aTitle, *this );
}
@@ -364,7 +363,7 @@ void RangeChooserTabPage::listeningFinished( const OUString & rNewRange )
if( isValid())
changeDialogModelAccordingToControls();
- lcl_enableRangeChoosing( false, m_pParentController );
+ lcl_enableRangeChoosing(false, m_pDialogController);
}
void RangeChooserTabPage::disposingRangeSelection()
diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.hxx b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
index 41ae6f19e460..c3883e837951 100644
--- a/chart2/source/controller/dialogs/tp_RangeChooser.hxx
+++ b/chart2/source/controller/dialogs/tp_RangeChooser.hxx
@@ -37,7 +37,7 @@ class RangeChooserTabPage final : public vcl::OWizardPage, public RangeSelection
{
public:
- RangeChooserTabPage(TabPageParent pParent, DialogModel & rDialogModel,
+ RangeChooserTabPage(weld::Container* pPage, weld::DialogController* pController, DialogModel & rDialogModel,
ChartTypeTemplateProvider* pTemplateProvider,
bool bHideDescription = false);
virtual ~RangeChooserTabPage() override;
@@ -77,7 +77,6 @@ private:
ChartTypeTemplateProvider* m_pTemplateProvider;
DialogModel & m_rDialogModel;
- weld::DialogController* m_pParentController;
TabPageNotifiable * m_pTabPageNotifiable;
std::unique_ptr<weld::Label> m_xFT_Caption;
diff --git a/chart2/source/controller/dialogs/tp_Scale.cxx b/chart2/source/controller/dialogs/tp_Scale.cxx
index e7f5837fb9d5..b33a9eb3f3f3 100644
--- a/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -50,8 +50,8 @@ void lcl_setValue(weld::FormattedSpinButton& rFmtField, double fValue)
}
-ScaleTabPage::ScaleTabPage(TabPageParent pWindow,const SfxItemSet& rInAttrs)
- : SfxTabPage(pWindow, "modules/schart/ui/tp_Scale.ui", "tp_Scale", &rInAttrs)
+ScaleTabPage::ScaleTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "modules/schart/ui/tp_Scale.ui", "tp_Scale", &rInAttrs)
, fMin(0.0)
, fMax(0.0)
, fStepMain(0.0)
@@ -213,9 +213,9 @@ IMPL_LINK_NOARG(ScaleTabPage, SelectAxisTypeHdl, weld::ComboBox&, void)
SetNumFormat();
}
-std::unique_ptr<SfxTabPage> ScaleTabPage::Create(TabPageParent pParent, const SfxItemSet* rOutAttrs)
+std::unique_ptr<SfxTabPage> ScaleTabPage::Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rOutAttrs)
{
- return std::make_unique<ScaleTabPage>(pParent, *rOutAttrs);
+ return std::make_unique<ScaleTabPage>(pPage, pController, *rOutAttrs);
}
bool ScaleTabPage::FillItemSet(SfxItemSet* rOutAttrs)
diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx
index 09c47af57d57..b0e308845bc4 100644
--- a/chart2/source/controller/dialogs/tp_Scale.hxx
+++ b/chart2/source/controller/dialogs/tp_Scale.hxx
@@ -27,10 +27,10 @@ namespace chart
class ScaleTabPage : public SfxTabPage
{
public:
- ScaleTabPage(TabPageParent pParent, const SfxItemSet& rInAttrs);
+ ScaleTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs);
virtual ~ScaleTabPage() override;
- static std::unique_ptr<SfxTabPage> Create( TabPageParent pParent, const SfxItemSet* rInAttrs );
+ static std::unique_ptr<SfxTabPage> Create( weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* rInAttrs );
virtual bool FillItemSet( SfxItemSet* rOutAttrs ) override;
virtual void Reset( const SfxItemSet* rInAttrs ) override;
virtual DeactivateRC DeactivatePage( SfxItemSet* pItemSet ) override;
diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index db5a0cf5241f..82bd80ab6542 100644
--- a/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -30,8 +30,8 @@
namespace chart
{
-SchOptionTabPage::SchOptionTabPage(TabPageParent pWindow,const SfxItemSet& rInAttrs)
- : SfxTabPage(pWindow, "modules/schart/ui/tp_SeriesToAxis.ui", "TP_OPTIONS", &rInAttrs)
+SchOptionTabPage::SchOptionTabPage(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rInAttrs)
+ : SfxTabPage(pPage, pController, "modules/schart/ui/tp_SeriesToAxis.ui", "TP_OPTIONS", &rInAttrs)
, m_nAllSeriesAxisIndex(0)
, m_bProvidesSecondaryYAxis(true)
, m_bProvidesOverlapAndGapWidth(false)
@@ -68,10 +68,10 @@ IMPL_LINK_NOARG(SchOptionTabPage, EnableHdl, weld::ToggleButton&, void)
m_xCBAxisSideBySide->set_sensitive( m_xRbtAxis1->get_active());
}
-std::unique_ptr<SfxTabPage> SchOptionTabPage::Create(TabPageParent pParent,
+std::unique_ptr<SfxTabPage> SchOptionTabPage::Create(weld::Container* pPage, weld::DialogController* pController,
const SfxItemSet* rOutAttrs)
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list