basctl/source/basicide/brkdlg.hxx | 1 basctl/source/basicide/moduldlg.hxx | 2 basctl/source/inc/ColorSchemeDialog.hxx | 1 basctl/source/inc/managelang.hxx | 1 basic/source/runtime/inputbox.cxx | 1 basic/source/runtime/iosys.cxx | 1 chart2/source/controller/dialogs/RangeSelectionListener.cxx | 1 chart2/source/controller/dialogs/res_DataLabel.hxx | 1 chart2/source/controller/dialogs/res_ErrorBar.cxx | 1 chart2/source/controller/dialogs/res_LegendPosition.cxx | 1 chart2/source/controller/dialogs/res_Titles.cxx | 1 chart2/source/controller/dialogs/res_Trendline.cxx | 1 chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx | 1 chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx | 1 chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx | 1 chart2/source/controller/dialogs/tp_AxisLabel.hxx | 1 chart2/source/controller/inc/dlg_ChartType.hxx | 1 chart2/source/controller/inc/dlg_DataEditor.hxx | 1 chart2/source/controller/inc/dlg_DataSource.hxx | 1 chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx | 1 chart2/source/controller/inc/dlg_InsertDataLabel.hxx | 1 chart2/source/controller/inc/dlg_InsertDataTable.hxx | 1 chart2/source/controller/inc/dlg_InsertErrorBars.hxx | 1 chart2/source/controller/inc/dlg_InsertLegend.hxx | 1 chart2/source/controller/inc/dlg_InsertTitle.hxx | 1 chart2/source/controller/inc/dlg_View3D.hxx | 1 chart2/source/controller/inc/res_DataTableProperties.hxx | 1 chart2/source/inc/ChartColorPalettes.hxx | 1 chart2/source/inc/ChartResourceGroupDlgs.hxx | 1 chart2/source/inc/ChartTypeDialogController.hxx | 1 chart2/source/inc/res_BarGeometry.hxx | 1 cui/inc/dlgname.hxx | 1 cui/inc/widgettestdlg.hxx | 1 cui/source/customize/macropg_impl.hxx | 1 cui/source/inc/AdditionsDialog.hxx | 2 cui/source/inc/DiagramDialog.hxx | 1 cui/source/inc/FontFeaturesDialog.hxx | 2 cui/source/inc/GraphicsTestsDialog.hxx | 2 cui/source/inc/ImageViewerDialog.hxx | 1 cui/source/inc/MacroManagerDialog.hxx | 1 cui/source/inc/QrCodeGenDialog.hxx | 1 cui/source/inc/SignatureLineDialogBase.hxx | 1 cui/source/inc/SvxMenuConfigPage.hxx | 1 cui/source/inc/about.hxx | 1 cui/source/inc/cfg.hxx | 1 cui/source/inc/cfgutil.hxx | 1 cui/source/inc/chardlg.hxx | 1 cui/source/inc/cuifmsearch.hxx | 1 cui/source/inc/cuigaldlg.hxx | 1 cui/source/inc/cuigrfflt.hxx | 1 cui/source/inc/cuiimapwnd.hxx | 1 cui/source/inc/cuitbxform.hxx | 1 cui/source/inc/fileextcheckdlg.hxx | 1 cui/source/inc/hangulhanjadlg.hxx | 2 cui/source/inc/hlmarkwn.hxx | 1 cui/source/inc/insdlg.hxx | 1 cui/source/inc/insrc.hxx | 1 cui/source/inc/linkdlg.hxx | 1 cui/source/inc/multipat.hxx | 1 cui/source/inc/newtabledlg.hxx | 1 cui/source/inc/optdict.hxx | 1 cui/source/inc/optlingu.hxx | 1 cui/source/inc/pastedlg.hxx | 1 cui/source/inc/querydialog.hxx | 1 cui/source/inc/screenshotannotationdlg.hxx | 1 cui/source/inc/scriptdlg.hxx | 1 cui/source/inc/securityoptions.hxx | 1 cui/source/inc/showcols.hxx | 1 cui/source/inc/splitcelldlg.hxx | 1 cui/source/inc/srchxtra.hxx | 1 cui/source/inc/tipofthedaydlg.hxx | 1 cui/source/options/certpath.hxx | 1 cui/source/options/doclinkdialog.hxx | 1 cui/source/options/optaboutconfig.hxx | 1 cui/source/options/tsaurls.hxx | 1 cui/source/options/webconninfo.hxx | 1 dbaccess/source/core/inc/migrwarndlg.hxx | 1 dbaccess/source/ui/app/AppTitleWindow.hxx | 1 dbaccess/source/ui/dlg/admincontrols.hxx | 1 dbaccess/source/ui/dlg/dbfindex.hxx | 1 dbaccess/source/ui/dlg/dsselect.hxx | 1 dbaccess/source/ui/inc/ChildWindow.hxx | 1 dbaccess/source/ui/inc/CollectionView.hxx | 1 dbaccess/source/ui/inc/FieldDescControl.hxx | 1 dbaccess/source/ui/inc/QueryPropertiesDialog.hxx | 1 dbaccess/source/ui/inc/RelationControl.hxx | 1 dbaccess/source/ui/inc/RelationDlg.hxx | 1 dbaccess/source/ui/inc/adtabdlg.hxx | 1 dbaccess/source/ui/inc/directsql.hxx | 1 dbaccess/source/ui/inc/dlgsave.hxx | 1 dbaccess/source/ui/inc/dlgsize.hxx | 1 dbaccess/source/ui/inc/indexdialog.hxx | 1 dbaccess/source/ui/inc/paramdialog.hxx | 1 dbaccess/source/ui/inc/queryfilter.hxx | 1 dbaccess/source/ui/inc/queryorder.hxx | 1 dbaccess/source/ui/inc/sqlmessage.hxx | 1 dbaccess/source/ui/inc/textconnectionsettings.hxx | 1 dbaccess/source/ui/querydesign/querydlg.hxx | 1 desktop/source/deployment/gui/dp_gui_dependencydialog.hxx | 1 desktop/source/deployment/gui/dp_gui_dialog2.hxx | 1 desktop/source/deployment/gui/dp_gui_updatedialog.hxx | 1 desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx | 1 desktop/source/deployment/gui/license_dialog.cxx | 1 editeng/source/editeng/editview.cxx | 1 extensions/source/bibliography/bibview.cxx | 1 extensions/source/bibliography/datman.cxx | 1 extensions/source/propctrlr/browserline.hxx | 1 extensions/source/propctrlr/browserlistbox.hxx | 1 extensions/source/propctrlr/browserview.hxx | 1 extensions/source/propctrlr/commoncontrol.hxx | 1 extensions/source/propctrlr/formlinkdialog.hxx | 1 extensions/source/propctrlr/inspectorhelpwindow.hxx | 1 extensions/source/propctrlr/listselectiondlg.hxx | 1 extensions/source/propctrlr/newdatatype.hxx | 1 extensions/source/propctrlr/propcontroller.hxx | 1 extensions/source/propctrlr/selectlabeldialog.hxx | 1 extensions/source/propctrlr/taborder.hxx | 1 extensions/source/scanner/grid.hxx | 1 extensions/source/scanner/sanedlg.hxx | 1 filter/source/pdf/impdialog.hxx | 1 filter/source/xsltdialog/xmlfiltersettingsdialog.hxx | 1 filter/source/xsltdialog/xmlfiltertabdialog.hxx | 1 filter/source/xsltdialog/xmlfiltertabpagebasic.hxx | 1 filter/source/xsltdialog/xmlfiltertabpagexslt.hxx | 1 filter/source/xsltdialog/xmlfiltertestdialog.hxx | 1 formula/source/ui/dlg/funcpage.hxx | 1 formula/source/ui/dlg/parawin.hxx | 1 formula/source/ui/dlg/structpg.hxx | 1 fpicker/source/office/QueryFolderName.hxx | 1 fpicker/source/office/breadcrumb.hxx | 1 fpicker/source/office/fpdialogbase.hxx | 1 framework/inc/uielement/toolbarmanager.hxx | 1 include/formula/formula.hxx | 1 include/sfx2/basedlgs.hxx | 1 include/sfx2/charmapcontainer.hxx | 1 include/sfx2/devtools/ObjectInspectorWidgets.hxx | 1 include/sfx2/dinfdlg.hxx | 1 include/sfx2/newstyle.hxx | 1 include/sfx2/passwd.hxx | 1 include/sfx2/sidebar/Panel.hxx | 1 include/sfx2/sidebar/PanelLayout.hxx | 1 include/sfx2/sidebar/TabBar.hxx | 1 include/sfx2/templatedlg.hxx | 1 include/sfx2/templdlg.hxx | 1 include/svtools/PlaceEditDialog.hxx | 1 include/svtools/addresstemplate.hxx | 1 include/svtools/ctrlbox.hxx | 1 include/svtools/genericunodialog.hxx | 1 include/svtools/prnsetup.hxx | 1 include/svtools/querydelete.hxx | 1 include/svtools/toolbarmenu.hxx | 1 include/svx/ClassificationDialog.hxx | 1 include/svx/FileExportedDialog.hxx | 1 include/svx/GenericCheckDialog.hxx | 2 include/svx/GenericDropDownFieldDialog.hxx | 1 include/svx/compressgraphicdialog.hxx | 1 include/svx/ctredlin.hxx | 1 include/svx/dialog/ThemeColorEditDialog.hxx | 1 include/svx/dialog/ThemeDialog.hxx | 1 include/svx/dialog/gotodlg.hxx | 1 include/svx/dlgctrl.hxx | 1 include/svx/fontworkgallery.hxx | 1 include/svx/linkwarn.hxx | 1 include/test/screenshot_test.hxx | 1 include/vcl/ColorDialog.hxx | 1 include/vcl/InterimItemWindow.hxx | 1 include/vcl/WeldedTabbedNotebookbar.hxx | 1 include/vcl/builderpage.hxx | 1 include/vcl/weld/Builder.hxx | 85 +++++ include/vcl/weld/DialogController.hxx | 95 ++++++ include/vcl/weld/customweld.hxx | 1 include/vcl/weld/weld.hxx | 143 ---------- include/vcl/weld/weldutils.hxx | 1 include/vcl/wizardmachine.hxx | 1 reportdesign/source/ui/dlg/Condition.hxx | 2 reportdesign/source/ui/inc/AddField.hxx | 1 reportdesign/source/ui/inc/CondFormat.hxx | 1 reportdesign/source/ui/inc/DateTime.hxx | 1 reportdesign/source/ui/inc/GroupsSorting.hxx | 1 reportdesign/source/ui/inc/Navigator.hxx | 1 reportdesign/source/ui/inc/PageNumber.hxx | 1 sc/source/filter/oox/workbookfragment.cxx | 1 sc/source/ui/inc/FilterListBox.hxx | 1 sc/source/ui/inc/checklistmenu.hxx | 1 sc/source/ui/inc/colorformat.hxx | 1 sc/source/ui/inc/condformatdlgentry.hxx | 1 sc/source/ui/inc/condformatmgr.hxx | 1 sc/source/ui/inc/conflictsdlg.hxx | 1 sc/source/ui/inc/corodlg.hxx | 1 sc/source/ui/inc/crdlg.hxx | 1 sc/source/ui/inc/csvtablebox.hxx | 1 sc/source/ui/inc/dapidata.hxx | 1 sc/source/ui/inc/dapitype.hxx | 1 sc/source/ui/inc/datafdlg.hxx | 1 sc/source/ui/inc/dataproviderdlg.hxx | 1 sc/source/ui/inc/datastreamdlg.hxx | 1 sc/source/ui/inc/delcldlg.hxx | 1 sc/source/ui/inc/delcodlg.hxx | 1 sc/source/ui/inc/dialogs/SelectSheetViewDialog.hxx | 1 sc/source/ui/inc/dpgroupdlg.hxx | 1 sc/source/ui/inc/duplicaterecordsdlg.hxx | 1 sc/source/ui/inc/filldlg.hxx | 1 sc/source/ui/inc/gototabdlg.hxx | 1 sc/source/ui/inc/groupdlg.hxx | 1 sc/source/ui/inc/inputwin.hxx | 1 sc/source/ui/inc/inscldlg.hxx | 1 sc/source/ui/inc/inscodlg.hxx | 1 sc/source/ui/inc/instbdlg.hxx | 1 sc/source/ui/inc/lbseldlg.hxx | 1 sc/source/ui/inc/linkarea.hxx | 1 sc/source/ui/inc/mergecellsdialog.hxx | 1 sc/source/ui/inc/mtrindlg.hxx | 1 sc/source/ui/inc/mvtabdlg.hxx | 1 sc/source/ui/inc/namecrea.hxx | 1 sc/source/ui/inc/namepast.hxx | 1 sc/source/ui/inc/onlyactivesheetsaveddlg.hxx | 1 sc/source/ui/inc/pfiltdlg.hxx | 1 sc/source/ui/inc/protectiondlg.hxx | 1 sc/source/ui/inc/pvfundlg.hxx | 1 sc/source/ui/inc/retypepassdlg.hxx | 2 sc/source/ui/inc/scendlg.hxx | 1 sc/source/ui/inc/scuiasciiopt.hxx | 1 sc/source/ui/inc/scuiautofmt.hxx | 1 sc/source/ui/inc/scuiimoptdlg.hxx | 1 sc/source/ui/inc/sharedocdlg.hxx | 1 sc/source/ui/inc/shtabdlg.hxx | 1 sc/source/ui/inc/solveroptions.hxx | 1 sc/source/ui/inc/sortdlg.hxx | 1 sc/source/ui/inc/sortkeydlg.hxx | 1 sc/source/ui/inc/strindlg.hxx | 1 sc/source/ui/inc/tabbgcolordlg.hxx | 1 sc/source/ui/inc/textimportoptions.hxx | 1 sc/source/ui/inc/warnbox.hxx | 1 sc/source/ui/optdlg/calcoptionsdlg.hxx | 1 sd/source/ui/animations/CustomAnimationDialog.hxx | 2 sd/source/ui/annotations/annotationwindow.hxx | 1 sd/source/ui/dlg/PhotoAlbumDialog.hxx | 1 sd/source/ui/dlg/RemoteDialog.hxx | 1 sd/source/ui/dlg/RemoteDialogClientBox.hxx | 1 sd/source/ui/inc/BulletAndPositionDlg.hxx | 1 sd/source/ui/inc/SelectLayerDlg.hxx | 1 sd/source/ui/inc/TableDesignPane.hxx | 1 sd/source/ui/inc/custsdlg.hxx | 1 sd/source/ui/inc/dlgfield.hxx | 1 sd/source/ui/inc/dlgsnap.hxx | 1 sd/source/ui/inc/headerfooterdlg.hxx | 1 sd/source/ui/inc/ins_paste.hxx | 1 sd/source/ui/inc/inspagob.hxx | 1 sd/source/ui/inc/layeroptionsdlg.hxx | 1 sd/source/ui/inc/masterlayoutdlg.hxx | 1 sd/source/ui/inc/morphdlg.hxx | 1 sd/source/ui/inc/present.hxx | 1 sd/source/ui/inc/sdpopup.hxx | 1 sd/source/ui/inc/sdpreslt.hxx | 1 sd/source/ui/inc/vectdlg.hxx | 1 sdext/source/minimizer/informationdialog.hxx | 1 sfx2/inc/autoredactdialog.hxx | 1 sfx2/inc/checkin.hxx | 1 sfx2/inc/commandpopup/CommandPopup.hxx | 1 sfx2/inc/inputdlg.hxx | 1 sfx2/inc/saveastemplatedlg.hxx | 1 sfx2/inc/sidebar/DeckTitleBar.hxx | 1 sfx2/inc/sidebar/TitleBar.hxx | 1 sfx2/inc/srchdlg.hxx | 1 sfx2/source/appl/appserv.cxx | 1 sfx2/source/appl/impldde.cxx | 1 sfx2/source/appl/newhelp.hxx | 2 sfx2/source/dialog/mailmodel.cxx | 1 sfx2/source/doc/QuerySaveDocument.cxx | 1 sfx2/source/inc/StyleList.hxx | 1 sfx2/source/inc/templdgi.hxx | 1 sfx2/source/view/prnmon.hxx | 1 starmath/inc/dialog.hxx | 2 svtools/source/dialogs/restartdialog.cxx | 1 svtools/source/filter/exportdialog.hxx | 1 svtools/source/java/javainteractionhandler.cxx | 1 svx/inc/extrusiondepthdialog.hxx | 1 svx/source/dialog/SafeModeDialog.hxx | 1 svx/source/dialog/crashreportdlg.hxx | 1 svx/source/inc/datanavi.hxx | 1 svx/source/inc/docrecovery.hxx | 1 svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx | 1 svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.hxx | 1 sw/inc/colwd.hxx | 1 sw/source/core/inc/FormFieldButton.hxx | 1 sw/source/core/inc/contentcontrolbutton.hxx | 1 sw/source/ui/dbui/createaddresslistdialog.hxx | 1 sw/source/ui/inc/mmresultdialogs.hxx | 1 sw/source/ui/index/cnttab.cxx | 1 sw/source/ui/index/swuiidxmrk.cxx | 1 sw/source/uibase/inc/DateFormFieldDialog.hxx | 1 sw/source/uibase/inc/DropDownFieldDialog.hxx | 1 sw/source/uibase/inc/DropDownFormFieldDialog.hxx | 1 sw/source/uibase/inc/QuickFindPanel.hxx | 1 sw/source/uibase/inc/break.hxx | 1 sw/source/uibase/inc/contentcontrollistitemdlg.hxx | 1 sw/source/uibase/inc/copyfielddlg.hxx | 1 sw/source/uibase/inc/dbui.hxx | 1 sw/source/uibase/inc/inpdlg.hxx | 1 sw/source/uibase/inc/insfnote.hxx | 1 sw/source/uibase/inc/javaedit.hxx | 1 sw/source/uibase/inc/mailmrge.hxx | 1 sw/source/uibase/inc/mergetbl.hxx | 1 sw/source/uibase/inc/multmrk.hxx | 1 sw/source/uibase/inc/rowht.hxx | 1 sw/source/uibase/inc/selglos.hxx | 1 sw/source/uibase/inc/splittbl.hxx | 1 sw/source/uibase/inc/srtdlg.hxx | 1 sw/source/uibase/inc/swmessdialog.hxx | 1 sw/source/uibase/inc/swrenamexnameddlg.hxx | 1 sw/source/uibase/inc/swuicnttab.hxx | 1 sw/source/uibase/inc/swuiidxmrk.hxx | 1 sw/source/uibase/inc/translatelangselect.hxx | 1 sw/source/uibase/sidebar/A11yCheckIssuesPanel.hxx | 1 sw/source/uibase/uiview/pview.cxx | 1 sw/source/uibase/utlui/gloslst.cxx | 1 uui/source/authfallbackdlg.hxx | 1 uui/source/fltdlg.hxx | 1 uui/source/logindlg.hxx | 1 uui/source/masterpasscrtdlg.hxx | 1 uui/source/masterpassworddlg.hxx | 1 uui/source/nameclashdlg.hxx | 1 uui/source/openlocked.hxx | 1 uui/source/passworddlg.hxx | 1 uui/source/secmacrowarnings.hxx | 1 uui/source/sslwarndlg.hxx | 1 uui/source/unknownauthdlg.hxx | 1 vcl/Library_vcl.mk | 1 vcl/inc/colorpicker.hxx | 1 vcl/inc/printdlg.hxx | 1 vcl/inc/qt5/QtInstanceBuilder.hxx | 1 vcl/inc/qt5/QtInstanceDialog.hxx | 2 vcl/inc/salvtables.hxx | 2 vcl/source/control/calendar.cxx | 1 vcl/source/weld/DialogController.cxx | 73 +++++ vcl/source/weld/weldutils.cxx | 57 --- vcl/unx/generic/print/prtsetup.hxx | 2 vcl/unx/generic/printer/cupsmgr.cxx | 1 vcl/workben/minweld.cxx | 1 writerperfect/inc/WPFTEncodingDialog.hxx | 1 writerperfect/source/writer/EPUBExportDialog.hxx | 1 xmlsecurity/inc/certificatechooser.hxx | 1 xmlsecurity/inc/certificateviewer.hxx | 2 xmlsecurity/inc/digitalsignaturesdialog.hxx | 1 xmlsecurity/inc/macrosecurity.hxx | 2 345 files changed, 608 insertions(+), 201 deletions(-)
New commits: commit 93787a0aac792501c2d12df46b734c12ea14c082 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Dec 18 13:41:56 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Dec 18 19:44:51 2025 +0100 weld: Move weld::Builder to its own header Change-Id: I89270c89f65e55fea6ad67e74f87d29fbf50c1e0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195844 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx index 56b7adbed308..5a09724de76e 100644 --- a/basctl/source/basicide/moduldlg.hxx +++ b/basctl/source/basicide/moduldlg.hxx @@ -24,6 +24,7 @@ #include <string_view> #include <bastype2.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/chart2/source/controller/dialogs/res_DataLabel.hxx b/chart2/source/controller/dialogs/res_DataLabel.hxx index a50895731bd3..d811be131ee6 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.hxx +++ b/chart2/source/controller/dialogs/res_DataLabel.hxx @@ -20,6 +20,7 @@ #include <svl/itemset.hxx> #include <svx/dialcontrol.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <TextDirectionListBox.hxx> diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx index 3fe92f971ac8..469f931ddcb7 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -22,6 +22,7 @@ #include <RangeSelectionHelper.hxx> #include <helpids.h> #include <chartview/ChartSfxItemIds.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/weld.hxx> #include <ChartModel.hxx> diff --git a/chart2/source/controller/dialogs/res_LegendPosition.cxx b/chart2/source/controller/dialogs/res_LegendPosition.cxx index 9ccbf972bbb8..3f1237135054 100644 --- a/chart2/source/controller/dialogs/res_LegendPosition.cxx +++ b/chart2/source/controller/dialogs/res_LegendPosition.cxx @@ -32,6 +32,7 @@ #include <svl/eitem.hxx> #include <comphelper/diagnose_ex.hxx> #include <utility> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> namespace chart diff --git a/chart2/source/controller/dialogs/res_Titles.cxx b/chart2/source/controller/dialogs/res_Titles.cxx index 878479dced00..33e4a0fecf4f 100644 --- a/chart2/source/controller/dialogs/res_Titles.cxx +++ b/chart2/source/controller/dialogs/res_Titles.cxx @@ -19,6 +19,7 @@ #include <res_Titles.hxx> #include <TitleDialogData.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> namespace chart diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx index d3c3fac29da2..74ac88294683 100644 --- a/chart2/source/controller/dialogs/res_Trendline.cxx +++ b/chart2/source/controller/dialogs/res_Trendline.cxx @@ -27,6 +27,7 @@ #include <svl/numformat.hxx> #include <svl/stritem.hxx> #include <vcl/formatter.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> using namespace css::chart2; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx index 24ae2fb14910..70ddc3cec0dc 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> namespace chart { class ControllerLockHelper; } diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx index db0de7211734..5aa4cecf50ef 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.hxx @@ -19,6 +19,7 @@ #pragma once #include <vcl/timer.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/weld.hxx> #include <rtl/ref.hxx> diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx index e981abff0773..bf1fe2767887 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.hxx @@ -20,6 +20,7 @@ #include <ModifyListenerCallBack.hxx> #include <TimerTriggeredControllerLock.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> #include <svx/dlgctl3d.hxx> #include <svx/float3d.hxx> diff --git a/chart2/source/controller/inc/res_DataTableProperties.hxx b/chart2/source/controller/inc/res_DataTableProperties.hxx index 7e4147dd4a0c..a7f60fa510c2 100644 --- a/chart2/source/controller/inc/res_DataTableProperties.hxx +++ b/chart2/source/controller/inc/res_DataTableProperties.hxx @@ -10,6 +10,7 @@ #pragma once #include <svl/itemset.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> namespace chart diff --git a/chart2/source/inc/ChartColorPalettes.hxx b/chart2/source/inc/ChartColorPalettes.hxx index 486b40586dd7..08ed7c66982a 100644 --- a/chart2/source/inc/ChartColorPalettes.hxx +++ b/chart2/source/inc/ChartColorPalettes.hxx @@ -13,6 +13,7 @@ #include <rtl/ref.hxx> #include <tools/link.hxx> #include <vcl/weld/customweld.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/IconView.hxx> class MouseEvent; diff --git a/chart2/source/inc/ChartTypeDialogController.hxx b/chart2/source/inc/ChartTypeDialogController.hxx index 8634feee1dea..4847b5c91607 100644 --- a/chart2/source/inc/ChartTypeDialogController.hxx +++ b/chart2/source/inc/ChartTypeDialogController.hxx @@ -27,6 +27,7 @@ #include "ThreeDHelper.hxx" #include <com/sun/star/chart2/CurveStyle.hpp> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> namespace com::sun::star::beans diff --git a/chart2/source/inc/res_BarGeometry.hxx b/chart2/source/inc/res_BarGeometry.hxx index efd50a6e2e2d..20d20e6241d0 100644 --- a/chart2/source/inc/res_BarGeometry.hxx +++ b/chart2/source/inc/res_BarGeometry.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/Builder.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/source/inc/AdditionsDialog.hxx b/cui/source/inc/AdditionsDialog.hxx index a2a8f7249f1a..6b92115bb89e 100644 --- a/cui/source/inc/AdditionsDialog.hxx +++ b/cui/source/inc/AdditionsDialog.hxx @@ -12,6 +12,7 @@ #include <salhelper/thread.hxx> #include <rtl/ref.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/source/inc/FontFeaturesDialog.hxx b/cui/source/inc/FontFeaturesDialog.hxx index b33025b91c78..6b1aece56698 100644 --- a/cui/source/inc/FontFeaturesDialog.hxx +++ b/cui/source/inc/FontFeaturesDialog.hxx @@ -11,6 +11,7 @@ #pragma once #include <vcl/svapp.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <vcl/font/Feature.hxx> diff --git a/cui/source/inc/GraphicsTestsDialog.hxx b/cui/source/inc/GraphicsTestsDialog.hxx index 5f78962cfab4..684ca6c7aa4a 100644 --- a/cui/source/inc/GraphicsTestsDialog.hxx +++ b/cui/source/inc/GraphicsTestsDialog.hxx @@ -9,6 +9,7 @@ #pragma once #include <vcl/bitmap.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <tools/link.hxx> diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index ca6a75967044..e5a885ff3b0e 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -19,6 +19,7 @@ #pragma once #include <vcl/event.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/customweld.hxx> diff --git a/dbaccess/source/ui/app/AppTitleWindow.hxx b/dbaccess/source/ui/app/AppTitleWindow.hxx index d57f5241650f..f67489d62bc2 100644 --- a/dbaccess/source/ui/app/AppTitleWindow.hxx +++ b/dbaccess/source/ui/app/AppTitleWindow.hxx @@ -19,6 +19,7 @@ #pragma once #include <ChildWindow.hxx> + #include <unotools/resmgr.hxx> namespace dbaui diff --git a/dbaccess/source/ui/dlg/admincontrols.hxx b/dbaccess/source/ui/dlg/admincontrols.hxx index 6002e62c257c..6c022d6b2582 100644 --- a/dbaccess/source/ui/dlg/admincontrols.hxx +++ b/dbaccess/source/ui/dlg/admincontrols.hxx @@ -21,6 +21,7 @@ #include "adminpages.hxx" +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> namespace dbaui diff --git a/dbaccess/source/ui/inc/ChildWindow.hxx b/dbaccess/source/ui/inc/ChildWindow.hxx index 23bae73b9c9b..9f9cda99fd62 100644 --- a/dbaccess/source/ui/inc/ChildWindow.hxx +++ b/dbaccess/source/ui/inc/ChildWindow.hxx @@ -9,6 +9,7 @@ #pragma once +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> namespace dbaui diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index b2df03ea0cb4..82920c1958f3 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> #include "IClipBoardTest.hxx" #include "QEnumTypes.hxx" diff --git a/dbaccess/source/ui/inc/RelationControl.hxx b/dbaccess/source/ui/inc/RelationControl.hxx index 2b5590decebf..e596480acb1e 100644 --- a/dbaccess/source/ui/inc/RelationControl.hxx +++ b/dbaccess/source/ui/inc/RelationControl.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> #include "JoinTableView.hxx" diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 13c5353e17ca..214dbff46c81 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -46,6 +46,7 @@ #include <editeng/editrids.hrc> #include <editeng.hxx> #include <i18nlangtag/lang.h> +#include <vcl/weld/Builder.hxx> #include <vcl/window.hxx> #include <editeng/acorrcfg.hxx> #include <editeng/unolingu.hxx> diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx index 2180bcb95415..78f8f02b6f45 100644 --- a/extensions/source/propctrlr/browserline.hxx +++ b/extensions/source/propctrlr/browserline.hxx @@ -20,6 +20,7 @@ #pragma once #include <com/sun/star/inspection/XPropertyControl.hpp> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> namespace com::sun::star::inspection::PropertyLineElement diff --git a/extensions/source/propctrlr/browserlistbox.hxx b/extensions/source/propctrlr/browserlistbox.hxx index 8eaa93f90172..8262ba3c13ea 100644 --- a/extensions/source/propctrlr/browserlistbox.hxx +++ b/extensions/source/propctrlr/browserlistbox.hxx @@ -24,6 +24,7 @@ #include <com/sun/star/inspection/XPropertyControl.hpp> #include <com/sun/star/inspection/XPropertyHandler.hpp> #include <utility> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> #include <rtl/ref.hxx> diff --git a/extensions/source/propctrlr/browserview.hxx b/extensions/source/propctrlr/browserview.hxx index 8ac3d082098f..c14e41f0abb3 100644 --- a/extensions/source/propctrlr/browserview.hxx +++ b/extensions/source/propctrlr/browserview.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <o3tl/deleter.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> namespace pcr diff --git a/extensions/source/propctrlr/commoncontrol.hxx b/extensions/source/propctrlr/commoncontrol.hxx index 62fc99d856ae..db16c9cec6e6 100644 --- a/extensions/source/propctrlr/commoncontrol.hxx +++ b/extensions/source/propctrlr/commoncontrol.hxx @@ -24,6 +24,7 @@ #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <tools/link.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/weld.hxx> #include <vcl/weld/weldutils.hxx> diff --git a/extensions/source/propctrlr/inspectorhelpwindow.hxx b/extensions/source/propctrlr/inspectorhelpwindow.hxx index 204cf339dfdc..632d252a0808 100644 --- a/extensions/source/propctrlr/inspectorhelpwindow.hxx +++ b/extensions/source/propctrlr/inspectorhelpwindow.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> namespace pcr diff --git a/extensions/source/propctrlr/propcontroller.hxx b/extensions/source/propctrlr/propcontroller.hxx index 6999984c4832..47685ef27c45 100644 --- a/extensions/source/propctrlr/propcontroller.hxx +++ b/extensions/source/propctrlr/propcontroller.hxx @@ -38,6 +38,7 @@ #include <comphelper/uno3.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/broadcasthelper.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> #include <map> diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx index 9283d207a315..b2284131a3ba 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx +++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> class filter_info_impl; diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx index 2de625c1f64e..cbe4f94fc441 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> #include <svtools/inettbc.hxx> diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx index 76b717bb7c14..009693f75d46 100644 --- a/formula/source/ui/dlg/funcpage.hxx +++ b/formula/source/ui/dlg/funcpage.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/Builder.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include <vector> diff --git a/formula/source/ui/dlg/parawin.hxx b/formula/source/ui/dlg/parawin.hxx index 0ae3f51aa984..10b9d129b852 100644 --- a/formula/source/ui/dlg/parawin.hxx +++ b/formula/source/ui/dlg/parawin.hxx @@ -20,6 +20,7 @@ #pragma once #include <formula/funcutl.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> #include "ControlHelper.hxx" #include <vector> diff --git a/formula/source/ui/dlg/structpg.hxx b/formula/source/ui/dlg/structpg.hxx index bd0d4601488a..97cbb4b41795 100644 --- a/formula/source/ui/dlg/structpg.hxx +++ b/formula/source/ui/dlg/structpg.hxx @@ -20,6 +20,7 @@ #pragma once #include <formula/formula.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/fpicker/source/office/breadcrumb.hxx b/fpicker/source/office/breadcrumb.hxx index fe35e6afe025..b8b94d2bc2b0 100644 --- a/fpicker/source/office/breadcrumb.hxx +++ b/fpicker/source/office/breadcrumb.hxx @@ -9,6 +9,7 @@ #pragma once +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> #include <map> #include <vector> diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 37e63fa7881b..b76949f5b4d2 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -40,6 +40,7 @@ #include <comphelper/interfacecontainer4.hxx> #include <tools/link.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> #include <vcl/window.hxx> #include <vcl/timer.hxx> diff --git a/include/sfx2/charmapcontainer.hxx b/include/sfx2/charmapcontainer.hxx index 0034d1dfe088..77c9852296e3 100644 --- a/include/sfx2/charmapcontainer.hxx +++ b/include/sfx2/charmapcontainer.hxx @@ -22,6 +22,7 @@ #include <sfx2/charwin.hxx> #include <sfx2/dllapi.h> #include <vcl/virdev.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <deque> diff --git a/include/sfx2/devtools/ObjectInspectorWidgets.hxx b/include/sfx2/devtools/ObjectInspectorWidgets.hxx index 3e1a9ffe4161..57d744f2ab42 100644 --- a/include/sfx2/devtools/ObjectInspectorWidgets.hxx +++ b/include/sfx2/devtools/ObjectInspectorWidgets.hxx @@ -11,6 +11,7 @@ #pragma once #include <sfx2/dllapi.h> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index 10d19654129d..b9bf4ecf644c 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -33,6 +33,7 @@ #include <svtools/ctrlbox.hxx> #include <vcl/idle.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weldutils.hxx> #include <sfx2/tabdlg.hxx> diff --git a/include/sfx2/sidebar/Panel.hxx b/include/sfx2/sidebar/Panel.hxx index 4238688d51d1..3a645b3d161a 100644 --- a/include/sfx2/sidebar/Panel.hxx +++ b/include/sfx2/sidebar/Panel.hxx @@ -19,6 +19,7 @@ #pragma once #include <sfx2/dllapi.h> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> #include <vector> diff --git a/include/sfx2/sidebar/PanelLayout.hxx b/include/sfx2/sidebar/PanelLayout.hxx index 45a2ad3a340a..a79e803c966d 100644 --- a/include/sfx2/sidebar/PanelLayout.hxx +++ b/include/sfx2/sidebar/PanelLayout.hxx @@ -10,6 +10,7 @@ #pragma once #include <sfx2/dllapi.h> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> class DataChangedEvent; diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx index 7e3bcfeb28a2..2d25cd47c14d 100644 --- a/include/sfx2/sidebar/TabBar.hxx +++ b/include/sfx2/sidebar/TabBar.hxx @@ -21,6 +21,7 @@ #include <sfx2/sidebar/ResourceManager.hxx> #include <vcl/InterimItemWindow.hxx> +#include <vcl/weld/Builder.hxx> #include <functional> diff --git a/include/sfx2/templdlg.hxx b/include/sfx2/templdlg.hxx index 254fcc790fb0..700a5a8187fd 100644 --- a/include/sfx2/templdlg.hxx +++ b/include/sfx2/templdlg.hxx @@ -25,6 +25,7 @@ #include <sfx2/dllapi.h> #include <sfx2/sidebar/PanelLayout.hxx> #include <sfx2/sidebar/ControllerItem.hxx> +#include <vcl/weld/Builder.hxx> class SfxBindings; class SfxTemplateDialog_Impl; diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index c261e6ea687f..38a986941a62 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -24,6 +24,7 @@ #include <editeng/borderline.hxx> #include <vcl/idle.hxx> #include <vcl/metric.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> #include <memory> diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx index 874094047697..9a41a7fb5515 100644 --- a/include/svtools/toolbarmenu.hxx +++ b/include/svtools/toolbarmenu.hxx @@ -25,6 +25,7 @@ #include <rtl/ref.hxx> #include <vcl/dockwin.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> namespace com :: sun :: star :: frame { class XFrame; } diff --git a/include/svx/GenericCheckDialog.hxx b/include/svx/GenericCheckDialog.hxx index a2067b8028ec..42157efe2dc7 100644 --- a/include/svx/GenericCheckDialog.hxx +++ b/include/svx/GenericCheckDialog.hxx @@ -12,6 +12,7 @@ #include <svx/svxdllapi.h> #include <tools/link.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index 0b7bf734efc8..cd8017160334 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -27,6 +27,7 @@ #include <tools/datetime.hxx> #include <tools/link.hxx> #include <tools/time.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include <memory> diff --git a/include/vcl/InterimItemWindow.hxx b/include/vcl/InterimItemWindow.hxx index 5b7d929ea79e..a91d08849bcd 100644 --- a/include/vcl/InterimItemWindow.hxx +++ b/include/vcl/InterimItemWindow.hxx @@ -12,6 +12,7 @@ #include <vcl/dllapi.h> #include <vcl/ctrl.hxx> #include <vcl/idle.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> class VCL_DLLPUBLIC InterimItemWindow : public Control diff --git a/include/vcl/WeldedTabbedNotebookbar.hxx b/include/vcl/WeldedTabbedNotebookbar.hxx index 37b887c23f3f..6540cfb33bf2 100644 --- a/include/vcl/WeldedTabbedNotebookbar.hxx +++ b/include/vcl/WeldedTabbedNotebookbar.hxx @@ -13,6 +13,7 @@ #include <config_options.h> #include <vcl/dllapi.h> #include <rtl/ustring.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> #include <com/sun/star/frame/XFrame.hpp> diff --git a/include/vcl/builderpage.hxx b/include/vcl/builderpage.hxx index 5c20f212e3b5..fbc68066e716 100644 --- a/include/vcl/builderpage.hxx +++ b/include/vcl/builderpage.hxx @@ -10,6 +10,7 @@ #ifndef INCLUDED_VCL_BUILDERPAGE_HXX #define INCLUDED_VCL_BUILDERPAGE_HXX +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> class VCL_DLLPUBLIC BuilderPage diff --git a/include/vcl/weld/Builder.hxx b/include/vcl/weld/Builder.hxx new file mode 100644 index 000000000000..93d6efd9cd1e --- /dev/null +++ b/include/vcl/weld/Builder.hxx @@ -0,0 +1,85 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#pragma once + +#include <vcl/dllapi.h> +#include <vcl/weld/weld.hxx> + +namespace weld +{ +class VCL_DLLPUBLIC Builder +{ +public: + virtual std::unique_ptr<MessageDialog> weld_message_dialog(const OUString& id) = 0; + virtual std::unique_ptr<Dialog> weld_dialog(const OUString& id) = 0; + virtual std::unique_ptr<Assistant> weld_assistant(const OUString& id) = 0; + virtual std::unique_ptr<Widget> weld_widget(const OUString& id) = 0; + virtual std::unique_ptr<Container> weld_container(const OUString& id) = 0; + virtual std::unique_ptr<Box> weld_box(const OUString& id) = 0; + virtual std::unique_ptr<Grid> weld_grid(const OUString& id) = 0; + virtual std::unique_ptr<Paned> weld_paned(const OUString& id) = 0; + virtual std::unique_ptr<Button> weld_button(const OUString& id) = 0; + virtual std::unique_ptr<MenuButton> weld_menu_button(const OUString& id) = 0; + virtual std::unique_ptr<Frame> weld_frame(const OUString& id) = 0; + /* bUserManagedScrolling of true means that the automatic scrolling of the window is disabled + and the owner must specifically listen to adjustment changes and react appropriately to them. + */ + virtual std::unique_ptr<ScrolledWindow> weld_scrolled_window(const OUString& id, + bool bUserManagedScrolling = false) + = 0; + virtual std::unique_ptr<Notebook> weld_notebook(const OUString& id) = 0; + virtual std::unique_ptr<ToggleButton> weld_toggle_button(const OUString& id) = 0; + virtual std::unique_ptr<RadioButton> weld_radio_button(const OUString& id) = 0; + virtual std::unique_ptr<CheckButton> weld_check_button(const OUString& id) = 0; + virtual std::unique_ptr<LinkButton> weld_link_button(const OUString& id) = 0; + virtual std::unique_ptr<SpinButton> weld_spin_button(const OUString& id) = 0; + virtual std::unique_ptr<MetricSpinButton> weld_metric_spin_button(const OUString& id, + FieldUnit eUnit) + = 0; + virtual std::unique_ptr<FormattedSpinButton> weld_formatted_spin_button(const OUString& id) = 0; + virtual std::unique_ptr<ComboBox> weld_combo_box(const OUString& id) = 0; + virtual std::unique_ptr<TreeView> weld_tree_view(const OUString& id) = 0; + virtual std::unique_ptr<IconView> weld_icon_view(const OUString& id) = 0; + virtual std::unique_ptr<Label> weld_label(const OUString& id) = 0; + virtual std::unique_ptr<TextView> weld_text_view(const OUString& id) = 0; + virtual std::unique_ptr<Expander> weld_expander(const OUString& id) = 0; + virtual std::unique_ptr<Entry> weld_entry(const OUString& id) = 0; + virtual std::unique_ptr<Scale> weld_scale(const OUString& id) = 0; + virtual std::unique_ptr<ProgressBar> weld_progress_bar(const OUString& id) = 0; + virtual std::unique_ptr<LevelBar> weld_level_bar(const OUString& id) = 0; + virtual std::unique_ptr<Spinner> weld_spinner(const OUString& id) = 0; + virtual std::unique_ptr<Image> weld_image(const OUString& id) = 0; + virtual std::unique_ptr<Calendar> weld_calendar(const OUString& id) = 0; + virtual std::unique_ptr<DrawingArea> + weld_drawing_area(const OUString& id, + const rtl::Reference<comphelper::OAccessible>& rA11yImpl = nullptr, + FactoryFunction pUITestFactoryFunction = nullptr, void* pUserData = nullptr) + = 0; + virtual std::unique_ptr<EntryTreeView> weld_entry_tree_view(const OUString& containerid, + const OUString& entryid, + const OUString& treeviewid) + = 0; + virtual std::unique_ptr<Menu> weld_menu(const OUString& id) = 0; + virtual std::unique_ptr<Popover> weld_popover(const OUString& id) = 0; + virtual std::unique_ptr<Toolbar> weld_toolbar(const OUString& id) = 0; + virtual std::unique_ptr<Scrollbar> weld_scrollbar(const OUString& id) = 0; + virtual std::unique_ptr<SizeGroup> create_size_group() = 0; + /* return a Dialog suitable to take a screenshot of containing the contents of the .ui file. + + If the toplevel element is a dialog, that will be returned + If the toplevel is not a dialog, a dialog will be created and the contents of the .ui + inserted into it + */ + virtual std::unique_ptr<Window> create_screenshot_window() = 0; + virtual ~Builder() {} +}; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/include/vcl/weld/DialogController.hxx b/include/vcl/weld/DialogController.hxx index 4431ccea06f4..eb4ae6e2a6d1 100644 --- a/include/vcl/weld/DialogController.hxx +++ b/include/vcl/weld/DialogController.hxx @@ -10,6 +10,7 @@ #pragma once #include <vcl/dllapi.h> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> namespace weld diff --git a/include/vcl/weld/customweld.hxx b/include/vcl/weld/customweld.hxx index c37fe52a94af..a46188eabc85 100644 --- a/include/vcl/weld/customweld.hxx +++ b/include/vcl/weld/customweld.hxx @@ -10,6 +10,7 @@ #pragma once #include <comphelper/OAccessible.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> class InputContext; diff --git a/include/vcl/weld/weld.hxx b/include/vcl/weld/weld.hxx index 92d6b79ef758..9fa282ccff6d 100644 --- a/include/vcl/weld/weld.hxx +++ b/include/vcl/weld/weld.hxx @@ -2051,73 +2051,6 @@ public: virtual ~SizeGroup() {} }; -class VCL_DLLPUBLIC Builder -{ -public: - virtual std::unique_ptr<MessageDialog> weld_message_dialog(const OUString& id) = 0; - virtual std::unique_ptr<Dialog> weld_dialog(const OUString& id) = 0; - virtual std::unique_ptr<Assistant> weld_assistant(const OUString& id) = 0; - virtual std::unique_ptr<Widget> weld_widget(const OUString& id) = 0; - virtual std::unique_ptr<Container> weld_container(const OUString& id) = 0; - virtual std::unique_ptr<Box> weld_box(const OUString& id) = 0; - virtual std::unique_ptr<Grid> weld_grid(const OUString& id) = 0; - virtual std::unique_ptr<Paned> weld_paned(const OUString& id) = 0; - virtual std::unique_ptr<Button> weld_button(const OUString& id) = 0; - virtual std::unique_ptr<MenuButton> weld_menu_button(const OUString& id) = 0; - virtual std::unique_ptr<Frame> weld_frame(const OUString& id) = 0; - /* bUserManagedScrolling of true means that the automatic scrolling of the window is disabled - and the owner must specifically listen to adjustment changes and react appropriately to them. - */ - virtual std::unique_ptr<ScrolledWindow> weld_scrolled_window(const OUString& id, - bool bUserManagedScrolling = false) - = 0; - virtual std::unique_ptr<Notebook> weld_notebook(const OUString& id) = 0; - virtual std::unique_ptr<ToggleButton> weld_toggle_button(const OUString& id) = 0; - virtual std::unique_ptr<RadioButton> weld_radio_button(const OUString& id) = 0; - virtual std::unique_ptr<CheckButton> weld_check_button(const OUString& id) = 0; - virtual std::unique_ptr<LinkButton> weld_link_button(const OUString& id) = 0; - virtual std::unique_ptr<SpinButton> weld_spin_button(const OUString& id) = 0; - virtual std::unique_ptr<MetricSpinButton> weld_metric_spin_button(const OUString& id, - FieldUnit eUnit) - = 0; - virtual std::unique_ptr<FormattedSpinButton> weld_formatted_spin_button(const OUString& id) = 0; - virtual std::unique_ptr<ComboBox> weld_combo_box(const OUString& id) = 0; - virtual std::unique_ptr<TreeView> weld_tree_view(const OUString& id) = 0; - virtual std::unique_ptr<IconView> weld_icon_view(const OUString& id) = 0; - virtual std::unique_ptr<Label> weld_label(const OUString& id) = 0; - virtual std::unique_ptr<TextView> weld_text_view(const OUString& id) = 0; - virtual std::unique_ptr<Expander> weld_expander(const OUString& id) = 0; - virtual std::unique_ptr<Entry> weld_entry(const OUString& id) = 0; - virtual std::unique_ptr<Scale> weld_scale(const OUString& id) = 0; - virtual std::unique_ptr<ProgressBar> weld_progress_bar(const OUString& id) = 0; - virtual std::unique_ptr<LevelBar> weld_level_bar(const OUString& id) = 0; - virtual std::unique_ptr<Spinner> weld_spinner(const OUString& id) = 0; - virtual std::unique_ptr<Image> weld_image(const OUString& id) = 0; - virtual std::unique_ptr<Calendar> weld_calendar(const OUString& id) = 0; - virtual std::unique_ptr<DrawingArea> - weld_drawing_area(const OUString& id, - const rtl::Reference<comphelper::OAccessible>& rA11yImpl = nullptr, - FactoryFunction pUITestFactoryFunction = nullptr, void* pUserData = nullptr) - = 0; - virtual std::unique_ptr<EntryTreeView> weld_entry_tree_view(const OUString& containerid, - const OUString& entryid, - const OUString& treeviewid) - = 0; - virtual std::unique_ptr<Menu> weld_menu(const OUString& id) = 0; - virtual std::unique_ptr<Popover> weld_popover(const OUString& id) = 0; - virtual std::unique_ptr<Toolbar> weld_toolbar(const OUString& id) = 0; - virtual std::unique_ptr<Scrollbar> weld_scrollbar(const OUString& id) = 0; - virtual std::unique_ptr<SizeGroup> create_size_group() = 0; - /* return a Dialog suitable to take a screenshot of containing the contents of the .ui file. - - If the toplevel element is a dialog, that will be returned - If the toplevel is not a dialog, a dialog will be created and the contents of the .ui - inserted into it - */ - virtual std::unique_ptr<Window> create_screenshot_window() = 0; - virtual ~Builder() {} -}; - void Dialog::set_default_response(int nResponse) { std::unique_ptr<weld::Button> pButton = weld_button_for_response(nResponse); diff --git a/include/vcl/weld/weldutils.hxx b/include/vcl/weld/weldutils.hxx index 8d2bd8623093..fed2f172c069 100644 --- a/include/vcl/weld/weldutils.hxx +++ b/include/vcl/weld/weldutils.hxx @@ -21,6 +21,7 @@ #include <vcl/formatter.hxx> #include <vcl/timer.hxx> #include <vcl/transfer.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index fd064c8a874b..652fce9264ac 100644 --- a/reportdesign/source/ui/dlg/Condition.hxx +++ b/reportdesign/source/ui/dlg/Condition.hxx @@ -26,7 +26,7 @@ #include <svx/colorwindow.hxx> #include <svx/fntctrl.hxx> - +#include <vcl/weld/Builder.hxx> #include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> diff --git a/sc/source/ui/inc/FilterListBox.hxx b/sc/source/ui/inc/FilterListBox.hxx index d11e46bd03ea..dff9c3dea2c3 100644 --- a/sc/source/ui/inc/FilterListBox.hxx +++ b/sc/source/ui/inc/FilterListBox.hxx @@ -22,6 +22,7 @@ #include <types.hxx> #include <tools/solar.h> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 8acee5bf8681..8fb90e2d11ee 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -11,6 +11,7 @@ #include <vcl/timer.hxx> #include <vcl/virdev.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index 85add22db09a..65c4a709338c 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -11,6 +11,7 @@ #include <conditio.hxx> #include <formula/funcutl.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> #include <svl/lstner.hxx> #include <svx/fntctrl.hxx> diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx index 08d282b548ac..32e79a470ea3 100644 --- a/sc/source/ui/inc/csvtablebox.hxx +++ b/sc/source/ui/inc/csvtablebox.hxx @@ -20,6 +20,7 @@ #pragma once #include <vcl/idle.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> #include <scdllapi.h> #include "csvcontrol.hxx" diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index f542ca753adc..b3779253a8f2 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -24,6 +24,7 @@ #include <memory> #include <vcl/toolbox.hxx> #include <vcl/InterimItemWindow.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/customweld.hxx> #include <sfx2/childwin.hxx> #include <svl/lstner.hxx> diff --git a/sc/source/ui/inc/retypepassdlg.hxx b/sc/source/ui/inc/retypepassdlg.hxx index 05f35d5b309e..796e4a06257f 100644 --- a/sc/source/ui/inc/retypepassdlg.hxx +++ b/sc/source/ui/inc/retypepassdlg.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/Builder.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <tabprotection.hxx> diff --git a/sc/source/ui/inc/sortkeydlg.hxx b/sc/source/ui/inc/sortkeydlg.hxx index 9c74a1d41101..19f73f3b88a3 100644 --- a/sc/source/ui/inc/sortkeydlg.hxx +++ b/sc/source/ui/inc/sortkeydlg.hxx @@ -12,6 +12,7 @@ #include <vector> #include <memory> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> struct ScSortKeyItem diff --git a/sd/source/ui/animations/CustomAnimationDialog.hxx b/sd/source/ui/animations/CustomAnimationDialog.hxx index 55c5f0450147..1fbda099bac9 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.hxx +++ b/sd/source/ui/animations/CustomAnimationDialog.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/Builder.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> diff --git a/sd/source/ui/annotations/annotationwindow.hxx b/sd/source/ui/annotations/annotationwindow.hxx index 3bd260d1011b..f2a2dca34a7a 100644 --- a/sd/source/ui/annotations/annotationwindow.hxx +++ b/sd/source/ui/annotations/annotationwindow.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> #include <tools/long.hxx> #include <svx/weldeditview.hxx> diff --git a/sd/source/ui/dlg/RemoteDialogClientBox.hxx b/sd/source/ui/dlg/RemoteDialogClientBox.hxx index f273f320f4a2..529cb8578806 100644 --- a/sd/source/ui/dlg/RemoteDialogClientBox.hxx +++ b/sd/source/ui/dlg/RemoteDialogClientBox.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> #include <memory> diff --git a/sd/source/ui/inc/TableDesignPane.hxx b/sd/source/ui/inc/TableDesignPane.hxx index 168b477aab32..1c8e345bd74d 100644 --- a/sd/source/ui/inc/TableDesignPane.hxx +++ b/sd/source/ui/inc/TableDesignPane.hxx @@ -22,6 +22,7 @@ #include <svtools/valueset.hxx> #include <sfx2/sidebar/ILayoutableWindow.hxx> #include <sfx2/sidebar/PanelLayout.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> namespace com::sun::star::beans { class XPropertySet; } diff --git a/sd/source/ui/inc/sdpopup.hxx b/sd/source/ui/inc/sdpopup.hxx index faab9354010c..535e09f2ddf8 100644 --- a/sd/source/ui/inc/sdpopup.hxx +++ b/sd/source/ui/inc/sdpopup.hxx @@ -20,6 +20,7 @@ #pragma once #include <i18nlangtag/lang.h> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> class SvxFieldData; diff --git a/sfx2/inc/commandpopup/CommandPopup.hxx b/sfx2/inc/commandpopup/CommandPopup.hxx index fcb93a87ab39..2bfc8b6fad84 100644 --- a/sfx2/inc/commandpopup/CommandPopup.hxx +++ b/sfx2/inc/commandpopup/CommandPopup.hxx @@ -10,6 +10,7 @@ #pragma once #include <utility> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/sfx2/inc/sidebar/DeckTitleBar.hxx b/sfx2/inc/sidebar/DeckTitleBar.hxx index 0ad16e0dcde2..4f020ccd3287 100644 --- a/sfx2/inc/sidebar/DeckTitleBar.hxx +++ b/sfx2/inc/sidebar/DeckTitleBar.hxx @@ -19,6 +19,7 @@ #pragma once #include <sidebar/TitleBar.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/customweld.hxx> namespace sfx2::sidebar diff --git a/sfx2/inc/sidebar/TitleBar.hxx b/sfx2/inc/sidebar/TitleBar.hxx index fdc3ec9615db..65463598a1bb 100644 --- a/sfx2/inc/sidebar/TitleBar.hxx +++ b/sfx2/inc/sidebar/TitleBar.hxx @@ -19,6 +19,7 @@ #pragma once #include <sfx2/sidebar/Theme.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> namespace sfx2::sidebar { diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 1fa5d4fe9632..b22688821d71 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -27,6 +27,7 @@ #include <vcl/dockwin.hxx> #include <vcl/idle.hxx> #include <vcl/keycod.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index 4c7b27978e52..3a94a89b8aec 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -41,6 +41,7 @@ #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/util/XModifiable.hpp> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> #include <osl/diagnose.h> diff --git a/sfx2/source/doc/QuerySaveDocument.cxx b/sfx2/source/doc/QuerySaveDocument.cxx index b0b781b50dff..601fac63ed2a 100644 --- a/sfx2/source/doc/QuerySaveDocument.cxx +++ b/sfx2/source/doc/QuerySaveDocument.cxx @@ -19,6 +19,7 @@ #include <sfx2/QuerySaveDocument.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> short ExecuteQuerySaveDocument(weld::Widget* _pParent, std::u16string_view _rTitle) diff --git a/sfx2/source/inc/StyleList.hxx b/sfx2/source/inc/StyleList.hxx index f7e8c3ac29ee..737bc99e3782 100644 --- a/sfx2/source/inc/StyleList.hxx +++ b/sfx2/source/inc/StyleList.hxx @@ -28,6 +28,7 @@ #include <svl/style.hxx> #include <vcl/idle.hxx> #include <vcl/transfer.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 70736b900e61..802f7a7cf83f 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -24,6 +24,7 @@ #include <memory> #include <vcl/transfer.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> #include <svl/eitem.hxx> diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index c898efb2feea..a2a4c11906a3 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -21,6 +21,7 @@ #include <sfx2/tabdlg.hxx> #include <vcl/outdev.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/EntryTreeView.hxx> #include <vcl/weld/MetricSpinButton.hxx> diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx index 6a1ff8915578..e7945e8ef566 100644 --- a/svtools/source/java/javainteractionhandler.cxx +++ b/svtools/source/java/javainteractionhandler.cxx @@ -29,6 +29,7 @@ #include <comphelper/processfactory.hxx> #include <osl/process.h> #include <vcl/svapp.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> #include <jvmfwk/framework.hxx> diff --git a/sw/source/core/inc/FormFieldButton.hxx b/sw/source/core/inc/FormFieldButton.hxx index 294e6d64934b..dce5c5872d6a 100644 --- a/sw/source/core/inc/FormFieldButton.hxx +++ b/sw/source/core/inc/FormFieldButton.hxx @@ -10,6 +10,7 @@ #pragma once #include <vcl/ctrl.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> #include <swrect.hxx> diff --git a/sw/source/core/inc/contentcontrolbutton.hxx b/sw/source/core/inc/contentcontrolbutton.hxx index 16352e46164b..c38a0fed9eda 100644 --- a/sw/source/core/inc/contentcontrolbutton.hxx +++ b/sw/source/core/inc/contentcontrolbutton.hxx @@ -10,6 +10,7 @@ #pragma once #include <vcl/ctrl.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> #include <swrect.hxx> diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index cc05f12bdc98..3fe702bb39a4 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -22,6 +22,7 @@ #include <sfx2/tabdlg.hxx> #include <svx/langbox.hxx> #include <vcl/idle.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/customweld.hxx> diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx index f3befb07647d..e501e092749f 100644 --- a/sw/source/uibase/inc/swuiidxmrk.hxx +++ b/sw/source/uibase/inc/swuiidxmrk.hxx @@ -23,6 +23,7 @@ #include <com/sun/star/i18n/XExtendedIndexEntrySupplier.hpp> #include <sfx2/basedlgs.hxx> #include <sfx2/childwin.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> #include <toxe.hxx> #include <memory> diff --git a/sw/source/uibase/sidebar/A11yCheckIssuesPanel.hxx b/sw/source/uibase/sidebar/A11yCheckIssuesPanel.hxx index 5e8a924a59f9..3515d51ca295 100644 --- a/sw/source/uibase/sidebar/A11yCheckIssuesPanel.hxx +++ b/sw/source/uibase/sidebar/A11yCheckIssuesPanel.hxx @@ -16,6 +16,7 @@ #include <sfx2/sidebar/PanelLayout.hxx> #include <svl/poolitem.hxx> #include <tools/link.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> #include <com/sun/star/ui/XSidebar.hpp> diff --git a/vcl/inc/qt5/QtInstanceBuilder.hxx b/vcl/inc/qt5/QtInstanceBuilder.hxx index dce62ebdb414..313019d82fa5 100644 --- a/vcl/inc/qt5/QtInstanceBuilder.hxx +++ b/vcl/inc/qt5/QtInstanceBuilder.hxx @@ -16,6 +16,7 @@ #include <QtWidgets/QWidget> #include <rtl/ustring.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/EntryTreeView.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/TreeView.hxx> diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx index e9c77666254a..f014377beecc 100644 --- a/vcl/inc/salvtables.hxx +++ b/vcl/inc/salvtables.hxx @@ -9,6 +9,7 @@ #pragma once #include <vcl/builder.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/EntryTreeView.hxx> #include <vcl/weld/MetricSpinButton.hxx> diff --git a/vcl/source/control/calendar.cxx b/vcl/source/control/calendar.cxx index c85d8de7f66a..7024e2a2be6a 100644 --- a/vcl/source/control/calendar.cxx +++ b/vcl/source/control/calendar.cxx @@ -23,6 +23,7 @@ #include <vcl/toolkit/calendar.hxx> #include <vcl/commandevent.hxx> #include <vcl/dockwin.hxx> +#include <vcl/weld/Builder.hxx> #include <unotools/localedatawrapper.hxx> #include <com/sun/star/i18n/Weekdays.hpp> diff --git a/vcl/unx/generic/print/prtsetup.hxx b/vcl/unx/generic/print/prtsetup.hxx index 17de89ab5855..3d9d9119aadf 100644 --- a/vcl/unx/generic/print/prtsetup.hxx +++ b/vcl/unx/generic/print/prtsetup.hxx @@ -20,6 +20,7 @@ #pragma once #include <vcl/idle.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/xmlsecurity/inc/certificateviewer.hxx b/xmlsecurity/inc/certificateviewer.hxx index be288486d24d..da8066115349 100644 --- a/xmlsecurity/inc/certificateviewer.hxx +++ b/xmlsecurity/inc/certificateviewer.hxx @@ -20,6 +20,7 @@ #pragma once #include <utility> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/xmlsecurity/inc/macrosecurity.hxx b/xmlsecurity/inc/macrosecurity.hxx index 94772ecb19db..78fb44f3e833 100644 --- a/xmlsecurity/inc/macrosecurity.hxx +++ b/xmlsecurity/inc/macrosecurity.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/Builder.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> commit 5454b7ed949200d0d89c79b19e4c117c0d26a4d9 Author: Michael Weghorn <[email protected]> AuthorDate: Thu Dec 18 12:45:26 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Dec 18 19:44:41 2025 +0100 weld: Move weld::DialogController and subclasses to own header/source This is also in preparation of moving weld::Builder to its own header. Change-Id: Icb65ee85376d17e1abead2c6339f78b129112d0a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195841 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/basctl/source/basicide/brkdlg.hxx b/basctl/source/basicide/brkdlg.hxx index a2c1ecf37a7b..57aa5e78abf2 100644 --- a/basctl/source/basicide/brkdlg.hxx +++ b/basctl/source/basicide/brkdlg.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/EntryTreeView.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx index f92d6e87256d..56b7adbed308 100644 --- a/basctl/source/basicide/moduldlg.hxx +++ b/basctl/source/basicide/moduldlg.hxx @@ -24,6 +24,7 @@ #include <string_view> #include <bastype2.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include <com/sun/star/task/XInteractionHandler.hpp> diff --git a/basctl/source/inc/ColorSchemeDialog.hxx b/basctl/source/inc/ColorSchemeDialog.hxx index 8fd6cb10e945..d677f642c093 100644 --- a/basctl/source/inc/ColorSchemeDialog.hxx +++ b/basctl/source/inc/ColorSchemeDialog.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx index f1ef48df58be..732a875e38ad 100644 --- a/basctl/source/inc/managelang.hxx +++ b/basctl/source/inc/managelang.hxx @@ -20,6 +20,7 @@ #pragma once #include <utility> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx index 53036f2dcb06..f88e6b469427 100644 --- a/basic/source/runtime/inputbox.cxx +++ b/basic/source/runtime/inputbox.cxx @@ -21,6 +21,7 @@ #include <tools/lineend.hxx> #include <vcl/outdev.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <rtlproto.hxx> #include <memory> diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index d58b089f9e94..13bf04227725 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -19,6 +19,7 @@ #include <string.h> #include <vcl/svapp.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <osl/diagnose.h> #include <osl/file.hxx> diff --git a/chart2/source/controller/dialogs/RangeSelectionListener.cxx b/chart2/source/controller/dialogs/RangeSelectionListener.cxx index c5372c9922d6..df46cdf4a3b7 100644 --- a/chart2/source/controller/dialogs/RangeSelectionListener.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionListener.cxx @@ -19,6 +19,7 @@ #include <RangeSelectionListener.hxx> #include <ChartModel.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <utility> diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.hxx b/chart2/source/controller/dialogs/tp_AxisLabel.hxx index 1bed8e05c231..300a5644a10b 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.hxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.hxx @@ -21,6 +21,7 @@ #include <sfx2/tabdlg.hxx> #include <svx/dialcontrol.hxx> #include <tools/degree.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <TextDirectionListBox.hxx> diff --git a/chart2/source/controller/inc/dlg_ChartType.hxx b/chart2/source/controller/inc/dlg_ChartType.hxx index 6f94b77cd87f..ffe1cf6b7763 100644 --- a/chart2/source/controller/inc/dlg_ChartType.hxx +++ b/chart2/source/controller/inc/dlg_ChartType.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <rtl/ref.hxx> diff --git a/chart2/source/controller/inc/dlg_DataEditor.hxx b/chart2/source/controller/inc/dlg_DataEditor.hxx index 91d293450ac2..3fadbc581997 100644 --- a/chart2/source/controller/inc/dlg_DataEditor.hxx +++ b/chart2/source/controller/inc/dlg_DataEditor.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <rtl/ref.hxx> diff --git a/chart2/source/controller/inc/dlg_DataSource.hxx b/chart2/source/controller/inc/dlg_DataSource.hxx index 377a1f0c226e..f09a93ddb32c 100644 --- a/chart2/source/controller/inc/dlg_DataSource.hxx +++ b/chart2/source/controller/inc/dlg_DataSource.hxx @@ -19,6 +19,7 @@ #pragma once #include "TabPageNotifiable.hxx" +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <memory> diff --git a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx index 70ba4f57b7e2..5c7bbfc21670 100644 --- a/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx +++ b/chart2/source/controller/inc/dlg_InsertAxis_Grid.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx index 0cc7178d1946..3bf6f0bb7fc5 100644 --- a/chart2/source/controller/inc/dlg_InsertDataLabel.hxx +++ b/chart2/source/controller/inc/dlg_InsertDataLabel.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <svl/itemset.hxx> #include <memory> diff --git a/chart2/source/controller/inc/dlg_InsertDataTable.hxx b/chart2/source/controller/inc/dlg_InsertDataTable.hxx index 24c77b10e3a1..af6ea5c58860 100644 --- a/chart2/source/controller/inc/dlg_InsertDataTable.hxx +++ b/chart2/source/controller/inc/dlg_InsertDataTable.hxx @@ -9,6 +9,7 @@ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include "res_DataTableProperties.hxx" diff --git a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx index bc9ae985ae12..7e652ef61f21 100644 --- a/chart2/source/controller/inc/dlg_InsertErrorBars.hxx +++ b/chart2/source/controller/inc/dlg_InsertErrorBars.hxx @@ -19,6 +19,7 @@ #pragma once #include <memory> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <svl/itemset.hxx> diff --git a/chart2/source/controller/inc/dlg_InsertLegend.hxx b/chart2/source/controller/inc/dlg_InsertLegend.hxx index 029022f2c0b7..4892e7247013 100644 --- a/chart2/source/controller/inc/dlg_InsertLegend.hxx +++ b/chart2/source/controller/inc/dlg_InsertLegend.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <rtl/ref.hxx> diff --git a/chart2/source/controller/inc/dlg_InsertTitle.hxx b/chart2/source/controller/inc/dlg_InsertTitle.hxx index b7f984157fe1..f10a6ca44425 100644 --- a/chart2/source/controller/inc/dlg_InsertTitle.hxx +++ b/chart2/source/controller/inc/dlg_InsertTitle.hxx @@ -19,6 +19,7 @@ #pragma once #include "res_Titles.hxx" +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <memory> diff --git a/chart2/source/controller/inc/dlg_View3D.hxx b/chart2/source/controller/inc/dlg_View3D.hxx index cb09c10d1774..30df4eb3ddc0 100644 --- a/chart2/source/controller/inc/dlg_View3D.hxx +++ b/chart2/source/controller/inc/dlg_View3D.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <ControllerLockGuard.hxx> diff --git a/chart2/source/inc/ChartResourceGroupDlgs.hxx b/chart2/source/inc/ChartResourceGroupDlgs.hxx index b71ede421604..8dfb5a4fde20 100644 --- a/chart2/source/inc/ChartResourceGroupDlgs.hxx +++ b/chart2/source/inc/ChartResourceGroupDlgs.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> namespace chart diff --git a/cui/inc/dlgname.hxx b/cui/inc/dlgname.hxx index 35dfebb9ccc5..733cecec7915 100644 --- a/cui/inc/dlgname.hxx +++ b/cui/inc/dlgname.hxx @@ -19,6 +19,7 @@ #pragma once #include <vcl/formatter.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/inc/widgettestdlg.hxx b/cui/inc/widgettestdlg.hxx index b42e6c84f429..c3a02dbe5ecf 100644 --- a/cui/inc/widgettestdlg.hxx +++ b/cui/inc/widgettestdlg.hxx @@ -10,6 +10,7 @@ #pragma once #include <tools/link.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx index 2f2bf5be615d..8b10aa74beba 100644 --- a/cui/source/customize/macropg_impl.hxx +++ b/cui/source/customize/macropg_impl.hxx @@ -20,6 +20,7 @@ #pragma once #include <svl/itemset.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/source/inc/AdditionsDialog.hxx b/cui/source/inc/AdditionsDialog.hxx index 5f4295ea635f..a2a8f7249f1a 100644 --- a/cui/source/inc/AdditionsDialog.hxx +++ b/cui/source/inc/AdditionsDialog.hxx @@ -12,6 +12,7 @@ #include <salhelper/thread.hxx> #include <rtl/ref.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> // Detect changes on the UI diff --git a/cui/source/inc/DiagramDialog.hxx b/cui/source/inc/DiagramDialog.hxx index b121be472ddd..3b4acdf9df77 100644 --- a/cui/source/inc/DiagramDialog.hxx +++ b/cui/source/inc/DiagramDialog.hxx @@ -10,6 +10,7 @@ #pragma once #include <tools/link.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/source/inc/FontFeaturesDialog.hxx b/cui/source/inc/FontFeaturesDialog.hxx index e5f2448052fb..b33025b91c78 100644 --- a/cui/source/inc/FontFeaturesDialog.hxx +++ b/cui/source/inc/FontFeaturesDialog.hxx @@ -11,6 +11,7 @@ #pragma once #include <vcl/svapp.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <vcl/font/Feature.hxx> #include <svx/fntctrl.hxx> diff --git a/cui/source/inc/GraphicsTestsDialog.hxx b/cui/source/inc/GraphicsTestsDialog.hxx index a25ae3bb5e66..5f78962cfab4 100644 --- a/cui/source/inc/GraphicsTestsDialog.hxx +++ b/cui/source/inc/GraphicsTestsDialog.hxx @@ -9,6 +9,7 @@ #pragma once #include <vcl/bitmap.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <tools/link.hxx> diff --git a/cui/source/inc/ImageViewerDialog.hxx b/cui/source/inc/ImageViewerDialog.hxx index 38115a2d1ecb..1ff26307a5f2 100644 --- a/cui/source/inc/ImageViewerDialog.hxx +++ b/cui/source/inc/ImageViewerDialog.hxx @@ -9,6 +9,7 @@ #pragma once #include <vcl/bitmap.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> class ImageViewerDialog : public weld::GenericDialogController diff --git a/cui/source/inc/MacroManagerDialog.hxx b/cui/source/inc/MacroManagerDialog.hxx index 56942e1237b0..4d671e04f27b 100644 --- a/cui/source/inc/MacroManagerDialog.hxx +++ b/cui/source/inc/MacroManagerDialog.hxx @@ -15,6 +15,7 @@ #include <basctl/scriptdocument.hxx> #include <svx/passwd.hxx> #include <svl/lstner.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/cui/source/inc/QrCodeGenDialog.hxx b/cui/source/inc/QrCodeGenDialog.hxx index 316d91f62c0e..7af1b63ddac0 100644 --- a/cui/source/inc/QrCodeGenDialog.hxx +++ b/cui/source/inc/QrCodeGenDialog.hxx @@ -10,6 +10,7 @@ #include <config_zxing.h> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <com/sun/star/frame/XModel.hpp> diff --git a/cui/source/inc/SignatureLineDialogBase.hxx b/cui/source/inc/SignatureLineDialogBase.hxx index 3d4701aa0a4d..243f8c4b60a6 100644 --- a/cui/source/inc/SignatureLineDialogBase.hxx +++ b/cui/source/inc/SignatureLineDialogBase.hxx @@ -12,6 +12,7 @@ #include <string_view> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <com/sun/star/frame/XModel.hpp> diff --git a/cui/source/inc/SvxMenuConfigPage.hxx b/cui/source/inc/SvxMenuConfigPage.hxx index 044ab4187931..4b68bced9aa2 100644 --- a/cui/source/inc/SvxMenuConfigPage.hxx +++ b/cui/source/inc/SvxMenuConfigPage.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index 8bd7db6d0789..06b303802e64 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> class AboutDialog : public weld::GenericDialogController diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 3020492df683..c0a6c0470cd5 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -20,6 +20,7 @@ #pragma once #include <vcl/timer.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include <vcl/weld/weldutils.hxx> diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx index e8e1e3c53732..febb5910d01c 100644 --- a/cui/source/inc/cfgutil.hxx +++ b/cui/source/inc/cfgutil.hxx @@ -30,6 +30,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/script/browse/XBrowseNode.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include <config_features.h> diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index ed69628c3d68..0d0c7d8705eb 100644 --- a/cui/source/inc/chardlg.hxx +++ b/cui/source/inc/chardlg.hxx @@ -23,6 +23,7 @@ #include <svx/fntctrl.hxx> #include <svx/colorbox.hxx> #include <svx/langbox.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index b90f38acd8c7..b55457a59df2 100644 --- a/cui/source/inc/cuifmsearch.hxx +++ b/cui/source/inc/cuifmsearch.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/sdbc/XResultSet.hpp> #include <svx/fmsearch.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <tools/link.hxx> #include <rtl/ustring.hxx> diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 31b2c01d1fac..279276acc5eb 100644 --- a/cui/source/inc/cuigaldlg.hxx +++ b/cui/source/inc/cuigaldlg.hxx @@ -30,6 +30,7 @@ #include <com/sun/star/media/XPlayer.hpp> #include <com/sun/star/ui/dialogs/XFolderPicker2.hpp> #include <svtools/dialogclosedlistener.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <string_view> diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx index ffd62dd92f22..acc35a232d05 100644 --- a/cui/source/inc/cuigrfflt.hxx +++ b/cui/source/inc/cuigrfflt.hxx @@ -22,6 +22,7 @@ #include <vcl/timer.hxx> #include <svx/dlgctrl.hxx> #include <svx/rectenum.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/MetricSpinButton.hxx> class CuiGraphicPreviewWindow : public weld::CustomWidgetController diff --git a/cui/source/inc/cuiimapwnd.hxx b/cui/source/inc/cuiimapwnd.hxx index 5b153c4313b6..4f9ef0495989 100644 --- a/cui/source/inc/cuiimapwnd.hxx +++ b/cui/source/inc/cuiimapwnd.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <sfx2/frame.hxx> diff --git a/cui/source/inc/cuitbxform.hxx b/cui/source/inc/cuitbxform.hxx index 09bc2d71e64c..8f3589c55215 100644 --- a/cui/source/inc/cuitbxform.hxx +++ b/cui/source/inc/cuitbxform.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> class FmInputRecordNoDialog : public weld::GenericDialogController diff --git a/cui/source/inc/fileextcheckdlg.hxx b/cui/source/inc/fileextcheckdlg.hxx index 7b84bfdcc425..99e4bc9592da 100644 --- a/cui/source/inc/fileextcheckdlg.hxx +++ b/cui/source/inc/fileextcheckdlg.hxx @@ -20,6 +20,7 @@ #include <sal/config.h> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> class FileExtCheckDialog : public weld::GenericDialogController diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index f4c0e77d99d8..ca6a75967044 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -19,6 +19,7 @@ #pragma once #include <vcl/event.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx index 853260331b24..1cff9f901dbc 100644 --- a/cui/source/inc/hlmarkwn.hxx +++ b/cui/source/inc/hlmarkwn.hxx @@ -20,6 +20,7 @@ #pragma once #include <com/sun/star/container/XNameAccess.hpp> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx index 21cd354d7d5f..25b077013457 100644 --- a/cui/source/inc/insdlg.hxx +++ b/cui/source/inc/insdlg.hxx @@ -23,6 +23,7 @@ #include <com/sun/star/embed/XStorage.hpp> #include <svtools/insdlg.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include <comphelper/embeddedobjectcontainer.hxx> diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx index 19a6535f9d88..ef8218635670 100644 --- a/cui/source/inc/insrc.hxx +++ b/cui/source/inc/insrc.hxx @@ -20,6 +20,7 @@ #include <sal/config.h> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> class SvxInsRowColDlg : public weld::GenericDialogController diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx index 813d553edf37..61182113160b 100644 --- a/cui/source/inc/linkdlg.hxx +++ b/cui/source/inc/linkdlg.hxx @@ -21,6 +21,7 @@ #include <vcl/idle.hxx> #include <vcl/virdev.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> /********************** SvUpdateLinksDialog ****************************** diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx index 21f2463cc848..ec8495478e70 100644 --- a/cui/source/inc/multipat.hxx +++ b/cui/source/inc/multipat.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/source/inc/newtabledlg.hxx b/cui/source/inc/newtabledlg.hxx index ca49db55c287..16492f7d7749 100644 --- a/cui/source/inc/newtabledlg.hxx +++ b/cui/source/inc/newtabledlg.hxx @@ -19,6 +19,7 @@ #pragma once #include <svx/svxdlg.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> class SvxNewTableDialog : public weld::GenericDialogController diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx index f6d50f72206d..dc696bca92b0 100644 --- a/cui/source/inc/optdict.hxx +++ b/cui/source/inc/optdict.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include <com/sun/star/uno/Reference.hxx> diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx index 2789c583501b..4f955ce4a620 100644 --- a/cui/source/inc/optlingu.hxx +++ b/cui/source/inc/optlingu.hxx @@ -23,6 +23,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/configuration/XReadWriteAccess.hpp> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> namespace com::sun::star{ diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx index 41b7ac1c413c..a14185ca5f56 100644 --- a/cui/source/inc/pastedlg.hxx +++ b/cui/source/inc/pastedlg.hxx @@ -23,6 +23,7 @@ #include <sot/formats.hxx> #include <tools/globname.hxx> #include <vcl/transfer.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/source/inc/querydialog.hxx b/cui/source/inc/querydialog.hxx index aabba451f8f7..2d607eaf06f8 100644 --- a/cui/source/inc/querydialog.hxx +++ b/cui/source/inc/querydialog.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> class QueryDialog final : public weld::GenericDialogController diff --git a/cui/source/inc/screenshotannotationdlg.hxx b/cui/source/inc/screenshotannotationdlg.hxx index 4ab5a963438d..c30b4bfd8fd4 100644 --- a/cui/source/inc/screenshotannotationdlg.hxx +++ b/cui/source/inc/screenshotannotationdlg.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <memory> diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx index 7432c1225a58..c5f305d42235 100644 --- a/cui/source/inc/scriptdlg.hxx +++ b/cui/source/inc/scriptdlg.hxx @@ -21,6 +21,7 @@ #include <memory> #include <sfx2/basedlgs.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/source/inc/securityoptions.hxx b/cui/source/inc/securityoptions.hxx index 740df19a144b..6ce11d6117a1 100644 --- a/cui/source/inc/securityoptions.hxx +++ b/cui/source/inc/securityoptions.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> namespace svx diff --git a/cui/source/inc/showcols.hxx b/cui/source/inc/showcols.hxx index defe2c8e71f9..493a675d8af6 100644 --- a/cui/source/inc/showcols.hxx +++ b/cui/source/inc/showcols.hxx @@ -21,6 +21,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/container/XIndexContainer.hpp> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx index 0710a315fe64..2c4486686eeb 100644 --- a/cui/source/inc/splitcelldlg.hxx +++ b/cui/source/inc/splitcelldlg.hxx @@ -20,6 +20,7 @@ #include <sal/config.h> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> class SvxSplitTableDlg : public weld::GenericDialogController diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx index 080b8d25d7e1..e33ef32c387a 100644 --- a/cui/source/inc/srchxtra.hxx +++ b/cui/source/inc/srchxtra.hxx @@ -21,6 +21,7 @@ #include <sfx2/tabdlg.hxx> #include <svtools/ctrltool.hxx> #include <svx/srchdlg.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/source/inc/tipofthedaydlg.hxx b/cui/source/inc/tipofthedaydlg.hxx index 6ee213ee0ae1..20d6c1364de3 100644 --- a/cui/source/inc/tipofthedaydlg.hxx +++ b/cui/source/inc/tipofthedaydlg.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include "cuigrfflt.hxx" diff --git a/cui/source/options/certpath.hxx b/cui/source/options/certpath.hxx index 563caedee43f..ebdbe920dbca 100644 --- a/cui/source/options/certpath.hxx +++ b/cui/source/options/certpath.hxx @@ -9,6 +9,7 @@ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx index 239709486406..3d4f0c8605c7 100644 --- a/cui/source/options/doclinkdialog.hxx +++ b/cui/source/options/doclinkdialog.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <svtools/inettbc.hxx> #include <com/sun/star/configuration/XReadWriteAccess.hpp> diff --git a/cui/source/options/optaboutconfig.hxx b/cui/source/options/optaboutconfig.hxx index 2ca47dda1470..524ae25270a4 100644 --- a/cui/source/options/optaboutconfig.hxx +++ b/cui/source/options/optaboutconfig.hxx @@ -13,6 +13,7 @@ #include <dlgname.hxx> #include <i18nutil/searchopt.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/source/options/tsaurls.hxx b/cui/source/options/tsaurls.hxx index f1d763a4920a..688497371c98 100644 --- a/cui/source/options/tsaurls.hxx +++ b/cui/source/options/tsaurls.hxx @@ -9,6 +9,7 @@ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/source/options/webconninfo.hxx b/cui/source/options/webconninfo.hxx index 00dde27c29aa..476df534dff0 100644 --- a/cui/source/options/webconninfo.hxx +++ b/cui/source/options/webconninfo.hxx @@ -17,6 +17,7 @@ */ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/dbaccess/source/core/inc/migrwarndlg.hxx b/dbaccess/source/core/inc/migrwarndlg.hxx index 59a774496a77..00eb07a85ccb 100644 --- a/dbaccess/source/core/inc/migrwarndlg.hxx +++ b/dbaccess/source/core/inc/migrwarndlg.hxx @@ -8,6 +8,7 @@ */ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> namespace dbaccess diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx index 5faf8653bed6..2614170a64d3 100644 --- a/dbaccess/source/ui/dlg/dbfindex.hxx +++ b/dbaccess/source/ui/dlg/dbfindex.hxx @@ -20,6 +20,7 @@ #pragma once #include <utility> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include <deque> diff --git a/dbaccess/source/ui/dlg/dsselect.hxx b/dbaccess/source/ui/dlg/dsselect.hxx index 515da030efe8..95cf64b187fc 100644 --- a/dbaccess/source/ui/dlg/dsselect.hxx +++ b/dbaccess/source/ui/dlg/dsselect.hxx @@ -20,6 +20,7 @@ #pragma once #include <rtl/ustring.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/dbaccess/source/ui/inc/CollectionView.hxx b/dbaccess/source/ui/inc/CollectionView.hxx index 05ffb23f1485..c7295faaa67b 100644 --- a/dbaccess/source/ui/inc/CollectionView.hxx +++ b/dbaccess/source/ui/inc/CollectionView.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include <com/sun/star/ucb/XContent.hpp> diff --git a/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx b/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx index 6481b6b19b11..bbc3fdb7b197 100644 --- a/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx +++ b/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx @@ -9,6 +9,7 @@ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> namespace dbaui diff --git a/dbaccess/source/ui/inc/RelationDlg.hxx b/dbaccess/source/ui/inc/RelationDlg.hxx index 445fd947b718..dadac4096b51 100644 --- a/dbaccess/source/ui/inc/RelationDlg.hxx +++ b/dbaccess/source/ui/inc/RelationDlg.hxx @@ -19,6 +19,7 @@ #pragma once #include <memory> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include "JoinTableView.hxx" #include "RelControliFace.hxx" diff --git a/dbaccess/source/ui/inc/adtabdlg.hxx b/dbaccess/source/ui/inc/adtabdlg.hxx index 67a5cdae8fd7..c864e0ddcaea 100644 --- a/dbaccess/source/ui/inc/adtabdlg.hxx +++ b/dbaccess/source/ui/inc/adtabdlg.hxx @@ -20,6 +20,7 @@ #include <memory> #include <com/sun/star/sdbc/XConnection.hpp> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include "tabletree.hxx" diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx index 88380e0a57b7..4cd95f11e7cc 100644 --- a/dbaccess/source/ui/inc/directsql.hxx +++ b/dbaccess/source/ui/inc/directsql.hxx @@ -21,6 +21,7 @@ #include <sal/config.h> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <deque> #include <string_view> diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx index 0f559827616d..de1fe353215d 100644 --- a/dbaccess/source/ui/inc/dlgsave.hxx +++ b/dbaccess/source/ui/inc/dlgsave.hxx @@ -23,6 +23,7 @@ #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <o3tl/typed_flags_set.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <memory> diff --git a/dbaccess/source/ui/inc/dlgsize.hxx b/dbaccess/source/ui/inc/dlgsize.hxx index b32c060ea4b3..a477cba7c5f6 100644 --- a/dbaccess/source/ui/inc/dlgsize.hxx +++ b/dbaccess/source/ui/inc/dlgsize.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/weld.hxx> diff --git a/dbaccess/source/ui/inc/indexdialog.hxx b/dbaccess/source/ui/inc/indexdialog.hxx index 61ce00678a25..bedba211e888 100644 --- a/dbaccess/source/ui/inc/indexdialog.hxx +++ b/dbaccess/source/ui/inc/indexdialog.hxx @@ -23,6 +23,7 @@ #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/XComponentContext.hpp> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include "indexes.hxx" diff --git a/dbaccess/source/ui/inc/paramdialog.hxx b/dbaccess/source/ui/inc/paramdialog.hxx index f7c6ed3370d3..aecafd630e0f 100644 --- a/dbaccess/source/ui/inc/paramdialog.hxx +++ b/dbaccess/source/ui/inc/paramdialog.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include <vcl/timer.hxx> diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx index db31b9fe5510..1d037818f094 100644 --- a/dbaccess/source/ui/inc/queryfilter.hxx +++ b/dbaccess/source/ui/inc/queryfilter.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <connectivity/sqliterator.hxx> diff --git a/dbaccess/source/ui/inc/queryorder.hxx b/dbaccess/source/ui/inc/queryorder.hxx index 78a5dd89a858..311441a9c75f 100644 --- a/dbaccess/source/ui/inc/queryorder.hxx +++ b/dbaccess/source/ui/inc/queryorder.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #define DOG_ROWS 3 diff --git a/dbaccess/source/ui/inc/sqlmessage.hxx b/dbaccess/source/ui/inc/sqlmessage.hxx index 2d54d61eb132..0f343706d02b 100644 --- a/dbaccess/source/ui/inc/sqlmessage.hxx +++ b/dbaccess/source/ui/inc/sqlmessage.hxx @@ -20,6 +20,7 @@ #pragma once #include <connectivity/dbexception.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <memory> diff --git a/dbaccess/source/ui/inc/textconnectionsettings.hxx b/dbaccess/source/ui/inc/textconnectionsettings.hxx index b3d2fc7f643e..af0e2fa07561 100644 --- a/dbaccess/source/ui/inc/textconnectionsettings.hxx +++ b/dbaccess/source/ui/inc/textconnectionsettings.hxx @@ -20,6 +20,7 @@ #pragma once #include "propertystorage.hxx" +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <memory> diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx index 44241b8aecfa..a29fe8536be9 100644 --- a/dbaccess/source/ui/querydesign/querydlg.hxx +++ b/dbaccess/source/ui/querydesign/querydlg.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <QEnumTypes.hxx> diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx index 2c67af4907cb..f9880c5bd88f 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx @@ -21,6 +21,7 @@ #include <sal/config.h> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index e8161a70d17a..9cd4f60fb0f6 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -22,6 +22,7 @@ #include <vcl/timer.hxx> #include <vcl/idle.hxx> #include <vcl/locktoplevels.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx index cf02575e1e90..995385d1adb1 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.hxx @@ -27,6 +27,7 @@ #include <rtl/ref.hxx> #include <rtl/ustring.hxx> #include <tools/link.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx index e922805b4845..34c6a0bf4b39 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.hxx @@ -20,6 +20,7 @@ #pragma once #include <sal/config.h> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <rtl/ref.hxx> diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index dc17369a5d41..1cd60b0bb10c 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -23,6 +23,7 @@ #include <vcl/idle.hxx> #include <vcl/svapp.hxx> #include <vcl/threadex.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx index 7a7049db419a..976847c96d53 100644 --- a/extensions/source/bibliography/bibview.cxx +++ b/extensions/source/bibliography/bibview.cxx @@ -28,6 +28,7 @@ #include <vcl/svapp.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> using namespace ::com::sun::star; diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 01f1209c3344..025f8a788a6a 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -46,6 +46,7 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <tools/debug.hxx> #include <tools/urlobj.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include "datman.hxx" diff --git a/extensions/source/propctrlr/formlinkdialog.hxx b/extensions/source/propctrlr/formlinkdialog.hxx index 3c4b65d1dc7d..855d5670a640 100644 --- a/extensions/source/propctrlr/formlinkdialog.hxx +++ b/extensions/source/propctrlr/formlinkdialog.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <com/sun/star/sdbc/XConnection.hpp> diff --git a/extensions/source/propctrlr/listselectiondlg.hxx b/extensions/source/propctrlr/listselectiondlg.hxx index 916948a0a04d..6e4d611b02c2 100644 --- a/extensions/source/propctrlr/listselectiondlg.hxx +++ b/extensions/source/propctrlr/listselectiondlg.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/extensions/source/propctrlr/newdatatype.hxx b/extensions/source/propctrlr/newdatatype.hxx index 4354a81ff43d..81d89c6829d8 100644 --- a/extensions/source/propctrlr/newdatatype.hxx +++ b/extensions/source/propctrlr/newdatatype.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <set> diff --git a/extensions/source/propctrlr/selectlabeldialog.hxx b/extensions/source/propctrlr/selectlabeldialog.hxx index 48a545e95f72..3aa693a6cf02 100644 --- a/extensions/source/propctrlr/selectlabeldialog.hxx +++ b/extensions/source/propctrlr/selectlabeldialog.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx index a4c402c8aaf2..b456edea4ddd 100644 --- a/extensions/source/propctrlr/taborder.hxx +++ b/extensions/source/propctrlr/taborder.hxx @@ -23,6 +23,7 @@ #include <com/sun/star/awt/XControlContainer.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/extensions/source/scanner/grid.hxx b/extensions/source/scanner/grid.hxx index 98ae8ba4c9f4..530cdde15e53 100644 --- a/extensions/source/scanner/grid.hxx +++ b/extensions/source/scanner/grid.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <vcl/weld/customweld.hxx> diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx index 0266ce01707b..cbac162c42d4 100644 --- a/extensions/source/scanner/sanedlg.hxx +++ b/extensions/source/scanner/sanedlg.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/customweld.hxx> diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index b8e78d92b343..ed3b00b505ec 100644 --- a/filter/source/pdf/impdialog.hxx +++ b/filter/source/pdf/impdialog.hxx @@ -24,6 +24,7 @@ #include <vcl/pdfwriter.hxx> #include <vcl/FilterConfigItem.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx index cf07887e1a60..34b045be83b9 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx @@ -20,6 +20,7 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include <vcl/locktoplevels.hxx> diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.hxx b/filter/source/xsltdialog/xmlfiltertabdialog.hxx index f8133a5c5ade..c4f48945f627 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.hxx @@ -19,6 +19,7 @@ #pragma once #include <com/sun/star/uno/XComponentContext.hpp> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> class filter_info_impl; diff --git a/filter/source/xsltdialog/xmlfiltertestdialog.hxx b/filter/source/xsltdialog/xmlfiltertestdialog.hxx index 7a5b412677e4..dd71bc94e195 100644 --- a/filter/source/xsltdialog/xmlfiltertestdialog.hxx +++ b/filter/source/xsltdialog/xmlfiltertestdialog.hxx @@ -23,6 +23,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/weakref.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> class filter_info_impl; diff --git a/fpicker/source/office/QueryFolderName.hxx b/fpicker/source/office/QueryFolderName.hxx index 237f05bf9222..d2734c574d6f 100644 --- a/fpicker/source/office/QueryFolderName.hxx +++ b/fpicker/source/office/QueryFolderName.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> class QueryFolderNameDialog : public weld::GenericDialogController diff --git a/fpicker/source/office/fpdialogbase.hxx b/fpicker/source/office/fpdialogbase.hxx index 784b52bd613e..78a10228aab9 100644 --- a/fpicker/source/office/fpdialogbase.hxx +++ b/fpicker/source/office/fpdialogbase.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <com/sun/star/beans/StringPair.hpp> #include <com/sun/star/uno/Any.hxx> diff --git a/include/formula/formula.hxx b/include/formula/formula.hxx index 116ea782907c..3107041b2fbf 100644 --- a/include/formula/formula.hxx +++ b/include/formula/formula.hxx @@ -30,6 +30,7 @@ #include <sal/types.h> #include <sfx2/basedlgs.hxx> #include <tools/gen.hxx> +#include <vcl/weld/DialogController.hxx> class SfxBindings; class SfxChildWindow; diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index 67a8d0c0aad2..05d868bd2259 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -22,6 +22,7 @@ #include <memory> #include <sal/config.h> #include <sfx2/dllapi.h> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> class SfxTabPage; diff --git a/include/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx index 88b5eb5a8b5b..be5d2dc29b9e 100644 --- a/include/sfx2/newstyle.hxx +++ b/include/sfx2/newstyle.hxx @@ -23,6 +23,7 @@ #include <sal/config.h> #include <sfx2/dllapi.h> #include <svl/style.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/EntryTreeView.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx index 60d32340e678..c8292efb7b05 100644 --- a/include/sfx2/passwd.hxx +++ b/include/sfx2/passwd.hxx @@ -20,6 +20,7 @@ #include <sal/config.h> #include <sfx2/dllapi.h> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <o3tl/typed_flags_set.hxx> diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index 1ab231146da5..0b771fca7b5f 100644 --- a/include/sfx2/templatedlg.hxx +++ b/include/sfx2/templatedlg.hxx @@ -18,6 +18,7 @@ #include <vcl/idle.hxx> #include <vcl/timer.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/include/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx index 2af7d9ed5a30..d171402a1289 100644 --- a/include/svtools/PlaceEditDialog.hxx +++ b/include/svtools/PlaceEditDialog.hxx @@ -11,6 +11,7 @@ #include <config_options.h> #include <svtools/svtdllapi.h> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <memory> diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index 8ea187b5c372..a76834691cf1 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -22,6 +22,7 @@ #include <config_options.h> #include <memory> #include <svtools/svtdllapi.h> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> namespace com :: sun :: star :: container { class XNameAccess; } diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index c927cae6982f..1ec216c5b42b 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -29,6 +29,7 @@ #include <comphelper/uno3.hxx> #include <comphelper/propertycontainer.hxx> #include <comphelper/broadcasthelper.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> namespace com :: sun :: star :: awt { class XWindow; } diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx index 3eed976022b3..25d3c500a915 100644 --- a/include/svtools/prnsetup.hxx +++ b/include/svtools/prnsetup.hxx @@ -21,6 +21,7 @@ #include <svtools/svtdllapi.h> #include <vcl/print.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <vcl/timer.hxx> diff --git a/include/svtools/querydelete.hxx b/include/svtools/querydelete.hxx index dcfe71d867e1..cef306a7094b 100644 --- a/include/svtools/querydelete.hxx +++ b/include/svtools/querydelete.hxx @@ -20,6 +20,7 @@ #include <config_options.h> #include <memory> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <svtools/svtdllapi.h> diff --git a/include/svx/ClassificationDialog.hxx b/include/svx/ClassificationDialog.hxx index 77785f2b86c2..8d2682017019 100644 --- a/include/svx/ClassificationDialog.hxx +++ b/include/svx/ClassificationDialog.hxx @@ -12,6 +12,7 @@ #define INCLUDED_SVX_CLASSIFICATIONDIALOG_HXX #include <sal/config.h> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include <svx/svxdllapi.h> diff --git a/include/svx/FileExportedDialog.hxx b/include/svx/FileExportedDialog.hxx index 518131da7d99..82768f5cabef 100644 --- a/include/svx/FileExportedDialog.hxx +++ b/include/svx/FileExportedDialog.hxx @@ -7,6 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <svx/svxdllapi.h> diff --git a/include/svx/GenericCheckDialog.hxx b/include/svx/GenericCheckDialog.hxx index 43e1c71ce717..a2067b8028ec 100644 --- a/include/svx/GenericCheckDialog.hxx +++ b/include/svx/GenericCheckDialog.hxx @@ -12,6 +12,7 @@ #include <svx/svxdllapi.h> #include <tools/link.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> namespace svx diff --git a/include/svx/GenericDropDownFieldDialog.hxx b/include/svx/GenericDropDownFieldDialog.hxx index c5778132a9a9..90ac36e09781 100644 --- a/include/svx/GenericDropDownFieldDialog.hxx +++ b/include/svx/GenericDropDownFieldDialog.hxx @@ -10,6 +10,7 @@ #pragma once #include <svx/svxdllapi.h> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> class SVX_DLLPUBLIC GenericDropDownFieldDialog : public weld::GenericDialogController diff --git a/include/svx/compressgraphicdialog.hxx b/include/svx/compressgraphicdialog.hxx index ed36f78cb639..667b579584cf 100644 --- a/include/svx/compressgraphicdialog.hxx +++ b/include/svx/compressgraphicdialog.hxx @@ -23,6 +23,7 @@ #include <svx/svxdllapi.h> #include <tools/gen.hxx> #include <tools/link.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <vcl/graph.hxx> diff --git a/include/svx/dialog/ThemeColorEditDialog.hxx b/include/svx/dialog/ThemeColorEditDialog.hxx index dcf38a6149e2..dfee5bdb4f02 100644 --- a/include/svx/dialog/ThemeColorEditDialog.hxx +++ b/include/svx/dialog/ThemeColorEditDialog.hxx @@ -12,6 +12,7 @@ #include <config_options.h> #include <svx/svxdllapi.h> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <docmodel/theme/ColorSet.hxx> diff --git a/include/svx/dialog/ThemeDialog.hxx b/include/svx/dialog/ThemeDialog.hxx index f869884b517d..ebc73cffb296 100644 --- a/include/svx/dialog/ThemeDialog.hxx +++ b/include/svx/dialog/ThemeDialog.hxx @@ -10,6 +10,7 @@ #pragma once #include <svx/svxdllapi.h> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/IconView.hxx> #include <vcl/weld/weld.hxx> #include <svx/svdpage.hxx> diff --git a/include/svx/dialog/gotodlg.hxx b/include/svx/dialog/gotodlg.hxx index f2f571992efa..c772aa60b0b2 100644 --- a/include/svx/dialog/gotodlg.hxx +++ b/include/svx/dialog/gotodlg.hxx @@ -20,6 +20,7 @@ #pragma once #include <svx/svxdllapi.h> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> namespace svx diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index cf513131eae8..0560a4ab30b2 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -22,6 +22,7 @@ #include <sfx2/tabdlg.hxx> #include <svx/svxdllapi.h> #include <svx/rectenum.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <vcl/virdev.hxx> diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx index bb805be4b7a8..7e8b52f275a7 100644 --- a/include/svx/fontworkgallery.hxx +++ b/include/svx/fontworkgallery.hxx @@ -22,6 +22,7 @@ #define INCLUDED_SVX_FONTWORKGALLERY_HXX #include <svx/svxdllapi.h> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/IconView.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/weld.hxx> diff --git a/include/svx/linkwarn.hxx b/include/svx/linkwarn.hxx index 133411f00f7c..494dae58c83e 100644 --- a/include/svx/linkwarn.hxx +++ b/include/svx/linkwarn.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_SVX_LINKWARN_HXX #define INCLUDED_SVX_LINKWARN_HXX +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <svx/svxdllapi.h> diff --git a/include/test/screenshot_test.hxx b/include/test/screenshot_test.hxx index b7007a300aa3..480524400478 100644 --- a/include/test/screenshot_test.hxx +++ b/include/test/screenshot_test.hxx @@ -14,6 +14,7 @@ #include <test/bootstrapfixture.hxx> #include <unotest/macros_test.hxx> #include <vcl/vclptr.hxx> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <map> #include <string_view> diff --git a/include/vcl/ColorDialog.hxx b/include/vcl/ColorDialog.hxx index 6c4ae901793f..0a3a32ff2360 100644 --- a/include/vcl/ColorDialog.hxx +++ b/include/vcl/ColorDialog.hxx @@ -21,6 +21,7 @@ #include <tools/color.hxx> #include <vcl/dllapi.h> +#include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <functional> diff --git a/include/vcl/weld/DialogController.hxx b/include/vcl/weld/DialogController.hxx new file mode 100644 index 000000000000..4431ccea06f4 --- /dev/null +++ b/include/vcl/weld/DialogController.hxx @@ -0,0 +1,94 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#pragma once + +#include <vcl/dllapi.h> +#include <vcl/weld/weld.hxx> + +namespace weld +{ +class VCL_DLLPUBLIC DialogController : public std::enable_shared_from_this<DialogController> +{ +public: + virtual Dialog* getDialog() = 0; + const Dialog* getConstDialog() const + { + return const_cast<DialogController*>(this)->getDialog(); + } + virtual short run() { return getDialog()->run(); } + static bool runAsync(const std::shared_ptr<DialogController>& rController, + const std::function<void(sal_Int32)>&); + void set_title(const OUString& rTitle) { getDialog()->set_title(rTitle); } + OUString get_title() const { return getConstDialog()->get_title(); } + void set_help_id(const OUString& rHelpId) { getDialog()->set_help_id(rHelpId); } + OUString get_help_id() const { return getConstDialog()->get_help_id(); } + void response(int nResponse) { getDialog()->response(nResponse); } + virtual ~DialogController(); +}; + +class VCL_DLLPUBLIC GenericDialogController : public DialogController +{ +protected: + std::unique_ptr<weld::Builder> m_xBuilder; + std::shared_ptr<weld::Dialog> m_xDialog; + +public: + GenericDialogController(weld::Widget* pParent, const OUString& rUIFile, + const OUString& rDialogId, bool bMobile = false); + virtual Dialog* getDialog() override; + virtual ~GenericDialogController() override; +}; + +class VCL_DLLPUBLIC MessageDialogController : public DialogController +{ +protected: + std::unique_ptr<weld::Builder> m_xBuilder; + std::unique_ptr<weld::MessageDialog> m_xDialog; + std::unique_ptr<weld::Container> m_xContentArea; + std::unique_ptr<weld::Widget> m_xRelocate; + std::unique_ptr<weld::Container> m_xOrigParent; + +public: + /* @param rRelocateId - optional argument of the name of a widget in the .ui file + which should be relocated into the content area of the dialog. + + e.g. a checkbox for a "Never show this again" option. + + This results in the named widget relocating to the same container + as the messages. This enables aligning the extra widget with the + message labels in the content area container which doesn't + explicitly exist in the ui description, but is only implied. + */ + MessageDialogController(weld::Widget* pParent, const OUString& rUIFile, + const OUString& rDialogId, const OUString& rRelocateId = {}); + virtual Dialog* getDialog() override; + virtual ~MessageDialogController() override; + void set_primary_text(const OUString& rText) { m_xDialog->set_primary_text(rText); } + OUString get_primary_text() const { return m_xDialog->get_primary_text(); } + void set_secondary_text(const OUString& rText) { m_xDialog->set_secondary_text(rText); } -e ... etc. - the rest is truncated
