basctl/source/basicide/IDEComboBox.cxx | 1 basctl/source/inc/IDEComboBox.hxx | 5 ++ chart2/source/controller/dialogs/tp_ChartType.cxx | 1 chart2/source/controller/main/ElementSelector.cxx | 1 chart2/source/controller/sidebar/ChartColorPaletteControl.cxx | 1 chart2/source/controller/sidebar/ChartTypePanel.cxx | 1 cui/IwyuFilter_cui.yaml | 12 +++++ cui/source/customize/cfg.cxx | 2 cui/source/dialogs/hangulhanjadlg.cxx | 1 cui/source/dialogs/srchxtra.cxx | 1 cui/source/dialogs/welcomedlg.cxx | 1 cui/source/options/appearance.cxx | 1 cui/source/options/fontsubs.cxx | 1 cui/source/options/optchart.cxx | 1 cui/source/options/treeopt.cxx | 1 cui/source/tabpages/align.cxx | 1 cui/source/tabpages/border.cxx | 2 cui/source/tabpages/chardlg.cxx | 1 cui/source/tabpages/grfpage.cxx | 1 cui/source/tabpages/labdlg.cxx | 2 cui/source/tabpages/paragrph.cxx | 1 cui/source/tabpages/tabstpge.cxx | 1 cui/source/tabpages/tpbitmap.cxx | 1 cui/source/tabpages/tpcolor.cxx | 1 cui/source/tabpages/tpgradnt.cxx | 3 + cui/source/tabpages/tphatch.cxx | 3 + cui/source/tabpages/tpline.cxx | 1 cui/source/tabpages/tppattern.cxx | 3 + cui/source/tabpages/tpshadow.cxx | 1 dbaccess/source/ui/browser/sbagrid.cxx | 1 dbaccess/source/ui/control/TableGrantCtrl.cxx | 1 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 2 dbaccess/source/ui/querydesign/limitboxcontroller.cxx | 1 dbaccess/source/ui/uno/composerdialogs.hxx | 2 editeng/source/items/textitem.cxx | 2 filter/source/graphic/GraphicExportFilter.cxx | 2 filter/source/msfilter/msvbahelper.cxx | 1 fpicker/source/office/RemoteFilesDialog.cxx | 1 framework/source/accelerators/acceleratorconfiguration.cxx | 1 framework/source/uielement/dropdownboxtoolbarcontroller.cxx | 1 framework/source/uielement/edittoolbarcontroller.cxx | 1 framework/source/uielement/newmenucontroller.cxx | 1 framework/source/uielement/subtoolbarcontroller.cxx | 2 include/IwyuFilter_include.yaml | 22 +--------- include/svtools/DocumentToGraphicRenderer.hxx | 8 ++- include/svtools/PlaceEditDialog.hxx | 10 +++- include/svtools/acceleratorexecute.hxx | 6 +- include/svtools/addresstemplate.hxx | 11 +++-- include/svtools/bindablecontrolhelper.hxx | 4 - include/svtools/borderhelper.hxx | 8 ++- include/svtools/brwbox.hxx | 4 - include/svtools/colorcfg.hxx | 3 - include/svtools/ctrlbox.hxx | 7 ++- include/svtools/ctrltool.hxx | 4 + include/svtools/editbrowsebox.hxx | 1 include/svtools/embedhlp.hxx | 12 ++++- include/svtools/genericunodialog.hxx | 3 - include/svtools/imageresourceaccess.hxx | 4 - include/svtools/inettbc.hxx | 6 +- include/svtools/insdlg.hxx | 5 +- include/svtools/langhelp.hxx | 4 - include/svtools/optionsdrawinglayer.hxx | 3 - include/svtools/parhtml.hxx | 2 include/svtools/prnsetup.hxx | 3 - include/svtools/recorditemwindow.hxx | 6 ++ include/svtools/ruler.hxx | 2 include/svtools/scrolladaptor.hxx | 1 include/svtools/statusbarcontroller.hxx | 2 include/svtools/strings.hrc | 2 include/svtools/svtresid.hxx | 3 - include/svtools/toolbarmenu.hxx | 5 +- include/svtools/toolboxcontroller.hxx | 5 +- include/svtools/unitconv.hxx | 5 +- include/svtools/unoimap.hxx | 2 include/svtools/valueset.hxx | 5 +- include/svx/colorwindow.hxx | 4 + oox/source/drawingml/textparagraph.cxx | 1 reportdesign/source/ui/report/StartMarker.cxx | 1 sc/IwyuFilter_sc.yaml | 3 + sc/source/filter/excel/xehelper.cxx | 1 sc/source/filter/excel/xistyle.cxx | 1 sc/source/ui/cctrl/tbzoomsliderctrl.cxx | 1 sc/source/ui/condformat/colorformat.cxx | 1 sc/source/ui/dbgui/dpgroupdlg.cxx | 1 sc/source/ui/dbgui/filtdlg.cxx | 1 sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 1 sc/source/ui/optdlg/opredlin.cxx | 1 sc/source/ui/optdlg/tpview.cxx | 1 sc/source/ui/sidebar/AlignmentPropertyPanel.cxx | 2 sc/source/ui/sidebar/CellBorderStyleControl.cxx | 1 sc/source/ui/sidebar/CellLineStyleControl.cxx | 1 sd/IwyuFilter_sd.yaml | 3 + sd/source/ui/animations/CustomAnimationDialog.cxx | 1 sd/source/ui/controller/displaymodecontroller.cxx | 4 + sd/source/ui/controller/slidelayoutcontroller.cxx | 4 + sd/source/ui/dlg/copydlg.cxx | 1 sd/source/ui/dlg/diactrl.cxx | 1 sd/source/ui/dlg/gluectrl.cxx | 1 sd/source/ui/dlg/sdpreslt.cxx | 1 sd/source/ui/table/TableDesignPane.cxx | 1 sfx2/source/dialog/charmappopup.cxx | 1 sfx2/source/inet/inettbc.cxx | 2 sfx2/source/view/classificationcontroller.cxx | 1 svtools/IwyuFilter_svtools.yaml | 3 + svtools/qa/unit/testHtmlReader.cxx | 1 svtools/source/brwbox/brwbox1.cxx | 2 svtools/source/brwbox/brwbox3.cxx | 1 svtools/source/brwbox/editbrowsebox.cxx | 1 svtools/source/control/ctrlbox.cxx | 2 svtools/source/control/ctrltool.cxx | 1 svtools/source/control/inettbc.cxx | 1 svtools/source/control/ruler.cxx | 1 svtools/source/control/toolbarmenu.cxx | 2 svtools/source/control/valueset.cxx | 1 svtools/source/dialogs/PlaceEditDialog.cxx | 2 svtools/source/dialogs/ServerDetailsControls.cxx | 2 svtools/source/dialogs/addresstemplate.cxx | 2 svtools/source/dialogs/insdlg.cxx | 1 svtools/source/dialogs/prnsetup.cxx | 1 svtools/source/filter/DocumentToGraphicRenderer.cxx | 1 svtools/source/misc/acceleratorexecute.cxx | 2 svtools/source/misc/embedhlp.cxx | 1 svtools/source/misc/svtresid.cxx | 1 svtools/source/misc/unitconv.cxx | 2 svtools/source/uno/genericunodialog.cxx | 1 svtools/source/uno/popupwindowcontroller.cxx | 1 svx/source/dialog/TableAutoFmtDlg.cxx | 1 svx/source/dialog/TableStylesDlg.cxx | 4 + svx/source/dialog/ThemeColorEditDialog.cxx | 1 svx/source/dialog/_bmpmask.cxx | 2 svx/source/dialog/fontwork.cxx | 2 svx/source/dialog/hdft.cxx | 1 svx/source/dialog/svxbmpnumvalueset.cxx | 1 svx/source/dialog/svxruler.cxx | 1 svx/source/engine3d/float3d.cxx | 2 svx/source/fmcomp/fmgridcl.cxx | 1 svx/source/fmcomp/gridctrl.cxx | 1 svx/source/form/databaselocationinput.cxx | 1 svx/source/mnuctrls/clipboardctl.cxx | 1 svx/source/sidebar/line/LineWidthValueSet.cxx | 1 svx/source/sidebar/nbdtmg.cxx | 1 svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx | 2 svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx | 1 svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 1 svx/source/sidebar/paragraph/ParaSpacingWindow.cxx | 1 svx/source/sidebar/shapes/DefaultShapesPanel.cxx | 2 svx/source/sidebar/text/TextCharacterSpacingControl.cxx | 1 svx/source/sidebar/text/TextCharacterSpacingPopup.cxx | 1 svx/source/sidebar/text/TextUnderlineControl.cxx | 1 svx/source/sidebar/text/TextUnderlineControl.hxx | 5 ++ svx/source/sidebar/text/TextUnderlinePopup.cxx | 1 svx/source/sidebar/textcolumns/TextColumnsPropertyPanel.cxx | 1 svx/source/tbxctrls/StylesPreviewWindow.cxx | 1 svx/source/tbxctrls/SvxColorValueSet.cxx | 1 svx/source/tbxctrls/SvxPresetListBox.cxx | 1 svx/source/tbxctrls/ThemeColorsToolBoxControl.cxx | 2 svx/source/tbxctrls/bulletsnumbering.cxx | 3 + svx/source/tbxctrls/colrctrl.cxx | 1 svx/source/tbxctrls/extrusioncontrols.cxx | 3 + svx/source/tbxctrls/extrusioncontrols.hxx | 1 svx/source/tbxctrls/fillctrl.cxx | 1 svx/source/tbxctrls/fontworkgallery.cxx | 2 svx/source/tbxctrls/grafctrl.cxx | 1 svx/source/tbxctrls/itemwin.cxx | 2 svx/source/tbxctrls/layctrl.cxx | 2 svx/source/tbxctrls/lboxctrl.cxx | 2 svx/source/tbxctrls/linectrl.cxx | 3 + svx/source/tbxctrls/tbcontrl.cxx | 4 + svx/source/tbxctrls/tbunocontroller.cxx | 2 svx/source/tbxctrls/tbunosearchcontrollers.cxx | 1 svx/source/tbxctrls/verttexttbxctrl.cxx | 1 sw/IwyuFilter_sw.yaml | 9 ++++ sw/source/core/unocore/unostyle.cxx | 1 sw/source/filter/html/svxcss1.cxx | 1 sw/source/filter/html/swhtml.cxx | 1 sw/source/ui/config/optpage.cxx | 1 sw/source/ui/dialog/uiregionsw.cxx | 1 sw/source/ui/fmtui/tmpdlg.cxx | 1 sw/source/ui/frmdlg/column.cxx | 1 sw/source/ui/misc/pgfnote.cxx | 1 sw/source/ui/misc/pggrid.cxx | 1 sw/source/uibase/app/docshini.cxx | 1 sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx | 1 sw/source/uibase/dialog/watermarkdialog.cxx | 2 sw/source/uibase/inc/labimp.hxx | 1 sw/source/uibase/inc/prcntfld.hxx | 1 sw/source/uibase/ribbar/workctrl.cxx | 2 sw/source/uibase/sidebar/PageColumnControl.cxx | 1 sw/source/uibase/sidebar/PageColumnPopup.cxx | 1 sw/source/uibase/sidebar/PageMarginControl.cxx | 2 sw/source/uibase/sidebar/PageMarginPopup.cxx | 1 sw/source/uibase/sidebar/PageOrientationControl.cxx | 1 sw/source/uibase/sidebar/PageOrientationControl.hxx | 2 sw/source/uibase/sidebar/PageOrientationPopup.cxx | 1 sw/source/uibase/sidebar/PageSizeControl.cxx | 1 sw/source/uibase/sidebar/PageSizePopup.cxx | 1 sw/source/uibase/sidebar/StylePresetsPanel.cxx | 1 writerperfect/source/writer/EPUBExportFilter.cxx | 1 198 files changed, 356 insertions(+), 71 deletions(-)
New commits: commit 6e9fa580f09afcb5b1dc24f632b6272f20bed443 Author: Gabor Kelemen <[email protected]> AuthorDate: Mon Feb 9 12:33:48 2026 +0100 Commit: Gabor Kelemen <[email protected]> CommitDate: Tue Feb 17 09:13:52 2026 +0100 tdf#146619 Use more forward declarations in include/svtools Change-Id: If91cce7bf7ece7d1c125509118cbbe1a9ee65397 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198971 Reviewed-by: Gabor Kelemen <[email protected]> Tested-by: Jenkins diff --git a/basctl/source/basicide/IDEComboBox.cxx b/basctl/source/basicide/IDEComboBox.cxx index 2a16b6bc2f29..879cb6a88696 100644 --- a/basctl/source/basicide/IDEComboBox.cxx +++ b/basctl/source/basicide/IDEComboBox.cxx @@ -34,6 +34,7 @@ #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> #include <vcl/event.hxx> +#include <vcl/weld/Builder.hxx> #include <svl/itemset.hxx> namespace basctl diff --git a/basctl/source/inc/IDEComboBox.hxx b/basctl/source/inc/IDEComboBox.hxx index 0baf28b13cac..f6fd299d7391 100644 --- a/basctl/source/inc/IDEComboBox.hxx +++ b/basctl/source/inc/IDEComboBox.hxx @@ -26,6 +26,11 @@ #include "doceventnotifier.hxx" #include <basctl/scriptdocument.hxx> +namespace weld +{ +class ComboBox; +} + namespace basctl { /*! diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx index 062fbeb912af..11c34d6498b5 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.cxx +++ b/chart2/source/controller/dialogs/tp_ChartType.cxx @@ -31,6 +31,7 @@ #include <tools/mapunit.hxx> #include <utility> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/weld.hxx> #include <vcl/outdev.hxx> diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index 89e7f54d017b..7839e180150e 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -32,6 +32,7 @@ #include <o3tl/safeint.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> namespace chart diff --git a/chart2/source/controller/sidebar/ChartColorPaletteControl.cxx b/chart2/source/controller/sidebar/ChartColorPaletteControl.cxx index 412e6a1cd313..c261d05cbc31 100644 --- a/chart2/source/controller/sidebar/ChartColorPaletteControl.cxx +++ b/chart2/source/controller/sidebar/ChartColorPaletteControl.cxx @@ -22,6 +22,7 @@ #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> #include <vcl/virdev.hxx> +#include <vcl/weld/Toolbar.hxx> #include <ChartColorPaletteHelper.hxx> #include "ChartColorPaletteControl.hxx" diff --git a/chart2/source/controller/sidebar/ChartTypePanel.cxx b/chart2/source/controller/sidebar/ChartTypePanel.cxx index 74c3423ebe6d..0eb7d16421ff 100644 --- a/chart2/source/controller/sidebar/ChartTypePanel.cxx +++ b/chart2/source/controller/sidebar/ChartTypePanel.cxx @@ -30,6 +30,7 @@ #include <unonames.hxx> #include <svtools/valueset.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <comphelper/diagnose_ex.hxx> using namespace css; diff --git a/cui/IwyuFilter_cui.yaml b/cui/IwyuFilter_cui.yaml index 12335fef167c..b059ec287a95 100644 --- a/cui/IwyuFilter_cui.yaml +++ b/cui/IwyuFilter_cui.yaml @@ -33,9 +33,21 @@ excludelist: cui/source/tabpages/numfmt.cxx: # Actually used - com/sun/star/frame/XModel.hpp + cui/source/tabpages/tpgradnt.cxx: + # Needed for implicit dtor + - vcl/weld/ScrolledWindow.hxx + cui/source/tabpages/tphatch.cxx: + # Needed for implicit dtor + - vcl/weld/ScrolledWindow.hxx + cui/source/tabpages/tppattern.cxx: + # Needed for implicit dtor + - vcl/weld/ScrolledWindow.hxx cui/source/customize/cfg.cxx: # Actually used - com/sun/star/ui/dialogs/XFilePicker3.hpp cui/source/dialogs/AdditionsDialog.cxx: # Actually needed for orcus::json::parse_error - orcus/json_parser.hpp + cui/source/options/optchart.cxx: + # Needed for implicit dtor + - vcl/weld/ScrolledWindow.hxx diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 075e33dac97a..3a89161a26f3 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -30,6 +30,7 @@ #include <vcl/event.hxx> #include <vcl/graph.hxx> #include <vcl/graphicfilter.hxx> +#include <vcl/image.hxx> #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> #include <vcl/weld/Builder.hxx> @@ -38,6 +39,7 @@ #include <vcl/weld/weld.hxx> #include <vcl/decoview.hxx> #include <vcl/virdev.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <sfx2/minfitem.hxx> #include <sfx2/sfxhelp.hxx> diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index af5f295f0bb2..e82ac6ecc8cf 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -29,6 +29,7 @@ #include <tools/debug.hxx> #include <i18nlangtag/languagetag.hxx> #include <vcl/virdev.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/Dialog.hxx> #include <vcl/weld/weldutils.hxx> #include <unotools/lingucfg.hxx> diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx index 102024641bf6..22ad7534518f 100644 --- a/cui/source/dialogs/srchxtra.cxx +++ b/cui/source/dialogs/srchxtra.cxx @@ -34,6 +34,7 @@ #include <tools/debug.hxx> #include <tools/resary.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/Dialog.hxx> #include <vcl/tabs.hrc> diff --git a/cui/source/dialogs/welcomedlg.cxx b/cui/source/dialogs/welcomedlg.cxx index f25cdf6b741f..b80fa4469551 100644 --- a/cui/source/dialogs/welcomedlg.cxx +++ b/cui/source/dialogs/welcomedlg.cxx @@ -17,6 +17,7 @@ #include <officecfg/Office/UI/ToolbarMode.hxx> #include <officecfg/Setup.hxx> #include <unotools/confignode.hxx> +#include <vcl/weld/Builder.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> diff --git a/cui/source/options/appearance.cxx b/cui/source/options/appearance.cxx index 640225ac6ed6..969f84019610 100644 --- a/cui/source/options/appearance.cxx +++ b/cui/source/options/appearance.cxx @@ -21,6 +21,7 @@ #include <svtools/restartdialog.hxx> #include <vcl/svapp.hxx> #include <vcl/themecolors.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/Dialog.hxx> #include <comphelper/propertyvalue.hxx> #include <map> diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index dd4d9f2aa552..553100a84836 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -21,6 +21,7 @@ #include <officecfg/Office/Common.hxx> #include <svtools/ctrltool.hxx> +#include <vcl/metric.hxx> #include <vcl/svapp.hxx> #include <vcl/vclenum.hxx> #include <vcl/weld/Builder.hxx> diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx index 7e904d5f1a26..a6e84108996a 100644 --- a/cui/source/options/optchart.cxx +++ b/cui/source/options/optchart.cxx @@ -22,6 +22,7 @@ #include <rtl/ustrbuf.hxx> #include <vcl/virdev.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/MessageDialog.hxx> #include <vcl/weld/weld.hxx> #include <vcl/settings.hxx> diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index d255182eddf2..ec6549823c52 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -108,6 +108,7 @@ #include <vcl/svapp.hxx> #include <vcl/weld/Dialog.hxx> #include <vcl/window.hxx> +#include <vcl/weld/Builder.hxx> #include <sal/log.hxx> using namespace ::com::sun::star; diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index e2d9db2c5120..4124eaa0213b 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -34,6 +34,7 @@ #include <tools/fldunit.hxx> #include <vcl/image.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #define IID_BOTTOMLOCK 1 #define IID_TOPLOCK 2 diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index f24d9c78eb29..4f7b675a3c9e 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -34,8 +34,10 @@ #include <dialmgr.hxx> #include <sfx2/htmlmode.hxx> #include <vcl/fieldvalues.hxx> +#include <vcl/image.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld/Builder.hxx> #include <svx/dialmgr.hxx> #include <svx/flagsdef.hxx> #include <svl/grabbagitem.hxx> diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 256ffb4d41fb..a1a0130ac6c6 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <tools/fldunit.hxx> #include <vcl/svapp.hxx> #include <vcl/idle.hxx> #include <svtools/ctrltool.hxx> diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx index d8ac54613740..a74d44a164e9 100644 --- a/cui/source/tabpages/grfpage.cxx +++ b/cui/source/tabpages/grfpage.cxx @@ -29,6 +29,7 @@ #include <rtl/ustring.hxx> #include <tools/debug.hxx> #include <tools/fract.hxx> +#include <tools/mapunit.hxx> #include <svx/svxids.hrc> #include <strings.hrc> #include <vcl/fieldvalues.hxx> diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx index 1e528be8f0ea..6786183dd78c 100644 --- a/cui/source/tabpages/labdlg.cxx +++ b/cui/source/tabpages/labdlg.cxx @@ -21,6 +21,7 @@ #include <o3tl/untaint.hxx> #include <svtools/unitconv.hxx> #include <tools/debug.hxx> +#include <tools/mapunit.hxx> #include <svx/svddef.hxx> #include <svx/sxcecitm.hxx> @@ -35,6 +36,7 @@ #include <vcl/tabs.hrc> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ScrolledWindow.hxx> // define ---------------------------------------------------------------- diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index 6658a96dd74d..3e1e1aee4710 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -28,6 +28,7 @@ #include <svx/svxids.hrc> #include <svx/sdtaitm.hxx> #include <tools/debug.hxx> +#include <tools/mapunit.hxx> #include <svl/cjkoptions.hxx> #include <editeng/pgrditem.hxx> diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx index 439619cb28e1..266ec6b97757 100644 --- a/cui/source/tabpages/tabstpge.cxx +++ b/cui/source/tabpages/tabstpge.cxx @@ -20,6 +20,7 @@ #include <svtools/ruler.hxx> #include <svtools/unitconv.hxx> #include <svx/svxids.hrc> +#include <tools/mapunit.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/weld/Builder.hxx> diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 4a81ba62ada8..75ecd4ce05aa 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -54,6 +54,7 @@ #include <svtools/unitconv.hxx> #include <tools/debug.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ScrolledWindow.hxx> using namespace com::sun::star; diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 8a0f1c3d19bf..171a40ae33d6 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -22,6 +22,7 @@ #include <vcl/ColorDialog.hxx> #include <vcl/svapp.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/MessageDialog.hxx> #include <vcl/weld/weld.hxx> diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 9fed334ad245..c1fb2c56fa99 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -19,7 +19,10 @@ #include <memory> #include <tools/urlobj.hxx> +#include <vcl/image.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld/Builder.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/MessageDialog.hxx> #include <vcl/weld/weld.hxx> #include <sfx2/dialoghelper.hxx> diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 596480b7ebcb..f5f6f8512d01 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -19,8 +19,11 @@ #include <memory> #include <tools/urlobj.hxx> +#include <vcl/image.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld/Builder.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/MessageDialog.hxx> #include <vcl/weld/weld.hxx> #include <sfx2/dialoghelper.hxx> diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx index f5a66761cc14..5ec0158bf89f 100644 --- a/cui/source/tabpages/tpline.cxx +++ b/cui/source/tabpages/tpline.cxx @@ -67,6 +67,7 @@ #include <vcl/weld/Dialog.hxx> #include <comphelper/lok.hxx> #include <o3tl/string_view.hxx> +#include <vcl/weld/Builder.hxx> #define MAX_BMP_WIDTH 16 #define MAX_BMP_HEIGHT 16 diff --git a/cui/source/tabpages/tppattern.cxx b/cui/source/tabpages/tppattern.cxx index c812fc6edeb0..25317e1bbbd1 100644 --- a/cui/source/tabpages/tppattern.cxx +++ b/cui/source/tabpages/tppattern.cxx @@ -24,7 +24,10 @@ #include <svx/colorbox.hxx> #include <svx/dialmgr.hxx> #include <vcl/BitmapTools.hxx> +#include <vcl/image.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld/Builder.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/MessageDialog.hxx> #include <vcl/weld/weld.hxx> #include <svx/strings.hrc> diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx index 5310b807d7da..bd9b66f3c0fd 100644 --- a/cui/source/tabpages/tpshadow.cxx +++ b/cui/source/tabpages/tpshadow.cxx @@ -35,6 +35,7 @@ #include <svx/sdsxyitm.hxx> #include <svx/drawitem.hxx> #include <svx/xfltrit.hxx> +#include <vcl/weld/Builder.hxx> #include <cuitabarea.hxx> #include <svx/dlgutil.hxx> #include <vcl/weld/Dialog.hxx> diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 72d6eb64c851..035ba9cdd34c 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -37,6 +37,7 @@ #include <svl/numuno.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <vcl/accessibility/AccessibleBrowseBoxObjType.hxx> #include <vcl/svapp.hxx> #include <cppuhelper/queryinterface.hxx> diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index c48f2afe3964..083bb0b3e261 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -28,6 +28,7 @@ #include <connectivity/dbtools.hxx> #include <connectivity/dbexception.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <vcl/accessibility/AccessibleBrowseBox.hxx> #include <vcl/svapp.hxx> #include <osl/diagnose.h> #include <strings.hrc> diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index c6d77721c8b7..fda18f7e2ced 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -47,6 +47,8 @@ #include <osl/diagnose.h> #include <i18nlangtag/languagetag.hxx> #include <unotools/fontdefs.hxx> +#include <vcl/accessibility/AccessibleBrowseBox.hxx> +#include <vcl/accessibility/AccessibleBrowseBoxObjType.hxx> #include <vcl/commandevent.hxx> #include <vcl/rendercontext/GetDefaultFontFlags.hxx> #include <vcl/svapp.hxx> diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.cxx b/dbaccess/source/ui/querydesign/limitboxcontroller.cxx index 53e5220c40be..30c6bbb7f967 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/Builder.hxx> #include <vcl/weld/ComboBox.hxx> #include <vcl/window.hxx> #include <vcl/weld/weld.hxx> diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx index 4e71b1c64704..b42a8b10e25a 100644 --- a/dbaccess/source/ui/uno/composerdialogs.hxx +++ b/dbaccess/source/ui/uno/composerdialogs.hxx @@ -27,6 +27,8 @@ #include <comphelper/proparrhlp.hxx> #include <connectivity/CommonTools.hxx> #include <svtools/genericunodialog.hxx> +#include <vcl/weld/DialogController.hxx> +#include <vcl/weld/weld.hxx> namespace dbaui { diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx index 8f1c35935d73..0714418d99ab 100644 --- a/editeng/source/items/textitem.cxx +++ b/editeng/source/items/textitem.cxx @@ -28,6 +28,7 @@ #include <unotools/intlwrapper.hxx> #include <unotools/syslocale.hxx> #include <utility> +#include <vcl/metric.hxx> #include <vcl/outdev.hxx> #include <vcl/rendercontext/GetDefaultFontFlags.hxx> #include <vcl/unohelp.hxx> @@ -37,6 +38,7 @@ #include <editeng/editrids.hrc> #include <tools/bigint.hxx> #include <tools/debug.hxx> +#include <tools/fldunit.hxx> #include <tools/mapunit.hxx> #include <tools/UnitConversion.hxx> diff --git a/filter/source/graphic/GraphicExportFilter.cxx b/filter/source/graphic/GraphicExportFilter.cxx index e16cc64a0484..a6e4d6b30a14 100644 --- a/filter/source/graphic/GraphicExportFilter.cxx +++ b/filter/source/graphic/GraphicExportFilter.cxx @@ -26,7 +26,9 @@ #include <cppuhelper/supportsservice.hxx> #include <utility> +#include <tools/color.hxx> #include <vcl/bitmap.hxx> +#include <vcl/graph.hxx> #include <vcl/graphicfilter.hxx> #include <svl/outstrm.hxx> #include <svtools/DocumentToGraphicRenderer.hxx> diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx index a4500ef08231..d3699dc427ff 100644 --- a/filter/source/msfilter/msvbahelper.cxx +++ b/filter/source/msfilter/msvbahelper.cxx @@ -41,6 +41,7 @@ #include <sfx2/objsh.hxx> #include <o3tl/string_view.hxx> #include <svtools/acceleratorexecute.hxx> +#include <vcl/keycod.hxx> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/XUIConfigurationManager.hpp> #include <frozen/bits/defines.h> diff --git a/fpicker/source/office/RemoteFilesDialog.cxx b/fpicker/source/office/RemoteFilesDialog.cxx index 206469f81fc7..06736e13c98f 100644 --- a/fpicker/source/office/RemoteFilesDialog.cxx +++ b/fpicker/source/office/RemoteFilesDialog.cxx @@ -24,6 +24,7 @@ #include <vcl/errinf.hxx> #include <vcl/windowstate.hxx> #include <vcl/vclenum.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MenuButton.hxx> #include <vcl/weld/MessageDialog.hxx> #include <officecfg/Office/Common.hxx> diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index d6dfe17cbbdc..1cb6fa7871f2 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -53,6 +53,7 @@ #include <rtl/ref.hxx> #include <rtl/ustrbuf.hxx> #include <o3tl/string_view.hxx> +#include <vcl/keycod.hxx> constexpr OUString PRESET_DEFAULT = u"default"_ustr; constexpr OUString TARGET_CURRENT = u"current"_ustr; diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index 462549b31c09..a4de2da2e527 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -27,6 +27,7 @@ #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> #include <vcl/weld/weld.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/ComboBox.hxx> using namespace ::com::sun::star; diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index ef3ca8ef6e29..e3cc9b06f9a2 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -28,6 +28,7 @@ #include <vcl/toolbox.hxx> #include <vcl/event.hxx> #include <vcl/weld/weld.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/Entry.hxx> using namespace ::com::sun::star; diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index 2475b368ee3d..99a414172cef 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -34,6 +34,7 @@ #include <comphelper/propertyvalue.hxx> #include <helper/persistentwindowstate.hxx> #include <vcl/image.hxx> +#include <vcl/keycod.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/commandinfoprovider.hxx> diff --git a/framework/source/uielement/subtoolbarcontroller.cxx b/framework/source/uielement/subtoolbarcontroller.cxx index 8a25a4eb0d2c..e6509bb6be06 100644 --- a/framework/source/uielement/subtoolbarcontroller.cxx +++ b/framework/source/uielement/subtoolbarcontroller.cxx @@ -29,6 +29,8 @@ #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> #include <vcl/commandinfoprovider.hxx> +#include <vcl/weld/Builder.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/weldutils.hxx> #include <com/sun/star/awt/XDockableWindow.hpp> diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index df81f1804a4e..003ba340e614 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -467,34 +467,18 @@ excludelist: include/svtools/dialogclosedlistener.hxx: # base class has to be a complete type - com/sun/star/ui/dialogs/XDialogClosedListener.hpp - include/svtools/genericunodialog.hxx: - # base class has to be a complete type - - com/sun/star/lang/XInitialization.hpp - - com/sun/star/lang/XServiceInfo.hpp - - com/sun/star/ui/dialogs/XExecutableDialog.hpp include/svtools/openfiledroptargetlistener.hxx: # base class has to be a complete type - com/sun/star/datatransfer/dnd/XDropTargetListener.hpp - include/svtools/popupmenucontrollerbase.hxx: - # base class has to be a complete type - - com/sun/star/frame/XDispatch.hpp - - com/sun/star/frame/XDispatchProvider.hpp - - com/sun/star/frame/XPopupMenuController.hpp - - com/sun/star/frame/XStatusListener.hpp - - com/sun/star/lang/XInitialization.hpp - - com/sun/star/lang/XServiceInfo.hpp include/svtools/popupwindowcontroller.hxx: # base class has to be a complete type - com/sun/star/lang/XServiceInfo.hpp include/svtools/sfxecode.hxx: # Needed for macro defines - class ErrCode - include/svtools/toolboxcontroller.hxx: - # base class has to be a complete type - - com/sun/star/frame/XStatusListener.hpp - - com/sun/star/frame/XToolbarController.hpp - - com/sun/star/util/XUpdatable.hpp - - com/sun/star/lang/XInitialization.hpp + include/svtools/strings.hrc: + # Needed for TranslateId macro + - unotools/resmgr.hxx include/svtools/unoevent.hxx: # base class has to be a complete type - com/sun/star/container/XNameReplace.hpp diff --git a/include/svtools/DocumentToGraphicRenderer.hxx b/include/svtools/DocumentToGraphicRenderer.hxx index b196ae3dc21b..9f8eadc7927c 100644 --- a/include/svtools/DocumentToGraphicRenderer.hxx +++ b/include/svtools/DocumentToGraphicRenderer.hxx @@ -22,9 +22,6 @@ #include <vector> -#include <tools/color.hxx> -#include <vcl/graph.hxx> - #include <svtools/svtdllapi.h> #include <com/sun/star/uno/Reference.hxx> @@ -44,6 +41,11 @@ namespace com::sun::star { } } +class Color; +class Graphic; +class Point; +class Size; + class SVT_DLLPUBLIC DocumentToGraphicRenderer { const css::uno::Reference<css::lang::XComponent>& mxDocument; diff --git a/include/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx index b54798287d20..c4565475566e 100644 --- a/include/svtools/PlaceEditDialog.hxx +++ b/include/svtools/PlaceEditDialog.hxx @@ -11,10 +11,8 @@ #include <config_options.h> #include <svtools/svtdllapi.h> -#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/DialogController.hxx> #include <vcl/weld/Entry.hxx> -#include <vcl/weld/SpinButton.hxx> #include <vcl/weld/weld.hxx> #include <memory> @@ -22,6 +20,14 @@ class Place; class DetailsContainer; +namespace weld +{ +class ComboBox; +} +namespace weld +{ +class SpinButton; +} class UNLESS_MERGELIBS(SVT_DLLPUBLIC) PlaceEditDialog final : public weld::GenericDialogController { diff --git a/include/svtools/acceleratorexecute.hxx b/include/svtools/acceleratorexecute.hxx index 048eb8911b28..2da8f887f588 100644 --- a/include/svtools/acceleratorexecute.hxx +++ b/include/svtools/acceleratorexecute.hxx @@ -24,9 +24,9 @@ #include <memory> #include <mutex> -#include <com/sun/star/awt/KeyEvent.hpp> -#include <vcl/keycod.hxx> +#include <com/sun/star/uno/Reference.hxx> +namespace com::sun::star::awt { struct KeyEvent; } namespace com :: sun :: star :: frame { class XDispatchProvider; } namespace com :: sun :: star :: frame { class XFrame; } namespace com :: sun :: star :: frame { class XModel; } @@ -34,6 +34,8 @@ namespace com :: sun :: star :: ui { class XAcceleratorConfiguration; } namespace com :: sun :: star :: uno { class XComponentContext; } namespace com :: sun :: star :: util { class XURLTransformer; } +namespace vcl { class KeyCode; } + namespace svt { diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index 03fe9aeef311..bfbe2d601beb 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -22,10 +22,10 @@ #include <config_options.h> #include <memory> #include <svtools/svtdllapi.h> -#include <vcl/weld/ComboBox.hxx> +#include <tools/link.hxx> #include <vcl/weld/DialogController.hxx> -#include <vcl/weld/ScrolledWindow.hxx> -#include <vcl/weld/weld.hxx> + +#include <com/sun/star/uno/Reference.hxx> namespace com :: sun :: star :: container { class XNameAccess; } namespace com :: sun :: star :: sdbc { class XDataSource; } @@ -33,6 +33,11 @@ namespace com :: sun :: star :: sdb { class XDatabaseContext; } namespace com :: sun :: star :: uno { class XComponentContext; } namespace com :: sun :: star :: util { struct AliasProgrammaticPair; } +namespace weld { class Button; } +namespace weld { class ComboBox; } +namespace weld { class ScrolledWindow; } +namespace weld { class Window; } + #define FIELD_PAIRS_VISIBLE 5 #define FIELD_CONTROLS_VISIBLE 2 * FIELD_PAIRS_VISIBLE diff --git a/include/svtools/bindablecontrolhelper.hxx b/include/svtools/bindablecontrolhelper.hxx index 8ec4762d2dd1..39db62590b48 100644 --- a/include/svtools/bindablecontrolhelper.hxx +++ b/include/svtools/bindablecontrolhelper.hxx @@ -20,11 +20,11 @@ #pragma once #include <svtools/svtdllapi.h> - -#include <com/sun/star/uno/Reference.hxx> +#include <rtl/ustring.hxx> namespace com :: sun :: star :: frame { class XModel; } namespace com :: sun :: star :: uno { class XInterface; } +namespace com::sun::star::uno { template <class interface_type> class Reference; } namespace svt { diff --git a/include/svtools/borderhelper.hxx b/include/svtools/borderhelper.hxx index c7169d767767..6fb5647e7bfe 100644 --- a/include/svtools/borderhelper.hxx +++ b/include/svtools/borderhelper.hxx @@ -21,15 +21,17 @@ #include <svtools/svtdllapi.h> -#include <basegfx/polygon/b2dpolypolygon.hxx> -#include <basegfx/polygon/b2dpolygon.hxx> -#include <basegfx/point/b2dpoint.hxx> +#include <vector> class OutputDevice; class Point; enum class SvxBorderLineStyle : sal_Int16; +namespace basegfx { class B2DPoint; } +namespace basegfx { class B2DPolyPolygon; } +namespace basegfx { class B2DPolygon; } + namespace svtools { SVT_DLLPUBLIC std::vector<double> GetLineDashing( SvxBorderLineStyle nDashing, double fScale ); diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index dbfa3de7c058..4ef28bcf77dc 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -26,8 +26,6 @@ #include <vcl/headbar.hxx> #include <vcl/transfer.hxx> #include <vcl/timer.hxx> -#include <vcl/accessibility/AccessibleBrowseBox.hxx> -#include <vcl/accessibility/AccessibleBrowseBoxObjType.hxx> #include <vcl/accessibletableprovider.hxx> #include <vector> #include <stack> @@ -37,10 +35,12 @@ #include <memory> #include <o3tl/typed_flags_set.hxx> +class AccessibleBrowseBox; class BrowserColumn; class BrowserHeader; class ScrollAdaptor; class MeasureStatusBar; +enum class AccessibleBrowseBoxObjType; namespace weld { class Scrollbar; diff --git a/include/svtools/colorcfg.hxx b/include/svtools/colorcfg.hxx index 93e10fc789d2..32f5f4427201 100644 --- a/include/svtools/colorcfg.hxx +++ b/include/svtools/colorcfg.hxx @@ -21,10 +21,11 @@ #include <svtools/svtdllapi.h> #include <rtl/ustring.hxx> #include <tools/color.hxx> -#include <com/sun/star/uno/Sequence.h> #include <unotools/options.hxx> #include <memory> +namespace com::sun::star::uno { template <class E> class Sequence; } + namespace svtools{ enum ColorConfigEntry : int { diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index 323a297c42bc..ca30437f3e6c 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -20,18 +20,18 @@ #pragma once #include <tools/date.hxx> +#include <svtools/borderline.hxx> #include <svtools/svtdllapi.h> #include <svtools/toolbarmenu.hxx> -#include <editeng/borderline.hxx> #include <vcl/idle.hxx> #include <vcl/metric.hxx> -#include <vcl/weld/Builder.hxx> #include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MenuButton.hxx> #include <vcl/weld/weld.hxx> #include <memory> +namespace weld { class Builder; } namespace weld { class CustomWeld; } class Bitmap; @@ -39,6 +39,9 @@ class FontList; class VclSimpleEvent; class VirtualDevice; +enum class SvxBorderLineStyle : sal_Int16; +enum class FieldUnit : sal_uInt16; + /** Utility class storing the border line width, style and colors. The widths are defined in Twips. */ diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx index f8caa7efd2cd..a8698c42a17b 100644 --- a/include/svtools/ctrltool.hxx +++ b/include/svtools/ctrltool.hxx @@ -20,16 +20,18 @@ #pragma once #include <config_options.h> +#include <i18nlangtag/lang.h> #include <svtools/svtdllapi.h> +#include <tools/fontenum.hxx> #include <rtl/ustring.hxx> #include <sal/types.h> -#include <vcl/metric.hxx> #include <vcl/vclptr.hxx> #include <vector> #include <memory> #include <string_view> +class FontMetric; class ImplFontListNameInfo; class OutputDevice; diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 3cdb5896c154..600714adb88a 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/Builder.hxx> #include <vcl/weld/ComboBox.hxx> #include <vcl/weld/Entry.hxx> #include <vcl/weld/FormattedSpinButton.hxx> diff --git a/include/svtools/embedhlp.hxx b/include/svtools/embedhlp.hxx index 753084f76aca..d9e99dc199a0 100644 --- a/include/svtools/embedhlp.hxx +++ b/include/svtools/embedhlp.hxx @@ -20,12 +20,13 @@ #pragma once #include <svtools/svtdllapi.h> -#include <com/sun/star/uno/Reference.hxx> -#include <tools/link.hxx> -#include <vcl/graph.hxx> #include <rtl/ustring.hxx> #include <memory> +class Graphic; +class LinkParamNone; +class MapMode; +class Size; class SvStream; namespace com :: sun :: star :: io { class XInputStream; } @@ -35,9 +36,14 @@ namespace comphelper class EmbeddedObjectContainer; } +namespace tools { class Rectangle; } + namespace com::sun::star::embed { class XEmbeddedObject; } +namespace com::sun::star::uno { template <class interface_type> class Reference; } + +template <typename Arg, typename Ret> class Link; class OutputDevice; typedef struct _xmlTextWriter* xmlTextWriterPtr; diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx index 1ec216c5b42b..f0794766bd1b 100644 --- a/include/svtools/genericunodialog.hxx +++ b/include/svtools/genericunodialog.hxx @@ -29,11 +29,10 @@ #include <comphelper/uno3.hxx> #include <comphelper/propertycontainer.hxx> #include <comphelper/broadcasthelper.hxx> -#include <vcl/weld/DialogController.hxx> -#include <vcl/weld/weld.hxx> namespace com :: sun :: star :: awt { class XWindow; } namespace com :: sun :: star :: uno { class XComponentContext; } +namespace weld { class DialogController; } namespace svt diff --git a/include/svtools/imageresourceaccess.hxx b/include/svtools/imageresourceaccess.hxx index ca76c0909f17..c73331609af8 100644 --- a/include/svtools/imageresourceaccess.hxx +++ b/include/svtools/imageresourceaccess.hxx @@ -25,12 +25,12 @@ #include <string_view> #include <config_options.h> +#include <rtl/ustring.hxx> #include <svtools/svtdllapi.h> -#include <com/sun/star/uno/Reference.hxx> - namespace com :: sun :: star :: io { class XInputStream; } namespace com :: sun :: star :: uno { class XComponentContext; } +namespace com::sun::star::uno { template <class interface_type> class Reference; } class SvStream; diff --git a/include/svtools/inettbc.hxx b/include/svtools/inettbc.hxx index 113047f9ea58..773efcaff4b6 100644 --- a/include/svtools/inettbc.hxx +++ b/include/svtools/inettbc.hxx @@ -22,15 +22,17 @@ #include <memory> #include <rtl/ref.hxx> #include <svtools/svtdllapi.h> -#include <tools/urlobj.hxx> #include <vcl/idle.hxx> #include <vcl/weld/ComboBox.hxx> -#include <vcl/weld/weld.hxx> class SvtMatchContext_Impl; class SvtURLBox_Impl; +enum class INetProtocol; + +namespace weld { class Widget; } + class SVT_DLLPUBLIC SvtURLBox { friend class SvtMatchContext_Impl; diff --git a/include/svtools/insdlg.hxx b/include/svtools/insdlg.hxx index 501823fe7b6a..69ef25b03206 100644 --- a/include/svtools/insdlg.hxx +++ b/include/svtools/insdlg.hxx @@ -20,11 +20,12 @@ #include <svtools/svtdllapi.h> #include <tools/globname.hxx> -#include <sot/formats.hxx> #include <utility> #include <vector> -#include <vcl/transfer.hxx> + +class TransferableDataHelper; +enum class SotClipboardFormatId : sal_uInt32; class SvObjectServer { diff --git a/include/svtools/langhelp.hxx b/include/svtools/langhelp.hxx index 1aa8bcb72a78..8eeb2b907705 100644 --- a/include/svtools/langhelp.hxx +++ b/include/svtools/langhelp.hxx @@ -11,10 +11,10 @@ #include <svtools/svtdllapi.h> -#include <com/sun/star/uno/Sequence.hxx> - #include <rtl/ustring.hxx> +namespace com::sun::star::uno { template <typename> class Sequence; } + /** Localize a URI to one of the foundation's webservices @param io_rURI diff --git a/include/svtools/optionsdrawinglayer.hxx b/include/svtools/optionsdrawinglayer.hxx index e620c0c71e6d..4807cb081d28 100644 --- a/include/svtools/optionsdrawinglayer.hxx +++ b/include/svtools/optionsdrawinglayer.hxx @@ -21,7 +21,8 @@ #include <svtools/svtdllapi.h> #include <sal/types.h> -#include <tools/color.hxx> + +class Color; namespace SvtOptionsDrawinglayer { diff --git a/include/svtools/parhtml.hxx b/include/svtools/parhtml.hxx index 22dfe2769e2a..a5a353022720 100644 --- a/include/svtools/parhtml.hxx +++ b/include/svtools/parhtml.hxx @@ -21,7 +21,6 @@ #include <svtools/svtdllapi.h> #include <svtools/svparser.hxx> -#include <svtools/htmltokn.h> #include <string_view> #include <vector> @@ -36,6 +35,7 @@ namespace com::sun::star { class Color; enum class HtmlOptionId; +enum class HtmlTokenId : sal_Int16; #define HTMLFONTSZ1_DFLT 7 #define HTMLFONTSZ2_DFLT 10 diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx index 3b7fd5df7aed..ffae83c63af7 100644 --- a/include/svtools/prnsetup.hxx +++ b/include/svtools/prnsetup.hxx @@ -21,14 +21,13 @@ #include <svtools/svtdllapi.h> #include <vcl/print.hxx> -#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/Dialog.hxx> #include <vcl/weld/DialogController.hxx> -#include <vcl/weld/weld.hxx> #include <vcl/timer.hxx> class QueueInfo; class VclSimpleEvent; +namespace weld { class ComboBox; } class SVT_DLLPUBLIC PrinterSetupDialog final : public weld::GenericDialogController { diff --git a/include/svtools/recorditemwindow.hxx b/include/svtools/recorditemwindow.hxx index ddb9d2ab5706..053a6c06c41d 100644 --- a/include/svtools/recorditemwindow.hxx +++ b/include/svtools/recorditemwindow.hxx @@ -10,10 +10,14 @@ #pragma once #include <vcl/InterimItemWindow.hxx> -#include <vcl/weld/weld.hxx> #include <vcl/weld/Entry.hxx> #include <svtools/svtdllapi.h> +namespace weld +{ +class Widget; +} + class SVT_DLLPUBLIC RecordItemWindowBase { public: diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx index 1990043eb6ed..0d884ab64e98 100644 --- a/include/svtools/ruler.hxx +++ b/include/svtools/ruler.hxx @@ -23,13 +23,13 @@ #include <map> #include <vector> #include <svtools/svtdllapi.h> -#include <tools/fldunit.hxx> #include <tools/link.hxx> #include <tools/fract.hxx> #include <vcl/window.hxx> #include <vcl/glyphitem.hxx> class MouseEvent; +enum class FieldUnit : sal_uInt16; /************************************************************************* diff --git a/include/svtools/scrolladaptor.hxx b/include/svtools/scrolladaptor.hxx index 41666c62a2af..ee3e906a24ae 100644 --- a/include/svtools/scrolladaptor.hxx +++ b/include/svtools/scrolladaptor.hxx @@ -24,7 +24,6 @@ #include <vcl/InterimItemWindow.hxx> #include <vcl/scrollable.hxx> #include <vcl/weld/Scrollbar.hxx> -#include <vcl/weld/weld.hxx> class SVT_DLLPUBLIC ScrollAdaptor : public InterimItemWindow, public Scrollable { diff --git a/include/svtools/statusbarcontroller.hxx b/include/svtools/statusbarcontroller.hxx index d18cfde1b31c..65ad766a34ed 100644 --- a/include/svtools/statusbarcontroller.hxx +++ b/include/svtools/statusbarcontroller.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/frame/XStatusbarController.hpp> #include <cppuhelper/weak.hxx> #include <comphelper/interfacecontainer4.hxx> -#include <tools/gen.hxx> #include <unordered_map> #include <utility> @@ -34,6 +33,7 @@ namespace com :: sun :: star :: frame { class XFrame; } namespace com :: sun :: star :: ui { class XStatusbarItem; } namespace com :: sun :: star :: uno { class XComponentContext; } namespace com :: sun :: star :: util { class XURLTransformer; } +namespace tools { class Rectangle; } namespace svt { diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc index f85e21450bb1..2cfa054b8345 100644 --- a/include/svtools/strings.hrc +++ b/include/svtools/strings.hrc @@ -19,6 +19,8 @@ #pragma once +#include <unotools/resmgr.hxx> + #define NC_(Context, String) TranslateId(Context, u8##String) // To translators: tdf#125447 use no mnemonic in this string diff --git a/include/svtools/svtresid.hxx b/include/svtools/svtresid.hxx index c24ee7d936ae..983fb23d66aa 100644 --- a/include/svtools/svtresid.hxx +++ b/include/svtools/svtresid.hxx @@ -21,9 +21,10 @@ #include <svtools/svtdllapi.h> #include <rtl/ustring.hxx> -#include <unotools/resmgr.hxx> #include <locale> +struct TranslateId; + SVT_DLLPUBLIC std::locale SvtResLocale(); SVT_DLLPUBLIC OUString SvtResId(TranslateId aId); diff --git a/include/svtools/toolbarmenu.hxx b/include/svtools/toolbarmenu.hxx index 9a41a7fb5515..4280eb4eda4a 100644 --- a/include/svtools/toolbarmenu.hxx +++ b/include/svtools/toolbarmenu.hxx @@ -25,12 +25,13 @@ #include <rtl/ref.hxx> #include <vcl/dockwin.hxx> -#include <vcl/weld/Builder.hxx> -#include <vcl/weld/weld.hxx> namespace com :: sun :: star :: frame { class XFrame; } namespace com :: sun :: star :: frame { struct FeatureStateEvent; } namespace svt { class FrameStatusListener; } +namespace weld { class Builder; } +namespace weld { class Container; } +namespace weld { class Widget; } class SVT_DLLPUBLIC WeldToolbarPopup { diff --git a/include/svtools/toolboxcontroller.hxx b/include/svtools/toolboxcontroller.hxx index 43ca44a40fee..63b89eb3a5b6 100644 --- a/include/svtools/toolboxcontroller.hxx +++ b/include/svtools/toolboxcontroller.hxx @@ -35,8 +35,6 @@ #include <tools/link.hxx> #include <utility> #include <vcl/toolboxid.hxx> -#include <vcl/weld/Builder.hxx> -#include <vcl/weld/Toolbar.hxx> #include <unordered_map> @@ -46,6 +44,9 @@ namespace com :: sun :: star :: frame { class XLayoutManager; } namespace com :: sun :: star :: uno { class XComponentContext; } namespace com :: sun :: star :: util { class XURLTransformer; } +namespace weld { class Builder; } +namespace weld { class Toolbar; } + class ToolBox; namespace svt diff --git a/include/svtools/unitconv.hxx b/include/svtools/unitconv.hxx index ab9bdf50a914..d676219d883e 100644 --- a/include/svtools/unitconv.hxx +++ b/include/svtools/unitconv.hxx @@ -19,10 +19,11 @@ #pragma once #include <svtools/svtdllapi.h> -#include <tools/mapunit.hxx> -#include <tools/fldunit.hxx> #include <tools/long.hxx> +enum class FieldUnit : sal_uInt16; +enum class MapUnit : sal_uInt8; + namespace weld { class MetricSpinButton; } // macro ----------------------------------------------------------------- diff --git a/include/svtools/unoimap.hxx b/include/svtools/unoimap.hxx index f668aaa38708..64816db4be91 100644 --- a/include/svtools/unoimap.hxx +++ b/include/svtools/unoimap.hxx @@ -20,9 +20,9 @@ #pragma once #include <svtools/svtdllapi.h> -#include <com/sun/star/uno/Reference.hxx> namespace com :: sun :: star :: uno { class XInterface; } +namespace com::sun::star::uno { template <class interface_type> class Reference; } class ImageMap; struct SvEventDescription; diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 68ef922033c4..8e69b8ed8ae1 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -22,18 +22,19 @@ #include <svtools/svtdllapi.h> #include <tools/color.hxx> #include <vcl/wintypes.hxx> -#include <vcl/image.hxx> #include <vcl/vclptr.hxx> -#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/customweld.hxx> #include <rtl/ref.hxx> #include <memory> #include <vector> +class Image; class UserDrawEvent; class VirtualDevice; class ValueSetAcc; +namespace weld { class ScrolledWindow; } + struct ValueSetItem; enum class DrawFrameStyle; diff --git a/include/svx/colorwindow.hxx b/include/svx/colorwindow.hxx index a08381711593..87120763d911 100644 --- a/include/svx/colorwindow.hxx +++ b/include/svx/colorwindow.hxx @@ -24,11 +24,15 @@ #include <svx/SvxColorValueSet.hxx> #include <svx/Palette.hxx> #include <vcl/toolboxid.hxx> +#include <vcl/weld/MenuButton.hxx> typedef std::function<weld::Window*()> TopLevelParentFunction; namespace com::sun::star::frame { class XFrame; } +namespace weld { class ComboBox; } +namespace weld { class Toolbar; } + class PaletteManager; class ToolBox; diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx index 65d31195002e..0f3bf8d0079e 100644 --- a/oox/source/drawingml/textparagraph.cxx +++ b/oox/source/drawingml/textparagraph.cxx @@ -25,6 +25,7 @@ #include <rtl/ustring.hxx> #include <sal/log.hxx> +#include <tools/fldunit.hxx> #include <oox/mathml/importutils.hxx> #include <oox/helper/propertyset.hxx> #include <com/sun/star/text/XText.hpp> diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index 372fce1297c4..329acf2be015 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -18,6 +18,7 @@ */ #include <StartMarker.hxx> #include <UITools.hxx> +#include <tools/fldunit.hxx> #include <vcl/image.hxx> #include <vcl/svapp.hxx> #include <bitmaps.hlst> diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml index c8b696904869..a5f327d39494 100644 --- a/sc/IwyuFilter_sc.yaml +++ b/sc/IwyuFilter_sc.yaml @@ -518,6 +518,9 @@ excludelist: sc/source/ui/inc/tpview.hxx: # Needed for VclPtr type - svx/colorbox.hxx + sc/source/ui/optdlg/opredlin.cxx: + # Needed for implicit ctor + - vcl/weld/Dialog.hxx sc/source/ui/unoobj/exceldetect.hxx: # base class has to be a complete type - com/sun/star/document/XExtendedFilterDetection.hpp diff --git a/sc/source/filter/excel/xehelper.cxx b/sc/source/filter/excel/xehelper.cxx index 27bcee2fbb67..71761b18264a 100644 --- a/sc/source/filter/excel/xehelper.cxx +++ b/sc/source/filter/excel/xehelper.cxx @@ -30,6 +30,7 @@ #include <o3tl/string_view.hxx> #include <sfx2/objsh.hxx> #include <vcl/font.hxx> +#include <vcl/metric.hxx> #include <tools/urlobj.hxx> #include <svl/itemset.hxx> #include <svtools/ctrltool.hxx> diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index e1a64e4d29dc..58141989aa6f 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -48,6 +48,7 @@ #include <sal/log.hxx> #include <tools/UnitConversion.hxx> #include <vcl/fontcharmap.hxx> +#include <vcl/metric.hxx> #include <vcl/outdev.hxx> #include <document.hxx> #include <documentimport.hxx> diff --git a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx index 13fdf3e6a431..29a609a4b1b5 100644 --- a/sc/source/ui/cctrl/tbzoomsliderctrl.cxx +++ b/sc/source/ui/cctrl/tbzoomsliderctrl.cxx @@ -28,6 +28,7 @@ #include <vcl/image.hxx> #include <vcl/toolbox.hxx> #include <vcl/virdev.hxx> +#include <vcl/weld/Builder.hxx> #include <svx/zoomslideritem.hxx> #include <iterator> #include <set> diff --git a/sc/source/ui/condformat/colorformat.cxx b/sc/source/ui/condformat/colorformat.cxx index bcd7a36e41c6..6768bd587b0d 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/Builder.hxx> #include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MessageDialog.hxx> #include <vcl/weld/weld.hxx> diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index b69527488f8a..509b754ed8a7 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp> #include <svtools/ctrlbox.hxx> +#include <vcl/weld/Builder.hxx> namespace { diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index e4fd24cbce51..51af5b60e842 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -39,6 +39,7 @@ #include <vcl/settings.hxx> #include <vcl/virdev.hxx> #include <vcl/weld/ComboBox.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/Dialog.hxx> #include <vcl/weld/MessageDialog.hxx> #include <vcl/weld/weld.hxx> diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index 737bc949d894..55bc7f81aee1 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -24,6 +24,7 @@ #include <tools/color.hxx> #include <vcl/event.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/Dialog.hxx> #include <officecfg/Office/Common.hxx> diff --git a/sc/source/ui/optdlg/opredlin.cxx b/sc/source/ui/optdlg/opredlin.cxx index d85d27ad778f..04e1baed370d 100644 --- a/sc/source/ui/optdlg/opredlin.cxx +++ b/sc/source/ui/optdlg/opredlin.cxx @@ -25,6 +25,7 @@ #include <scmod.hxx> #include <docsh.hxx> #include <svx/svxids.hrc> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/Dialog.hxx> #include <officecfg/Office/Calc.hxx> diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx index 6e461edfd9c5..42055ec91434 100644 --- a/sc/source/ui/optdlg/tpview.cxx +++ b/sc/source/ui/optdlg/tpview.cxx @@ -33,6 +33,7 @@ #include <svl/eitem.hxx> #include <svtools/unitconv.hxx> #include <unotools/localedatawrapper.hxx> +#include <vcl/weld/Builder.hxx> ScTpContentOptions::ScTpContentOptions(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet& rArgSet) : SfxTabPage(pPage, pController, u"modules/scalc/ui/tpviewpage.ui"_ustr, u"TpViewPage"_ustr, &rArgSet) diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx index ad69fe7016cf..d07f6029df9b 100644 --- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx +++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx @@ -28,6 +28,8 @@ #include <svl/itemset.hxx> #include <svx/rotmodit.hxx> #include <svtools/unitconv.hxx> +#include <tools/fldunit.hxx> +#include <tools/mapunit.hxx> #include <com/sun/star/lang/IllegalArgumentException.hpp> using namespace css; diff --git a/sc/source/ui/sidebar/CellBorderStyleControl.cxx b/sc/source/ui/sidebar/CellBorderStyleControl.cxx index 1e71eb2bc976..ff20a11e8639 100644 --- a/sc/source/ui/sidebar/CellBorderStyleControl.cxx +++ b/sc/source/ui/sidebar/CellBorderStyleControl.cxx @@ -26,6 +26,7 @@ #include <svx/strings.hrc> #include <svx/svxids.hrc> #include <vcl/settings.hxx> +#include <vcl/weld/Builder.hxx> #include <editeng/lineitem.hxx> #include <svl/itemset.hxx> #include <memory> diff --git a/sc/source/ui/sidebar/CellLineStyleControl.cxx b/sc/source/ui/sidebar/CellLineStyleControl.cxx index 592014b4f392..2729fea06126 100644 --- a/sc/source/ui/sidebar/CellLineStyleControl.cxx +++ b/sc/source/ui/sidebar/CellLineStyleControl.cxx @@ -21,6 +21,7 @@ #include <vcl/i18nhelp.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld/Builder.hxx> #include <editeng/borderline.hxx> #include <editeng/lineitem.hxx> #include <sfx2/bindings.hxx> diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml index 697fd12ae3dc..8c64e181430c 100644 --- a/sd/IwyuFilter_sd.yaml +++ b/sd/IwyuFilter_sd.yaml @@ -100,6 +100,9 @@ excludelist: # Needed on MACOSX - svl/intitem.hxx - app.hrc + sd/source/ui/dlg/sdpreslt.cxx: + # Needed for implicit dtor + - vcl/weld/ScrolledWindow.hxx sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx: # base class has to be a complete type - com/sun/star/container/XNamed.hpp diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index c87e3f4ae1ed..2cf4051ffafd 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -37,6 +37,7 @@ #include <comphelper/lok.hxx> #include <i18nutil/unicode.hxx> +#include <vcl/metric.hxx> #include <vcl/svapp.hxx> #include <vcl/stdtext.hxx> #include <vcl/weld/ComboBox.hxx> diff --git a/sd/source/ui/controller/displaymodecontroller.cxx b/sd/source/ui/controller/displaymodecontroller.cxx index f56cd890cf24..a67e9128c528 100644 --- a/sd/source/ui/controller/displaymodecontroller.cxx +++ b/sd/source/ui/controller/displaymodecontroller.cxx @@ -10,7 +10,11 @@ #include <svtools/popupwindowcontroller.hxx> #include <svtools/toolbarmenu.hxx> #include <svtools/valueset.hxx> +#include <vcl/image.hxx> #include <vcl/toolbox.hxx> +#include <vcl/weld/Builder.hxx> +#include <vcl/weld/Toolbar.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <strings.hrc> diff --git a/sd/source/ui/controller/slidelayoutcontroller.cxx b/sd/source/ui/controller/slidelayoutcontroller.cxx index 7478fd290825..d07762e1462f 100644 --- a/sd/source/ui/controller/slidelayoutcontroller.cxx +++ b/sd/source/ui/controller/slidelayoutcontroller.cxx @@ -24,7 +24,11 @@ #include <comphelper/propertyvalue.hxx> #include <vcl/commandinfoprovider.hxx> +#include <vcl/image.hxx> #include <vcl/toolbox.hxx> +#include <vcl/weld/Builder.hxx> +#include <vcl/weld/Toolbar.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <svl/cjkoptions.hxx> diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index 3d536eed6232..3eeaa82c8fd6 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -29,6 +29,7 @@ #include <svtools/unitconv.hxx> #include <vcl/weld/Dialog.hxx> #include <o3tl/string_view.hxx> +#include <vcl/weld/Builder.hxx> #include <sdattr.hrc> #include <View.hxx> diff --git a/sd/source/ui/dlg/diactrl.cxx b/sd/source/ui/dlg/diactrl.cxx index 10bc2675420c..18d9c0d40eea 100644 --- a/sd/source/ui/dlg/diactrl.cxx +++ b/sd/source/ui/dlg/diactrl.cxx @@ -26,6 +26,7 @@ #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> +#include <vcl/weld/Builder.hxx> #include <svl/intitem.hxx> #include <tools/debug.hxx> diff --git a/sd/source/ui/dlg/gluectrl.cxx b/sd/source/ui/dlg/gluectrl.cxx index c069d3f659a7..7927e55594da 100644 --- a/sd/source/ui/dlg/gluectrl.cxx +++ b/sd/source/ui/dlg/gluectrl.cxx @@ -23,6 +23,7 @@ #include <svx/svdglue.hxx> #include <svl/intitem.hxx> #include <vcl/toolbox.hxx> +#include <vcl/weld/Builder.hxx> #include <strings.hrc> #include <gluectrl.hxx> diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx index 9d90f1ea4745..ea155962e801 100644 --- a/sd/source/ui/dlg/sdpreslt.cxx +++ b/sd/source/ui/dlg/sdpreslt.cxx @@ -26,6 +26,7 @@ #include <vcl/image.hxx> #include <vcl/vclenum.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/Dialog.hxx> #include <strings.hrc> diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index 946313a48714..9183885bf78f 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -38,6 +38,7 @@ #include <vcl/svapp.hxx> #include <vcl/virdev.hxx> #include <vcl/weld/Menu.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/MessageDialog.hxx> #include <tools/debug.hxx> diff --git a/sfx2/source/dialog/charmappopup.cxx b/sfx2/source/dialog/charmappopup.cxx index d34e24fb6a17..fa6a09dbe401 100644 --- a/sfx2/source/dialog/charmappopup.cxx +++ b/sfx2/source/dialog/charmappopup.cxx @@ -19,6 +19,7 @@ #include <charmappopup.hxx> #include <charmapcontrol.hxx> #include <vcl/toolbox.hxx> +#include <vcl/weld/Toolbar.hxx> CharmapPopup::CharmapPopup(const css::uno::Reference<css::uno::XComponentContext>& rContext) : PopupWindowController(rContext, nullptr, OUString()) diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index d424067ed37f..279ac6bb1ae5 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -27,6 +27,7 @@ #include <comphelper/propertyvalue.hxx> #include <svl/stritem.hxx> +#include <tools/urlobj.hxx> #include <unotools/historyoptions.hxx> #include <vcl/toolbox.hxx> #include <vcl/svapp.hxx> @@ -36,6 +37,7 @@ #include <svtools/inettbc.hxx> #include <vcl/InterimItemWindow.hxx> +#include <vcl/weld/Builder.hxx> #include <sfx2/sfxsids.hrc> using namespace ::com::sun::star::uno; diff --git a/sfx2/source/view/classificationcontroller.cxx b/sfx2/source/view/classificationcontroller.cxx index 219d733ceda3..ee4d3cbd82f9 100644 --- a/sfx2/source/view/classificationcontroller.cxx +++ b/sfx2/source/view/classificationcontroller.cxx @@ -26,6 +26,7 @@ #include <vcl/toolbox.hxx> #include <vcl/svapp.hxx> #include <vcl/vclptr.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/ComboBox.hxx> #include <vcl/weld/weld.hxx> diff --git a/svtools/IwyuFilter_svtools.yaml b/svtools/IwyuFilter_svtools.yaml index d0b4c20b8093..830904c052f5 100644 --- a/svtools/IwyuFilter_svtools.yaml +++ b/svtools/IwyuFilter_svtools.yaml @@ -10,6 +10,9 @@ excludelist: - com/sun/star/accessibility/XAccessible.hpp - com/sun/star/accessibility/XAccessibleComponent.hpp - com/sun/star/accessibility/XAccessibleContext.hpp + svtools/source/control/toolbarmenu.cxx: + # Needed for implicit dtor + - vcl/weld/Popover.hxx svtools/source/dialogs/insdlg.cxx: # Needed on WIN - comphelper/classids.hxx diff --git a/svtools/qa/unit/testHtmlReader.cxx b/svtools/qa/unit/testHtmlReader.cxx index eb869df31976..55b8d89624e2 100644 --- a/svtools/qa/unit/testHtmlReader.cxx +++ b/svtools/qa/unit/testHtmlReader.cxx @@ -10,6 +10,7 @@ #include <cppunit/TestFixture.h> #include <unotest/bootstrapfixturebase.hxx> +#include <svtools/htmltokn.h> #include <svtools/parhtml.hxx> #include <tools/ref.hxx> #include <tools/stream.hxx> diff --git a/svtools/source/brwbox/brwbox1.cxx b/svtools/source/brwbox/brwbox1.cxx index f10662a304d4..2b9ae9da8095 100644 --- a/svtools/source/brwbox/brwbox1.cxx +++ b/svtools/source/brwbox/brwbox1.cxx @@ -28,6 +28,8 @@ #include <tools/debug.hxx> #include <tools/fract.hxx> #include <sal/log.hxx> +#include <vcl/accessibility/AccessibleBrowseBox.hxx> +#include <vcl/accessibility/AccessibleBrowseBoxObjType.hxx> #include <vcl/InterimItemWindow.hxx> #include <vcl/svapp.hxx> #include <vcl/weld/Entry.hxx> diff --git a/svtools/source/brwbox/brwbox3.cxx b/svtools/source/brwbox/brwbox3.cxx index f72903e089c8..18323568fa8a 100644 --- a/svtools/source/brwbox/brwbox3.cxx +++ b/svtools/source/brwbox/brwbox3.cxx @@ -19,6 +19,7 @@ #include <osl/diagnose.h> #include <svtools/brwbox.hxx> +#include <vcl/accessibility/AccessibleBrowseBox.hxx> #include <vcl/accessibility/AccessibleBrowseBoxHeaderCell.hxx> #include <vcl/accessibility/AccessibleBrowseBoxObjType.hxx> #include <vcl/accessibility/AccessibleBrowseBoxTableCell.hxx> diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index c62b0e646b3f..a39e30dfcfc3 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -20,6 +20,7 @@ #include <svtools/editbrowsebox.hxx> #include <tools/debug.hxx> +#include <vcl/accessibility/AccessibleBrowseBox.hxx> #include <vcl/image.hxx> #include <vcl/rendercontext/SystemTextColorFlags.hxx> #include <vcl/settings.hxx> diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 790e60d38c9c..23ec823c6970 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -35,9 +35,11 @@ #include <vcl/image.hxx> #include <vcl/vclevent.hxx> #include <vcl/virdev.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/Popover.hxx> #include <vcl/weld/customweld.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/weldutils.hxx> #include <rtl/math.hxx> #include <sal/macros.h> diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index 6f4d49f04b62..bc19672226a4 100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -28,6 +28,7 @@ #include <i18nlangtag/mslangid.hxx> #include <utility> #include <vcl/embeddedfontsmanager.hxx> +#include <vcl/metric.hxx> #include <vcl/outdev.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 406905655345..fcf15734bdbd 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -39,6 +39,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> #include <salhelper/thread.hxx> +#include <tools/urlobj.hxx> #include <tools/debug.hxx> #include <o3tl/string_view.hxx> #include <osl/file.hxx> diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx index 3fe07aed772a..75de7548656c 100644 --- a/svtools/source/control/ruler.cxx +++ b/svtools/source/control/ruler.cxx @@ -18,6 +18,7 @@ */ #include <tools/debug.hxx> +#include <tools/fldunit.hxx> #include <tools/mapunit.hxx> #include <tools/poly.hxx> #include <vcl/event.hxx> diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index b7f8144a693f..5951ca79afdc 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -24,6 +24,8 @@ #include <utility> #include <vcl/taskpanelist.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld/Builder.hxx> +#include <vcl/weld/weld.hxx> #include <vcl/weld/Popover.hxx> #include <framestatuslistener.hxx> diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index ebe041f6d10b..cd7adf7d166f 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -31,6 +31,7 @@ #include <vcl/settings.hxx> #include <vcl/virdev.hxx> #include <vcl/lineinfo.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> diff --git a/svtools/source/dialogs/PlaceEditDialog.cxx b/svtools/source/dialogs/PlaceEditDialog.cxx index fe1f8182586c..c78533c4bc30 100644 --- a/svtools/source/dialogs/PlaceEditDialog.cxx +++ b/svtools/source/dialogs/PlaceEditDialog.cxx @@ -17,6 +17,8 @@ #include <svtools/strings.hrc> #include <svtools/place.hxx> #include <vcl/vclenum.hxx> +#include <vcl/weld/ComboBox.hxx> +#include <vcl/weld/SpinButton.hxx> #include <vcl/weld/Dialog.hxx> #include "ServerDetailsControls.hxx" diff --git a/svtools/source/dialogs/ServerDetailsControls.cxx b/svtools/source/dialogs/ServerDetailsControls.cxx index 30c5adb0bdcc..f0daa8020b2d 100644 --- a/svtools/source/dialogs/ServerDetailsControls.cxx +++ b/svtools/source/dialogs/ServerDetailsControls.cxx @@ -21,6 +21,8 @@ #include <ucbhelper/commandenvironment.hxx> #include <vcl/weld/Dialog.hxx> #include <comphelper/diagnose_ex.hxx> +#include <vcl/weld/ComboBox.hxx> +#include <vcl/weld/SpinButton.hxx> #include <svtools/PlaceEditDialog.hxx> #include <utility> diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index a6b7d16f12cc..2ada2b93ca49 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -32,6 +32,8 @@ #include <vcl/svapp.hxx> #include <vcl/vclenum.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ComboBox.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/Dialog.hxx> #include <vcl/weld/weld.hxx> #include <sal/log.hxx> diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx index fdec3a29ec58..8e57cd82d923 100644 --- a/svtools/source/dialogs/insdlg.cxx +++ b/svtools/source/dialogs/insdlg.cxx @@ -25,6 +25,7 @@ #include <comphelper/classids.hxx> #include <sot/stg.hxx> #include <sal/macros.h> +#include <vcl/transfer.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index 709c3220da37..8277bb2e33c7 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -30,6 +30,7 @@ #include <vcl/PrinterSupport.hxx> #include <vcl/event.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ComboBox.hxx> #include <vcl/weld/Dialog.hxx> #include <vcl/vclevent.hxx> #include <sal/log.hxx> diff --git a/svtools/source/filter/DocumentToGraphicRenderer.cxx b/svtools/source/filter/DocumentToGraphicRenderer.cxx index 6a4ecbe71c92..751bd703cf98 100644 --- a/svtools/source/filter/DocumentToGraphicRenderer.cxx +++ b/svtools/source/filter/DocumentToGraphicRenderer.cxx @@ -21,6 +21,7 @@ #include <comphelper/propertyvalue.hxx> #include <vcl/gdimtf.hxx> +#include <vcl/graph.hxx> #include <vcl/svapp.hxx> #include <vcl/outdev.hxx> #include <vcl/pdfextoutdevdata.hxx> diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx index 82918676b649..678b4c565c9d 100644 --- a/svtools/source/misc/acceleratorexecute.cxx +++ b/svtools/source/misc/acceleratorexecute.cxx @@ -20,6 +20,7 @@ #include <memory> #include <svtools/acceleratorexecute.hxx> +#include <com/sun/star/awt/KeyEvent.hpp> #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/ui/GlobalAcceleratorConfiguration.hpp> @@ -36,6 +37,7 @@ #include <utility> #include <vcl/evntpost.hxx> +#include <vcl/keycod.hxx> #include <sal/log.hxx> #include <vcl/lok.hxx> #include <rtl/ref.hxx> diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index 0cda25c72cdf..59f4b25e4cf9 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -20,6 +20,7 @@ #include <libxml/xmlwriter.h> #include <svtools/embedhlp.hxx> +#include <vcl/graph.hxx> #include <vcl/graphicfilter.hxx> #include <vcl/gdimtf.hxx> #include <vcl/outdev.hxx> diff --git a/svtools/source/misc/svtresid.cxx b/svtools/source/misc/svtresid.cxx index 5d886a01bfee..047d7473a2fc 100644 --- a/svtools/source/misc/svtresid.cxx +++ b/svtools/source/misc/svtresid.cxx @@ -18,6 +18,7 @@ */ #include <svtools/svtresid.hxx> +#include <unotools/resmgr.hxx> std::locale SvtResLocale() { return Translate::Create("svt"); } diff --git a/svtools/source/misc/unitconv.cxx b/svtools/source/misc/unitconv.cxx index 3c80e5508618..a7e7ad914e9b 100644 --- a/svtools/source/misc/unitconv.cxx +++ b/svtools/source/misc/unitconv.cxx @@ -20,6 +20,8 @@ #include <o3tl/temporary.hxx> #include <svtools/unitconv.hxx> #include <tools/debug.hxx> +#include <tools/fldunit.hxx> +#include <tools/mapunit.hxx> #include <tools/UnitConversion.hxx> #include <vcl/outdev.hxx> #include <vcl/weld/MetricSpinButton.hxx> diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index 6a7f0a3be741..06622ef1e356 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -31,6 +31,7 @@ #include <comphelper/diagnose_ex.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld/DialogController.hxx> using namespace css::uno; using namespace css::lang; diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx index df753062bab0..6548c405e5c5 100644 --- a/svtools/source/uno/popupwindowcontroller.cxx +++ b/svtools/source/uno/popupwindowcontroller.cxx @@ -23,6 +23,7 @@ #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> #include <vcl/vclevent.hxx> +#include <vcl/weld/Toolbar.hxx> #include <svtools/popupwindowcontroller.hxx> #include <svtools/toolbarmenu.hxx> diff --git a/svx/source/dialog/TableAutoFmtDlg.cxx b/svx/source/dialog/TableAutoFmtDlg.cxx index 2554b0fdcbe8..9f8037f05d23 100644 --- a/svx/source/dialog/TableAutoFmtDlg.cxx +++ b/svx/source/dialog/TableAutoFmtDlg.cxx @@ -25,6 +25,7 @@ #include <svx/dialmgr.hxx> #include <svx/strings.hrc> #include <vcl/svapp.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/Dialog.hxx> #include <vcl/weld/MessageDialog.hxx> diff --git a/svx/source/dialog/TableStylesDlg.cxx b/svx/source/dialog/TableStylesDlg.cxx index 7154cae6db76..a0af3f3f134c 100644 --- a/svx/source/dialog/TableStylesDlg.cxx +++ b/svx/source/dialog/TableStylesDlg.cxx @@ -26,8 +26,10 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <editeng/adjustitem.hxx> +#include <vcl/image.hxx> #include <vcl/svapp.hxx> #include <bitmaps.hlst> +#include <editeng/borderline.hxx> #include <editeng/editids.hrc> #include <editeng/flstitem.hxx> #include <sfx2/objsh.hxx> @@ -37,6 +39,8 @@ #include <svx/svxtableitems.hxx> #include <svx/dialog/TableStylesDlg.hxx> #include <tools/fldunit.hxx> +#include <vcl/weld/Builder.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/Dialog.hxx> #include <vcl/weld/MessageDialog.hxx> #include <vcl/weld/Toolbar.hxx> diff --git a/svx/source/dialog/ThemeColorEditDialog.cxx b/svx/source/dialog/ThemeColorEditDialog.cxx index b3845f162bd6..ecf477e8437f 100644 --- a/svx/source/dialog/ThemeColorEditDialog.cxx +++ b/svx/source/dialog/ThemeColorEditDialog.cxx @@ -9,6 +9,7 @@ #include <svx/dialog/ThemeColorEditDialog.hxx> #include <svx/colorbox.hxx> +#include <vcl/weld/Builder.hxx> namespace svx { diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 83fb8f963b02..88340484bd65 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -24,6 +24,8 @@ #include <vcl/metaact.hxx> #include <vcl/metaactiontypes.hxx> #include <vcl/virdev.hxx> +#include <vcl/weld/Builder.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <svtools/valueset.hxx> #include <svl/eitem.hxx> #include <svl/itemset.hxx> diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index 404c80808c60..e3de97c49c28 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -35,9 +35,11 @@ #include <svtools/unitconv.hxx> #include <svx/svxids.hrc> +#include <tools/mapunit.hxx> #include <bitmaps.hlst> #include <svx/fontwork.hxx> #include <svl/itemset.hxx> +#include <vcl/weld/Builder.hxx> constexpr int WIDTH_CHARS = 10; diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index a0a674f7575b..03c085e0db2a 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -36,6 +36,7 @@ #include <sfx2/htmlmode.hxx> #include <osl/diagnose.h> #include <tools/debug.hxx> +#include <tools/mapunit.hxx> #include <editeng/brushitem.hxx> #include <editeng/lrspitem.hxx> diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index 7e0b613eebf1..025fc769ab44 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -32,6 +32,7 @@ #include <vcl/graph.hxx> #include <vcl/rendercontext/GetDefaultFontFlags.hxx> #include <vcl/virdev.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <svx/numvset.hxx> #include <com/sun/star/style/NumberingType.hpp> #include <com/sun/star/container/XIndexAccess.hpp> diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index b402d8d19089..8a740728203b 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -39,6 +39,7 @@ #include <svx/ruler.hxx> #include <svx/rulritem.hxx> #include <sfx2/viewsh.hxx> +#include <tools/fldunit.hxx> #include <editeng/editids.hrc> #include <editeng/tstpitem.hxx> #include <editeng/lrspitem.hxx> diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index bf9185304367..a6ff50abbe52 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -46,7 +46,9 @@ #include <svtools/unitconv.hxx> #include <svx/float3d.hxx> +#include <tools/mapunit.hxx> #include <vcl/ColorDialog.hxx> +#include <vcl/weld/Builder.hxx> #include <com/sun/star/drawing/TextureKind2.hpp> #include <bitmaps.hlst> diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 0583ee5313f8..6d1edb0206c2 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -60,6 +60,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> #include <svl/eitem.hxx> +#include <vcl/accessibility/AccessibleBrowseBoxObjType.hxx> #include <vcl/commandevent.hxx> #include <vcl/svapp.hxx> #include <tools/debug.hxx> diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index ffe63829d8ee..38095946de11 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -44,6 +44,7 @@ #include <comphelper/diagnose_ex.hxx> #include <tools/debug.hxx> #include <tools/fract.hxx> +#include <vcl/accessibility/AccessibleBrowseBox.hxx> #include <vcl/settings.hxx> #include <vcl/commandevent.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index f2e4ff9740b9..c5376f694d12 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -32,6 +32,7 @@ #include <sfx2/filedlghelper.hxx> #include <svl/filenotation.hxx> #include <svtools/inettbc.hxx> +#include <tools/urlobj.hxx> #include <comphelper/diagnose_ex.hxx> #include <unotools/confignode.hxx> #include <unotools/ucbhelper.hxx> diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index 729df99a560d..bed84b1fb54e 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -25,6 +25,7 @@ #include <svl/voiditem.hxx> #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/Menu.hxx> #include <vcl/weld/weldutils.hxx> #include <svx/clipboardctl.hxx> diff --git a/svx/source/sidebar/line/LineWidthValueSet.cxx b/svx/source/sidebar/line/LineWidthValueSet.cxx index ffff42375df3..a8fc15ebd7dd 100644 --- a/svx/source/sidebar/line/LineWidthValueSet.cxx +++ b/svx/source/sidebar/line/LineWidthValueSet.cxx @@ -25,6 +25,7 @@ #include <vcl/rendercontext/GetDefaultFontFlags.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld/ScrolledWindow.hxx> namespace svx::sidebar { diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index c7fc6b1748c7..33f0c2285602 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -26,6 +26,7 @@ #include <sfx2/objsh.hxx> #include <editeng/flstitem.hxx> #include <svl/itempool.hxx> +#include <vcl/metric.hxx> #include <vcl/outdev.hxx> #include <editeng/brushitem.hxx> #include <svx/dialmgr.hxx> diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx index 035cd256567b..9a2cfc38b335 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx @@ -26,6 +26,7 @@ #include <sfx2/sfxsids.hrc> #include <sfx2/viewfrm.hxx> #include <svtools/unitconv.hxx> +#include <tools/mapunit.hxx> #include <svl/intitem.hxx> #include <svl/itemset.hxx> @@ -33,6 +34,7 @@ #include <ParaLineSpacingPopup.hxx> #include <vcl/commandinfoprovider.hxx> +#include <vcl/weld/Builder.hxx> #define DEFAULT_LINE_SPACING 200 #define FIX_DIST_DEF 283 diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx index 341af91d28e5..595f23fba371 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx @@ -21,6 +21,7 @@ #include <ParaLineSpacingPopup.hxx> #include <vcl/toolbox.hxx> +#include <vcl/weld/Toolbar.hxx> using namespace svx; diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx index 1e963565bb7a..8ac8196cb67c 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx @@ -28,6 +28,7 @@ #include <svl/intitem.hxx> #include <sfx2/objsh.hxx> #include <svtools/unitconv.hxx> +#include <tools/mapunit.hxx> #include <sal/log.hxx> #include <com/sun/star/lang/IllegalArgumentException.hpp> diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx index 875d64d10dd7..96bb8dec4858 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx +++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx @@ -25,6 +25,7 @@ #include <sfx2/viewfrm.hxx> #include <svl/itempool.hxx> #include <svl/itemset.hxx> +#include <tools/mapunit.hxx> #include <vcl/weld/Builder.hxx> using namespace svx; diff --git a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx index 46cf453ef2ea..4275da409e1b 100644 --- a/svx/source/sidebar/shapes/DefaultShapesPanel.cxx +++ b/svx/source/sidebar/shapes/DefaultShapesPanel.cxx @@ -22,8 +22,10 @@ #include <comphelper/dispatchcommand.hxx> #include <utility> #include <vcl/commandinfoprovider.hxx> +#include <vcl/image.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld/ScrolledWindow.hxx> namespace svx::sidebar { diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx index a454803d61ff..088876345fa1 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx @@ -30,6 +30,7 @@ #include <svl/itempool.hxx> #include <svl/itemset.hxx> #include <tools/mapunit.hxx> +#include <vcl/weld/Builder.hxx> #include <helpids.h> #include <com/sun/star/beans/NamedValue.hpp> diff --git a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx index 5ed612c79efc..3002ed514888 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingPopup.cxx @@ -19,6 +19,7 @@ #include <TextCharacterSpacingPopup.hxx> #include "TextCharacterSpacingControl.hxx" #include <vcl/toolbox.hxx> +#include <vcl/weld/Toolbar.hxx> using namespace svx; diff --git a/svx/source/sidebar/text/TextUnderlineControl.cxx b/svx/source/sidebar/text/TextUnderlineControl.cxx index 03156430187f..ce04344b395b 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.cxx +++ b/svx/source/sidebar/text/TextUnderlineControl.cxx @@ -26,6 +26,7 @@ #include <svl/itemset.hxx> #include <helpids.h> #include <sfx2/tbxctrl.hxx> +#include <vcl/weld/Builder.hxx> #include <com/sun/star/frame/XDispatchProvider.hpp> namespace svx { diff --git a/svx/source/sidebar/text/TextUnderlineControl.hxx b/svx/source/sidebar/text/TextUnderlineControl.hxx index cc1a19c67915..033ef7c4dbf1 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.hxx +++ b/svx/source/sidebar/text/TextUnderlineControl.hxx @@ -22,6 +22,11 @@ #include <svtools/toolbarmenu.hxx> +namespace weld +{ +class Button; +} + namespace svx { class TextUnderlinePopup; diff --git a/svx/source/sidebar/text/TextUnderlinePopup.cxx b/svx/source/sidebar/text/TextUnderlinePopup.cxx index 96276893bd41..30fe1a46fa62 100644 --- a/svx/source/sidebar/text/TextUnderlinePopup.cxx +++ b/svx/source/sidebar/text/TextUnderlinePopup.cxx @@ -19,6 +19,7 @@ #include <TextUnderlinePopup.hxx> #include "TextUnderlineControl.hxx" #include <vcl/toolbox.hxx> +#include <vcl/weld/Toolbar.hxx> using namespace svx; diff --git a/svx/source/sidebar/textcolumns/TextColumnsPropertyPanel.cxx b/svx/source/sidebar/textcolumns/TextColumnsPropertyPanel.cxx index ba2a2a54f1d0..e44f68ee4fc1 100644 --- a/svx/source/sidebar/textcolumns/TextColumnsPropertyPanel.cxx +++ b/svx/source/sidebar/textcolumns/TextColumnsPropertyPanel.cxx @@ -25,6 +25,7 @@ #include <svl/eitem.hxx> #include <svx/sdtfsitm.hxx> #include <svx/svdoattr.hxx> +#include <tools/fldunit.hxx> #include <com/sun/star/lang/IllegalArgumentException.hpp> diff --git a/svx/source/tbxctrls/StylesPreviewWindow.cxx b/svx/source/tbxctrls/StylesPreviewWindow.cxx index f17fb9db4ad0..1ad8e871feb1 100644 --- a/svx/source/tbxctrls/StylesPreviewWindow.cxx +++ b/svx/source/tbxctrls/StylesPreviewWindow.cxx @@ -34,6 +34,7 @@ #include <vcl/glyphitemcache.hxx> #include <vcl/virdev.hxx> #include <vcl/settings.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/Menu.hxx> #include <editeng/editids.hrc> diff --git a/svx/source/tbxctrls/SvxColorValueSet.cxx b/svx/source/tbxctrls/SvxColorValueSet.cxx index ee24b81170dd..4e3358b15a2f 100644 --- a/svx/source/tbxctrls/SvxColorValueSet.cxx +++ b/svx/source/tbxctrls/SvxColorValueSet.cxx @@ -21,6 +21,7 @@ #include <svx/xtable.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <osl/diagnose.h> #include <svx/uiobject.hxx> diff --git a/svx/source/tbxctrls/SvxPresetListBox.cxx b/svx/source/tbxctrls/SvxPresetListBox.cxx index bb48da9dc65c..a1b2f713e2a6 100644 --- a/svx/source/tbxctrls/SvxPresetListBox.cxx +++ b/svx/source/tbxctrls/SvxPresetListBox.cxx @@ -24,6 +24,7 @@ #include <vcl/svapp.hxx> #include <vcl/weld/Builder.hxx> #include <vcl/weld/Menu.hxx> +#include <vcl/weld/ScrolledWindow.hxx> SvxPresetListBox::SvxPresetListBox(std::unique_ptr<weld::ScrolledWindow> pWindow) : ValueSet(std::move(pWindow)) diff --git a/svx/source/tbxctrls/ThemeColorsToolBoxControl.cxx b/svx/source/tbxctrls/ThemeColorsToolBoxControl.cxx index cacfe9343d84..bc2eb709176f 100644 --- a/svx/source/tbxctrls/ThemeColorsToolBoxControl.cxx +++ b/svx/source/tbxctrls/ThemeColorsToolBoxControl.cxx @@ -19,6 +19,8 @@ #include <comphelper/processfactory.hxx> #include <comphelper/dispatchcommand.hxx> #include <comphelper/propertyvalue.hxx> +#include <vcl/weld/Builder.hxx> +#include <svx/dialog/ThemeColorsPaneBase.hxx> ThemeColorsToolBoxControl::ThemeColorsToolBoxControl() {} diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx b/svx/source/tbxctrls/bulletsnumbering.cxx index e0156209843c..1ed061a2e9f9 100644 --- a/svx/source/tbxctrls/bulletsnumbering.cxx +++ b/svx/source/tbxctrls/bulletsnumbering.cxx @@ -22,6 +22,9 @@ #include <vcl/toolbox.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld/Builder.hxx> +#include <vcl/weld/ScrolledWindow.hxx> +#include <vcl/weld/Toolbar.hxx> namespace { diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index fa16afa2dcf9..244a2685f0b1 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -30,6 +30,7 @@ #include <vcl/image.hxx> #include <vcl/transfer.hxx> #include <vcl/weld/Builder.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <colrctrl.hxx> diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index 995e97f3f910..c3845119d7ae 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -22,6 +22,9 @@ #include <comphelper/propertyvalue.hxx> #include <svtools/toolbarmenu.hxx> #include <vcl/toolbox.hxx> +#include <vcl/weld/Builder.hxx> +#include <vcl/weld/ScrolledWindow.hxx> +#include <vcl/weld/Toolbar.hxx> #include <svx/strings.hrc> #include <svx/svdtrans.hxx> diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx index f6b4b819b380..7c4d23075c94 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hxx +++ b/svx/source/tbxctrls/extrusioncontrols.hxx @@ -22,6 +22,7 @@ #include <svtools/toolbarmenu.hxx> #include <svtools/popupwindowcontroller.hxx> #include <svtools/valueset.hxx> +#include <vcl/image.hxx> #include <vcl/weld/customweld.hxx> // enum to index light images diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index b8b734185030..6f8705cceef2 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -26,6 +26,7 @@ #include <vcl/settings.hxx> #include <vcl/toolbox.hxx> #include <vcl/virdev.hxx> +#include <vcl/weld/Builder.hxx> #include <svl/itemset.hxx> #include <svx/svxids.hrc> #include <tools/json_writer.hxx> diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 02ba44c4eb4a..8d4c163996f1 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -29,6 +29,8 @@ #include <o3tl/untaint.hxx> #include <vcl/toolbox.hxx> #include <vcl/virdev.hxx> +#include <vcl/weld/Builder.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/Dialog.hxx> #include <sfx2/viewsh.hxx> diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index 6fc3324b5328..67bf17994290 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/Builder.hxx> #include <vcl/weld/ComboBox.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <svl/intitem.hxx> diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 6b9a6090ffdd..a46fa456df84 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -30,6 +30,7 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/virdev.hxx> +#include <vcl/weld/Builder.hxx> #include <svx/dialmgr.hxx> #include <svx/strings.hrc> @@ -38,6 +39,7 @@ #include <svx/xtable.hxx> #include <svx/itemwin.hxx> #include <svtools/unitconv.hxx> +#include <tools/mapunit.hxx> #include "linemetricbox.hxx" using namespace ::com::sun::star; diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index b309a65d061c..ce3d199825de 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -22,7 +22,9 @@ #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/SpinButton.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/customweld.hxx> #include <svx/strings.hrc> diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index 0632f40c1bdd..d3836bbaed5f 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -22,6 +22,8 @@ #include <sal/types.h> #include <vcl/event.hxx> #include <vcl/toolbox.hxx> +#include <vcl/weld/Builder.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/TreeView.hxx> #include <svtools/toolbarmenu.hxx> #include <svx/dialmgr.hxx> diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 8b07ac2803f1..df4f78c8eb1f 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -18,10 +18,13 @@ */ #include <tools/debug.hxx> +#include <vcl/image.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> #include <vcl/virdev.hxx> +#include <vcl/weld/Builder.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <sfx2/objsh.hxx> #include <svtools/toolbarmenu.hxx> diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index f984b040ada0..e8fbe5d0883a 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -33,7 +33,9 @@ #include <vcl/event.hxx> #include <vcl/toolbox.hxx> #include <vcl/vclptr.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/Menu.hxx> +#include <vcl/weld/ScrolledWindow.hxx> #include <vcl/weld/TreeView.hxx> #include <vcl/weld/customweld.hxx> #include <vcl/weld/weldutils.hxx> @@ -49,6 +51,7 @@ #include <sfx2/viewsh.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <sfx2/viewfrm.hxx> +#include <vcl/image.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/virdev.hxx> @@ -65,6 +68,7 @@ #include <helpids.h> #include <sfx2/sidebar/Sidebar.hxx> #include <svx/xtable.hxx> +#include <editeng/borderline.hxx> #include <editeng/editids.hrc> #include <editeng/fontitem.hxx> #include <editeng/fhgtitem.hxx> diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx index be488e2ddc6a..7a7bfccd1053 100644 --- a/svx/source/tbxctrls/tbunocontroller.cxx +++ b/svx/source/tbxctrls/tbunocontroller.cxx @@ -29,6 +29,8 @@ #include <utility> #include <vcl/event.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld/Builder.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/weldutils.hxx> #include <vcl/window.hxx> #include <vcl/settings.hxx> diff --git a/svx/source/tbxctrls/tbunosearchcontrollers.cxx b/svx/source/tbxctrls/tbunosearchcontrollers.cxx index 59f8c4389a70..f3a69b6ca937 100644 --- a/svx/source/tbxctrls/tbunosearchcontrollers.cxx +++ b/svx/source/tbxctrls/tbunosearchcontrollers.cxx @@ -50,6 +50,7 @@ #include <com/sun/star/util/SearchAlgorithms.hpp> #include <com/sun/star/util/SearchAlgorithms2.hpp> +#include <vcl/weld/Builder.hxx> #include <vcl/InterimItemWindow.hxx> #include <svl/ctloptions.hxx> #include <svl/srchitem.hxx> diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx index 9de82814ca5c..7cd1d5c56c95 100644 --- a/svx/source/tbxctrls/verttexttbxctrl.cxx +++ b/svx/source/tbxctrls/verttexttbxctrl.cxx @@ -22,6 +22,7 @@ #include <svl/cjkoptions.hxx> #include <svl/ctloptions.hxx> #include <vcl/toolbox.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/weld.hxx> #include <rtl/ustring.hxx> diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml index 37d1669b1569..260508a791c4 100644 --- a/sw/IwyuFilter_sw.yaml +++ b/sw/IwyuFilter_sw.yaml @@ -751,12 +751,21 @@ excludelist: # Needed for defines in swslots.hxx - cmdid.h - globals.hrc + sw/source/ui/config/optpage.cxx: + # Needed for implicit ctor + - vcl/weld/Dialog.hxx sw/source/ui/fldui/fldedt.cxx: # Needed for template - com/sun/star/frame/XModel.hpp sw/source/ui/fldui/flddinf.cxx: # Needed for direct member access - com/sun/star/beans/XPropertySet.hpp + sw/source/ui/misc/pgfnote.cxx: + # Needed for implicit ctor + - vcl/weld/Dialog.hxx + sw/source/ui/misc/pggrid.cxx: + # Needed for implicit ctor + - vcl/weld/Dialog.hxx sw/source/ui/vba/vbacolumn.cxx: # Actually needed - com/sun/star/frame/XModel.hpp diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index f38bfc6b680e..4aa6b2f8c0c9 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -26,6 +26,7 @@ #include <comphelper/propertysequence.hxx> #include <hintids.hxx> #include <utility> +#include <vcl/metric.hxx> #include <vcl/svapp.hxx> #include <svl/hint.hxx> #include <svtools/ctrltool.hxx> diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index e116e30376ba..69cc2f381cd4 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -53,6 +53,7 @@ #include <editeng/frmdiritem.hxx> #include <editeng/orphitem.hxx> #include <utility> +#include <vcl/metric.hxx> #include <vcl/svapp.hxx> #include <sal/log.hxx> #include <osl/diagnose.h> diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index 626ed1e19ac5..28bf2ddad04b 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -47,6 +47,7 @@ #include <svtools/htmlkywd.hxx> #include <svtools/ctrltool.hxx> #include <unotools/pathoptions.hxx> +#include <vcl/metric.hxx> #include <vcl/svapp.hxx> #include <sfx2/event.hxx> #include <sfx2/docfile.hxx> diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 0676e9efbf14..77a29f52e227 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -71,6 +71,7 @@ #include <vcl/rendercontext/GetDefaultFontFlags.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/Dialog.hxx> #include <optload.hxx> diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 5c3770d4ee09..998cfc60e0d3 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -22,6 +22,7 @@ #include <svl/urihelper.hxx> #include <svl/PasswordHelper.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/Dialog.hxx> #include <vcl/weld/MessageDialog.hxx> #include <vcl/weld/weld.hxx> diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index f81719203010..a7035e3edbb1 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -27,6 +27,7 @@ #include <sfx2/sfxdlg.hxx> #include <svl/cjkoptions.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld/Builder.hxx> #include <numpara.hxx> #include <swmodule.hxx> #include <wrtsh.hxx> diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index bbd54da943f3..9f2bfda0d678 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -39,6 +39,7 @@ #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/virdev.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/Dialog.hxx> #include <vcl/weld/IconView.hxx> diff --git a/sw/source/ui/misc/pgfnote.cxx b/sw/source/ui/misc/pgfnote.cxx index f46209c67060..f21554b3eb8a 100644 --- a/sw/source/ui/misc/pgfnote.cxx +++ b/sw/source/ui/misc/pgfnote.cxx @@ -30,6 +30,7 @@ #include <svl/eitem.hxx> #include <editeng/ulspitem.hxx> #include <svl/grabbagitem.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/Dialog.hxx> #include <uitool.hxx> #include <pagedesc.hxx> diff --git a/sw/source/ui/misc/pggrid.cxx b/sw/source/ui/misc/pggrid.cxx index 92708ef05b43..2ef49e550ee0 100644 --- a/sw/source/ui/misc/pggrid.cxx +++ b/sw/source/ui/misc/pggrid.cxx @@ -29,6 +29,7 @@ #include <pggrid.hxx> #include <tgrditem.hxx> #include <svx/pageitem.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/Dialog.hxx> #include <wrtsh.hxx> diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx index e7599745f463..4c24c8706c9c 100644 --- a/sw/source/uibase/app/docshini.cxx +++ b/sw/source/uibase/app/docshini.cxx @@ -47,6 +47,7 @@ #include <editeng/orphitem.hxx> #include <editeng/widwitem.hxx> #include <editeng/hyphenzoneitem.hxx> +#include <vcl/metric.hxx> #include <vcl/rendercontext/GetDefaultFontFlags.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx index 75bb46c9aec8..592389e3a2cc 100644 --- a/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx +++ b/sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx @@ -24,6 +24,7 @@ #include <vcl/InterimItemWindow.hxx> #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> +#include <vcl/weld/Builder.hxx> #include <vcl/weld/Entry.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/sw/source/uibase/dialog/watermarkdialog.cxx b/sw/source/uibase/dialog/watermarkdialog.cxx index 611c2f9c2819..02d3a61976eb 100644 --- a/sw/source/uibase/dialog/watermarkdialog.cxx +++ b/sw/source/uibase/dialog/watermarkdialog.cxx @@ -17,6 +17,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/objsh.hxx> #include <tools/fldunit.hxx> +#include <vcl/metric.hxx> #include <vcl/svapp.hxx> #include <vcl/weld/Dialog.hxx> #include <sfx2/watermarkitem.hxx> @@ -24,6 +25,7 @@ #include <comphelper/lok.hxx> #include <sfx2/viewsh.hxx> #include <svl/itemset.hxx> +#include <vcl/weld/Builder.hxx> static bool isLOKMobilePhone() { diff --git a/sw/source/uibase/inc/labimp.hxx b/sw/source/uibase/inc/labimp.hxx index fef5f4d8907d..6d2a8920e669 100644 --- a/sw/source/uibase/inc/labimp.hxx +++ b/sw/source/uibase/inc/labimp.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_LABIMP_HXX #define INCLUDED_SW_SOURCE_UIBASE_INC_LABIMP_HXX +#include <tools/fldunit.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/weld.hxx> diff --git a/sw/source/uibase/inc/prcntfld.hxx b/sw/source/uibase/inc/prcntfld.hxx index cd13bbb17c40..f31e0d44a4f7 100644 --- a/sw/source/uibase/inc/prcntfld.hxx +++ b/sw/source/uibase/inc/prcntfld.hxx @@ -19,6 +19,7 @@ #pragma once #include <svtools/unitconv.hxx> +#include <tools/fldunit.hxx> #include <vcl/weld/MetricSpinButton.hxx> #include <vcl/weld/weld.hxx> #include <swdllapi.h> diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index b34e413f88f4..4e18c95b459a 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -45,6 +45,8 @@ #include <swabstdlg.hxx> #include <sfx2/zoomitem.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld/Builder.hxx> +#include <vcl/weld/Toolbar.hxx> #include <vcl/weld/weldutils.hxx> #include <svx/dialmgr.hxx> #include <svx/strings.hrc> diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx b/sw/source/uibase/sidebar/PageColumnControl.cxx index af84a767fff8..1b957eb040ad 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.cxx +++ b/sw/source/uibase/sidebar/PageColumnControl.cxx @@ -28,6 +28,7 @@ #include <sfx2/viewfrm.hxx> #include <svl/intitem.hxx> #include <svx/pageitem.hxx> +#include <vcl/weld/Builder.hxx> namespace sw::sidebar { diff --git a/sw/source/uibase/sidebar/PageColumnPopup.cxx b/sw/source/uibase/sidebar/PageColumnPopup.cxx index 20c766037cf4..6a37029e867f 100644 --- a/sw/source/uibase/sidebar/PageColumnPopup.cxx +++ b/sw/source/uibase/sidebar/PageColumnPopup.cxx @@ -19,6 +19,7 @@ #include <PageColumnPopup.hxx> #include "PageColumnControl.hxx" #include <vcl/toolbox.hxx> +#include <vcl/weld/Toolbar.hxx> PageColumnPopup::PageColumnPopup(const css::uno::Reference<css::uno::XComponentContext>& rContext) : PopupWindowController(rContext, nullptr, OUString()) diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx index 8e0fa07ae01c..4b934ce992b2 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.cxx +++ b/sw/source/uibase/sidebar/PageMarginControl.cxx @@ -33,7 +33,9 @@ #include <svl/itempool.hxx> #include <svl/intitem.hxx> #include <svtools/unitconv.hxx> +#include <tools/mapunit.hxx> #include <unotools/viewoptions.hxx> +#include <vcl/weld/Builder.hxx> #include <swtypes.hxx> #include <cmdid.h> diff --git a/sw/source/uibase/sidebar/PageMarginPopup.cxx b/sw/source/uibase/sidebar/PageMarginPopup.cxx index 169d0333ba1a..c118b34b5040 100644 --- a/sw/source/uibase/sidebar/PageMarginPopup.cxx +++ b/sw/source/uibase/sidebar/PageMarginPopup.cxx @@ -19,6 +19,7 @@ #include <PageMarginPopup.hxx> #include "PageMarginControl.hxx" #include <vcl/toolbox.hxx> +#include <vcl/weld/Toolbar.hxx> PageMarginPopup::PageMarginPopup(const css::uno::Reference<css::uno::XComponentContext>& rContext) : PopupWindowController(rContext, nullptr, OUString()) diff --git a/sw/source/uibase/sidebar/PageOrientationControl.cxx b/sw/source/uibase/sidebar/PageOrientationControl.cxx index b7afdcdba6b3..62f1b0ad3548 100644 --- a/sw/source/uibase/sidebar/PageOrientationControl.cxx +++ b/sw/source/uibase/sidebar/PageOrientationControl.cxx @@ -27,6 +27,7 @@ #include <sfx2/viewsh.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> +#include <vcl/weld/Builder.hxx> #include <cmdid.h> namespace { diff --git a/sw/source/uibase/sidebar/PageOrientationControl.hxx b/sw/source/uibase/sidebar/PageOrientationControl.hxx index da82474b08cc..987bd3dcc362 100644 --- a/sw/source/uibase/sidebar/PageOrientationControl.hxx +++ b/sw/source/uibase/sidebar/PageOrientationControl.hxx @@ -26,6 +26,8 @@ class PageOrientationPopup; +namespace weld { class Button; } + namespace sw::sidebar { class PageOrientationControl final : public WeldToolbarPopup diff --git a/sw/source/uibase/sidebar/PageOrientationPopup.cxx b/sw/source/uibase/sidebar/PageOrientationPopup.cxx index aba10280e628..9788abfaa0fa 100644 --- a/sw/source/uibase/sidebar/PageOrientationPopup.cxx +++ b/sw/source/uibase/sidebar/PageOrientationPopup.cxx @@ -19,6 +19,7 @@ #include <PageOrientationPopup.hxx> #include "PageOrientationControl.hxx" #include <vcl/toolbox.hxx> +#include <vcl/weld/Toolbar.hxx> PageOrientationPopup::PageOrientationPopup(const css::uno::Reference<css::uno::XComponentContext>& rContext) : PopupWindowController(rContext, nullptr, OUString()) diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx index 365553693904..f0b11614a4ca 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.cxx +++ b/sw/source/uibase/sidebar/PageSizeControl.cxx @@ -37,6 +37,7 @@ #include <svl/intitem.hxx> #include <svtools/unitconv.hxx> #include <editeng/sizeitem.hxx> +#include <vcl/weld/Builder.hxx> #include <PageSizePopup.hxx> -e ... etc. - the rest is truncated
