From 8b5a46a0e0eda3f52002cd06bfbb399998a60470 Mon Sep 17 00:00:00 2001 From: Michael Weghorn Date: Tue, 2 Jun 2026 17:34:32 +0200 Subject: [PATCH] weld: Move weld::toId and weld::fromId to weldutils.hxx In the past, weld.hxx used to contain the class definitions for weld::Widget and all subclasses, as well as a few helpers. By now, weld::Widget and almost all subclasses have been moved to separate headers, to make it easier to keep the overview and to avoid having to recompile ~all UI code when anything in weld.hxx changes. Move the weld::toId and weld::fromId helpers from weld.hxx to weldutils.hxx, in preparation of getting rid of weld.hxx altogether in an upcomcing commit. Change-Id: I408fe20a74ff104cbfe07bde3105317a1922ff61 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/205936 Tested-by: Jenkins Reviewed-by: Michael Weghorn --- basctl/source/basicide/IDEComboBox.cxx | 1 + basctl/source/basicide/bastype2.cxx | 1 + basctl/source/basicide/bastype3.cxx | 1 + basctl/source/basicide/moduldl2.cxx | 2 +- basctl/source/basicide/moduldlg.cxx | 2 +- basctl/source/dlged/managelang.cxx | 2 +- chart2/source/controller/dialogs/tp_DataSource.cxx | 1 + cui/source/customize/cfgutil.cxx | 1 + cui/source/dialogs/MacroManagerDialog.cxx | 1 + cui/source/dialogs/hlmarkwn.cxx | 1 + cui/source/dialogs/hyperlinknewdoctabpage.cxx | 1 + cui/source/dialogs/scriptdlg.cxx | 2 +- cui/source/options/dbregister.cxx | 2 +- cui/source/options/optaboutconfig.cxx | 1 + cui/source/options/optgdlg.cxx | 1 + cui/source/options/optlingu.cxx | 1 + cui/source/options/optpath.cxx | 1 + cui/source/options/optsave.cxx | 1 + cui/source/options/treeopt.cxx | 1 + cui/source/tabpages/autocdlg.cxx | 1 + cui/source/tabpages/swpossizetabpage.cxx | 1 + dbaccess/source/ui/app/AppDetailView.cxx | 1 + dbaccess/source/ui/control/dbtreelistbox.cxx | 1 + dbaccess/source/ui/misc/WColumnSelect.cxx | 1 + dbaccess/source/ui/misc/WNameMatch.cxx | 5 ++++- dbaccess/source/ui/querydesign/QTableWindow.cxx | 1 + desktop/source/deployment/gui/dp_gui_updatedialog.cxx | 1 + extensions/source/propctrlr/selectlabeldialog.cxx | 1 + extensions/source/propctrlr/taborder.cxx | 1 + filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 2 +- formula/source/ui/dlg/funcpage.cxx | 1 + formula/source/ui/dlg/structpg.cxx | 1 + fpicker/source/office/fileview.cxx | 1 + fpicker/source/office/iodlgimp.hxx | 1 + include/vcl/weld/weld.hxx | 10 ---------- include/vcl/weld/weldutils.hxx | 10 ++++++++++ reportdesign/source/ui/dlg/AddField.cxx | 1 + reportdesign/source/ui/dlg/Navigator.cxx | 2 +- sc/source/core/tool/orcusxml.cxx | 2 +- sc/source/filter/orcus/xmlcontext.cxx | 2 +- sc/source/ui/cctrl/checklistmenu.cxx | 1 + sc/source/ui/dbgui/PivotLayoutTreeList.cxx | 1 + sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx | 2 ++ sc/source/ui/dbgui/PivotLayoutTreeListData.cxx | 1 + sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx | 4 +++- sc/source/ui/formdlg/dwfunctr.cxx | 1 + sc/source/ui/miscdlgs/acredlin.cxx | 1 + sc/source/ui/miscdlgs/conflictsdlg.cxx | 1 + sc/source/ui/miscdlgs/mvtabdlg.cxx | 1 + sc/source/ui/miscdlgs/solveroptions.cxx | 1 + sc/source/ui/view/cellsh1.cxx | 2 +- sd/source/ui/animations/CustomAnimationPane.cxx | 1 + sd/source/ui/animations/SlideTransitionPane.cxx | 2 +- sd/source/ui/dlg/navigatr.cxx | 1 + sd/source/ui/dlg/sdtreelb.cxx | 2 +- sfx2/source/appl/newhelp.cxx | 2 +- sfx2/source/devtools/DocumentModelTreeHandler.cxx | 1 + sfx2/source/devtools/ObjectInspectorTreeHandler.cxx | 1 + sfx2/source/dialog/versdlg.cxx | 1 + sfx2/source/doc/autoredactdialog.cxx | 2 +- starmath/source/ElementsDockingWindow.cxx | 1 + starmath/source/dialog.cxx | 2 +- svx/source/dialog/ctredlin.cxx | 1 + svx/source/dialog/cuicharmap.cxx | 1 + svx/source/dialog/docrecovery.cxx | 2 +- svx/source/form/datanavi.cxx | 2 +- svx/source/form/filtnav.cxx | 1 + svx/source/form/navigatortree.cxx | 1 + svx/source/form/tabwin.cxx | 1 + .../textconversiondlgs/chinese_dictionarydialog.cxx | 1 + sw/source/ui/config/optload.cxx | 1 + sw/source/ui/config/optpage.cxx | 1 + sw/source/ui/dbui/addresslistdialog.cxx | 1 + sw/source/ui/dialog/uiregionsw.cxx | 2 +- sw/source/ui/frmdlg/frmpage.cxx | 1 + sw/source/ui/misc/bookmark.cxx | 2 +- sw/source/ui/misc/glosbib.cxx | 2 +- sw/source/ui/misc/glossary.cxx | 2 +- sw/source/uibase/misc/redlndlg.cxx | 1 + sw/source/uibase/utlui/glbltree.cxx | 1 + sw/source/uibase/utlui/navipi.cxx | 1 + vcl/unx/generic/print/prtsetup.cxx | 1 + xmlsecurity/source/dialogs/certificatechooser.cxx | 1 + xmlsecurity/source/dialogs/certificateviewer.cxx | 1 + 84 files changed, 98 insertions(+), 33 deletions(-) diff --git a/basctl/source/basicide/IDEComboBox.cxx b/basctl/source/basicide/IDEComboBox.cxx index 94e3217d2428..191c1e738a1a 100644 --- a/basctl/source/basicide/IDEComboBox.cxx +++ b/basctl/source/basicide/IDEComboBox.cxx @@ -36,6 +36,7 @@ #include #include #include +#include #include namespace basctl diff --git a/basctl/source/basicide/bastype2.cxx b/basctl/source/basicide/bastype2.cxx index 1df660b1c5a4..e462d651cb5e 100644 --- a/basctl/source/basicide/bastype2.cxx +++ b/basctl/source/basicide/bastype2.cxx @@ -39,6 +39,7 @@ #include #include #include +#include #include #include diff --git a/basctl/source/basicide/bastype3.cxx b/basctl/source/basicide/bastype3.cxx index 6249eb0e6417..841ecea48eb3 100644 --- a/basctl/source/basicide/bastype3.cxx +++ b/basctl/source/basicide/bastype3.cxx @@ -31,6 +31,7 @@ #include #include #include +#include namespace basctl { diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index 3ca49fbcd0fb..b768ad9d4ce8 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index 78db931411cc..d5597b052b57 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index dc32332aff37..c0517ba2b3dd 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include #include diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index c51eb4d508cc..8fd9939fdd0d 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -36,6 +36,7 @@ #include #include #include +#include #include diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx index 808be891d5b2..075134a4e378 100644 --- a/cui/source/customize/cfgutil.cxx +++ b/cui/source/customize/cfgutil.cxx @@ -56,6 +56,7 @@ #include #include #include +#include #include #include diff --git a/cui/source/dialogs/MacroManagerDialog.cxx b/cui/source/dialogs/MacroManagerDialog.cxx index ade3ba5ec0b3..6a465f379ce7 100644 --- a/cui/source/dialogs/MacroManagerDialog.cxx +++ b/cui/source/dialogs/MacroManagerDialog.cxx @@ -44,6 +44,7 @@ #include #include #include +#include #include #include diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 06152cd49f38..fab44ec43e18 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -28,6 +28,7 @@ #include #include #include +#include // UNO-Stuff #include diff --git a/cui/source/dialogs/hyperlinknewdoctabpage.cxx b/cui/source/dialogs/hyperlinknewdoctabpage.cxx index 53b190aedcba..46a32d287eec 100644 --- a/cui/source/dialogs/hyperlinknewdoctabpage.cxx +++ b/cui/source/dialogs/hyperlinknewdoctabpage.cxx @@ -22,6 +22,7 @@ #include #include #include +#include #include #include #include diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx index c04ef86ef991..46194154a827 100644 --- a/cui/source/dialogs/scriptdlg.cxx +++ b/cui/source/dialogs/scriptdlg.cxx @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 8a48dd341fe4..9ae7120cc70e 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #include "doclinkdialog.hxx" #include diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx index 4f4e971433d6..aa9b4e0fbf63 100644 --- a/cui/source/options/optaboutconfig.cxx +++ b/cui/source/options/optaboutconfig.cxx @@ -38,6 +38,7 @@ #include #include #include +#include #include #include diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx index 475cfbf99d04..19a91264f5a8 100644 --- a/cui/source/options/optgdlg.cxx +++ b/cui/source/options/optgdlg.cxx @@ -86,6 +86,7 @@ #include #include #include +#include #if defined(_WIN32) #include diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 9fb1205e351f..e607daec2e76 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -59,6 +59,7 @@ #include #include #include +#include #include #include diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 82541583c25b..2814766f1a94 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -27,6 +27,7 @@ #include #include #include +#include #include #include diff --git a/cui/source/options/optsave.cxx b/cui/source/options/optsave.cxx index 8ae50501f013..415ed3c41aaa 100644 --- a/cui/source/options/optsave.cxx +++ b/cui/source/options/optsave.cxx @@ -47,6 +47,7 @@ #include #include #include +#include #include diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index d0c8119c1e2b..5b638a68c7c3 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -109,6 +109,7 @@ #include #include #include +#include #include using namespace ::com::sun::star; diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 116850607620..19fbba3ca67d 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx index 33588dec67a8..accec72631ae 100644 --- a/cui/source/tabpages/swpossizetabpage.cxx +++ b/cui/source/tabpages/swpossizetabpage.cxx @@ -38,6 +38,7 @@ #include #include #include +#include #include diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index ff48b3d1704c..095ed7f77fa5 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -30,6 +30,7 @@ #include #include #include +#include #include "AppDetailPageHelper.hxx" #include #include diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 88ee9635edcb..061f67819d85 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -41,6 +41,7 @@ #include #include #include +#include #include diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index bb47519ffd45..017c0660e9cf 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include diff --git a/dbaccess/source/ui/misc/WNameMatch.cxx b/dbaccess/source/ui/misc/WNameMatch.cxx index bbd327ea45b1..32358508890b 100644 --- a/dbaccess/source/ui/misc/WNameMatch.cxx +++ b/dbaccess/source/ui/misc/WNameMatch.cxx @@ -18,12 +18,15 @@ */ #include -#include #include #include #include #include #include + +#include +#include + #include using namespace ::dbaui; diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx index ed490860c3ea..dbab2b47a434 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx @@ -31,6 +31,7 @@ #include "TableFieldInfo.hxx" #include #include +#include using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::uno; diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index b9837335254a..1fcb1dc6f6d3 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -61,6 +61,7 @@ #include #include #include +#include #include #include diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx index 13a697ad737e..a22667c3ca53 100644 --- a/extensions/source/propctrlr/selectlabeldialog.cxx +++ b/extensions/source/propctrlr/selectlabeldialog.cxx @@ -36,6 +36,7 @@ #include #include #include +#include namespace pcr { diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index 1b292bccb175..ede2708485cf 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -33,6 +33,7 @@ #include #include #include +#include namespace pcr { diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index eb89c94b4925..8ad80402b5b7 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index 99ece328c631..c23d0e76b8d5 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -20,6 +20,7 @@ #include #include #include +#include #include #include "funcpage.hxx" diff --git a/formula/source/ui/dlg/structpg.cxx b/formula/source/ui/dlg/structpg.cxx index 94ee07e513cb..dd8c928b43a4 100644 --- a/formula/source/ui/dlg/structpg.cxx +++ b/formula/source/ui/dlg/structpg.cxx @@ -18,6 +18,7 @@ */ #include +#include #include "structpg.hxx" #include diff --git a/fpicker/source/office/fileview.cxx b/fpicker/source/office/fileview.cxx index a7c24aeb1dcd..e3b49086f633 100644 --- a/fpicker/source/office/fileview.cxx +++ b/fpicker/source/office/fileview.cxx @@ -64,6 +64,7 @@ #include #include #include +#include #include #include "fileview.hxx" diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx index e35092fbf845..ef6c2d70a233 100644 --- a/fpicker/source/office/iodlgimp.hxx +++ b/fpicker/source/office/iodlgimp.hxx @@ -26,6 +26,7 @@ #include #include #include +#include #include #include diff --git a/include/vcl/weld/weld.hxx b/include/vcl/weld/weld.hxx index 538e6aa07976..79e8a5066e5d 100644 --- a/include/vcl/weld/weld.hxx +++ b/include/vcl/weld/weld.hxx @@ -31,16 +31,6 @@ class LOKTrigger; namespace weld { -inline OUString toId(const void* pValue) -{ - return OUString::number(reinterpret_cast(pValue)); -} - -template T fromId(const OUString& rValue) -{ - return reinterpret_cast(rValue.toUInt64()); -} - class VCL_DLLPUBLIC Button : virtual public Widget { friend class ::LOKTrigger; diff --git a/include/vcl/weld/weldutils.hxx b/include/vcl/weld/weldutils.hxx index 28b1d7fa6fc0..b0ffb15d628a 100644 --- a/include/vcl/weld/weldutils.hxx +++ b/include/vcl/weld/weldutils.hxx @@ -120,6 +120,16 @@ public: ReorderingDropTarget(weld::TreeView& rTreeView); }; +inline OUString toId(const void* pValue) +{ + return OUString::number(reinterpret_cast(pValue)); +} + +template T fromId(const OUString& rValue) +{ + return reinterpret_cast(rValue.toUInt64()); +} + // get the row the iterator is on VCL_DLLPUBLIC size_t GetAbsPos(const weld::TreeView& rTreeView, const weld::TreeIter& rIter); diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index 3e8194dc1200..1578c7ce2c60 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -25,6 +25,7 @@ #include #include #include +#include #include diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 216a0deea5dd..ea344b5eebc0 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sc/source/core/tool/orcusxml.cxx b/sc/source/core/tool/orcusxml.cxx index b10f92f6e48b..6b693adc6c70 100644 --- a/sc/source/core/tool/orcusxml.cxx +++ b/sc/source/core/tool/orcusxml.cxx @@ -11,7 +11,7 @@ #include #include -#include +#include ScOrcusXMLTreeParam::EntryData::EntryData(EntryType eType) : mnNamespaceID(0) diff --git a/sc/source/filter/orcus/xmlcontext.cxx b/sc/source/filter/orcus/xmlcontext.cxx index 916a94ab9bce..41ea9d61d8ca 100644 --- a/sc/source/filter/orcus/xmlcontext.cxx +++ b/sc/source/filter/orcus/xmlcontext.cxx @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include #include diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index 743676490c94..667cf2fd08df 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include diff --git a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx index fb8a3cc4fef2..1b1df1c3a9d6 100644 --- a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx +++ b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx @@ -16,6 +16,7 @@ #include #include #include +#include #include #include diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx index f25b06a56d81..a9cf83ac2f94 100644 --- a/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx +++ b/sc/source/ui/dbgui/PivotLayoutTreeListBase.cxx @@ -12,6 +12,8 @@ #include #include +#include + ScPivotLayoutTreeListBase::ScPivotLayoutTreeListBase(std::unique_ptr xControl, SvPivotTreeListType eType) : mxControl(std::move(xControl)) , maDropTargetHelper(*this) diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx index e085f9ade438..eb8d6bdfc2c4 100644 --- a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx +++ b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx @@ -16,6 +16,7 @@ #include #include +#include #include #include #include diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx index e4a2276dacee..b2ade1f5d2a8 100644 --- a/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx +++ b/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx @@ -13,9 +13,11 @@ #include #include -#include #include +#include +#include + ScPivotLayoutTreeListLabel::ScPivotLayoutTreeListLabel(std::unique_ptr xControl) : ScPivotLayoutTreeListBase(std::move(xControl), LABEL_LIST) , maDataItem(0) diff --git a/sc/source/ui/formdlg/dwfunctr.cxx b/sc/source/ui/formdlg/dwfunctr.cxx index 19532e942fba..6144f4eb00aa 100644 --- a/sc/source/ui/formdlg/dwfunctr.cxx +++ b/sc/source/ui/formdlg/dwfunctr.cxx @@ -27,6 +27,7 @@ #include #include #include +#include #include #include diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index 663899094ed7..35c988a12022 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -26,6 +26,7 @@ #include #include #include +#include #include #include diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 6e40c01066a9..979cdefd91cc 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -20,6 +20,7 @@ #include #include #include +#include #include #include diff --git a/sc/source/ui/miscdlgs/mvtabdlg.cxx b/sc/source/ui/miscdlgs/mvtabdlg.cxx index a84d26a25434..b100cc8fc6ae 100644 --- a/sc/source/ui/miscdlgs/mvtabdlg.cxx +++ b/sc/source/ui/miscdlgs/mvtabdlg.cxx @@ -29,6 +29,7 @@ #include #include +#include ScMoveTableDlg::ScMoveTableDlg(weld::Window* pParent, OUString aDefault) : GenericDialogController(pParent, u"modules/scalc/ui/movecopysheet.ui"_ustr, diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 620be14fcc67..6f6fab92dc43 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -30,6 +30,7 @@ #include #include #include +#include #include diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx index 2d304e7fa2d6..944f38342530 100644 --- a/sc/source/ui/view/cellsh1.cxx +++ b/sc/source/ui/view/cellsh1.cxx @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 9ab30d2d44e2..e159c15f1c47 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -75,6 +75,7 @@ #include #include +#include #include #include diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx b/sd/source/ui/animations/SlideTransitionPane.cxx index d5d933adebbf..d44e97c70531 100644 --- a/sd/source/ui/animations/SlideTransitionPane.cxx +++ b/sd/source/ui/animations/SlideTransitionPane.cxx @@ -43,7 +43,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 2591fcd25c40..8164bb233ce5 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -55,6 +55,7 @@ #include #include #include +#include #include #include diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index cf7b54e11724..26ab06664778 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 991a60ae7e86..585cbc42f1cf 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -85,7 +85,7 @@ #include #include #include -#include +#include #include #include diff --git a/sfx2/source/devtools/DocumentModelTreeHandler.cxx b/sfx2/source/devtools/DocumentModelTreeHandler.cxx index 520f6e98e58e..8c761f6ff90a 100644 --- a/sfx2/source/devtools/DocumentModelTreeHandler.cxx +++ b/sfx2/source/devtools/DocumentModelTreeHandler.cxx @@ -15,6 +15,7 @@ #include #include "DevToolsStrings.hrc" #include +#include #include #include diff --git a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx index 41c6e3a91009..fb92735ebe64 100644 --- a/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx +++ b/sfx2/source/devtools/ObjectInspectorTreeHandler.cxx @@ -56,6 +56,7 @@ #include #include #include +#include #include using namespace css; diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 71a79ce83388..22c20fa55c00 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -37,6 +37,7 @@ #include #include #include +#include #include #include diff --git a/sfx2/source/doc/autoredactdialog.cxx b/sfx2/source/doc/autoredactdialog.cxx index 44b578cf76dc..dc1509367bcf 100644 --- a/sfx2/source/doc/autoredactdialog.cxx +++ b/sfx2/source/doc/autoredactdialog.cxx @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index 024555fbebc4..e1db9ec45788 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -42,6 +42,7 @@ #include #include #include +#include #include #include diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 5c2a98fcfa1b..29f001aa05e6 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 23748c7b4e62..9996640bae21 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -24,6 +24,7 @@ #include #include #include +#include #include #include diff --git a/svx/source/dialog/cuicharmap.cxx b/svx/source/dialog/cuicharmap.cxx index 0f4c74bf0e04..ed2c5806eaed 100644 --- a/svx/source/dialog/cuicharmap.cxx +++ b/svx/source/dialog/cuicharmap.cxx @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 2645b94572ec..453929e06d50 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index ff8d861798b2..fa4ad8e20eb1 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -49,7 +49,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index f0ca7c470a96..868b08ffac78 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -52,6 +52,7 @@ #include #include #include +#include #include diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 140ae022b873..ffe51ddcc340 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -57,6 +57,7 @@ #include #include #include +#include namespace svxform { diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 473c0098f03a..c01910e0c9d9 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -43,6 +43,7 @@ #include #include #include +#include #include #include #include diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index e6996022f314..8bbb2010e16d 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -32,6 +32,7 @@ #include #include #include +#include #include #include diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 54dc61cd6809..52597d0b1ac4 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -53,6 +53,7 @@ #include #include #include +#include using namespace ::com::sun::star; diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index 1b73feba8211..03683681c79d 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -73,6 +73,7 @@ #include #include #include +#include #include diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index da2e6ba56bb4..db1399604c17 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 4750e1242edd..80397203bb7c 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx index 4c5d902bbe3d..e12ea0c21b7d 100644 --- a/sw/source/ui/frmdlg/frmpage.cxx +++ b/sw/source/ui/frmdlg/frmpage.cxx @@ -74,6 +74,7 @@ #include #include #include +#include #include #include #include diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx index df78b9e65900..00ed20126c12 100644 --- a/sw/source/ui/misc/bookmark.cxx +++ b/sw/source/ui/misc/bookmark.cxx @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 5a203c3a1fef..89b31f0039b1 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 0adf98ec6edd..8cd691750505 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index e7b03bdbda6e..2e43fe1b3b52 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include diff --git a/sw/source/uibase/utlui/glbltree.cxx b/sw/source/uibase/utlui/glbltree.cxx index 21de46153edc..caff4dee8be8 100644 --- a/sw/source/uibase/utlui/glbltree.cxx +++ b/sw/source/uibase/utlui/glbltree.cxx @@ -34,6 +34,7 @@ #include #include #include +#include #include #include diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index f495a3138127..e3501fea487e 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -30,6 +30,7 @@ #include #include #include +#include #include #include #include diff --git a/vcl/unx/generic/print/prtsetup.cxx b/vcl/unx/generic/print/prtsetup.cxx index 185e398787b6..f1f4c9426c2a 100644 --- a/vcl/unx/generic/print/prtsetup.cxx +++ b/vcl/unx/generic/print/prtsetup.cxx @@ -23,6 +23,7 @@ #include #include +#include using namespace psp; diff --git a/xmlsecurity/source/dialogs/certificatechooser.cxx b/xmlsecurity/source/dialogs/certificatechooser.cxx index 25f9ab2996e7..f2b90deaae21 100644 --- a/xmlsecurity/source/dialogs/certificatechooser.cxx +++ b/xmlsecurity/source/dialogs/certificatechooser.cxx @@ -32,6 +32,7 @@ #include #include #include +#include #include #include diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 5ceb01a9782f..c4a129430f44 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -42,6 +42,7 @@ #include #include #include +#include using namespace comphelper; using namespace ::com::sun::star;