avmedia/inc/mediacontrol.hxx | 1 basctl/source/basicide/moduldlg.cxx | 7 basctl/source/basicide/moduldlg.hxx | 1 basctl/source/inc/objectbrowser.hxx | 1 chart2/source/controller/dialogs/res_DataLabel.hxx | 1 chart2/source/controller/dialogs/res_ErrorBar.cxx | 1 chart2/source/controller/dialogs/res_Trendline.cxx | 1 chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx | 1 chart2/source/controller/dialogs/tp_AxisPositions.hxx | 1 chart2/source/controller/dialogs/tp_Scale.hxx | 1 chart2/source/controller/main/ElementSelector.hxx | 1 chart2/source/controller/sidebar/ChartAxisPanel.hxx | 1 chart2/source/controller/sidebar/ChartElementsPanel.hxx | 1 chart2/source/controller/sidebar/ChartErrorBarPanel.hxx | 1 chart2/source/controller/sidebar/ChartSeriesPanel.hxx | 1 chart2/source/inc/ChartResourceGroupDlgs.hxx | 1 cui/source/customize/SvxMenuConfigPage.cxx | 10 cui/source/customize/SvxToolbarConfigPage.cxx | 10 cui/source/customize/cfg.cxx | 4 cui/source/customize/eventdlg.hxx | 1 cui/source/inc/CommandCategoryListBox.hxx | 2 cui/source/inc/FontFeaturesDialog.hxx | 1 cui/source/inc/QrCodeGenDialog.hxx | 1 cui/source/inc/SpellDialog.hxx | 1 cui/source/inc/SvxMenuConfigPage.hxx | 1 cui/source/inc/SvxToolbarConfigPage.hxx | 1 cui/source/inc/align.hxx | 1 cui/source/inc/border.hxx | 1 cui/source/inc/cfg.hxx | 1 cui/source/inc/chardlg.hxx | 1 cui/source/inc/connect.hxx | 1 cui/source/inc/cuifmsearch.hxx | 1 cui/source/inc/cuigaldlg.hxx | 1 cui/source/inc/cuiimapwnd.hxx | 1 cui/source/inc/cuitabarea.hxx | 1 cui/source/inc/hangulhanjadlg.hxx | 1 cui/source/inc/swpossizetabpage.hxx | 1 cui/source/inc/thesdlg.hxx | 1 cui/source/options/appearance.hxx | 1 cui/source/options/doclinkdialog.hxx | 1 cui/source/options/fontsubs.hxx | 1 cui/source/options/optaccessibility.hxx | 1 cui/source/options/optchart.hxx | 1 cui/source/options/optctl.hxx | 1 cui/source/options/optinet2.hxx | 1 cui/source/options/optsave.hxx | 1 dbaccess/source/ui/app/AppDetailPageHelper.cxx | 4 dbaccess/source/ui/browser/dsbrowserDnD.cxx | 9 dbaccess/source/ui/control/dbtreelistbox.cxx | 11 dbaccess/source/ui/dlg/advancedsettings.hxx | 3 dbaccess/source/ui/dlg/dbfindex.hxx | 1 dbaccess/source/ui/inc/FieldDescControl.hxx | 1 dbaccess/source/ui/inc/QueryPropertiesDialog.hxx | 1 dbaccess/source/ui/inc/charsetlistbox.hxx | 1 dbaccess/source/ui/inc/directsql.hxx | 1 dbaccess/source/ui/inc/dlgsave.hxx | 1 dbaccess/source/ui/inc/opendoccontrols.hxx | 1 dbaccess/source/ui/inc/queryfilter.hxx | 1 dbaccess/source/ui/inc/queryorder.hxx | 1 dbaccess/source/ui/querydesign/TableWindowListBox.cxx | 6 dbaccess/source/ui/querydesign/limitboxcontroller.cxx | 1 dbaccess/source/ui/querydesign/querydlg.hxx | 1 extensions/source/bibliography/general.cxx | 1 extensions/source/bibliography/toolbar.hxx | 1 extensions/source/dbpilots/commonpagesdbp.hxx | 1 extensions/source/dbpilots/controlwizard.hxx | 1 extensions/source/propctrlr/formlinkdialog.cxx | 1 extensions/source/scanner/grid.hxx | 1 extensions/source/scanner/sanedlg.hxx | 1 filter/source/pdf/impdialog.hxx | 1 filter/source/xsltdialog/xmlfiltertabpagebasic.hxx | 1 formula/source/ui/dlg/funcpage.hxx | 1 fpicker/source/office/OfficeControlAccess.hxx | 1 fpicker/source/office/iodlgimp.hxx | 1 framework/source/uielement/comboboxtoolbarcontroller.cxx | 1 framework/source/uielement/dropdownboxtoolbarcontroller.cxx | 1 include/avmedia/MediaControlBase.hxx | 1 include/sfx2/newstyle.hxx | 1 include/sfx2/printopt.hxx | 1 include/sfx2/templatedlg.hxx | 1 include/svtools/PlaceEditDialog.hxx | 1 include/svtools/addresstemplate.hxx | 1 include/svtools/ctrlbox.hxx | 1 include/svtools/editbrowsebox.hxx | 1 include/svtools/inettbc.hxx | 1 include/svtools/prnsetup.hxx | 1 include/svx/ClassificationDialog.hxx | 1 include/svx/GenericDropDownFieldDialog.hxx | 1 include/svx/SvxNumOptionsTabPageHelper.hxx | 1 include/svx/compressgraphicdialog.hxx | 1 include/svx/ctredlin.hxx | 1 include/svx/cuicharmap.hxx | 1 include/svx/dlgctrl.hxx | 1 include/svx/fillctrl.hxx | 1 include/svx/float3d.hxx | 1 include/svx/frmdirlbox.hxx | 1 include/svx/itemwin.hxx | 1 include/svx/langbox.hxx | 1 include/svx/pagenumberlistbox.hxx | 1 include/svx/papersizelistbox.hxx | 1 include/svx/rubydialog.hxx | 1 include/svx/samecontentlistbox.hxx | 2 include/svx/sidebar/AreaPropertyPanelBase.hxx | 1 include/svx/spacinglistbox.hxx | 2 include/svx/srchdlg.hxx | 1 include/svx/txencbox.hxx | 1 include/vcl/jsdialog/executor.hxx | 1 include/vcl/weld/ComboBox.hxx | 228 ++++++++++ include/vcl/weld/EntryTreeView.hxx | 1 include/vcl/weld/TreeView.hxx | 4 include/vcl/weld/weld.hxx | 227 --------- reportdesign/source/ui/dlg/Condition.hxx | 1 reportdesign/source/ui/inc/DateTime.hxx | 1 reportdesign/source/ui/inc/PageNumber.hxx | 1 sc/source/ui/condformat/colorformat.cxx | 1 sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx | 6 sc/source/ui/dbgui/filtdlg.cxx | 1 sc/source/ui/inc/SheetViewBox.hxx | 1 sc/source/ui/inc/cbnumberformat.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/condformateasydlg.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/foptmgr.hxx | 1 sc/source/ui/inc/inputwin.hxx | 1 sc/source/ui/inc/pfiltdlg.hxx | 1 sc/source/ui/inc/pvfundlg.hxx | 1 sc/source/ui/inc/scuitphfedit.hxx | 1 sc/source/ui/inc/solveroptions.hxx | 1 sc/source/ui/inc/sortkeydlg.hxx | 1 sc/source/ui/inc/tabbgcolordlg.hxx | 1 sc/source/ui/inc/tpcompatibility.hxx | 1 sc/source/ui/inc/tpformula.hxx | 1 sc/source/ui/inc/tptable.hxx | 1 sc/source/ui/inc/tpview.hxx | 1 sc/source/ui/inc/validate.hxx | 1 sc/source/ui/miscdlgs/dataproviderdlg.cxx | 1 sc/source/ui/optdlg/calcoptionsdlg.hxx | 1 sc/source/ui/pagedlg/areasdlg.cxx | 1 sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx | 1 sd/source/ui/animations/CustomAnimationDialog.cxx | 1 sd/source/ui/animations/CustomAnimationList.cxx | 11 sd/source/ui/dlg/PhotoAlbumDialog.hxx | 1 sd/source/ui/dlg/sdtreelb.cxx | 26 - sd/source/ui/inc/BulletAndPositionDlg.hxx | 1 sd/source/ui/inc/CustomAnimationPane.hxx | 1 sd/source/ui/inc/SlideTransitionPane.hxx | 1 sd/source/ui/inc/animobjs.hxx | 1 sd/source/ui/inc/dlgfield.hxx | 1 sd/source/ui/inc/gluectrl.hxx | 1 sd/source/ui/inc/present.hxx | 1 sd/source/ui/inc/tpaction.hxx | 1 sd/source/ui/inc/tpoption.hxx | 1 sdext/source/minimizer/optimizerdialog.hxx | 1 sfx2/inc/autoredactdialog.hxx | 1 sfx2/inc/srchdlg.hxx | 1 sfx2/source/appl/newhelp.hxx | 1 sfx2/source/dialog/StyleList.cxx | 12 sfx2/source/dialog/backingwindow.hxx | 1 sfx2/source/dialog/mgetempl.cxx | 1 sfx2/source/inc/templdgi.hxx | 1 sfx2/source/view/classificationcontroller.cxx | 1 starmath/inc/dialog.hxx | 1 starmath/inc/utility.hxx | 1 starmath/source/SmElementsPanel.hxx | 1 svtools/source/filter/exportdialog.hxx | 1 svx/source/form/datanavi.cxx | 5 svx/source/form/filtnav.cxx | 15 svx/source/form/navigatortree.cxx | 16 svx/source/gallery2/galbrws1.cxx | 4 svx/source/gallery2/gallery1.cxx | 1 svx/source/inc/datanavi.hxx | 1 svx/source/inc/findtextfield.hxx | 1 svx/source/sidebar/graphic/GraphicPropertyPanel.hxx | 1 svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx | 1 svx/source/sidebar/shadow/ShadowPropertyPanel.hxx | 1 svx/source/tbxctrls/grafctrl.cxx | 1 svx/source/tbxctrls/lboxctrl.cxx | 17 svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx | 1 sw/source/ui/dbui/createaddresslistdialog.hxx | 1 sw/source/ui/dbui/mmaddressblockpage.hxx | 1 sw/source/ui/dbui/mmdocselectpage.hxx | 1 sw/source/ui/dbui/mmgreetingspage.hxx | 1 sw/source/ui/dbui/mmlayoutpage.hxx | 1 sw/source/ui/envelp/envfmt.hxx | 1 sw/source/ui/envelp/labfmt.hxx | 1 sw/source/ui/inc/mmresultdialogs.hxx | 1 sw/source/ui/inc/regionsw.hxx | 1 sw/source/ui/misc/glossary.cxx | 11 sw/source/ui/misc/impfnote.hxx | 1 sw/source/uibase/dbui/dbmgr.cxx | 1 sw/source/uibase/inc/break.hxx | 1 sw/source/uibase/inc/column.hxx | 1 sw/source/uibase/inc/dbinsdlg.hxx | 1 sw/source/uibase/inc/drpcps.hxx | 1 sw/source/uibase/inc/envlop.hxx | 1 sw/source/uibase/inc/frmpage.hxx | 1 sw/source/uibase/inc/glosbib.hxx | 1 sw/source/uibase/inc/linenum.hxx | 1 sw/source/uibase/inc/mailmrge.hxx | 1 sw/source/uibase/inc/num.hxx | 1 sw/source/uibase/inc/numberingtypelistbox.hxx | 1 sw/source/uibase/inc/numfmtlb.hxx | 1 sw/source/uibase/inc/numpara.hxx | 1 sw/source/uibase/inc/optload.hxx | 1 sw/source/uibase/inc/optpage.hxx | 1 sw/source/uibase/inc/pgfnote.hxx | 1 sw/source/uibase/inc/srtdlg.hxx | 1 sw/source/uibase/inc/swuiccoll.hxx | 1 sw/source/uibase/inc/swuicnttab.hxx | 1 sw/source/uibase/inc/swuiidxmrk.hxx | 1 sw/source/uibase/inc/titlepage.hxx | 1 sw/source/uibase/inc/translatelangselect.hxx | 2 sw/source/uibase/inc/uitool.hxx | 1 sw/source/uibase/inc/watermarkdialog.hxx | 1 sw/source/uibase/inc/workctrl.hxx | 1 sw/source/uibase/sidebar/PageFormatPanel.hxx | 1 sw/source/uibase/sidebar/QuickFindPanel.cxx | 4 sw/source/uibase/sidebar/TableEditPanel.hxx | 1 sw/source/uibase/sidebar/WrapPropertyPanel.hxx | 1 sw/source/uibase/table/tablepg.hxx | 1 sw/source/uibase/utlui/content.cxx | 35 - sw/source/uibase/utlui/glbltree.cxx | 6 vcl/Library_vcl.mk | 1 vcl/inc/printdlg.hxx | 1 vcl/inc/qt5/QtInstanceBuilder.hxx | 1 vcl/inc/qt5/QtInstanceComboBox.hxx | 2 vcl/inc/qt5/QtInstanceTreeView.hxx | 4 vcl/inc/salvtables.hxx | 5 vcl/jsdialog/jsdialogbuilder.cxx | 4 vcl/qt5/QtInstanceTreeView.cxx | 4 vcl/source/app/salvtables.cxx | 13 vcl/source/weld/ComboBox.cxx | 36 + vcl/source/weld/weldutils.cxx | 6 vcl/unx/generic/print/prtsetup.hxx | 1 vcl/unx/gtk3/gtkinst.cxx | 15 writerperfect/inc/WPFTEncodingDialog.hxx | 1 writerperfect/source/writer/EPUBExportDialog.hxx | 1 241 files changed, 620 insertions(+), 371 deletions(-)
New commits: commit b44a20cdb774c0c1388cce2fadd7076709ac3300 Author: Michael Weghorn <[email protected]> AuthorDate: Fri Jan 2 21:58:28 2026 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Sat Jan 3 08:12:10 2026 +0100 weld: Move weld::ComboBox to own header/source Move the class out of weld.hxx into its own header and source file, in order to make it easier to keep an overview and to avoid having to recompile ~all UI code when the class is modified. Change-Id: Ib2fe4a6b5e34ad8ae2194ba85249ca25ed16e9d5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196435 Reviewed-by: Michael Weghorn <[email protected]> Tested-by: Jenkins diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx index 5a609478eea2..c249fbccf680 100644 --- a/avmedia/inc/mediacontrol.hxx +++ b/avmedia/inc/mediacontrol.hxx @@ -24,6 +24,7 @@ #include <vcl/InterimItemWindow.hxx> #include <vcl/timer.hxx> #include <vcl/idle.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> #include <avmedia/MediaControlBase.hxx> diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx index 5a09724de76e..ef7c91538a93 100644 --- a/basctl/source/basicide/moduldlg.hxx +++ b/basctl/source/basicide/moduldlg.hxx @@ -25,6 +25,7 @@ #include <bastype2.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/basctl/source/inc/objectbrowser.hxx b/basctl/source/inc/objectbrowser.hxx index ce9d4da2fb12..0db68b96dfc0 100644 --- a/basctl/source/inc/objectbrowser.hxx +++ b/basctl/source/inc/objectbrowser.hxx @@ -20,6 +20,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/sfxsids.hrc> #include <sfx2/viewfrm.hxx> +#include <vcl/weld/ComboBox.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 d811be131ee6..49324fdd7274 100644 --- a/chart2/source/controller/dialogs/res_DataLabel.hxx +++ b/chart2/source/controller/dialogs/res_DataLabel.hxx @@ -21,6 +21,7 @@ #include <svl/itemset.hxx> #include <svx/dialcontrol.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ComboBox.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 469f931ddcb7..1974c3b4e8c9 100644 --- a/chart2/source/controller/dialogs/res_ErrorBar.cxx +++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx @@ -23,6 +23,7 @@ #include <helpids.h> #include <chartview/ChartSfxItemIds.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/weld.hxx> #include <ChartModel.hxx> diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx index 74ac88294683..e27ba7979942 100644 --- a/chart2/source/controller/dialogs/res_Trendline.cxx +++ b/chart2/source/controller/dialogs/res_Trendline.cxx @@ -28,6 +28,7 @@ #include <svl/stritem.hxx> #include <vcl/formatter.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ComboBox.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 70ddc3cec0dc..4d8f10fdf51f 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.hxx @@ -19,6 +19,7 @@ #pragma once #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> namespace chart { class ControllerLockHelper; } diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.hxx b/chart2/source/controller/dialogs/tp_AxisPositions.hxx index 0b570d651d1f..398d7937985b 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.hxx +++ b/chart2/source/controller/dialogs/tp_AxisPositions.hxx @@ -19,6 +19,7 @@ #pragma once #include <sfx2/tabdlg.hxx> +#include <vcl/weld/ComboBox.hxx> class SvNumberFormatter; diff --git a/chart2/source/controller/dialogs/tp_Scale.hxx b/chart2/source/controller/dialogs/tp_Scale.hxx index 928637101a67..3f6336bbe950 100644 --- a/chart2/source/controller/dialogs/tp_Scale.hxx +++ b/chart2/source/controller/dialogs/tp_Scale.hxx @@ -20,6 +20,7 @@ #include <sfx2/tabdlg.hxx> #include <unotools/resmgr.hxx> +#include <vcl/weld/ComboBox.hxx> class SvNumberFormatter; diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index fb1e4e0527ff..0e1ce9b6aa2f 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -24,6 +24,7 @@ #include <svtools/toolboxcontroller.hxx> #include <vcl/InterimItemWindow.hxx> +#include <vcl/weld/ComboBox.hxx> #include <unotools/weakref.hxx> namespace chart diff --git a/chart2/source/controller/sidebar/ChartAxisPanel.hxx b/chart2/source/controller/sidebar/ChartAxisPanel.hxx index 1dddc8bce8c1..f655526d3b85 100644 --- a/chart2/source/controller/sidebar/ChartAxisPanel.hxx +++ b/chart2/source/controller/sidebar/ChartAxisPanel.hxx @@ -14,6 +14,7 @@ #include <sfx2/sidebar/IContextChangeReceiver.hxx> #include <sfx2/sidebar/SidebarModelUpdate.hxx> #include <sfx2/sidebar/PanelLayout.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include "ChartSidebarModifyListener.hxx" #include "ChartSidebarSelectionListener.hxx" diff --git a/chart2/source/controller/sidebar/ChartElementsPanel.hxx b/chart2/source/controller/sidebar/ChartElementsPanel.hxx index 2e0dee28b68f..4d78dc33349c 100644 --- a/chart2/source/controller/sidebar/ChartElementsPanel.hxx +++ b/chart2/source/controller/sidebar/ChartElementsPanel.hxx @@ -22,6 +22,7 @@ #include <sfx2/sidebar/SidebarModelUpdate.hxx> #include <sfx2/sidebar/PanelLayout.hxx> #include <vcl/EnumContext.hxx> +#include <vcl/weld/ComboBox.hxx> #include "ChartSidebarModifyListener.hxx" #include <TitleHelper.hxx> diff --git a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx index 92f7afb0ad53..162898e66d3b 100644 --- a/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx +++ b/chart2/source/controller/sidebar/ChartErrorBarPanel.hxx @@ -14,6 +14,7 @@ #include <sfx2/sidebar/IContextChangeReceiver.hxx> #include <sfx2/sidebar/SidebarModelUpdate.hxx> #include <sfx2/sidebar/PanelLayout.hxx> +#include <vcl/weld/ComboBox.hxx> #include "ChartSidebarModifyListener.hxx" namespace com::sun::star::util { class XModifyListener; } diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx index 5b69cc3b959f..dcc71ec06c78 100644 --- a/chart2/source/controller/sidebar/ChartSeriesPanel.hxx +++ b/chart2/source/controller/sidebar/ChartSeriesPanel.hxx @@ -22,6 +22,7 @@ #include <sfx2/sidebar/IContextChangeReceiver.hxx> #include <sfx2/sidebar/SidebarModelUpdate.hxx> #include <sfx2/sidebar/PanelLayout.hxx> +#include <vcl/weld/ComboBox.hxx> #include "ChartSidebarModifyListener.hxx" #include "ChartSidebarSelectionListener.hxx" diff --git a/chart2/source/inc/ChartResourceGroupDlgs.hxx b/chart2/source/inc/ChartResourceGroupDlgs.hxx index 8dfb5a4fde20..79b9c651086f 100644 --- a/chart2/source/inc/ChartResourceGroupDlgs.hxx +++ b/chart2/source/inc/ChartResourceGroupDlgs.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx index 35e74e66b840..f3c93bd9eac8 100644 --- a/cui/source/customize/eventdlg.hxx +++ b/cui/source/customize/eventdlg.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> #include <macropg.hxx> diff --git a/cui/source/inc/CommandCategoryListBox.hxx b/cui/source/inc/CommandCategoryListBox.hxx index 9de709b29b36..d90e6a095e3a 100644 --- a/cui/source/inc/CommandCategoryListBox.hxx +++ b/cui/source/inc/CommandCategoryListBox.hxx @@ -20,6 +20,8 @@ #pragma once #include <i18nutil/searchopt.hxx> +#include <vcl/weld/ComboBox.hxx> + #include "cfgutil.hxx" class SaveInData; diff --git a/cui/source/inc/FontFeaturesDialog.hxx b/cui/source/inc/FontFeaturesDialog.hxx index 6f5dbd0b9926..cd286d61938d 100644 --- a/cui/source/inc/FontFeaturesDialog.hxx +++ b/cui/source/inc/FontFeaturesDialog.hxx @@ -12,6 +12,7 @@ #include <vcl/svapp.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/source/inc/QrCodeGenDialog.hxx b/cui/source/inc/QrCodeGenDialog.hxx index 7af1b63ddac0..61a6b60cacca 100644 --- a/cui/source/inc/QrCodeGenDialog.hxx +++ b/cui/source/inc/QrCodeGenDialog.hxx @@ -10,6 +10,7 @@ #include <config_zxing.h> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index b207d9c3b59a..6f99c7590d21 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -28,6 +28,7 @@ #include <svl/undo.hxx> #include <svx/weldeditview.hxx> #include <editeng/SpellPortions.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/customweld.hxx> diff --git a/cui/source/inc/SvxMenuConfigPage.hxx b/cui/source/inc/SvxMenuConfigPage.hxx index 4b68bced9aa2..e89b4bebc543 100644 --- a/cui/source/inc/SvxMenuConfigPage.hxx +++ b/cui/source/inc/SvxMenuConfigPage.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/source/inc/SvxToolbarConfigPage.hxx b/cui/source/inc/SvxToolbarConfigPage.hxx index 60180cedb2ee..c6997a3c54d0 100644 --- a/cui/source/inc/SvxToolbarConfigPage.hxx +++ b/cui/source/inc/SvxToolbarConfigPage.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 7c99b1bf8ce6..5d1ad35c569f 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -42,6 +42,7 @@ enum VerticalAlign { #include <svtools/valueset.hxx> #include <svx/dialcontrol.hxx> #include <svx/frmdirlbox.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx index 30b0d2369d75..6d63dc74a2a2 100644 --- a/cui/source/inc/border.hxx +++ b/cui/source/inc/border.hxx @@ -20,6 +20,7 @@ #include <editeng/shaditem.hxx> #include <svtools/ctrlbox.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/IconView.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index c0a6c0470cd5..0ee2d161fc28 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/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx index 0d0c7d8705eb..7cb50806eea0 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/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/TreeView.hxx> diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index 3b8b58f9eddf..a750994613db 100644 --- a/cui/source/inc/connect.hxx +++ b/cui/source/inc/connect.hxx @@ -20,6 +20,7 @@ #include <svx/connctrl.hxx> #include <sfx2/tabdlg.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx index b55457a59df2..6e7dd5db1474 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/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <tools/link.hxx> diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx index 279276acc5eb..526d40a535e8 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/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> diff --git a/cui/source/inc/cuiimapwnd.hxx b/cui/source/inc/cuiimapwnd.hxx index 4f9ef0495989..6e1fe8743240 100644 --- a/cui/source/inc/cuiimapwnd.hxx +++ b/cui/source/inc/cuiimapwnd.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <sfx2/frame.hxx> diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx index faf1c26374d3..89eda44b4cb4 100644 --- a/cui/source/inc/cuitabarea.hxx +++ b/cui/source/inc/cuitabarea.hxx @@ -27,6 +27,7 @@ #include <svx/PaletteManager.hxx> #include <svx/svdview.hxx> #include <vcl/hexcolorcontrol.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> class ColorListBox; diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index e5a885ff3b0e..94881e0290a0 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -20,6 +20,7 @@ #include <vcl/event.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/customweld.hxx> diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index c4fbdf112255..f7386b8dab3a 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -20,6 +20,7 @@ #include <sfx2/tabdlg.hxx> #include <svx/swframeexample.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/weld.hxx> #include <svx/dlgutil.hxx> diff --git a/cui/source/inc/thesdlg.hxx b/cui/source/inc/thesdlg.hxx index 40f260c990b4..94612a04423b 100644 --- a/cui/source/inc/thesdlg.hxx +++ b/cui/source/inc/thesdlg.hxx @@ -21,6 +21,7 @@ #include <com/sun/star/linguistic2/XThesaurus.hpp> #include <vcl/idle.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/TreeView.hxx> #include <sfx2/basedlgs.hxx> diff --git a/cui/source/options/appearance.hxx b/cui/source/options/appearance.hxx index 25ec9538d826..7bfbab2311fb 100644 --- a/cui/source/options/appearance.hxx +++ b/cui/source/options/appearance.hxx @@ -9,6 +9,7 @@ #pragma once +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> #include <sfx2/tabdlg.hxx> #include <svx/colorbox.hxx> diff --git a/cui/source/options/doclinkdialog.hxx b/cui/source/options/doclinkdialog.hxx index 3d4f0c8605c7..686647e8e7ec 100644 --- a/cui/source/options/doclinkdialog.hxx +++ b/cui/source/options/doclinkdialog.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <svtools/inettbc.hxx> diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index 7cea1ac07bdf..9e8592891719 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -20,6 +20,7 @@ #pragma once #include <sfx2/tabdlg.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/TreeView.hxx> // class SvxFontSubstTabPage ---------------------------------------------------- diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx index cac51636737b..679543b2979f 100644 --- a/cui/source/options/optaccessibility.hxx +++ b/cui/source/options/optaccessibility.hxx @@ -20,6 +20,7 @@ #include <sfx2/tabdlg.hxx> #include <sfx2/AccessibilityIssue.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/TreeView.hxx> #include <map> diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index 3f75b1e90831..74c73781f90a 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -23,6 +23,7 @@ #include <svtools/valueset.hxx> #include <svx/xtable.hxx> #include <svx/PaletteManager.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/customweld.hxx> diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx index 35c07d3a81df..3933ad99877a 100644 --- a/cui/source/options/optctl.hxx +++ b/cui/source/options/optctl.hxx @@ -19,6 +19,7 @@ #pragma once #include <sfx2/tabdlg.hxx> +#include <vcl/weld/ComboBox.hxx> // class SvxCTLOptionsPage ----------------------------------------------------- diff --git a/cui/source/options/optinet2.hxx b/cui/source/options/optinet2.hxx index e05a79be029b..0f6c2cfd2bfb 100644 --- a/cui/source/options/optinet2.hxx +++ b/cui/source/options/optinet2.hxx @@ -20,6 +20,7 @@ #include <memory> #include <sfx2/tabdlg.hxx> +#include <vcl/weld/ComboBox.hxx> namespace svx { class SecurityOptionsDialog; diff --git a/cui/source/options/optsave.hxx b/cui/source/options/optsave.hxx index e31c0419df40..a195e11c82ad 100644 --- a/cui/source/options/optsave.hxx +++ b/cui/source/options/optsave.hxx @@ -20,6 +20,7 @@ #include <memory> #include <sfx2/tabdlg.hxx> +#include <vcl/weld/ComboBox.hxx> enum AppType { diff --git a/dbaccess/source/ui/dlg/advancedsettings.hxx b/dbaccess/source/ui/dlg/advancedsettings.hxx index 9eaca4a41b48..1a4313024d71 100644 --- a/dbaccess/source/ui/dlg/advancedsettings.hxx +++ b/dbaccess/source/ui/dlg/advancedsettings.hxx @@ -21,6 +21,9 @@ #include "adminpages.hxx" #include <dsmeta.hxx> + +#include <vcl/weld/ComboBox.hxx> + #include <vector> namespace dbaui diff --git a/dbaccess/source/ui/dlg/dbfindex.hxx b/dbaccess/source/ui/dlg/dbfindex.hxx index 2614170a64d3..6bb6a5c335e5 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/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index 82920c1958f3..ab3e1e765b91 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -19,6 +19,7 @@ #pragma once #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> #include "IClipBoardTest.hxx" #include "QEnumTypes.hxx" diff --git a/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx b/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx index bbc3fdb7b197..214eb7a2c632 100644 --- a/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx +++ b/dbaccess/source/ui/inc/QueryPropertiesDialog.hxx @@ -9,6 +9,7 @@ #pragma once +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> diff --git a/dbaccess/source/ui/inc/charsetlistbox.hxx b/dbaccess/source/ui/inc/charsetlistbox.hxx index 9aaed1d93091..d3dc829c7193 100644 --- a/dbaccess/source/ui/inc/charsetlistbox.hxx +++ b/dbaccess/source/ui/inc/charsetlistbox.hxx @@ -20,6 +20,7 @@ #pragma once #include <svl/typedwhich.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> #include "charsets.hxx" diff --git a/dbaccess/source/ui/inc/directsql.hxx b/dbaccess/source/ui/inc/directsql.hxx index 4cd95f11e7cc..17d78ebd104f 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/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <deque> diff --git a/dbaccess/source/ui/inc/dlgsave.hxx b/dbaccess/source/ui/inc/dlgsave.hxx index de1fe353215d..0797ff9a4ea1 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/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <memory> diff --git a/dbaccess/source/ui/inc/opendoccontrols.hxx b/dbaccess/source/ui/inc/opendoccontrols.hxx index b82c2bb8b58f..c710b48eef7b 100644 --- a/dbaccess/source/ui/inc/opendoccontrols.hxx +++ b/dbaccess/source/ui/inc/opendoccontrols.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> #include <rtl/ustring.hxx> diff --git a/dbaccess/source/ui/inc/queryfilter.hxx b/dbaccess/source/ui/inc/queryfilter.hxx index 1d037818f094..988995c57635 100644 --- a/dbaccess/source/ui/inc/queryfilter.hxx +++ b/dbaccess/source/ui/inc/queryfilter.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/ComboBox.hxx> #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 311441a9c75f..808a39a2eb70 100644 --- a/dbaccess/source/ui/inc/queryorder.hxx +++ b/dbaccess/source/ui/inc/queryorder.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index ac61359cd67c..b43c43b685a3 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx @@ -18,6 +18,7 @@ #include <vcl/InterimItemWindow.hxx> #include <vcl/event.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/window.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/dbaccess/source/ui/querydesign/querydlg.hxx b/dbaccess/source/ui/querydesign/querydlg.hxx index a29fe8536be9..232a6ff07be8 100644 --- a/dbaccess/source/ui/querydesign/querydlg.hxx +++ b/dbaccess/source/ui/querydesign/querydlg.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index 7f37505d032c..faf3b15ebcd3 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -34,6 +34,7 @@ #include <utility> #include <vcl/event.hxx> #include <vcl/mnemonic.hxx> +#include <vcl/weld/ComboBox.hxx> #include "general.hxx" #include "bibresid.hxx" #include "datman.hxx" diff --git a/extensions/source/bibliography/toolbar.hxx b/extensions/source/bibliography/toolbar.hxx index 2ccc43cfff7a..30184309d9b5 100644 --- a/extensions/source/bibliography/toolbar.hxx +++ b/extensions/source/bibliography/toolbar.hxx @@ -25,6 +25,7 @@ #include <vcl/InterimItemWindow.hxx> #include <vcl/toolbox.hxx> #include <vcl/timer.hxx> +#include <vcl/weld/ComboBox.hxx> #include <cppuhelper/implbase.hxx> #include <vector> diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx index 9c619e85261d..0f3f1a55635d 100644 --- a/extensions/source/dbpilots/commonpagesdbp.hxx +++ b/extensions/source/dbpilots/commonpagesdbp.hxx @@ -20,6 +20,7 @@ #pragma once #include "controlwizard.hxx" +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include <com/sun/star/sdb/XDatabaseContext.hpp> diff --git a/extensions/source/dbpilots/controlwizard.hxx b/extensions/source/dbpilots/controlwizard.hxx index 4cdebc88f71b..9e6bb1ffa0e1 100644 --- a/extensions/source/dbpilots/controlwizard.hxx +++ b/extensions/source/dbpilots/controlwizard.hxx @@ -24,6 +24,7 @@ #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include <vcl/wizardmachine.hxx> diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index fc379c3acd3a..b8ad0d308729 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -27,6 +27,7 @@ #include <comphelper/diagnose_ex.hxx> #include <utility> #include <vcl/svapp.hxx> +#include <vcl/weld/ComboBox.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/dbexception.hxx> #include <comphelper/sequence.hxx> diff --git a/extensions/source/scanner/grid.hxx b/extensions/source/scanner/grid.hxx index 530cdde15e53..a4e826de2084 100644 --- a/extensions/source/scanner/grid.hxx +++ b/extensions/source/scanner/grid.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/ComboBox.hxx> #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 cbac162c42d4..2d982ecc9692 100644 --- a/extensions/source/scanner/sanedlg.hxx +++ b/extensions/source/scanner/sanedlg.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/TreeView.hxx> diff --git a/filter/source/pdf/impdialog.hxx b/filter/source/pdf/impdialog.hxx index ed3b00b505ec..b137f0cdd1f6 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/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/TreeView.hxx> diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx index b2284131a3ba..4c78315d77c6 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx +++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.hxx @@ -19,6 +19,7 @@ #pragma once #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> class filter_info_impl; diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx index 009693f75d46..106ac3fb5010 100644 --- a/formula/source/ui/dlg/funcpage.hxx +++ b/formula/source/ui/dlg/funcpage.hxx @@ -20,6 +20,7 @@ #pragma once #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include <vector> diff --git a/fpicker/source/office/OfficeControlAccess.hxx b/fpicker/source/office/OfficeControlAccess.hxx index 5a6959bea1bf..7c4862253686 100644 --- a/fpicker/source/office/OfficeControlAccess.hxx +++ b/fpicker/source/office/OfficeControlAccess.hxx @@ -27,6 +27,7 @@ #include "fpdialogbase.hxx" #include "pickercallbacks.hxx" #include <o3tl/typed_flags_set.hxx> +#include <vcl/weld/ComboBox.hxx> enum class PropFlags { Unknown = -1, // used as an error sentinel diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx index e6847db807ca..b2a72d6814c2 100644 --- a/fpicker/source/office/iodlgimp.hxx +++ b/fpicker/source/office/iodlgimp.hxx @@ -21,6 +21,7 @@ #include "PlacesListBox.hxx" #include <vcl/idle.hxx> +#include <vcl/weld/ComboBox.hxx> #include <deque> #include <memory> diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index cc7d43e5fc08..cac7a98ce4d7 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -26,6 +26,7 @@ #include <svtools/toolboxcontroller.hxx> #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> +#include <vcl/weld/ComboBox.hxx> using namespace ::com::sun::star; using namespace css::uno; diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index 3537bcc7c9e5..6e1654bbaa77 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -26,6 +26,7 @@ #include <svtools/toolboxcontroller.hxx> #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> +#include <vcl/weld/ComboBox.hxx> using namespace ::com::sun::star; using namespace css::uno; diff --git a/include/avmedia/MediaControlBase.hxx b/include/avmedia/MediaControlBase.hxx index 09b80dd33389..7ca4332bea64 100644 --- a/include/avmedia/MediaControlBase.hxx +++ b/include/avmedia/MediaControlBase.hxx @@ -19,6 +19,7 @@ #pragma once #include <config_options.h> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> #include <avmedia/avmediadllapi.h> diff --git a/include/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx index be5d2dc29b9e..3bcd50b97537 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/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/EntryTreeView.hxx> #include <vcl/weld/TreeView.hxx> diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx index ee105f86c730..a06e0877e9ae 100644 --- a/include/sfx2/printopt.hxx +++ b/include/sfx2/printopt.hxx @@ -24,6 +24,7 @@ #include <sfx2/tabdlg.hxx> #include <sal/types.h> #include <vcl/printer/Options.hxx> +#include <vcl/weld/ComboBox.hxx> class SFX2_DLLPUBLIC SfxCommonPrintOptionsTabPage final : public SfxTabPage { diff --git a/include/sfx2/templatedlg.hxx b/include/sfx2/templatedlg.hxx index e779bd0807fc..6574f0a2e7fc 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/ComboBox.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 d171402a1289..9c20852c89dc 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/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index 52ed85a38ffb..03fe9aeef311 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/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/weld.hxx> diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index 38a986941a62..4236b6dfff73 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -25,6 +25,7 @@ #include <vcl/idle.hxx> #include <vcl/metric.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> #include <memory> diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index a8fb74ab1a6b..a59de6f2ffca 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -27,6 +27,7 @@ #include <svtools/brwhead.hxx> #include <tools/lineend.hxx> #include <vcl/InterimItemWindow.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weldutils.hxx> #include <o3tl/typed_flags_set.hxx> diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index f953f0a2cef0..113047f9ea58 100644 --- a/include/svtools/inettbc.hxx +++ b/include/svtools/inettbc.hxx @@ -25,6 +25,7 @@ #include <tools/urlobj.hxx> #include <vcl/idle.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> class SvtMatchContext_Impl; diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx index 25d3c500a915..bbf16510be94 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/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <vcl/timer.hxx> diff --git a/include/svx/ClassificationDialog.hxx b/include/svx/ClassificationDialog.hxx index 8d2682017019..5a8302aa9851 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/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/include/svx/GenericDropDownFieldDialog.hxx b/include/svx/GenericDropDownFieldDialog.hxx index 90ac36e09781..665447167ee6 100644 --- a/include/svx/GenericDropDownFieldDialog.hxx +++ b/include/svx/GenericDropDownFieldDialog.hxx @@ -10,6 +10,7 @@ #pragma once #include <svx/svxdllapi.h> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> diff --git a/include/svx/SvxNumOptionsTabPageHelper.hxx b/include/svx/SvxNumOptionsTabPageHelper.hxx index a9ecfe95b408..a64d879b0c15 100644 --- a/include/svx/SvxNumOptionsTabPageHelper.hxx +++ b/include/svx/SvxNumOptionsTabPageHelper.hxx @@ -20,6 +20,7 @@ #pragma once #include <com/sun/star/text/XDefaultNumberingProvider.hpp> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> #include <svx/svxdllapi.h> diff --git a/include/svx/compressgraphicdialog.hxx b/include/svx/compressgraphicdialog.hxx index 667b579584cf..0f6f242dad6d 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/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <vcl/graph.hxx> diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index cd8017160334..50cb56a88af0 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -28,6 +28,7 @@ #include <tools/link.hxx> #include <tools/time.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include <memory> diff --git a/include/svx/cuicharmap.hxx b/include/svx/cuicharmap.hxx index 53680b447b9f..0588734dffa7 100644 --- a/include/svx/cuicharmap.hxx +++ b/include/svx/cuicharmap.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <vcl/virdev.hxx> diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 0560a4ab30b2..d2699bf8a1fb 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/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx index 1a781713dbaa..5e02bd7058e9 100644 --- a/include/svx/fillctrl.hxx +++ b/include/svx/fillctrl.hxx @@ -25,6 +25,7 @@ #include <sfx2/tbxctrl.hxx> #include <sfx2/weldutils.hxx> #include <svx/svxdllapi.h> +#include <vcl/weld/ComboBox.hxx> class XFillStyleItem; class XFillColorItem; diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx index 299d55fddb2b..cd2099828e3f 100644 --- a/include/svx/float3d.hxx +++ b/include/svx/float3d.hxx @@ -24,6 +24,7 @@ #include <editeng/colritem.hxx> #include <sfx2/ctrlitem.hxx> #include <sfx2/dockwin.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/weld.hxx> #include <svl/eitem.hxx> diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx index a2220c6866b9..0124c73642be 100644 --- a/include/svx/frmdirlbox.hxx +++ b/include/svx/frmdirlbox.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_SVX_FRMDIRLBOX_HXX #define INCLUDED_SVX_FRMDIRLBOX_HXX +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> #include <editeng/frmdir.hxx> #include <svx/svxdllapi.h> diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index 1eecbabf552d..bdf2d0795430 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -22,6 +22,7 @@ #include <svtools/toolbarmenu.hxx> #include <svx/svxdllapi.h> #include <svx/xtable.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/customweld.hxx> class ValueSet; diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index a2114024d2a5..71f75ebf6ad2 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -23,6 +23,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/i18n/ScriptType.hpp> #include <svx/svxdllapi.h> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> #include <o3tl/typed_flags_set.hxx> diff --git a/include/svx/pagenumberlistbox.hxx b/include/svx/pagenumberlistbox.hxx index bd4117933887..43cef0463a45 100644 --- a/include/svx/pagenumberlistbox.hxx +++ b/include/svx/pagenumberlistbox.hxx @@ -22,6 +22,7 @@ #include <editeng/svxenum.hxx> #include <svx/svxdllapi.h> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> class SVXCORE_DLLPUBLIC SvxPageNumberListBox diff --git a/include/svx/papersizelistbox.hxx b/include/svx/papersizelistbox.hxx index da24db2aca2e..c31e60073022 100644 --- a/include/svx/papersizelistbox.hxx +++ b/include/svx/papersizelistbox.hxx @@ -22,6 +22,7 @@ #include <i18nutil/paper.hxx> #include <svx/svxdllapi.h> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> enum class PaperSizeApp diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx index 8d194731753c..d81fcb53dd26 100644 --- a/include/svx/rubydialog.hxx +++ b/include/svx/rubydialog.hxx @@ -25,6 +25,7 @@ #include <sfx2/basedlgs.hxx> #include <svx/svxdllapi.h> #include <rtl/ref.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/customweld.hxx> diff --git a/include/svx/samecontentlistbox.hxx b/include/svx/samecontentlistbox.hxx index bbc2a6a7cefb..1e575cfd885c 100644 --- a/include/svx/samecontentlistbox.hxx +++ b/include/svx/samecontentlistbox.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SVX_SAMECONTENTLISTBOXHELPER_HXX #include <svx/svxdllapi.h> -#include <vcl/weld/weld.hxx> +#include <vcl/weld/ComboBox.hxx> namespace SameContentListBox { diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx index 4c7642807cc5..42fdd95c5828 100644 --- a/include/svx/sidebar/AreaPropertyPanelBase.hxx +++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx @@ -34,6 +34,7 @@ #include <svl/intitem.hxx> #include <svx/svxdllapi.h> #include <vcl/EnumContext.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> class ToolbarUnoDispatcher; diff --git a/include/svx/spacinglistbox.hxx b/include/svx/spacinglistbox.hxx index b2790c892a14..cf54a8ab418f 100644 --- a/include/svx/spacinglistbox.hxx +++ b/include/svx/spacinglistbox.hxx @@ -21,7 +21,7 @@ #define INCLUDED_SVX_SPACINGLISTBOXHELPER_HXX #include <svx/svxdllapi.h> -#include <vcl/weld/weld.hxx> +#include <vcl/weld/ComboBox.hxx> enum class SpacingType { diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index 34d82fbb9d28..0093b4751514 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -27,6 +27,7 @@ #include <svl/itemset.hxx> #include <svx/svxdllapi.h> #include <vcl/timer.hxx> +#include <vcl/weld/ComboBox.hxx> #include <memory> #include <vector> diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx index 70dc795ea07c..4ce79b0933a7 100644 --- a/include/svx/txencbox.hxx +++ b/include/svx/txencbox.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_SVX_TXENCBOX_HXX #define INCLUDED_SVX_TXENCBOX_HXX +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include <rtl/textenc.h> diff --git a/include/vcl/jsdialog/executor.hxx b/include/vcl/jsdialog/executor.hxx index ecf85ff0eead..2360ec2fdacc 100644 --- a/include/vcl/jsdialog/executor.hxx +++ b/include/vcl/jsdialog/executor.hxx @@ -11,6 +11,7 @@ #include <vcl/dllapi.h> #include <vcl/uitest/uiobject.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/IconView.hxx> #include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/TreeView.hxx> diff --git a/include/vcl/weld/ComboBox.hxx b/include/vcl/weld/ComboBox.hxx new file mode 100644 index 000000000000..ca8ffb0b4130 --- /dev/null +++ b/include/vcl/weld/ComboBox.hxx @@ -0,0 +1,228 @@ +/* -*- 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 +{ +struct VCL_DLLPUBLIC ComboBoxEntry +{ + OUString sString; + OUString sId; + OUString sImage; + ComboBoxEntry(OUString _aString) + : sString(std::move(_aString)) + { + } + ComboBoxEntry(OUString _aString, OUString _aId) + : sString(std::move(_aString)) + , sId(std::move(_aId)) + { + } + ComboBoxEntry(OUString _aString, OUString _aId, OUString _aImage) + : sString(std::move(_aString)) + , sId(std::move(_aId)) + , sImage(std::move(_aImage)) + { + } +}; + +/// A widget used to choose from a list of items. +class VCL_DLLPUBLIC ComboBox : virtual public Widget +{ +private: + OUString m_sSavedValue; + std::vector<OUString> m_aSavedValues; + +public: + // OUString is the id of the row, it may be null to measure the height of a generic line + typedef std::tuple<vcl::RenderContext&, const tools::Rectangle&, bool, const OUString&> + render_args; + +protected: + Link<ComboBox&, void> m_aChangeHdl; + Link<ComboBox&, void> m_aPopupToggledHdl; + Link<ComboBox&, bool> m_aEntryActivateHdl; + Link<OUString&, bool> m_aEntryInsertTextHdl; + + friend class ::LOKTrigger; + + void signal_changed() + { + if (notify_events_disabled()) + return; + m_aChangeHdl.Call(*this); + } + + virtual void signal_popup_toggled() { m_aPopupToggledHdl.Call(*this); } + + Link<render_args, void> m_aRenderHdl; + void signal_custom_render(vcl::RenderContext& rDevice, const tools::Rectangle& rRect, + bool bSelected, const OUString& rId) + { + m_aRenderHdl.Call(render_args(rDevice, rRect, bSelected, rId)); + } + + Link<vcl::RenderContext&, Size> m_aGetSizeHdl; + Size signal_custom_get_size(vcl::RenderContext& rDevice) { return m_aGetSizeHdl.Call(rDevice); } + + virtual void do_set_active(int pos) = 0; + virtual void do_set_active_id(const OUString& rStr) = 0; + +public: + virtual void insert(int pos, const OUString& rStr, const OUString* pId, + const OUString* pIconName, VirtualDevice* pImageSurface) + = 0; + virtual void insert_vector(const std::vector<weld::ComboBoxEntry>& rItems, bool bKeepExisting) + = 0; + void insert(int pos, const weld::ComboBoxEntry& rItem) + { + insert(pos, rItem.sString, rItem.sId.isEmpty() ? nullptr : &rItem.sId, + rItem.sImage.isEmpty() ? nullptr : &rItem.sImage, nullptr); + } + void insert_text(int pos, const OUString& rStr) + { + insert(pos, rStr, nullptr, nullptr, nullptr); + } + void append(const weld::ComboBoxEntry& rItem) { insert(-1, rItem); } + void append_text(const OUString& rStr) { insert(-1, rStr, nullptr, nullptr, nullptr); } + void append(const OUString& rId, const OUString& rStr) + { + insert(-1, rStr, &rId, nullptr, nullptr); + } + void append(const OUString& rId, const OUString& rStr, const OUString& rImage) + { + insert(-1, rStr, &rId, &rImage, nullptr); + } + void append(const OUString& rId, const OUString& rStr, VirtualDevice& rImage) + { + insert(-1, rStr, &rId, nullptr, &rImage); + } + void append(int pos, const OUString& rId, const OUString& rStr) + { + insert(pos, rStr, &rId, nullptr, nullptr); + } + virtual void insert_separator(int pos, const OUString& rId) = 0; + void append_separator(const OUString& rId) { insert_separator(-1, rId); } + + virtual int get_count() const = 0; + virtual void make_sorted() = 0; + virtual void clear() = 0; + + //by index, returns -1 if nothing is selected + virtual int get_active() const = 0; + void set_active(int pos); + virtual void remove(int pos) = 0; + + //by text + virtual OUString get_active_text() const = 0; + void set_active_text(const OUString& rStr) { set_active(find_text(rStr)); } + virtual OUString get_text(int pos) const = 0; + virtual int find_text(const OUString& rStr) const = 0; + void remove_text(const OUString& rText) { remove(find_text(rText)); } + + //by id + virtual OUString get_active_id() const = 0; + void set_active_id(const OUString& rStr); + virtual OUString get_id(int pos) const = 0; + virtual void set_id(int row, const OUString& rId) = 0; + virtual int find_id(const OUString& rId) const = 0; + void remove_id(const OUString& rId) { remove(find_id(rId)); } + + /* m_aChangeHdl is called when the active item is changed. The can be due + to the user selecting a different item from the list or while typing + into the entry of a combo box with an entry. + + Use changed_by_direct_pick() to discover whether an item was actually explicitly + selected, e.g. from the menu. + */ + void connect_changed(const Link<ComboBox&, void>& rLink) { m_aChangeHdl = rLink; } + + virtual bool changed_by_direct_pick() const = 0; + + virtual void connect_popup_toggled(const Link<ComboBox&, void>& rLink) + { + m_aPopupToggledHdl = rLink; + } + + //entry related + virtual bool has_entry() const = 0; + virtual void set_entry_message_type(EntryMessageType eType) = 0; + virtual void set_entry_text(const OUString& rStr) = 0; + virtual void set_entry_width_chars(int nChars) = 0; + virtual void set_entry_max_length(int nChars) = 0; + virtual void select_entry_region(int nStartPos, int nEndPos) = 0; + virtual bool get_entry_selection_bounds(int& rStartPos, int& rEndPos) = 0; + virtual void set_entry_completion(bool bEnable, bool bCaseSensitive = false) = 0; + virtual void set_entry_placeholder_text(const OUString& rText) = 0; + virtual void set_entry_editable(bool bEditable) = 0; + virtual void cut_entry_clipboard() = 0; + virtual void copy_entry_clipboard() = 0; + virtual void paste_entry_clipboard() = 0; + + // font size is in points, not pixels, e.g. see Window::[G]etPointFont + virtual void set_font(const vcl::Font& rFont) = 0; + + // font size is in points, not pixels, e.g. see Window::[G]etPointFont + virtual void set_entry_font(const vcl::Font& rFont) = 0; + virtual vcl::Font get_entry_font() = 0; + + virtual bool get_popup_shown() const = 0; + + void connect_entry_insert_text(const Link<OUString&, bool>& rLink) + { + m_aEntryInsertTextHdl = rLink; + } + + // callback returns true to indicated no further processing of activate wanted + void connect_entry_activate(const Link<ComboBox&, bool>& rLink) { m_aEntryActivateHdl = rLink; } + + void save_value() { m_sSavedValue = get_active_text(); } + + void save_values_by_id(const OUString& rId) + { + m_aSavedValues.push_back(get_text(find_id(rId))); + } + + OUString const& get_saved_value() const { return m_sSavedValue; } + OUString const& get_saved_values(int pos) const { return m_aSavedValues[pos]; } + bool get_value_changed_from_saved() const { return m_sSavedValue != get_active_text(); } + bool get_values_changed_from_saved() const; + + void removeSavedValues() { m_aSavedValues.clear(); } + + // for custom rendering a row + void connect_custom_get_size(const Link<vcl::RenderContext&, Size>& rLink) + { + m_aGetSizeHdl = rLink; + } + void connect_custom_render(const Link<render_args, void>& rLink) { m_aRenderHdl = rLink; } + // call set_custom_renderer after setting custom callbacks + virtual void set_custom_renderer(bool bOn) = 0; + // set a sub menu for a entry, only works with custom rendering + virtual void set_item_menu(const OUString& rIdent, weld::Menu* pMenu) = 0; + // get the width needed to show the menu launcher in a custom row + virtual int get_menu_button_width() const = 0; + + // for mru support + virtual int get_max_mru_count() const = 0; + virtual void set_max_mru_count(int nCount) = 0; + virtual OUString get_mru_entries() const = 0; + virtual void set_mru_entries(const OUString& rEntries) = 0; + + // Backwards compatibility, should be avoided to allow + // UI consistency. + virtual void set_max_drop_down_rows(int nRows) = 0; +}; +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/include/vcl/weld/EntryTreeView.hxx b/include/vcl/weld/EntryTreeView.hxx index ce9530188102..e9823b9bf9db 100644 --- a/include/vcl/weld/EntryTreeView.hxx +++ b/include/vcl/weld/EntryTreeView.hxx @@ -10,6 +10,7 @@ #pragma once #include <vcl/dllapi.h> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/include/vcl/weld/weld.hxx b/include/vcl/weld/weld.hxx index f27b63a65127..86c2a1641870 100644 --- a/include/vcl/weld/weld.hxx +++ b/include/vcl/weld/weld.hxx @@ -716,28 +716,6 @@ template <typename T> T fromId(const OUString& rValue) return reinterpret_cast<T>(rValue.toUInt64()); } -struct VCL_DLLPUBLIC ComboBoxEntry -{ - OUString sString; - OUString sId; - OUString sImage; - ComboBoxEntry(OUString _aString) - : sString(std::move(_aString)) - { - } - ComboBoxEntry(OUString _aString, OUString _aId) - : sString(std::move(_aString)) - , sId(std::move(_aId)) - { - } - ComboBoxEntry(OUString _aString, OUString _aId, OUString _aImage) - : sString(std::move(_aString)) - , sId(std::move(_aId)) - , sImage(std::move(_aImage)) - { - } -}; - enum class EntryMessageType { Normal, @@ -745,211 +723,6 @@ enum class EntryMessageType Error, }; -class Menu; - -/// A widget used to choose from a list of items. -class VCL_DLLPUBLIC ComboBox : virtual public Widget -{ -private: - OUString m_sSavedValue; - std::vector<OUString> m_aSavedValues; - -public: - // OUString is the id of the row, it may be null to measure the height of a generic line - typedef std::tuple<vcl::RenderContext&, const tools::Rectangle&, bool, const OUString&> - render_args; - -protected: - Link<ComboBox&, void> m_aChangeHdl; - Link<ComboBox&, void> m_aPopupToggledHdl; - Link<ComboBox&, bool> m_aEntryActivateHdl; - Link<OUString&, bool> m_aEntryInsertTextHdl; - - friend class ::LOKTrigger; - - void signal_changed() - { - if (notify_events_disabled()) - return; - m_aChangeHdl.Call(*this); - } - - virtual void signal_popup_toggled() { m_aPopupToggledHdl.Call(*this); } - - Link<render_args, void> m_aRenderHdl; - void signal_custom_render(vcl::RenderContext& rDevice, const tools::Rectangle& rRect, - bool bSelected, const OUString& rId) - { - m_aRenderHdl.Call(render_args(rDevice, rRect, bSelected, rId)); - } - - Link<vcl::RenderContext&, Size> m_aGetSizeHdl; - Size signal_custom_get_size(vcl::RenderContext& rDevice) { return m_aGetSizeHdl.Call(rDevice); } - - virtual void do_set_active(int pos) = 0; - virtual void do_set_active_id(const OUString& rStr) = 0; - -public: - virtual void insert(int pos, const OUString& rStr, const OUString* pId, - const OUString* pIconName, VirtualDevice* pImageSurface) - = 0; - virtual void insert_vector(const std::vector<weld::ComboBoxEntry>& rItems, bool bKeepExisting) - = 0; - void insert(int pos, const weld::ComboBoxEntry& rItem) - { - insert(pos, rItem.sString, rItem.sId.isEmpty() ? nullptr : &rItem.sId, - rItem.sImage.isEmpty() ? nullptr : &rItem.sImage, nullptr); - } - void insert_text(int pos, const OUString& rStr) - { - insert(pos, rStr, nullptr, nullptr, nullptr); - } - void append(const weld::ComboBoxEntry& rItem) { insert(-1, rItem); } - void append_text(const OUString& rStr) { insert(-1, rStr, nullptr, nullptr, nullptr); } - void append(const OUString& rId, const OUString& rStr) - { - insert(-1, rStr, &rId, nullptr, nullptr); - } - void append(const OUString& rId, const OUString& rStr, const OUString& rImage) - { - insert(-1, rStr, &rId, &rImage, nullptr); - } - void append(const OUString& rId, const OUString& rStr, VirtualDevice& rImage) - { - insert(-1, rStr, &rId, nullptr, &rImage); - } - void append(int pos, const OUString& rId, const OUString& rStr) - { - insert(pos, rStr, &rId, nullptr, nullptr); - } - virtual void insert_separator(int pos, const OUString& rId) = 0; - void append_separator(const OUString& rId) { insert_separator(-1, rId); } - - virtual int get_count() const = 0; - virtual void make_sorted() = 0; - virtual void clear() = 0; - - //by index, returns -1 if nothing is selected - virtual int get_active() const = 0; - void set_active(int pos) - { - disable_notify_events(); - do_set_active(pos); - enable_notify_events(); - } - virtual void remove(int pos) = 0; - - //by text - virtual OUString get_active_text() const = 0; - void set_active_text(const OUString& rStr) { set_active(find_text(rStr)); } - virtual OUString get_text(int pos) const = 0; - virtual int find_text(const OUString& rStr) const = 0; - void remove_text(const OUString& rText) { remove(find_text(rText)); } - - //by id - virtual OUString get_active_id() const = 0; - void set_active_id(const OUString& rStr) - { - disable_notify_events(); - do_set_active_id(rStr); - enable_notify_events(); - } - virtual OUString get_id(int pos) const = 0; - virtual void set_id(int row, const OUString& rId) = 0; - virtual int find_id(const OUString& rId) const = 0; - void remove_id(const OUString& rId) { remove(find_id(rId)); } - - /* m_aChangeHdl is called when the active item is changed. The can be due - to the user selecting a different item from the list or while typing - into the entry of a combo box with an entry. - - Use changed_by_direct_pick() to discover whether an item was actually explicitly - selected, e.g. from the menu. - */ - void connect_changed(const Link<ComboBox&, void>& rLink) { m_aChangeHdl = rLink; } - - virtual bool changed_by_direct_pick() const = 0; - - virtual void connect_popup_toggled(const Link<ComboBox&, void>& rLink) - { - m_aPopupToggledHdl = rLink; - } - - //entry related - virtual bool has_entry() const = 0; - virtual void set_entry_message_type(EntryMessageType eType) = 0; - virtual void set_entry_text(const OUString& rStr) = 0; - virtual void set_entry_width_chars(int nChars) = 0; - virtual void set_entry_max_length(int nChars) = 0; - virtual void select_entry_region(int nStartPos, int nEndPos) = 0; - virtual bool get_entry_selection_bounds(int& rStartPos, int& rEndPos) = 0; - virtual void set_entry_completion(bool bEnable, bool bCaseSensitive = false) = 0; - virtual void set_entry_placeholder_text(const OUString& rText) = 0; - virtual void set_entry_editable(bool bEditable) = 0; - virtual void cut_entry_clipboard() = 0; - virtual void copy_entry_clipboard() = 0; - virtual void paste_entry_clipboard() = 0; - - // font size is in points, not pixels, e.g. see Window::[G]etPointFont - virtual void set_font(const vcl::Font& rFont) = 0; - - // font size is in points, not pixels, e.g. see Window::[G]etPointFont - virtual void set_entry_font(const vcl::Font& rFont) = 0; - virtual vcl::Font get_entry_font() = 0; - - virtual bool get_popup_shown() const = 0; - - void connect_entry_insert_text(const Link<OUString&, bool>& rLink) - { - m_aEntryInsertTextHdl = rLink; - } - - // callback returns true to indicated no further processing of activate wanted - void connect_entry_activate(const Link<ComboBox&, bool>& rLink) { m_aEntryActivateHdl = rLink; } - - void save_value() { m_sSavedValue = get_active_text(); } - - void save_values_by_id(const OUString& rId) - { - m_aSavedValues.push_back(get_text(find_id(rId))); - } - - OUString const& get_saved_value() const { return m_sSavedValue; } - OUString const& get_saved_values(int pos) const { return m_aSavedValues[pos]; } - bool get_value_changed_from_saved() const { return m_sSavedValue != get_active_text(); } - bool get_values_changed_from_saved() const - { - return !m_aSavedValues.empty() - && std::find(m_aSavedValues.begin(), m_aSavedValues.end(), get_active_text()) - == m_aSavedValues.end(); - } - - void removeSavedValues() { m_aSavedValues.clear(); } - - // for custom rendering a row - void connect_custom_get_size(const Link<vcl::RenderContext&, Size>& rLink) - { - m_aGetSizeHdl = rLink; - } - void connect_custom_render(const Link<render_args, void>& rLink) { m_aRenderHdl = rLink; } - // call set_custom_renderer after setting custom callbacks - virtual void set_custom_renderer(bool bOn) = 0; - // set a sub menu for a entry, only works with custom rendering - virtual void set_item_menu(const OUString& rIdent, weld::Menu* pMenu) = 0; - // get the width needed to show the menu launcher in a custom row - virtual int get_menu_button_width() const = 0; - - // for mru support - virtual int get_max_mru_count() const = 0; - virtual void set_max_mru_count(int nCount) = 0; - virtual OUString get_mru_entries() const = 0; - virtual void set_mru_entries(const OUString& rEntries) = 0; - - // Backwards compatibility, should be avoided to allow - // UI consistency. - virtual void set_max_drop_down_rows(int nRows) = 0; -}; - class VCL_DLLPUBLIC TreeIter { private: diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index 652fce9264ac..951b4f119163 100644 --- a/reportdesign/source/ui/dlg/Condition.hxx +++ b/reportdesign/source/ui/dlg/Condition.hxx @@ -27,6 +27,7 @@ #include <svx/colorwindow.hxx> #include <svx/fntctrl.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> diff --git a/reportdesign/source/ui/inc/DateTime.hxx b/reportdesign/source/ui/inc/DateTime.hxx index ade3b5a29c56..ef40dacf4eca 100644 --- a/reportdesign/source/ui/inc/DateTime.hxx +++ b/reportdesign/source/ui/inc/DateTime.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DATETIME_HXX #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_DATETIME_HXX +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <com/sun/star/report/XSection.hpp> diff --git a/reportdesign/source/ui/inc/PageNumber.hxx b/reportdesign/source/ui/inc/PageNumber.hxx index 93f090d71301..5eac2f95b203 100644 --- a/reportdesign/source/ui/inc/PageNumber.hxx +++ b/reportdesign/source/ui/inc/PageNumber.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_REPORTDESIGN_SOURCE_UI_INC_PAGENUMBER_HXX #define INCLUDED_REPORTDESIGN_SOURCE_UI_INC_PAGENUMBER_HXX +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <com/sun/star/report/XReportDefinition.hpp> diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx index 3885e8a79c5c..d1f2b6dd9fae 100644 --- a/sc/source/ui/condformat/colorformat.cxx +++ b/sc/source/ui/condformat/colorformat.cxx @@ -15,6 +15,7 @@ #include <svl/numformat.hxx> #include <svx/colorbox.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> namespace { diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index 8ec1c2528cfb..d7546a2bca6a 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -38,6 +38,7 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/virdev.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> #include <svl/numformat.hxx> #include <svl/sharedstringpool.hxx> diff --git a/sc/source/ui/inc/SheetViewBox.hxx b/sc/source/ui/inc/SheetViewBox.hxx index 95a39c7571dc..80303c518247 100644 --- a/sc/source/ui/inc/SheetViewBox.hxx +++ b/sc/source/ui/inc/SheetViewBox.hxx @@ -10,6 +10,7 @@ #pragma once #include <vcl/InterimItemWindow.hxx> +#include <vcl/weld/ComboBox.hxx> #include <SheetViewTypes.hxx> /** Box / container for the combobox for showing / selecting the sheet view */ diff --git a/sc/source/ui/inc/cbnumberformat.hxx b/sc/source/ui/inc/cbnumberformat.hxx index 5f2920ab432d..56a211fd278a 100644 --- a/sc/source/ui/inc/cbnumberformat.hxx +++ b/sc/source/ui/inc/cbnumberformat.hxx @@ -20,6 +20,7 @@ #pragma once #include <vcl/InterimItemWindow.hxx> +#include <vcl/weld/ComboBox.hxx> class ScNumberFormat final : public InterimItemWindow { diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx index 121bbc9983d7..2accd2a17265 100644 --- a/sc/source/ui/inc/checklistmenu.hxx +++ b/sc/source/ui/inc/checklistmenu.hxx @@ -12,6 +12,7 @@ #include <vcl/timer.hxx> #include <vcl/virdev.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/sc/source/ui/inc/colorformat.hxx b/sc/source/ui/inc/colorformat.hxx index 4a7c8fa3e887..4db3f6a056ef 100644 --- a/sc/source/ui/inc/colorformat.hxx +++ b/sc/source/ui/inc/colorformat.hxx @@ -9,6 +9,7 @@ #pragma once +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <svx/colorbox.hxx> diff --git a/sc/source/ui/inc/condformatdlgentry.hxx b/sc/source/ui/inc/condformatdlgentry.hxx index 65c4a709338c..44ea80e08fb1 100644 --- a/sc/source/ui/inc/condformatdlgentry.hxx +++ b/sc/source/ui/inc/condformatdlgentry.hxx @@ -12,6 +12,7 @@ #include <conditio.hxx> #include <formula/funcutl.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> #include <svl/lstner.hxx> #include <svx/fntctrl.hxx> diff --git a/sc/source/ui/inc/condformateasydlg.hxx b/sc/source/ui/inc/condformateasydlg.hxx index 2ffed223c7a5..687612ee0da9 100644 --- a/sc/source/ui/inc/condformateasydlg.hxx +++ b/sc/source/ui/inc/condformateasydlg.hxx @@ -11,6 +11,7 @@ #include "anyrefdg.hxx" #include <svl/lstner.hxx> +#include <vcl/weld/ComboBox.hxx> #include <conditio.hxx> class ScViewData; diff --git a/sc/source/ui/inc/csvtablebox.hxx b/sc/source/ui/inc/csvtablebox.hxx index a9d7bae77ad8..3d546952b74e 100644 --- a/sc/source/ui/inc/csvtablebox.hxx +++ b/sc/source/ui/inc/csvtablebox.hxx @@ -21,6 +21,7 @@ #include <vcl/idle.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/weld.hxx> #include <scdllapi.h> diff --git a/sc/source/ui/inc/dapidata.hxx b/sc/source/ui/inc/dapidata.hxx index 11e3524eec58..844a900491aa 100644 --- a/sc/source/ui/inc/dapidata.hxx +++ b/sc/source/ui/inc/dapidata.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> diff --git a/sc/source/ui/inc/dapitype.hxx b/sc/source/ui/inc/dapitype.hxx index c1837c256665..4130dadf1fb2 100644 --- a/sc/source/ui/inc/dapitype.hxx +++ b/sc/source/ui/inc/dapitype.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> diff --git a/sc/source/ui/inc/foptmgr.hxx b/sc/source/ui/inc/foptmgr.hxx index 8451c67567f1..c5e108eb9828 100644 --- a/sc/source/ui/inc/foptmgr.hxx +++ b/sc/source/ui/inc/foptmgr.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> namespace formula diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 06f83bd7cb9d..81428454752c 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -25,6 +25,7 @@ #include <vcl/toolbox.hxx> #include <vcl/InterimItemWindow.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/customweld.hxx> #include <sfx2/childwin.hxx> diff --git a/sc/source/ui/inc/pfiltdlg.hxx b/sc/source/ui/inc/pfiltdlg.hxx index 52cdc53e0a26..2aa8b94fc882 100644 --- a/sc/source/ui/inc/pfiltdlg.hxx +++ b/sc/source/ui/inc/pfiltdlg.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <address.hxx> diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx index 0ee02ad0961d..b5ea53510e67 100644 --- a/sc/source/ui/inc/pvfundlg.hxx +++ b/sc/source/ui/inc/pvfundlg.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/sheet/DataPilotFieldReference.hpp> #include <com/sun/star/sheet/DataPilotFieldOrientation.hpp> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index badc108723ec..c398f43a970a 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -24,6 +24,7 @@ #include <attrib.hxx> #include <sfx2/tabdlg.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> diff --git a/sc/source/ui/inc/solveroptions.hxx b/sc/source/ui/inc/solveroptions.hxx index 3371425a323b..56c46a93151d 100644 --- a/sc/source/ui/inc/solveroptions.hxx +++ b/sc/source/ui/inc/solveroptions.hxx @@ -20,6 +20,7 @@ #pragma once #include <utility> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/sc/source/ui/inc/sortkeydlg.hxx b/sc/source/ui/inc/sortkeydlg.hxx index 19f73f3b88a3..8b6d600891be 100644 --- a/sc/source/ui/inc/sortkeydlg.hxx +++ b/sc/source/ui/inc/sortkeydlg.hxx @@ -13,6 +13,7 @@ #include <memory> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> struct ScSortKeyItem diff --git a/sc/source/ui/inc/tabbgcolordlg.hxx b/sc/source/ui/inc/tabbgcolordlg.hxx index 8193f7d63262..a4632bb00806 100644 --- a/sc/source/ui/inc/tabbgcolordlg.hxx +++ b/sc/source/ui/inc/tabbgcolordlg.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <svx/SvxColorValueSet.hxx> #include <svx/PaletteManager.hxx> diff --git a/sc/source/ui/inc/tpcompatibility.hxx b/sc/source/ui/inc/tpcompatibility.hxx index 0ab84d4d93e8..0ef36ce7abc9 100644 --- a/sc/source/ui/inc/tpcompatibility.hxx +++ b/sc/source/ui/inc/tpcompatibility.hxx @@ -10,6 +10,7 @@ #pragma once #include <sfx2/tabdlg.hxx> +#include <vcl/weld/ComboBox.hxx> class ScTpCompatOptions : public SfxTabPage { diff --git a/sc/source/ui/inc/tpformula.hxx b/sc/source/ui/inc/tpformula.hxx index 1172a323d948..71a1875815b7 100644 --- a/sc/source/ui/inc/tpformula.hxx +++ b/sc/source/ui/inc/tpformula.hxx @@ -20,6 +20,7 @@ #pragma once #include <sfx2/tabdlg.hxx> +#include <vcl/weld/ComboBox.hxx> #include <calcconfig.hxx> #include <docoptio.hxx> diff --git a/sc/source/ui/inc/tptable.hxx b/sc/source/ui/inc/tptable.hxx index 0052398045b4..fe5cea284eee 100644 --- a/sc/source/ui/inc/tptable.hxx +++ b/sc/source/ui/inc/tptable.hxx @@ -20,6 +20,7 @@ #pragma once #include <sfx2/tabdlg.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> class ScTablePage : public SfxTabPage diff --git a/sc/source/ui/inc/tpview.hxx b/sc/source/ui/inc/tpview.hxx index 6fbf3c773b8a..a75d4131b74a 100644 --- a/sc/source/ui/inc/tpview.hxx +++ b/sc/source/ui/inc/tpview.hxx @@ -21,6 +21,7 @@ #include <sfx2/tabdlg.hxx> #include <svx/colorbox.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> class ScViewOptions; diff --git a/sc/source/ui/inc/validate.hxx b/sc/source/ui/inc/validate.hxx index 80b82d773509..21884ec97c83 100644 --- a/sc/source/ui/inc/validate.hxx +++ b/sc/source/ui/inc/validate.hxx @@ -20,6 +20,7 @@ #pragma once #include <sfx2/tabdlg.hxx> +#include <vcl/weld/ComboBox.hxx> #include "anyrefdg.hxx" #include <sc.hrc> diff --git a/sc/source/ui/miscdlgs/dataproviderdlg.cxx b/sc/source/ui/miscdlgs/dataproviderdlg.cxx index f71cf6acd676..21c8fe5a57fd 100644 --- a/sc/source/ui/miscdlgs/dataproviderdlg.cxx +++ b/sc/source/ui/miscdlgs/dataproviderdlg.cxx @@ -23,6 +23,7 @@ #include <unotools/charclass.hxx> #include <utility> #include <vcl/svapp.hxx> +#include <vcl/weld/ComboBox.hxx> class ScDataTransformationBaseControl { diff --git a/sc/source/ui/optdlg/calcoptionsdlg.hxx b/sc/source/ui/optdlg/calcoptionsdlg.hxx index fd3286ec1854..82cf95bb9aa3 100644 --- a/sc/source/ui/optdlg/calcoptionsdlg.hxx +++ b/sc/source/ui/optdlg/calcoptionsdlg.hxx @@ -9,6 +9,7 @@ #pragma once +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <calcconfig.hxx> diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index 019191dcd271..e11605d862cc 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -23,6 +23,7 @@ #include <sfx2/dispatch.hxx> #include <svl/stritem.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> #include <unotools/charclass.hxx> diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx index 7f16dffb92f4..f23adcd1b62c 100644 --- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx +++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx @@ -23,6 +23,7 @@ #include <sfx2/weldutils.hxx> #include <sfx2/sidebar/PanelLayout.hxx> #include <vcl/EnumContext.hxx> +#include <vcl/weld/ComboBox.hxx> namespace sc::sidebar { diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 33ead785a726..4467b33d68b6 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -39,6 +39,7 @@ #include <i18nutil/unicode.hxx> #include <vcl/svapp.hxx> #include <vcl/stdtext.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> #include <vcl/settings.hxx> diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.hxx b/sd/source/ui/dlg/PhotoAlbumDialog.hxx index cabf42f4805a..77e2f6f187b0 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.hxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.hxx @@ -11,6 +11,7 @@ #include <tools/link.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/sd/source/ui/inc/BulletAndPositionDlg.hxx b/sd/source/ui/inc/BulletAndPositionDlg.hxx index 373c0b6b4ff5..d2b50d621270 100644 --- a/sd/source/ui/inc/BulletAndPositionDlg.hxx +++ b/sd/source/ui/inc/BulletAndPositionDlg.hxx @@ -24,6 +24,7 @@ #include <editeng/numdef.hxx> #include <editeng/svxenum.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/TreeView.hxx> diff --git a/sd/source/ui/inc/CustomAnimationPane.hxx b/sd/source/ui/inc/CustomAnimationPane.hxx index f2c34d506b04..fe0acdb5c911 100644 --- a/sd/source/ui/inc/CustomAnimationPane.hxx +++ b/sd/source/ui/inc/CustomAnimationPane.hxx @@ -22,6 +22,7 @@ #include <sfx2/sidebar/ILayoutableWindow.hxx> #include <sfx2/sidebar/PanelLayout.hxx> #include <vcl/idle.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include "CustomAnimationList.hxx" #include <misc/scopelock.hxx> diff --git a/sd/source/ui/inc/SlideTransitionPane.hxx b/sd/source/ui/inc/SlideTransitionPane.hxx index 6201b5e9df5d..f76f402161a8 100644 --- a/sd/source/ui/inc/SlideTransitionPane.hxx +++ b/sd/source/ui/inc/SlideTransitionPane.hxx @@ -24,6 +24,7 @@ #include <svtools/valueset.hxx> #include <sfx2/sidebar/ILayoutableWindow.hxx> #include <sfx2/sidebar/PanelLayout.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/IconView.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/weld.hxx> diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index 9fc6c9bcaf99..ddf00cec57ec 100644 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -25,6 +25,7 @@ #include <sfx2/progress.hxx> #include <misc/scopelock.hxx> #include <vcl/bitmap.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <vcl/weld/weldutils.hxx> diff --git a/sd/source/ui/inc/dlgfield.hxx b/sd/source/ui/inc/dlgfield.hxx index acdd963e4807..1a23e5c905a9 100644 --- a/sd/source/ui/inc/dlgfield.hxx +++ b/sd/source/ui/inc/dlgfield.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <memory> diff --git a/sd/source/ui/inc/gluectrl.hxx b/sd/source/ui/inc/gluectrl.hxx index 626d721586eb..0cbef0fe9f85 100644 --- a/sd/source/ui/inc/gluectrl.hxx +++ b/sd/source/ui/inc/gluectrl.hxx @@ -20,6 +20,7 @@ #pragma once #include <vcl/InterimItemWindow.hxx> +#include <vcl/weld/ComboBox.hxx> #include <sfx2/tbxctrl.hxx> enum class SdrEscapeDirection; diff --git a/sd/source/ui/inc/present.hxx b/sd/source/ui/inc/present.hxx index bce891a4c1a7..d81b43268bfd 100644 --- a/sd/source/ui/inc/present.hxx +++ b/sd/source/ui/inc/present.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <vcl/weld/weldutils.hxx> diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index f45776548801..2c6183165b7b 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -24,6 +24,7 @@ #include <sfx2/basedlgs.hxx> #include <svx/xtable.hxx> #include <unotools/resmgr.hxx> +#include <vcl/weld/ComboBox.hxx> #include "sdtreelb.hxx" #include <vector> diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index 48b62a0ff113..cb370d4c4a67 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -21,6 +21,7 @@ #include <sfx2/tabdlg.hxx> #include <svx/optgrid.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> /** diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx index 8b3266f9f68d..212cb3b9f704 100644 --- a/sdext/source/minimizer/optimizerdialog.hxx +++ b/sdext/source/minimizer/optimizerdialog.hxx @@ -27,6 +27,7 @@ #include <com/sun/star/frame/XDispatch.hpp> #include <cppuhelper/implbase.hxx> #include <vcl/roadmapwizardmachine.hxx> +#include <vcl/weld/ComboBox.hxx> #define ITEM_ID_INTRODUCTION 0 #define ITEM_ID_SLIDES 1 diff --git a/sfx2/inc/autoredactdialog.hxx b/sfx2/inc/autoredactdialog.hxx index bfc7b2793ee2..aa0f57724868 100644 --- a/sfx2/inc/autoredactdialog.hxx +++ b/sfx2/inc/autoredactdialog.hxx @@ -14,6 +14,7 @@ #include <sal/config.h> #include <sfx2/basedlgs.hxx> #include <sfx2/objsh.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> diff --git a/sfx2/inc/srchdlg.hxx b/sfx2/inc/srchdlg.hxx index 2faf5aaa31ff..bb152aaf7f4b 100644 --- a/sfx2/inc/srchdlg.hxx +++ b/sfx2/inc/srchdlg.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_SFX2_INC_SRCHDLG_HXX #define INCLUDED_SFX2_INC_SRCHDLG_HXX +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index b22688821d71..d8e86cca43a9 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -28,6 +28,7 @@ #include <vcl/idle.hxx> #include <vcl/keycod.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/sfx2/source/dialog/backingwindow.hxx b/sfx2/source/dialog/backingwindow.hxx index 11ea3cb17ed5..082fe7cc2167 100644 --- a/sfx2/source/dialog/backingwindow.hxx +++ b/sfx2/source/dialog/backingwindow.hxx @@ -23,6 +23,7 @@ #include <rtl/ustring.hxx> #include <vcl/InterimItemWindow.hxx> +#include <vcl/weld/ComboBox.hxx> #include <recentdocsview.hxx> #include <templatedefaultview.hxx> diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index b3c49e1da0d5..5f01ade14375 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -19,6 +19,7 @@ #include <comphelper/string.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> #include <svl/eitem.hxx> #include <svl/intitem.hxx> diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 802f7a7cf83f..80a7dbb2cc5e 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -25,6 +25,7 @@ #include <vcl/transfer.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> #include <svl/eitem.hxx> diff --git a/sfx2/source/view/classificationcontroller.cxx b/sfx2/source/view/classificationcontroller.cxx index 183c6e980727..73f70dd47a1e 100644 --- a/sfx2/source/view/classificationcontroller.cxx +++ b/sfx2/source/view/classificationcontroller.cxx @@ -25,6 +25,7 @@ #include <vcl/toolbox.hxx> #include <vcl/svapp.hxx> #include <vcl/vclptr.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index 3bd26a0abe09..ceacabc88ff4 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -22,6 +22,7 @@ #include <sfx2/tabdlg.hxx> #include <vcl/outdev.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/EntryTreeView.hxx> #include <vcl/weld/MetricSpinButton.hxx> diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx index ffe38cc5e637..1258a2668afc 100644 --- a/starmath/inc/utility.hxx +++ b/starmath/inc/utility.hxx @@ -25,6 +25,7 @@ #include <o3tl/unit_conversion.hxx> #include <sal/log.hxx> #include <vcl/font.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> #include <tools/fract.hxx> #include <tools/mapunit.hxx> diff --git a/starmath/source/SmElementsPanel.hxx b/starmath/source/SmElementsPanel.hxx index f8d65a635464..fb1ff192fb18 100644 --- a/starmath/source/SmElementsPanel.hxx +++ b/starmath/source/SmElementsPanel.hxx @@ -25,6 +25,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/sidebar/PanelLayout.hxx> #include <vcl/EnumContext.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/customweld.hxx> #include <ElementsDockingWindow.hxx> diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx index 327e9c99a960..e31bb59794d3 100644 --- a/svtools/source/filter/exportdialog.hxx +++ b/svtools/source/filter/exportdialog.hxx @@ -21,6 +21,7 @@ #pragma once #include <FltCallDialogParameter.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <tools/stream.hxx> diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index ffd11403361e..8918c9fbecab 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -44,6 +44,7 @@ #include <svx/galtheme.hxx> #include <svx/gallery1.hxx> #include <galleryfilestorageentry.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 11d63308a396..1d8d8cc326af 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -24,6 +24,7 @@ #include <vcl/builderpage.hxx> #include <vcl/idle.hxx> #include <vcl/transfer.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/svx/source/inc/findtextfield.hxx b/svx/source/inc/findtextfield.hxx index 90ecf80bab93..bbf2a1a3a311 100644 --- a/svx/source/inc/findtextfield.hxx +++ b/svx/source/inc/findtextfield.hxx @@ -21,6 +21,7 @@ #include <vcl/InterimItemWindow.hxx> #include <vcl/toolbox.hxx> +#include <vcl/weld/ComboBox.hxx> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx index 8a645d0dc416..04275b472ce2 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx @@ -21,6 +21,7 @@ #include <sfx2/sidebar/ControllerItem.hxx> #include <sfx2/sidebar/PanelLayout.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/weld.hxx> diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx index f8ff548dc421..f12da2bb7e2b 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx @@ -19,6 +19,7 @@ #pragma once #include <svtools/toolbarmenu.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> class SvxLineSpacingItem; diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx index 6a0883c2a182..70ce8da446c1 100644 --- a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx +++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx @@ -11,6 +11,7 @@ #include <sfx2/sidebar/ControllerItem.hxx> #include <sfx2/sidebar/PanelLayout.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> class ColorListBox; diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index e3b0b750564d..6fc3324b5328 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -22,6 +22,7 @@ #include <comphelper/propertyvalue.hxx> #include <o3tl/string_view.hxx> #include <vcl/toolbox.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <svl/intitem.hxx> #include <svl/itempool.hxx> diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx index 80567760bf6e..2e6a3e7360c6 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/sw/source/ui/dbui/createaddresslistdialog.hxx b/sw/source/ui/dbui/createaddresslistdialog.hxx index f900d62bc1c9..57bb71738a2e 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.hxx +++ b/sw/source/ui/dbui/createaddresslistdialog.hxx @@ -20,6 +20,7 @@ #define INCLUDED_SW_SOURCE_UI_DBUI_CREATEADDRESSLISTDIALOG_HXX #include <sfx2/basedlgs.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <vector> diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx index 4f7fa9bb034a..2b3e69a3c78d 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.hxx +++ b/sw/source/ui/dbui/mmaddressblockpage.hxx @@ -20,6 +20,7 @@ #define INCLUDED_SW_SOURCE_UI_DBUI_MMADDRESSBLOCKPAGE_HXX #include <svx/weldeditview.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/wizardmachine.hxx> #include <mailmergehelper.hxx> diff --git a/sw/source/ui/dbui/mmdocselectpage.hxx b/sw/source/ui/dbui/mmdocselectpage.hxx index 3392ab841c72..c4cb61be43c5 100644 --- a/sw/source/ui/dbui/mmdocselectpage.hxx +++ b/sw/source/ui/dbui/mmdocselectpage.hxx @@ -20,6 +20,7 @@ #define INCLUDED_SW_SOURCE_UI_DBUI_MMDOCSELECTPAGE_HXX #include <vcl/wizardmachine.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> class SwMailMergeWizard; diff --git a/sw/source/ui/dbui/mmgreetingspage.hxx b/sw/source/ui/dbui/mmgreetingspage.hxx index a771d690c4c3..ee4213351d82 100644 --- a/sw/source/ui/dbui/mmgreetingspage.hxx +++ b/sw/source/ui/dbui/mmgreetingspage.hxx @@ -22,6 +22,7 @@ #include <vcl/wizardmachine.hxx> #include <sfx2/basedlgs.hxx> #include <mailmergehelper.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> #include <mailmergewizard.hxx> diff --git a/sw/source/ui/dbui/mmlayoutpage.hxx b/sw/source/ui/dbui/mmlayoutpage.hxx index 2a047c2eea07..c6bc571ba4e4 100644 --- a/sw/source/ui/dbui/mmlayoutpage.hxx +++ b/sw/source/ui/dbui/mmlayoutpage.hxx @@ -20,6 +20,7 @@ #define INCLUDED_SW_SOURCE_UI_DBUI_MMLAYOUTPAGE_HXX #include <vcl/wizardmachine.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <mailmergehelper.hxx> #include <com/sun/star/uno/Reference.h> diff --git a/sw/source/ui/envelp/envfmt.hxx b/sw/source/ui/envelp/envfmt.hxx index 571d9c35d8a3..a55929d83222 100644 --- a/sw/source/ui/envelp/envfmt.hxx +++ b/sw/source/ui/envelp/envfmt.hxx @@ -22,6 +22,7 @@ #include <string_view> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> #include <envlop.hxx> diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index 670ba94b4a1d..da4daa4dd5c0 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -23,6 +23,7 @@ #include <sfx2/tabdlg.hxx> #include <vcl/idle.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> diff --git a/sw/source/ui/inc/mmresultdialogs.hxx b/sw/source/ui/inc/mmresultdialogs.hxx index abb747d872fd..55b54d5dd84d 100644 --- a/sw/source/ui/inc/mmresultdialogs.hxx +++ b/sw/source/ui/inc/mmresultdialogs.hxx @@ -19,6 +19,7 @@ #pragma once +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx index aacf7aab9098..58ec90040a76 100644 --- a/sw/source/ui/inc/regionsw.hxx +++ b/sw/source/ui/inc/regionsw.hxx @@ -27,6 +27,7 @@ #include <fmtftntx.hxx> #include <numberingtypelistbox.hxx> #include <svx/paraprev.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/EntryTreeView.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/TreeView.hxx> diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx index a544787d4c33..56eefda7fe22 100644 --- a/sw/source/ui/misc/impfnote.hxx +++ b/sw/source/ui/misc/impfnote.hxx @@ -20,6 +20,7 @@ #define INCLUDED_SW_SOURCE_UI_MISC_IMPFNOTE_HXX #include <sfx2/tabdlg.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> #include <numberingtypelistbox.hxx> diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index c15efb7844f8..70f15c5821b1 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -44,6 +44,7 @@ #include <vcl/errinf.hxx> #include <vcl/print.hxx> #include <vcl/scheduler.hxx> +#include <vcl/weld/ComboBox.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/filedlghelper.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sw/source/uibase/inc/break.hxx b/sw/source/uibase/inc/break.hxx index 0d53d6665356..002a3828bb90 100644 --- a/sw/source/uibase/inc/break.hxx +++ b/sw/source/uibase/inc/break.hxx @@ -19,6 +19,7 @@ */ #pragma once +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <optional> diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx index 9a2f5158caf9..62e45a2902f7 100644 --- a/sw/source/uibase/inc/column.hxx +++ b/sw/source/uibase/inc/column.hxx @@ -24,6 +24,7 @@ #include <sfx2/tabdlg.hxx> #include <svx/colorbox.hxx> #include <svx/frmdirlbox.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <map> #include "colex.hxx" diff --git a/sw/source/uibase/inc/dbinsdlg.hxx b/sw/source/uibase/inc/dbinsdlg.hxx index 75fc6c0e1b80..fee61faa7ea3 100644 --- a/sw/source/uibase/inc/dbinsdlg.hxx +++ b/sw/source/uibase/inc/dbinsdlg.hxx @@ -21,6 +21,7 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_DBINSDLG_HXX #include <utility> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include <sfx2/basedlgs.hxx> diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx index f913dca62d4f..1875faa0c96a 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -24,6 +24,7 @@ #include <sfx2/basedlgs.hxx> #include <sfx2/tabdlg.hxx> #include <vcl/print.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/customweld.hxx> diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index 46e6467b8aa4..439765019cf9 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -20,6 +20,7 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_ENVLOP_HXX #include <sfx2/tabdlg.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx index eca60df1a271..060421803212 100644 --- a/sw/source/uibase/inc/frmpage.hxx +++ b/sw/source/uibase/inc/frmpage.hxx @@ -25,6 +25,7 @@ #include <svx/dlgutil.hxx> #include <svx/frmdirlbox.hxx> #include <svx/swframeexample.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <swtypes.hxx> #include "bmpwin.hxx" diff --git a/sw/source/uibase/inc/glosbib.hxx b/sw/source/uibase/inc/glosbib.hxx index be7d51fd5dcf..3ffe8acc9cf2 100644 --- a/sw/source/uibase/inc/glosbib.hxx +++ b/sw/source/uibase/inc/glosbib.hxx @@ -22,6 +22,7 @@ #include <sfx2/basedlgs.hxx> #include <rtl/ustring.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> diff --git a/sw/source/uibase/inc/linenum.hxx b/sw/source/uibase/inc/linenum.hxx index 48e516bcbf2c..d50a34f46819 100644 --- a/sw/source/uibase/inc/linenum.hxx +++ b/sw/source/uibase/inc/linenum.hxx @@ -20,6 +20,7 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_LINENUM_HXX #include <sfx2/basedlgs.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include "numberingtypelistbox.hxx" diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx index 6b8f15f28d8b..da39ac68de70 100644 --- a/sw/source/uibase/inc/mailmrge.hxx +++ b/sw/source/uibase/inc/mailmrge.hxx @@ -21,6 +21,7 @@ #include <memory> #include <sfx2/basedlgs.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <com/sun/star/uno/Sequence.h> diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index 817f4d431e9c..513e1a869362 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -20,6 +20,7 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_NUM_HXX #include <sfx2/tabdlg.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/TreeView.hxx> #include "numprevw.hxx" diff --git a/sw/source/uibase/inc/numberingtypelistbox.hxx b/sw/source/uibase/inc/numberingtypelistbox.hxx index 742cf51ad869..e354b8db8767 100644 --- a/sw/source/uibase/inc/numberingtypelistbox.hxx +++ b/sw/source/uibase/inc/numberingtypelistbox.hxx @@ -20,6 +20,7 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_NUMBERINGTYPELISTBOX_HXX #include <memory> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> #include <swdllapi.h> #include <o3tl/typed_flags_set.hxx> diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx index 5f3aa2a8878a..ca515ca2e076 100644 --- a/sw/source/uibase/inc/numfmtlb.hxx +++ b/sw/source/uibase/inc/numfmtlb.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_NUMFMTLB_HXX #define INCLUDED_SW_SOURCE_UIBASE_INC_NUMFMTLB_HXX +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include <svl/zforlist.hxx> diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx index cb6524f3eeff..e529e4b1d13b 100644 --- a/sw/source/uibase/inc/numpara.hxx +++ b/sw/source/uibase/inc/numpara.hxx @@ -21,6 +21,7 @@ #include <sfx2/tabdlg.hxx> #include <svl/style.hxx> +#include <vcl/weld/ComboBox.hxx> // with this TabPage numbering settings at the paragraph / paragraph style // are performed. diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index 30c3fd6ae942..33967b565263 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -25,6 +25,7 @@ #include <utility> #include <vcl/textfilter.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/customweld.hxx> diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index 7747ec808516..8f110b392a26 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -21,6 +21,7 @@ #include <sfx2/tabdlg.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/weld.hxx> #include <svtools/ctrlbox.hxx> diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx index adacd7f5a3cd..0e73af775848 100644 --- a/sw/source/uibase/inc/pgfnote.hxx +++ b/sw/source/uibase/inc/pgfnote.hxx @@ -22,6 +22,7 @@ #include <svtools/ctrlbox.hxx> #include <svx/colorbox.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> // footnote settings TabPage diff --git a/sw/source/uibase/inc/srtdlg.hxx b/sw/source/uibase/inc/srtdlg.hxx index 30b55f68d88b..b36f549b8655 100644 --- a/sw/source/uibase/inc/srtdlg.hxx +++ b/sw/source/uibase/inc/srtdlg.hxx @@ -21,6 +21,7 @@ #include <svtools/collatorres.hxx> #include <svx/langbox.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx index 639d1c519c3f..43ef7a600750 100644 --- a/sw/source/uibase/inc/swuiccoll.hxx +++ b/sw/source/uibase/inc/swuiccoll.hxx @@ -20,6 +20,7 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_SWUICCOLL_HXX #include <sfx2/tabdlg.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/TreeView.hxx> #include <ccoll.hxx> diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index a59654584db7..3907fbf6910c 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -23,6 +23,7 @@ #include <svx/langbox.hxx> #include <vcl/idle.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/TreeView.hxx> diff --git a/sw/source/uibase/inc/swuiidxmrk.hxx b/sw/source/uibase/inc/swuiidxmrk.hxx index e501e092749f..f3da413b1a4d 100644 --- a/sw/source/uibase/inc/swuiidxmrk.hxx +++ b/sw/source/uibase/inc/swuiidxmrk.hxx @@ -24,6 +24,7 @@ #include <sfx2/basedlgs.hxx> #include <sfx2/childwin.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> #include <toxe.hxx> #include <memory> diff --git a/sw/source/uibase/inc/titlepage.hxx b/sw/source/uibase/inc/titlepage.hxx index cecd3af93ebd..2aabc71eacc7 100644 --- a/sw/source/uibase/inc/titlepage.hxx +++ b/sw/source/uibase/inc/titlepage.hxx @@ -11,6 +11,7 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_TITLEPAGE_HXX #include <sfx2/basedlgs.hxx> +#include <vcl/weld/ComboBox.hxx> #include <fmtpdsc.hxx> diff --git a/sw/source/uibase/inc/translatelangselect.hxx b/sw/source/uibase/inc/translatelangselect.hxx index 61de53e1f956..f4839822724e 100644 --- a/sw/source/uibase/inc/translatelangselect.hxx +++ b/sw/source/uibase/inc/translatelangselect.hxx @@ -18,6 +18,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #pragma once + +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/weld.hxx> #include <rtl/string.hxx> diff --git a/sw/source/uibase/inc/uitool.hxx b/sw/source/uibase/inc/uitool.hxx index c8afdabb13ef..a398d4835cb4 100644 --- a/sw/source/uibase/inc/uitool.hxx +++ b/sw/source/uibase/inc/uitool.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_UITOOL_HXX #define INCLUDED_SW_SOURCE_UIBASE_INC_UITOOL_HXX +#include <vcl/weld/ComboBox.hxx> -e ... etc. - the rest is truncated
