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 <m.weghorn@posteo.de>
2026-06-04 14:37:13 +02:00
parent 7c6d496a71
commit 8b5a46a0e0
84 changed files with 98 additions and 33 deletions
@@ -36,6 +36,7 @@
 #include <vcl/event.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Window.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <svl/itemset.hxx>

 namespace basctl
@@ -39,6 +39,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Menu.hxx>
+#include <vcl/weld/weldutils.hxx>

 #include <initializer_list>
 #include <memory>
@@ -31,6 +31,7 @@
 #include <osl/diagnose.h>
 #include <tools/debug.hxx>
 #include <vcl/weld/WaitObject.hxx>
+#include <vcl/weld/weldutils.hxx>

 namespace basctl
 {
@@ -43,7 +43,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
-#include <vcl/weld/weld.hxx>
+#include <vcl/weld/weldutils.hxx>

 #include <com/sun/star/io/Pipe.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
@@ -45,7 +45,7 @@
 #include <vcl/transfer.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/MessageDialog.hxx>
-#include <vcl/weld/weld.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <tools/debug.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <xmlscript/xmldlg_imexp.hxx>
@@ -35,7 +35,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/MessageDialog.hxx>
-#include <vcl/weld/weld.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <vcl/settings.hxx>
 #include <tools/debug.hxx>

@@ -36,6 +36,7 @@
 #include <com/sun/star/chart2/data/XDataProvider.hpp>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/TreeView.hxx>
+#include <vcl/weld/weldutils.hxx>

 #include <comphelper/diagnose_ex.hxx>

@@ -56,6 +56,7 @@
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/Menu.hxx>
+#include <vcl/weld/weldutils.hxx>

 #include <sfx2/sidebar/ResourceManager.hxx>
 #include <sfx2/sidebar/Context.hxx>
@@ -44,6 +44,7 @@
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/Menu.hxx>
 #include <vcl/weld/WaitObject.hxx>
+#include <vcl/weld/weldutils.hxx>

 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
@@ -28,6 +28,7 @@
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/WaitObject.hxx>
+#include <vcl/weld/weldutils.hxx>

 // UNO-Stuff
 #include <comphelper/processfactory.hxx>
@@ -22,6 +22,7 @@
 #include <unotools/ucbhelper.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/WaitObject.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <osl/file.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/frame/XFrame.hpp>
@@ -26,7 +26,7 @@
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/Label.hxx>
-#include <vcl/weld/weld.hxx>
+#include <vcl/weld/weldutils.hxx>

 #include <strings.hrc>
 #include <bitmaps.hlst>
@@ -36,7 +36,7 @@
 #include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/TreeView.hxx>
-#include <vcl/weld/weld.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <svl/itemset.hxx>
 #include "doclinkdialog.hxx"
 #include <dialmgr.hxx>
@@ -38,6 +38,7 @@
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/WaitObject.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <utility>

 #include <dialmgr.hxx>
@@ -86,6 +86,7 @@
 #include <svtools/optionsdrawinglayer.hxx>
 #include <svtools/restartdialog.hxx>
 #include <vcl/unohelp2.hxx>
+#include <vcl/weld/weldutils.hxx>

 #if defined(_WIN32)
 #include <systools/win32/winstoreutil.hxx>
@@ -59,6 +59,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Frame.hxx>
 #include <vcl/weld/MessageDialog.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <sal/log.hxx>

 #include <svx/svxdlg.hxx>
@@ -27,6 +27,7 @@
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Label.hxx>
+#include <vcl/weld/weldutils.hxx>

 #include <bitmaps.hlst>
 #include <dialmgr.hxx>
@@ -47,6 +47,7 @@
 #include <officecfg/Office/Recovery.hxx>
 #include <unotools/confignode.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/weldutils.hxx>

 #include <sfx2/fcontnr.hxx>

@@ -109,6 +109,7 @@
 #include <vcl/weld/Dialog.hxx>
 #include <vcl/window.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <sal/log.hxx>

 using namespace ::com::sun::star;
@@ -30,6 +30,7 @@
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/MetricSpinButton.hxx>
 #include <vcl/weld/TreeView.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewsh.hxx>
@@ -38,6 +38,7 @@
 #include <osl/diagnose.h>
 #include <svl/grabbagitem.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/weldutils.hxx>

 #include <bitmaps.hlst>

@@ -30,6 +30,7 @@
 #include <com/sun/star/util/URL.hpp>
 #include <core_resource.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include "AppDetailPageHelper.hxx"
 #include <dbaccess/IController.hxx>
 #include <algorithm>
@@ -41,6 +41,7 @@
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/weldutils.hxx>

 #include <memory>

@@ -20,6 +20,7 @@
 #include <WColumnSelect.hxx>
 #include <strings.hrc>
 #include <osl/diagnose.h>
+#include <vcl/weld/weldutils.hxx>
 #include <WCopyTable.hxx>
 #include <core_resource.hxx>
 #include <com/sun/star/sdb/application/CopyTableOperation.hpp>
@@ -18,12 +18,15 @@
 */

 #include <WNameMatch.hxx>
-#include <osl/diagnose.h>
 #include <FieldDescriptions.hxx>
 #include <WCopyTable.hxx>
 #include <core_resource.hxx>
 #include <strings.hrc>
 #include <bitmaps.hlst>
+
+#include <osl/diagnose.h>
+#include <vcl/weld/weldutils.hxx>
+
 #include <com/sun/star/sdbc/DataType.hpp>

 using namespace ::dbaui;
@@ -31,6 +31,7 @@
 #include "TableFieldInfo.hxx"
 #include <comphelper/stl_types.hxx>
 #include <comphelper/types.hxx>
+#include <vcl/weld/weldutils.hxx>

 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::uno;
@@ -61,6 +61,7 @@
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Dialog.hxx>
+#include <vcl/weld/weldutils.hxx>

 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertyvalue.hxx>
@@ -36,6 +36,7 @@
 #include <sal/log.hxx>
 #include <tools/debug.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/weldutils.hxx>

 namespace pcr
 {
@@ -33,6 +33,7 @@
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Dialog.hxx>
+#include <vcl/weld/weldutils.hxx>

 namespace pcr
 {
@@ -37,7 +37,7 @@
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/MessageDialog.hxx>
-#include <vcl/weld/weld.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <tools/stream.hxx>

@@ -20,6 +20,7 @@
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <formula/IFunctionDescription.hxx>

 #include "funcpage.hxx"
@@ -18,6 +18,7 @@
 */

 #include <vcl/svapp.hxx>
+#include <vcl/weld/weldutils.hxx>

 #include "structpg.hxx"
 #include <formula/formula.hxx>
@@ -64,6 +64,7 @@
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Menu.hxx>
 #include <vcl/weld/WaitObject.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <memory>
 #include "fileview.hxx"

@@ -26,6 +26,7 @@
 #include <vcl/weld/Label.hxx>
 #include <vcl/weld/Menu.hxx>
 #include <vcl/weld/Toolbar.hxx>
+#include <vcl/weld/weldutils.hxx>

 #include <deque>
 #include <memory>
@@ -31,16 +31,6 @@ class LOKTrigger;

 namespace weld
 {
-inline OUString toId(const void* pValue)
-{
-    return OUString::number(reinterpret_cast<sal_uIntPtr>(pValue));
-}
-
-template <typename T> T fromId(const OUString& rValue)
-{
-    return reinterpret_cast<T>(rValue.toUInt64());
-}
-
 class VCL_DLLPUBLIC Button : virtual public Widget
 {
    friend class ::LOKTrigger;
@@ -120,6 +120,16 @@ public:
    ReorderingDropTarget(weld::TreeView& rTreeView);
 };

+inline OUString toId(const void* pValue)
+{
+    return OUString::number(reinterpret_cast<sal_uIntPtr>(pValue));
+}
+
+template <typename T> T fromId(const OUString& rValue)
+{
+    return reinterpret_cast<T>(rValue.toUInt64());
+}
+
 // get the row the iterator is on
 VCL_DLLPUBLIC size_t GetAbsPos(const weld::TreeView& rTreeView, const weld::TreeIter& rIter);

@@ -25,6 +25,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Dialog.hxx>
+#include <vcl/weld/weldutils.hxx>

 #include <comphelper/diagnose_ex.hxx>

@@ -43,7 +43,7 @@
 #include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/Menu.hxx>
 #include <vcl/weld/TreeView.hxx>
-#include <vcl/weld/weld.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <vcl/commandevent.hxx>
 #include <ReportVisitor.hxx>
 #include <core_resource.hxx>
@@ -11,7 +11,7 @@

 #include <utility>
 #include <vcl/weld/TreeView.hxx>
-#include <vcl/weld/weld.hxx>
+#include <vcl/weld/weldutils.hxx>

 ScOrcusXMLTreeParam::EntryData::EntryData(EntryType eType)
    : mnNamespaceID(0)
@@ -16,7 +16,7 @@

 #include <utility>
 #include <vcl/weld/TreeView.hxx>
-#include <vcl/weld/weld.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <ucbhelper/content.hxx>
 #include <sal/log.hxx>
 #include <osl/file.hxx>
@@ -31,6 +31,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/weld/Menu.hxx>
 #include <vcl/weld/Popover.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <rtl/math.hxx>
 #include <unotools/charclass.hxx>
 #include <comphelper/lok.hxx>
@@ -16,6 +16,7 @@
 #include <vcl/event.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/MessageDialog.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <pivot.hxx>

 #include <globstr.hrc>
@@ -12,6 +12,8 @@
 #include <PivotLayoutTreeListBase.hxx>
 #include <PivotLayoutDialog.hxx>

+#include <vcl/weld/weldutils.hxx>
+
 ScPivotLayoutTreeListBase::ScPivotLayoutTreeListBase(std::unique_ptr<weld::TreeView> xControl, SvPivotTreeListType eType)
    : mxControl(std::move(xControl))
    , maDropTargetHelper(*this)
@@ -16,6 +16,7 @@
 #include <PivotLayoutDialog.hxx>

 #include <vcl/event.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <pivot.hxx>
 #include <globstr.hrc>
 #include <scresid.hxx>
@@ -13,9 +13,11 @@
 #include <PivotLayoutTreeListLabel.hxx>
 #include <PivotLayoutDialog.hxx>

-#include <vcl/event.hxx>
 #include <pivot.hxx>

+#include <vcl/event.hxx>
+#include <vcl/weld/weldutils.hxx>
+
 ScPivotLayoutTreeListLabel::ScPivotLayoutTreeListLabel(std::unique_ptr<weld::TreeView> xControl)
    : ScPivotLayoutTreeListBase(std::move(xControl), LABEL_LIST)
    , maDataItem(0)
@@ -27,6 +27,7 @@
 #include <unotools/textsearch.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/help.hxx>
+#include <vcl/weld/weldutils.hxx>

 #include <global.hxx>
 #include <scmod.hxx>
@@ -26,6 +26,7 @@
 #include <vcl/commandevent.hxx>
 #include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/Menu.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <o3tl/string_view.hxx>

 #include <acredlin.hxx>
@@ -20,6 +20,7 @@
 #include <comphelper/string.hxx>
 #include <osl/diagnose.h>
 #include <vcl/weld/Dialog.hxx>
+#include <vcl/weld/weldutils.hxx>

 #include <conflictsdlg.hxx>
 #include <o3tl/safeint.hxx>
@@ -29,6 +29,7 @@
 #include <tabvwsh.hxx>

 #include <vcl/weld/Dialog.hxx>
+#include <vcl/weld/weldutils.hxx>

 ScMoveTableDlg::ScMoveTableDlg(weld::Window* pParent, OUString aDefault)
    : GenericDialogController(pParent, u"modules/scalc/ui/movecopysheet.ui"_ustr,
@@ -30,6 +30,7 @@
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Dialog.hxx>
+#include <vcl/weld/weldutils.hxx>

 #include <algorithm>

@@ -45,7 +45,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/WaitObject.hxx>
-#include <vcl/weld/weld.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <svx/svxdlg.hxx>
 #include <svx/chinese_translation_unodialog.hxx>
 #include <sot/formats.hxx>
@@ -75,6 +75,7 @@

 #include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
+#include <vcl/weld/weldutils.hxx>

 #include <algorithm>
 #include <memory>
@@ -43,7 +43,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/MessageDialog.hxx>
-#include <vcl/weld/weld.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <tools/urlobj.hxx>
 #include <slideshow.hxx>
 #include <sdundogr.hxx>
@@ -55,6 +55,7 @@
 #include <vcl/weld/ComboBox.hxx>
 #include <vcl/weld/Menu.hxx>
 #include <vcl/weld/Toolbar.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <comphelper/lok.hxx>

 #include <sdpage.hxx>
@@ -22,7 +22,7 @@
 #include <sot/formats.hxx>
 #include <utility>
 #include <vcl/weld/MessageDialog.hxx>
-#include <vcl/weld/weld.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <svx/svditer.hxx>
 #include <sfx2/docfile.hxx>
 #include <svx/svdoole2.hxx>
@@ -85,7 +85,7 @@
 #include <vcl/weld/Menu.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/WaitObject.hxx>
-#include <vcl/weld/weld.hxx>
+#include <vcl/weld/weldutils.hxx>

 #include <ucbhelper/content.hxx>
 #include <unotools/ucbhelper.hxx>
@@ -15,6 +15,7 @@
 #include <sfx2/sfxresid.hxx>
 #include "DevToolsStrings.hrc"
 #include <vcl/weld/TreeView.hxx>
+#include <vcl/weld/weldutils.hxx>

 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XNamed.hpp>
@@ -56,6 +56,7 @@
 #include <vcl/weld/TextView.hxx>
 #include <vcl/weld/Toolbar.hxx>
 #include <vcl/weld/TreeView.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <i18nlangtag/languagetag.hxx>

 using namespace css;
@@ -37,6 +37,7 @@
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Dialog.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <tools/datetime.hxx>

 #include <versdlg.hxx>
@@ -21,7 +21,7 @@
 #include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/WaitObject.hxx>
-#include <vcl/weld/weld.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <unotools/viewoptions.hxx>
 #include <o3tl/string_view.hxx>

@@ -42,6 +42,7 @@
 #include <vcl/uitest/logger.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/weld/Menu.hxx>
+#include <vcl/weld/weldutils.hxx>

 #include <span>
 #include <unordered_map>
@@ -31,7 +31,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/WaitObject.hxx>
-#include <vcl/weld/weld.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <svtools/ctrltool.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/wall.hxx>
@@ -24,6 +24,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/weld/TimeFormatter.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <svtools/ctrlbox.hxx>
 #include <unotools/textsearch.hxx>

@@ -31,6 +31,7 @@
 #include <vcl/fontcharmap.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <svl/stritem.hxx>
 #include <o3tl/string_view.hxx>
 #include <o3tl/temporary.hxx>
@@ -31,7 +31,7 @@
 #include <utility>
 #include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
-#include <vcl/weld/weld.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <vcl/svapp.hxx>

 #include <com/sun/star/util/URL.hpp>
@@ -49,7 +49,7 @@
 #include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/Menu.hxx>
 #include <vcl/weld/MessageDialog.hxx>
-#include <vcl/weld/weld.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/container/XSet.hpp>
 #include <com/sun/star/frame/XController.hpp>
@@ -52,6 +52,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Menu.hxx>
+#include <vcl/weld/weldutils.hxx>

 #include <bitmaps.hlst>

@@ -57,6 +57,7 @@
 #include <vcl/commandevent.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Menu.hxx>
+#include <vcl/weld/weldutils.hxx>

 namespace svxform
 {
@@ -43,6 +43,7 @@
 #include <svx/dataaccessdescriptor.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Dialog.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <tabwin.hrc>
 #include <utility>
@@ -32,6 +32,7 @@
 #include <unotools/linguprops.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <utility>
 #include <osl/diagnose.h>

@@ -53,6 +53,7 @@
 #include <svl/cjkoptions.hxx>
 #include <svl/eitem.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/weldutils.hxx>

 using namespace ::com::sun::star;

@@ -73,6 +73,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Dialog.hxx>
+#include <vcl/weld/weldutils.hxx>

 #include <optload.hxx>

@@ -33,6 +33,7 @@
 #include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/WaitObject.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <tools/urlobj.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/types.hxx>
@@ -25,7 +25,7 @@
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
-#include <vcl/weld/weld.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <svl/stritem.hxx>
 #include <svl/eitem.hxx>
 #include <sfx2/passwd.hxx>
@@ -74,6 +74,7 @@
 #include <vcl/graphicfilter.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <svtools/embedhlp.hxx>
 #include <comphelper/lok.hxx>
 #include <memory>
@@ -24,7 +24,7 @@
 #include <unotools/viewoptions.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Dialog.hxx>
-#include <vcl/weld/weld.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <vcl/windowstate.hxx>
 #include <o3tl/string_view.hxx>
 #include <com/sun/star/frame/XModel.hpp>
@@ -22,7 +22,7 @@
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/MessageDialog.hxx>
-#include <vcl/weld/weld.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/pathoptions.hxx>
@@ -27,7 +27,7 @@
 #include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/MessageDialog.hxx>
 #include <vcl/weld/WaitObject.hxx>
-#include <vcl/weld/weld.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <svl/stritem.hxx>
 #include <svl/macitem.hxx>
 #include <unotools/pathoptions.hxx>
@@ -29,6 +29,7 @@
 #include <vcl/commandevent.hxx>
 #include <vcl/weld/Dialog.hxx>
 #include <vcl/weld/Menu.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <swtypes.hxx>
 #include <wrtsh.hxx>
 #include <view.hxx>
@@ -34,6 +34,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Menu.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <osl/diagnose.h>

 #include <sfx2/docinsert.hxx>
@@ -30,6 +30,7 @@
 #include <osl/diagnose.h>
 #include <vcl/weld/Builder.hxx>
 #include <vcl/weld/Menu.hxx>
+#include <vcl/weld/weldutils.hxx>
 #include <swtypes.hxx>
 #include <swmodule.hxx>
 #include <view.hxx>
@@ -23,6 +23,7 @@

 #include <officecfg/Office/Common.hxx>
 #include <vcl/weld/Dialog.hxx>
+#include <vcl/weld/weldutils.hxx>

 using namespace psp;

@@ -32,6 +32,7 @@
 #include <svl/cryptosign.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Dialog.hxx>
+#include <vcl/weld/weldutils.hxx>

 #include <com/sun/star/security/NoPasswordException.hpp>
 #include <com/sun/star/security/CertificateCharacters.hpp>
@@ -42,6 +42,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/weld/Dialog.hxx>
+#include <vcl/weld/weldutils.hxx>

 using namespace comphelper;
 using namespace ::com::sun::star;