chart2/inc/pch/precompiled_chart2.hxx | 2 - chart2/source/inc/ChartColorPalettes.hxx | 2 - cui/inc/pch/precompiled_cui.hxx | 2 - cui/source/dialogs/screenshotannotationdlg.cxx | 2 - cui/source/inc/SpellDialog.hxx | 2 - cui/source/inc/connect.hxx | 2 - cui/source/inc/cuitabline.hxx | 2 - cui/source/inc/grfpage.hxx | 2 - cui/source/inc/hangulhanjadlg.hxx | 2 - cui/source/inc/numfmt.hxx | 2 - cui/source/inc/numpages.hxx | 2 - cui/source/inc/tabstpge.hxx | 2 - cui/source/inc/whatsnewtabpage.hxx | 2 - cui/source/options/optchart.hxx | 2 - dbaccess/source/ui/app/AppDetailPageHelper.hxx | 2 - desktop/source/deployment/gui/dp_gui_dialog2.hxx | 2 - desktop/source/deployment/gui/dp_gui_extlistbox.hxx | 2 - extensions/source/scanner/grid.cxx | 2 - extensions/source/scanner/grid.hxx | 2 - extensions/source/scanner/sanedlg.cxx | 2 - extensions/source/scanner/sanedlg.hxx | 2 - include/sfx2/charmapcontainer.hxx | 2 - include/sfx2/charwin.hxx | 2 - include/sfx2/thumbnailview.hxx | 2 - include/svtools/valueset.hxx | 2 - include/svx/charmap.hxx | 2 - include/svx/connctrl.hxx | 2 - include/svx/cuicharmap.hxx | 2 - include/svx/dialcontrol.hxx | 2 - include/svx/dlgctl3d.hxx | 2 - include/svx/dlgctrl.hxx | 2 - include/svx/dlgutil.hxx | 2 - include/svx/fntctrl.hxx | 2 - include/svx/frmsel.hxx | 2 - include/svx/galctrl.hxx | 2 - include/svx/graphctl.hxx | 2 - include/svx/itemwin.hxx | 2 - include/svx/measctrl.hxx | 3 + include/svx/numberingpreview.hxx | 2 - include/svx/pagectrl.hxx | 2 - include/svx/paraprev.hxx | 2 - include/svx/rubydialog.hxx | 2 - include/svx/sidebar/LineWidthPopup.hxx | 2 - include/svx/swframeexample.hxx | 2 - include/svx/weldeditview.hxx | 2 - reportdesign/source/ui/dlg/Condition.hxx | 2 - sc/inc/pch/precompiled_sc.hxx | 2 - sc/source/ui/inc/AccessibleEditObject.hxx | 2 - sc/source/ui/inc/autofmt.hxx | 2 - sc/source/ui/inc/csvcontrol.hxx | 2 - sc/source/ui/inc/inputwin.hxx | 2 - sc/source/ui/inc/scuiautofmt.hxx | 2 - sc/source/ui/inc/scuitphfedit.hxx | 2 - sc/source/ui/inc/tbzoomsliderctrl.hxx | 2 - sd/inc/pch/precompiled_sd.hxx | 2 - sd/inc/pch/precompiled_sdui.hxx | 2 - sd/source/ui/dlg/headerfooterdlg.cxx | 2 - sd/source/ui/inc/animobjs.hxx | 2 - sfx2/inc/pch/precompiled_sfx.hxx | 2 - sfx2/inc/sidebar/DeckTitleBar.hxx | 2 - sfx2/source/inc/preview.hxx | 2 - sfx2/source/sidebar/DeckTitleBar.cxx | 2 - starmath/inc/ElementsDockingWindow.hxx | 2 - starmath/inc/dialog.hxx | 2 - starmath/source/SmElementsPanel.hxx | 2 - svtools/source/control/ctrlbox.cxx | 2 - svx/inc/pch/precompiled_svx.hxx | 2 - svx/inc/pch/precompiled_svxcore.hxx | 2 - svx/source/dialog/ClassificationDialog.cxx | 2 - svx/source/inc/galbrws1.hxx | 2 - svx/source/sidebar/possize/PosSizePropertyPanel.hxx | 2 - svx/source/tbxctrls/extrusioncontrols.hxx | 2 - svx/source/tbxctrls/layctrl.cxx | 2 - svx/source/tbxctrls/tbcontrl.cxx | 2 - sw/inc/AnnotationWin.hxx | 2 - sw/inc/pch/precompiled_swui.hxx | 2 - sw/source/ui/envelp/labfmt.hxx | 2 - sw/source/uibase/inc/autoformatpreview.hxx | 2 - sw/source/uibase/inc/bmpwin.hxx | 2 - sw/source/uibase/inc/drpcps.hxx | 2 - sw/source/uibase/inc/envlop.hxx | 2 - sw/source/uibase/inc/glossary.hxx | 2 - sw/source/uibase/inc/mailmergehelper.hxx | 2 - sw/source/uibase/inc/numprevw.hxx | 2 - sw/source/uibase/inc/optload.hxx | 2 - sw/source/uibase/inc/pggrid.hxx | 2 - sw/source/uibase/inc/swuicnttab.hxx | 2 - sw/source/uibase/inc/unotools.hxx | 2 - vcl/Library_vcl.mk | 1 vcl/inc/colorpicker.hxx | 2 - vcl/inc/printdlg.hxx | 2 - vcl/source/app/customweld.cxx | 2 - vcl/source/weld/EntryTreeView.cxx | 37 ++++++++++++++++++++ vcl/source/window/builder.cxx | 25 ------------- 94 files changed, 130 insertions(+), 116 deletions(-)
New commits: commit ed77ec031b7c8a401b7d8661c5328f71d522798e Author: Michael Weghorn <[email protected]> AuthorDate: Thu Dec 18 09:14:46 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Dec 18 19:44:13 2025 +0100 weld: Move EntryTreeView impl to own source file Now that it got its own header file in commit 53f48e0f275f7749a33302621d3186824be627df Author: Michael Weghorn <[email protected]> Date: Wed Dec 17 10:11:07 2025 +0100 weld: Move weld::EntryTreeView to its own header , also move the implementation to an own .cxx for a bit more consistency in keeping code specific to the vcl/Salinstance* implementation and weld::Widget implementations separate. Change-Id: Ia0347684c6c5349fec7924f7684130c6e458decb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195828 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index 21edbbcb515e..a8365d08dad9 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -582,6 +582,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/uitest/uitest \ vcl/source/uitest/uno/uiobject_uno \ vcl/source/uitest/uno/uitest_uno \ + vcl/source/weld/EntryTreeView \ vcl/source/weld/IconView \ vcl/source/weld/ItemView \ vcl/source/weld/weldutils \ diff --git a/vcl/source/weld/EntryTreeView.cxx b/vcl/source/weld/EntryTreeView.cxx new file mode 100644 index 000000000000..282ec0fe4aeb --- /dev/null +++ b/vcl/source/weld/EntryTreeView.cxx @@ -0,0 +1,37 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#include <vcl/weld/EntryTreeView.hxx> + +namespace weld +{ +EntryTreeView::EntryTreeView(std::unique_ptr<Entry> xEntry, std::unique_ptr<TreeView> xTreeView) + : m_xEntry(std::move(xEntry)) + , m_xTreeView(std::move(xTreeView)) +{ + m_xTreeView->connect_selection_changed(LINK(this, EntryTreeView, ClickHdl)); + m_xEntry->connect_changed(LINK(this, EntryTreeView, ModifyHdl)); +} + +IMPL_LINK(EntryTreeView, ClickHdl, weld::TreeView&, rView, void) +{ + m_xEntry->set_text(rView.get_selected_text()); + m_aChangeHdl.Call(*this); +} + +IMPL_LINK_NOARG(EntryTreeView, ModifyHdl, weld::Entry&, void) { m_aChangeHdl.Call(*this); } + +void EntryTreeView::set_height_request_by_rows(int nRows) +{ + int nHeight = nRows == -1 ? -1 : m_xTreeView->get_height_rows(nRows); + m_xTreeView->set_size_request(m_xTreeView->get_size_request().Width(), nHeight); +} +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 19364668ae04..fb2f0ad95b5e 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -431,31 +431,6 @@ namespace weld return std::optional<int>(std::round(fResult)); } - EntryTreeView::EntryTreeView(std::unique_ptr<Entry> xEntry, std::unique_ptr<TreeView> xTreeView) - : m_xEntry(std::move(xEntry)) - , m_xTreeView(std::move(xTreeView)) - { - m_xTreeView->connect_selection_changed(LINK(this, EntryTreeView, ClickHdl)); - m_xEntry->connect_changed(LINK(this, EntryTreeView, ModifyHdl)); - } - - IMPL_LINK(EntryTreeView, ClickHdl, weld::TreeView&, rView, void) - { - m_xEntry->set_text(rView.get_selected_text()); - m_aChangeHdl.Call(*this); - } - - IMPL_LINK_NOARG(EntryTreeView, ModifyHdl, weld::Entry&, void) - { - m_aChangeHdl.Call(*this); - } - - void EntryTreeView::set_height_request_by_rows(int nRows) - { - int nHeight = nRows == -1 ? -1 : m_xTreeView->get_height_rows(nRows); - m_xTreeView->set_size_request(m_xTreeView->get_size_request().Width(), nHeight); - } - size_t GetAbsPos(const weld::TreeView& rTreeView, const weld::TreeIter& rIter) { size_t nAbsPos = 0; commit 7ba38cc79b989f778d6b1abfd270780245f53cdd Author: Michael Weghorn <[email protected]> AuthorDate: Thu Dec 18 09:11:44 2025 +0100 Commit: Michael Weghorn <[email protected]> CommitDate: Thu Dec 18 19:44:05 2025 +0100 weld: Move customweld.hxx to include/vcl/weld/ That's where the other weld-specific headers are since commit 5b16b3acc64bfd6bab7a86c7ddb5f0fdcad6b329 Author: Michael Weghorn <[email protected]> Date: Wed Dec 17 09:09:52 2025 +0100 weld: Move weld.hxx and weldutils.hxx to new include/vcl/weld subdir Change-Id: Ib15d985bcc291c59fb124591fd959f7e8f1e9093 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/195827 Tested-by: Jenkins Reviewed-by: Michael Weghorn <[email protected]> diff --git a/chart2/inc/pch/precompiled_chart2.hxx b/chart2/inc/pch/precompiled_chart2.hxx index e263a9d8d6d1..164b4096bf0d 100644 --- a/chart2/inc/pch/precompiled_chart2.hxx +++ b/chart2/inc/pch/precompiled_chart2.hxx @@ -116,7 +116,7 @@ #include <vcl/builderpage.hxx> #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/dllapi.h> #include <vcl/dockwin.hxx> #include <vcl/event.hxx> diff --git a/chart2/source/inc/ChartColorPalettes.hxx b/chart2/source/inc/ChartColorPalettes.hxx index 19e12ce2a780..486b40586dd7 100644 --- a/chart2/source/inc/ChartColorPalettes.hxx +++ b/chart2/source/inc/ChartColorPalettes.hxx @@ -12,7 +12,7 @@ #include <svx/ChartColorPaletteType.hxx> #include <rtl/ref.hxx> #include <tools/link.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/IconView.hxx> class MouseEvent; diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index 8ca2f99f2584..91a156d512b4 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -114,7 +114,7 @@ #include <vcl/builderpage.hxx> #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/dllapi.h> #include <vcl/dockwin.hxx> #include <vcl/event.hxx> diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx index 99ad8e5a7845..e07d8932b3c9 100644 --- a/cui/source/dialogs/screenshotannotationdlg.cxx +++ b/cui/source/dialogs/screenshotannotationdlg.cxx @@ -39,12 +39,12 @@ #include <tools/stream.hxx> #include <tools/urlobj.hxx> #include <vcl/bitmap.hxx> -#include <vcl/customweld.hxx> #include <vcl/event.hxx> #include <vcl/filter/PngImageWriter.hxx> #include <vcl/svapp.hxx> #include <vcl/salgtype.hxx> #include <vcl/virdev.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <svtools/optionsdrawinglayer.hxx> diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx index 2b7b1850cd60..f85ff3cedffe 100644 --- a/cui/source/inc/SpellDialog.hxx +++ b/cui/source/inc/SpellDialog.hxx @@ -26,10 +26,10 @@ #include <svx/langbox.hxx> #include <memory> #include <svl/undo.hxx> -#include <vcl/customweld.hxx> #include <svx/weldeditview.hxx> #include <editeng/SpellPortions.hxx> #include <vcl/weld/TreeView.hxx> +#include <vcl/weld/customweld.hxx> #include <set> diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx index d2e800b1a4a1..218f1666c0c7 100644 --- a/cui/source/inc/connect.hxx +++ b/cui/source/inc/connect.hxx @@ -20,7 +20,7 @@ #include <svx/connctrl.hxx> #include <sfx2/tabdlg.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <sfx2/basedlgs.hxx> diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx index 0118eff685c6..29fe07765cd3 100644 --- a/cui/source/inc/cuitabline.hxx +++ b/cui/source/inc/cuitabline.hxx @@ -28,7 +28,7 @@ #include <svx/xlnasit.hxx> #include <svx/xtable.hxx> #include <svx/dlgctrl.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> enum class PageType; class ColorListBox; diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx index 673062b7593a..12d44bc268a0 100644 --- a/cui/source/inc/grfpage.hxx +++ b/cui/source/inc/grfpage.hxx @@ -19,8 +19,8 @@ #pragma once -#include <vcl/customweld.hxx> #include <vcl/graph.hxx> +#include <vcl/weld/customweld.hxx> #include <sfx2/tabdlg.hxx> class SvxCropExample : public weld::CustomWidgetController diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx index 7f89c8ed5978..f4c0e77d99d8 100644 --- a/cui/source/inc/hangulhanjadlg.hxx +++ b/cui/source/inc/hangulhanjadlg.hxx @@ -18,9 +18,9 @@ */ #pragma once -#include <vcl/customweld.hxx> #include <vcl/event.hxx> #include <vcl/weld/TreeView.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <editeng/hangulhanja.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx index 47f7c1787de5..26c6f264e84c 100644 --- a/cui/source/inc/numfmt.hxx +++ b/cui/source/inc/numfmt.hxx @@ -23,8 +23,8 @@ #include <sfx2/tabdlg.hxx> #include <svx/langbox.hxx> #include <tools/color.hxx> -#include <vcl/customweld.hxx> #include <vcl/weld/TreeView.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> class SvxNumberFormatShell; diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx index 13ddd3f2451e..37de9822097e 100644 --- a/cui/source/inc/numpages.hxx +++ b/cui/source/inc/numpages.hxx @@ -26,8 +26,8 @@ #include <editeng/svxenum.hxx> #include <svtools/ctrlbox.hxx> #include <svx/numberingpreview.hxx> -#include <vcl/customweld.hxx> #include <vcl/weld/TreeView.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/timer.hxx> #include <svx/dlgutil.hxx> diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx index f7924a996e03..b9a556591a85 100644 --- a/cui/source/inc/tabstpge.hxx +++ b/cui/source/inc/tabstpge.hxx @@ -18,9 +18,9 @@ */ #pragma once -#include <vcl/customweld.hxx> #include <vcl/weld/EntryTreeView.hxx> #include <vcl/weld/TreeView.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <sfx2/tabdlg.hxx> diff --git a/cui/source/inc/whatsnewtabpage.hxx b/cui/source/inc/whatsnewtabpage.hxx index af17e7c1fb32..c77b2d61cb4d 100644 --- a/cui/source/inc/whatsnewtabpage.hxx +++ b/cui/source/inc/whatsnewtabpage.hxx @@ -9,9 +9,9 @@ #pragma once -#include <vcl/customweld.hxx> #include <sfx2/tabdlg.hxx> #include <vcl/graph.hxx> +#include <vcl/weld/customweld.hxx> class BrandGraphic : public weld::CustomWidgetController { diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx index cd3b75d5f68e..3f75b1e90831 100644 --- a/cui/source/options/optchart.hxx +++ b/cui/source/options/optchart.hxx @@ -23,8 +23,8 @@ #include <svtools/valueset.hxx> #include <svx/xtable.hxx> #include <svx/PaletteManager.hxx> -#include <vcl/customweld.hxx> #include <vcl/weld/TreeView.hxx> +#include <vcl/weld/customweld.hxx> #include "cfgchart.hxx" diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index f98f93f6a3f9..bb6d00bdde15 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -27,8 +27,8 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <vcl/graph.hxx> #include <vcl/GraphicObject.hxx> -#include <vcl/customweld.hxx> #include <vcl/weld/TreeView.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <AppElementType.hxx> #include <ChildWindow.hxx> diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 368a438d065a..e8161a70d17a 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -22,7 +22,7 @@ #include <vcl/timer.hxx> #include <vcl/idle.hxx> #include <vcl/locktoplevels.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <rtl/ustring.hxx> diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index 6eb63856dcd3..c88740263572 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -20,8 +20,8 @@ #pragma once #include <rtl/ustring.hxx> -#include <vcl/customweld.hxx> #include <vcl/image.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <cppuhelper/implbase.hxx> diff --git a/extensions/source/scanner/grid.cxx b/extensions/source/scanner/grid.cxx index 7cf2672f685b..0c66a498a145 100644 --- a/extensions/source/scanner/grid.cxx +++ b/extensions/source/scanner/grid.cxx @@ -27,10 +27,10 @@ #include "grid.hxx" #include <vcl/bitmap.hxx> -#include <vcl/customweld.hxx> #include <vcl/event.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld/customweld.hxx> #include <algorithm> #include <limits> diff --git a/extensions/source/scanner/grid.hxx b/extensions/source/scanner/grid.hxx index ab6f5038ad05..98ae8ba4c9f4 100644 --- a/extensions/source/scanner/grid.hxx +++ b/extensions/source/scanner/grid.hxx @@ -18,8 +18,8 @@ */ #pragma once -#include <vcl/customweld.hxx> #include <vcl/weld/weld.hxx> +#include <vcl/weld/customweld.hxx> class GridWindow; diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index 82a959d8c80f..b331b3304d5e 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -22,9 +22,9 @@ #include <tools/config.hxx> #include <unotools/resmgr.hxx> #include <vcl/bitmap.hxx> -#include <vcl/customweld.hxx> #include <vcl/dibtools.hxx> #include <vcl/lineinfo.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <vcl/svapp.hxx> #include <vcl/event.hxx> diff --git a/extensions/source/scanner/sanedlg.hxx b/extensions/source/scanner/sanedlg.hxx index 49baf6462c63..8ed4ef9dd4cc 100644 --- a/extensions/source/scanner/sanedlg.hxx +++ b/extensions/source/scanner/sanedlg.hxx @@ -18,8 +18,8 @@ */ #pragma once -#include <vcl/customweld.hxx> #include <vcl/weld/TreeView.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include "sane.hxx" diff --git a/include/sfx2/charmapcontainer.hxx b/include/sfx2/charmapcontainer.hxx index b6a179e8d74f..0034d1dfe088 100644 --- a/include/sfx2/charmapcontainer.hxx +++ b/include/sfx2/charmapcontainer.hxx @@ -21,8 +21,8 @@ #include <sfx2/charwin.hxx> #include <sfx2/dllapi.h> -#include <vcl/customweld.hxx> #include <vcl/virdev.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <deque> diff --git a/include/sfx2/charwin.hxx b/include/sfx2/charwin.hxx index 564402f565fe..d5bbc70a9f5f 100644 --- a/include/sfx2/charwin.hxx +++ b/include/sfx2/charwin.hxx @@ -20,8 +20,8 @@ #pragma once #include <sfx2/dllapi.h> -#include <vcl/customweld.hxx> #include <vcl/virdev.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> class SAL_DLLPUBLIC_RTTI SvxCharView final : public weld::CustomWidgetController diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx index 6cdfb5f4d32b..fcca2416359a 100644 --- a/include/sfx2/thumbnailview.hxx +++ b/include/sfx2/thumbnailview.hxx @@ -16,8 +16,8 @@ #include <memory> #include <vector> -#include <vcl/customweld.hxx> #include <vcl/settings.hxx> +#include <vcl/weld/customweld.hxx> class Bitmap; class ThumbnailViewItem; diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 3852200ea8c2..71c1a494ff96 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -21,8 +21,8 @@ #include <svtools/svtdllapi.h> #include <vcl/wintypes.hxx> -#include <vcl/customweld.hxx> #include <vcl/image.hxx> +#include <vcl/weld/customweld.hxx> #include <rtl/ref.hxx> #include <memory> #include <vector> diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index 412a618c30d8..c09c0637deb2 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -32,7 +32,7 @@ #include <tools/link.hxx> #include <vcl/metric.hxx> #include <vcl/vclptr.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> namespace com::sun::star { diff --git a/include/svx/connctrl.hxx b/include/svx/connctrl.hxx index d4eca1e6feee..bdee6f160880 100644 --- a/include/svx/connctrl.hxx +++ b/include/svx/connctrl.hxx @@ -21,8 +21,8 @@ #include <sal/types.h> #include <svx/svxdllapi.h> -#include <vcl/customweld.hxx> #include <vcl/outdev.hxx> +#include <vcl/weld/customweld.hxx> class SfxItemSet; class SdrEdgeObj; diff --git a/include/svx/cuicharmap.hxx b/include/svx/cuicharmap.hxx index 38b46900dc78..6d8492da7118 100644 --- a/include/svx/cuicharmap.hxx +++ b/include/svx/cuicharmap.hxx @@ -18,7 +18,7 @@ */ #pragma once -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <vcl/virdev.hxx> #include <sfx2/basedlgs.hxx> diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx index 42ed35598405..3eef892613a0 100644 --- a/include/svx/dialcontrol.hxx +++ b/include/svx/dialcontrol.hxx @@ -21,8 +21,8 @@ #define INCLUDED_SVX_DIALCONTROL_HXX #include <memory> -#include <vcl/customweld.hxx> #include <vcl/virdev.hxx> +#include <vcl/weld/customweld.hxx> #include <svx/svxdllapi.h> namespace svx { diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx index 7c8e043bd6a5..51c3c352c8e2 100644 --- a/include/svx/dlgctl3d.hxx +++ b/include/svx/dlgctl3d.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SVX_DLGCTL3D_HXX #define INCLUDED_SVX_DLGCTL3D_HXX -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <svl/itemset.hxx> #include <svx/svxdllapi.h> diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 420a17d7c917..cf513131eae8 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -22,7 +22,7 @@ #include <sfx2/tabdlg.hxx> #include <svx/svxdllapi.h> #include <svx/rectenum.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <vcl/virdev.hxx> #include <svx/xtable.hxx> diff --git a/include/svx/dlgutil.hxx b/include/svx/dlgutil.hxx index 70c8efd54c24..e87b0cdf5cdb 100644 --- a/include/svx/dlgutil.hxx +++ b/include/svx/dlgutil.hxx @@ -23,7 +23,7 @@ #include <tools/fldunit.hxx> #include <svx/svxdllapi.h> #include <vcl/rendercontext/DrawModeFlags.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> class SfxItemSet; diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx index b6869648762c..9962b96a785e 100644 --- a/include/svx/fntctrl.hxx +++ b/include/svx/fntctrl.hxx @@ -23,7 +23,7 @@ #include <editeng/svxfont.hxx> #include <rtl/ustring.hxx> #include <svx/svxdllapi.h> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> class SfxItemSet; class FontPrevWin_Impl; diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx index 95ceb25b4bb2..708453112228 100644 --- a/include/svx/frmsel.hxx +++ b/include/svx/frmsel.hxx @@ -21,11 +21,11 @@ #define INCLUDED_SVX_FRMSEL_HXX #include <memory> -#include <vcl/customweld.hxx> #include <editeng/borderline.hxx> #include <svx/framebordertype.hxx> #include <svx/svxdllapi.h> #include <o3tl/typed_flags_set.hxx> +#include <vcl/weld/customweld.hxx> class Color; diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx index 52c84d70e26d..fb973316dbf1 100644 --- a/include/svx/galctrl.hxx +++ b/include/svx/galctrl.hxx @@ -21,9 +21,9 @@ #define INCLUDED_SVX_GALCTRL_HXX #include <vcl/graph.hxx> -#include <vcl/customweld.hxx> #include <svtools/valueset.hxx> #include <vcl/GraphicObject.hxx> +#include <vcl/weld/customweld.hxx> #include <svx/svxdllapi.h> class GalleryDragDrop; diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx index 4a82c3f91b13..699be9b9563d 100644 --- a/include/svx/graphctl.hxx +++ b/include/svx/graphctl.hxx @@ -20,7 +20,7 @@ #define INCLUDED_SVX_GRAPHCTL_HXX #include <vcl/graph.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include <svx/svxdllapi.h> #include <svx/svdview.hxx> diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index 3c72ca4c9060..1eecbabf552d 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -22,7 +22,7 @@ #include <svtools/toolbarmenu.hxx> #include <svx/svxdllapi.h> #include <svx/xtable.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> class ValueSet; class SvxLineStyleToolBoxControl; diff --git a/include/svx/measctrl.hxx b/include/svx/measctrl.hxx index a6f25718596b..eb3c4953e4d5 100644 --- a/include/svx/measctrl.hxx +++ b/include/svx/measctrl.hxx @@ -19,9 +19,10 @@ #ifndef INCLUDED_SVX_MEASCTRL_HXX #define INCLUDED_SVX_MEASCTRL_HXX -#include <vcl/customweld.hxx> #include <svx/svxdllapi.h> #include <svx/svdobj.hxx> +#include <vcl/weld/customweld.hxx> + #include <memory> class SfxItemSet; diff --git a/include/svx/numberingpreview.hxx b/include/svx/numberingpreview.hxx index d5f66c571f2b..5bec89aa40aa 100644 --- a/include/svx/numberingpreview.hxx +++ b/include/svx/numberingpreview.hxx @@ -10,7 +10,7 @@ #include <svx/svxdllapi.h> #include <editeng/numitem.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> /// Provides the preview to show how looks bullet or numbering format before the apply. class SVXCORE_DLLPUBLIC SvxNumberingPreview final : public weld::CustomWidgetController diff --git a/include/svx/pagectrl.hxx b/include/svx/pagectrl.hxx index 07186afdd838..a82bec40d78c 100644 --- a/include/svx/pagectrl.hxx +++ b/include/svx/pagectrl.hxx @@ -19,9 +19,9 @@ #ifndef INCLUDED_SVX_PAGECTRL_HXX #define INCLUDED_SVX_PAGECTRL_HXX -#include <vcl/customweld.hxx> #include <svx/svxdllapi.h> #include <svx/sdr/attribute/sdrallfillattributeshelper.hxx> +#include <vcl/weld/customweld.hxx> enum class SvxPageUsage; enum class SvxFrameDirection; diff --git a/include/svx/paraprev.hxx b/include/svx/paraprev.hxx index bb6607318dc6..c571efe98432 100644 --- a/include/svx/paraprev.hxx +++ b/include/svx/paraprev.hxx @@ -19,9 +19,9 @@ #ifndef INCLUDED_SVX_PARAPREV_HXX #define INCLUDED_SVX_PARAPREV_HXX -#include <vcl/customweld.hxx> #include <editeng/svxenum.hxx> #include <svx/svxdllapi.h> +#include <vcl/weld/customweld.hxx> enum class SvxPrevLineSpace { diff --git a/include/svx/rubydialog.hxx b/include/svx/rubydialog.hxx index 9b996527a391..e8476992015a 100644 --- a/include/svx/rubydialog.hxx +++ b/include/svx/rubydialog.hxx @@ -23,9 +23,9 @@ #include <sfx2/childwin.hxx> #include <sfx2/basedlgs.hxx> -#include <vcl/customweld.hxx> #include <svx/svxdllapi.h> #include <rtl/ref.hxx> +#include <vcl/weld/customweld.hxx> class SvxRubyDialog; class RubyPreview final : public weld::CustomWidgetController diff --git a/include/svx/sidebar/LineWidthPopup.hxx b/include/svx/sidebar/LineWidthPopup.hxx index 500c86a89676..193b04acb96e 100644 --- a/include/svx/sidebar/LineWidthPopup.hxx +++ b/include/svx/sidebar/LineWidthPopup.hxx @@ -20,8 +20,8 @@ #define INCLUDED_SVX_SOURCE_SIDEBAR_LINE_LINEWIDTHPOPUP_HXX #include <tools/mapunit.hxx> -#include <vcl/customweld.hxx> #include <vcl/image.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <svtools/toolbarmenu.hxx> #include <array> diff --git a/include/svx/swframeexample.hxx b/include/svx/swframeexample.hxx index 1c3256d5c8fe..700bcbd3dad0 100644 --- a/include/svx/swframeexample.hxx +++ b/include/svx/swframeexample.hxx @@ -23,7 +23,7 @@ #include <tools/gen.hxx> #include <svx/svxdllapi.h> #include <svx/swframetypes.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include <com/sun/star/text/WrapTextMode.hpp> class SVX_DLLPUBLIC SwFrameExample final : public weld::CustomWidgetController diff --git a/include/svx/weldeditview.hxx b/include/svx/weldeditview.hxx index b54c4adeb632..0f6232e6f97e 100644 --- a/include/svx/weldeditview.hxx +++ b/include/svx/weldeditview.hxx @@ -14,8 +14,8 @@ #include <svx/svxdllapi.h> #include <editeng/editeng.hxx> #include <editeng/editview.hxx> -#include <vcl/customweld.hxx> #include <vcl/outdev.hxx> +#include <vcl/weld/customweld.hxx> class WeldEditAccessible; diff --git a/include/vcl/customweld.hxx b/include/vcl/weld/customweld.hxx similarity index 100% rename from include/vcl/customweld.hxx rename to include/vcl/weld/customweld.hxx diff --git a/reportdesign/source/ui/dlg/Condition.hxx b/reportdesign/source/ui/dlg/Condition.hxx index 7eeebd5ba7f4..fd064c8a874b 100644 --- a/reportdesign/source/ui/dlg/Condition.hxx +++ b/reportdesign/source/ui/dlg/Condition.hxx @@ -27,7 +27,7 @@ #include <svx/colorwindow.hxx> #include <svx/fntctrl.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <memory> diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index 679155b02c0c..c2ce76e8ea6c 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -127,7 +127,7 @@ #include <vcl/checksum.hxx> #include <vcl/commandevent.hxx> #include <vcl/ctrl.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/dllapi.h> #include <comphelper/errcode.hxx> #include <vcl/event.hxx> diff --git a/sc/source/ui/inc/AccessibleEditObject.hxx b/sc/source/ui/inc/AccessibleEditObject.hxx index 740fce1b5c20..d5577adbb991 100644 --- a/sc/source/ui/inc/AccessibleEditObject.hxx +++ b/sc/source/ui/inc/AccessibleEditObject.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <address.hxx> #include <vcl/vclptr.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include <memory> diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx index b0bc8b61bad7..b0ed51e01681 100644 --- a/sc/source/ui/inc/autofmt.hxx +++ b/sc/source/ui/inc/autofmt.hxx @@ -21,7 +21,7 @@ #include <svx/framelinkarray.hxx> #include <scdllapi.h> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> namespace com::sun::star::i18n { class XBreakIterator; } diff --git a/sc/source/ui/inc/csvcontrol.hxx b/sc/source/ui/inc/csvcontrol.hxx index fd9201812316..828380bd54f0 100644 --- a/sc/source/ui/inc/csvcontrol.hxx +++ b/sc/source/ui/inc/csvcontrol.hxx @@ -24,7 +24,7 @@ #include "csvsplits.hxx" #include <o3tl/typed_flags_set.hxx> #include <rtl/ref.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include "AccessibleCsvControl.hxx" /** Minimum character count for a column in separators mode. */ diff --git a/sc/source/ui/inc/inputwin.hxx b/sc/source/ui/inc/inputwin.hxx index 2a6a94211362..f542ca753adc 100644 --- a/sc/source/ui/inc/inputwin.hxx +++ b/sc/source/ui/inc/inputwin.hxx @@ -22,9 +22,9 @@ #include <set> #include <vector> #include <memory> -#include <vcl/customweld.hxx> #include <vcl/toolbox.hxx> #include <vcl/InterimItemWindow.hxx> +#include <vcl/weld/customweld.hxx> #include <sfx2/childwin.hxx> #include <svl/lstner.hxx> #include <svtools/stringtransfer.hxx> diff --git a/sc/source/ui/inc/scuiautofmt.hxx b/sc/source/ui/inc/scuiautofmt.hxx index a6c31d122f4e..4eb0fe6de912 100644 --- a/sc/source/ui/inc/scuiautofmt.hxx +++ b/sc/source/ui/inc/scuiautofmt.hxx @@ -18,8 +18,8 @@ */ #pragma once -#include <vcl/customweld.hxx> #include <vcl/weld/TreeView.hxx> +#include <vcl/weld/customweld.hxx> #include <autoform.hxx> #include "autofmt.hxx" diff --git a/sc/source/ui/inc/scuitphfedit.hxx b/sc/source/ui/inc/scuitphfedit.hxx index 3133daa216bb..badc108723ec 100644 --- a/sc/source/ui/inc/scuitphfedit.hxx +++ b/sc/source/ui/inc/scuitphfedit.hxx @@ -24,7 +24,7 @@ #include <attrib.hxx> #include <sfx2/tabdlg.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> enum ScHFEntryId diff --git a/sc/source/ui/inc/tbzoomsliderctrl.hxx b/sc/source/ui/inc/tbzoomsliderctrl.hxx index c1c6e53dc363..aa72239b8930 100644 --- a/sc/source/ui/inc/tbzoomsliderctrl.hxx +++ b/sc/source/ui/inc/tbzoomsliderctrl.hxx @@ -18,8 +18,8 @@ */ #pragma once -#include <vcl/customweld.hxx> #include <vcl/image.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/window.hxx> #include <svl/poolitem.hxx> #include <vcl/InterimItemWindow.hxx> diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index a46649b630f0..7c6296d10c23 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -91,7 +91,7 @@ #include <vcl/InterimItemWindow.hxx> #include <vcl/commandevent.hxx> #include <vcl/commandinfoprovider.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/dllapi.h> #include <vcl/errinf.hxx> #include <vcl/event.hxx> diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx index 7dda60458d25..d446a73ce99b 100644 --- a/sd/inc/pch/precompiled_sdui.hxx +++ b/sd/inc/pch/precompiled_sdui.hxx @@ -120,7 +120,7 @@ #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> #include <vcl/ctrl.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/dllapi.h> #include <vcl/dockwin.hxx> #include <vcl/event.hxx> diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 4ee751f37c24..4ef4faa0f3d6 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -38,9 +38,9 @@ #include <tools/color.hxx> #include <i18nlangtag/mslangid.hxx> #include <svtools/colorcfg.hxx> -#include <vcl/customweld.hxx> #include <vcl/decoview.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld/customweld.hxx> #include <undoheaderfooter.hxx> #include <sdundogr.hxx> diff --git a/sd/source/ui/inc/animobjs.hxx b/sd/source/ui/inc/animobjs.hxx index 3027757a49a9..9fc6c9bcaf99 100644 --- a/sd/source/ui/inc/animobjs.hxx +++ b/sd/source/ui/inc/animobjs.hxx @@ -25,7 +25,7 @@ #include <sfx2/progress.hxx> #include <misc/scopelock.hxx> #include <vcl/bitmap.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <vcl/weld/weldutils.hxx> diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx index 0ac58623f34a..13cb59a6114a 100644 --- a/sfx2/inc/pch/precompiled_sfx.hxx +++ b/sfx2/inc/pch/precompiled_sfx.hxx @@ -97,7 +97,7 @@ #include <vcl/builder.hxx> #include <vcl/commandevent.hxx> #include <vcl/commandinfoprovider.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/dibtools.hxx> #include <vcl/dllapi.h> #include <comphelper/errcode.hxx> diff --git a/sfx2/inc/sidebar/DeckTitleBar.hxx b/sfx2/inc/sidebar/DeckTitleBar.hxx index afcb7f2698f5..0ad16e0dcde2 100644 --- a/sfx2/inc/sidebar/DeckTitleBar.hxx +++ b/sfx2/inc/sidebar/DeckTitleBar.hxx @@ -19,7 +19,7 @@ #pragma once #include <sidebar/TitleBar.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> namespace sfx2::sidebar { diff --git a/sfx2/source/inc/preview.hxx b/sfx2/source/inc/preview.hxx index b1a5621ab8e3..f01709c1b3f0 100644 --- a/sfx2/source/inc/preview.hxx +++ b/sfx2/source/inc/preview.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SFX2_SOURCE_INC_PREVIEW_HXX #define INCLUDED_SFX2_SOURCE_INC_PREVIEW_HXX -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> class SfxObjectShell; class GDIMetaFile; diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx index 31b7c30590f4..3e0efe965811 100644 --- a/sfx2/source/sidebar/DeckTitleBar.cxx +++ b/sfx2/source/sidebar/DeckTitleBar.cxx @@ -22,9 +22,9 @@ #include <utility> #include <vcl/bitmap.hxx> -#include <vcl/customweld.hxx> #include <vcl/outdev.hxx> #include <vcl/ptrstyle.hxx> +#include <vcl/weld/customweld.hxx> #if OSL_DEBUG_LEVEL >= 2 #include <sidebar/Tools.hxx> diff --git a/starmath/inc/ElementsDockingWindow.hxx b/starmath/inc/ElementsDockingWindow.hxx index 63d2084952e2..1c6afdea0afd 100644 --- a/starmath/inc/ElementsDockingWindow.hxx +++ b/starmath/inc/ElementsDockingWindow.hxx @@ -20,8 +20,8 @@ #pragma once #include <sfx2/dockwin.hxx> -#include <vcl/customweld.hxx> #include <vcl/weld/IconView.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <unotools/resmgr.hxx> diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index eceff3619998..c4570bffa143 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -21,8 +21,8 @@ #include <sfx2/tabdlg.hxx> #include <vcl/outdev.hxx> -#include <vcl/customweld.hxx> #include <vcl/weld/EntryTreeView.hxx> +#include <vcl/weld/customweld.hxx> #include "symbol.hxx" class SubsetMap; diff --git a/starmath/source/SmElementsPanel.hxx b/starmath/source/SmElementsPanel.hxx index d77518630505..f8d65a635464 100644 --- a/starmath/source/SmElementsPanel.hxx +++ b/starmath/source/SmElementsPanel.hxx @@ -24,8 +24,8 @@ #include <svl/lstner.hxx> #include <sfx2/bindings.hxx> #include <sfx2/sidebar/PanelLayout.hxx> -#include <vcl/customweld.hxx> #include <vcl/EnumContext.hxx> +#include <vcl/weld/customweld.hxx> #include <ElementsDockingWindow.hxx> diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 390560d38459..bc5dad9c78e6 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -26,13 +26,13 @@ #include <o3tl/untaint.hxx> #include <officecfg/Office/Common.hxx> #include <tools/stream.hxx> -#include <vcl/customweld.hxx> #include <vcl/event.hxx> #include <vcl/svapp.hxx> #include <vcl/fieldvalues.hxx> #include <vcl/settings.hxx> #include <vcl/image.hxx> #include <vcl/virdev.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weldutils.hxx> #include <rtl/math.hxx> #include <sal/macros.h> diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 12827b8cfdf0..ac7876b6388f 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -84,7 +84,7 @@ #include <vcl/canvastools.hxx> #include <vcl/commandevent.hxx> #include <vcl/commandinfoprovider.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/dllapi.h> #include <vcl/errinf.hxx> #include <vcl/event.hxx> diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index 9e9dca98e5a2..5405fd23e4a4 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.hxx @@ -116,7 +116,7 @@ #include <vcl/checksum.hxx> #include <vcl/commandevent.hxx> #include <vcl/ctrl.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/dllapi.h> #include <vcl/dockwin.hxx> #include <comphelper/errcode.hxx> diff --git a/svx/source/dialog/ClassificationDialog.cxx b/svx/source/dialog/ClassificationDialog.cxx index a7be530f7bc3..ef628419e07f 100644 --- a/svx/source/dialog/ClassificationDialog.cxx +++ b/svx/source/dialog/ClassificationDialog.cxx @@ -24,9 +24,9 @@ #include <tools/XmlWriter.hxx> #include <tools/XmlWalker.hxx> #include <utility> -#include <vcl/customweld.hxx> #include <vcl/event.hxx> #include <vcl/svapp.hxx> +#include <vcl/weld/customweld.hxx> #include <officecfg/Office/Common.hxx> diff --git a/svx/source/inc/galbrws1.hxx b/svx/source/inc/galbrws1.hxx index e36d4c7ae243..1f8090697e74 100644 --- a/svx/source/inc/galbrws1.hxx +++ b/svx/source/inc/galbrws1.hxx @@ -20,9 +20,9 @@ #pragma once #include <svl/lstner.hxx> -#include <vcl/customweld.hxx> #include <vcl/transfer.hxx> #include <vcl/weld/TreeView.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <svx/galmisc.hxx> #include <svx/galctrl.hxx> diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index c8236e57d176..103a331a2379 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -29,7 +29,7 @@ #include <com/sun/star/ui/XSidebar.hpp> #include <basegfx/range/b2drange.hxx> #include <vcl/EnumContext.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <svx/dlgutil.hxx> diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx index 8b7c2e8afcc7..f6b4b819b380 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hxx +++ b/svx/source/tbxctrls/extrusioncontrols.hxx @@ -22,7 +22,7 @@ #include <svtools/toolbarmenu.hxx> #include <svtools/popupwindowcontroller.hxx> #include <svtools/valueset.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> // enum to index light images #define FROM_TOP_LEFT 0 diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 7079de22b99e..f92b0e6af744 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -18,11 +18,11 @@ */ #include <utility> -#include <vcl/customweld.hxx> #include <vcl/event.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> +#include <vcl/weld/customweld.hxx> #include <svx/strings.hrc> #include <layctrl.hxx> diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 1ef02f316edc..e9245160e96d 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -30,8 +30,8 @@ #include <vcl/commandinfoprovider.hxx> #include <vcl/event.hxx> #include <vcl/toolbox.hxx> -#include <vcl/customweld.hxx> #include <vcl/vclptr.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weldutils.hxx> #include <svtools/valueset.hxx> #include <svtools/ctrlbox.hxx> diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx index 9be34683fc3d..81e750774efd 100644 --- a/sw/inc/AnnotationWin.hxx +++ b/sw/inc/AnnotationWin.hxx @@ -24,7 +24,7 @@ #include <tools/date.hxx> #include <tools/time.hxx> #include <vcl/InterimItemWindow.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include "postithelper.hxx" #include "swrect.hxx" diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx index b246c4a64f95..ec15ae747924 100644 --- a/sw/inc/pch/precompiled_swui.hxx +++ b/sw/inc/pch/precompiled_swui.hxx @@ -115,7 +115,7 @@ #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> #include <vcl/ctrl.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/dllapi.h> #include <vcl/dockwin.hxx> #include <vcl/event.hxx> diff --git a/sw/source/ui/envelp/labfmt.hxx b/sw/source/ui/envelp/labfmt.hxx index 21d0f2cf9dc6..871f8fbbff3b 100644 --- a/sw/source/ui/envelp/labfmt.hxx +++ b/sw/source/ui/envelp/labfmt.hxx @@ -23,7 +23,7 @@ #include <sfx2/tabdlg.hxx> #include <vcl/idle.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> class SwLabPreview : public weld::CustomWidgetController diff --git a/sw/source/uibase/inc/autoformatpreview.hxx b/sw/source/uibase/inc/autoformatpreview.hxx index 095769f5e5a2..6a0502017405 100644 --- a/sw/source/uibase/inc/autoformatpreview.hxx +++ b/sw/source/uibase/inc/autoformatpreview.hxx @@ -24,8 +24,8 @@ #include <svl/numformat.hxx> #include <tools/gen.hxx> #include <rtl/ustring.hxx> -#include <vcl/customweld.hxx> #include <vcl/font.hxx> +#include <vcl/weld/customweld.hxx> #include "wrtsh.hxx" #include <tblafmt.hxx> diff --git a/sw/source/uibase/inc/bmpwin.hxx b/sw/source/uibase/inc/bmpwin.hxx index 706c78d2634a..2b1ca3f6f79c 100644 --- a/sw/source/uibase/inc/bmpwin.hxx +++ b/sw/source/uibase/inc/bmpwin.hxx @@ -19,9 +19,9 @@ #pragma once -#include <vcl/customweld.hxx> #include <vcl/bitmap.hxx> #include <vcl/graph.hxx> +#include <vcl/weld/customweld.hxx> // extended page for graphics class BmpWindow final : public weld::CustomWidgetController diff --git a/sw/source/uibase/inc/drpcps.hxx b/sw/source/uibase/inc/drpcps.hxx index 62c34ce59e5c..3a44fea10b30 100644 --- a/sw/source/uibase/inc/drpcps.hxx +++ b/sw/source/uibase/inc/drpcps.hxx @@ -23,8 +23,8 @@ #include <editeng/svxfont.hxx> #include <sfx2/basedlgs.hxx> #include <sfx2/tabdlg.hxx> -#include <vcl/customweld.hxx> #include <vcl/print.hxx> +#include <vcl/weld/customweld.hxx> /// Dedicated drop caps dialog, opened by the .uno:FormatDropcap UNO command, which is not in the /// default menus. diff --git a/sw/source/uibase/inc/envlop.hxx b/sw/source/uibase/inc/envlop.hxx index 4b841063a44d..d1f3b1310c33 100644 --- a/sw/source/uibase/inc/envlop.hxx +++ b/sw/source/uibase/inc/envlop.hxx @@ -20,8 +20,8 @@ #define INCLUDED_SW_SOURCE_UIBASE_INC_ENVLOP_HXX #include <sfx2/tabdlg.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> -#include <vcl/customweld.hxx> #include "envimg.hxx" inline int getfieldval(const weld::MetricSpinButton& rField) diff --git a/sw/source/uibase/inc/glossary.hxx b/sw/source/uibase/inc/glossary.hxx index a48f97d0fd84..33cd7d0eeb9f 100644 --- a/sw/source/uibase/inc/glossary.hxx +++ b/sw/source/uibase/inc/glossary.hxx @@ -19,9 +19,9 @@ #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_GLOSSARY_HXX #define INCLUDED_SW_SOURCE_UIBASE_INC_GLOSSARY_HXX -#include <vcl/customweld.hxx> #include <vcl/textfilter.hxx> #include <vcl/weld/TreeView.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <com/sun/star/text/XAutoTextContainer2.hpp> diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx index a15b8000a822..7ad1a7687a35 100644 --- a/sw/source/uibase/inc/mailmergehelper.hxx +++ b/sw/source/uibase/inc/mailmergehelper.hxx @@ -29,7 +29,7 @@ #include <cppuhelper/implbase.hxx> #include <comphelper/compbase.hxx> #include <utility> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <rtl/ustring.hxx> #include <swdllapi.h> diff --git a/sw/source/uibase/inc/numprevw.hxx b/sw/source/uibase/inc/numprevw.hxx index 923cde5f9b74..1a9439e84d0d 100644 --- a/sw/source/uibase/inc/numprevw.hxx +++ b/sw/source/uibase/inc/numprevw.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_SW_SOURCE_UIBASE_INC_NUMPREVW_HXX #define INCLUDED_SW_SOURCE_UIBASE_INC_NUMPREVW_HXX -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> class SwNumRule; diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx index e1a81960e231..b8966e01af9d 100644 --- a/sw/source/uibase/inc/optload.hxx +++ b/sw/source/uibase/inc/optload.hxx @@ -24,9 +24,9 @@ #include <sfx2/tabdlg.hxx> #include <utility> -#include <vcl/customweld.hxx> #include <vcl/textfilter.hxx> #include <vcl/weld/TreeView.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <sfx2/basedlgs.hxx> diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx index 1f99dc7aa21d..d3198fe4e9b6 100644 --- a/sw/source/uibase/inc/pggrid.hxx +++ b/sw/source/uibase/inc/pggrid.hxx @@ -20,7 +20,7 @@ #include <sfx2/tabdlg.hxx> #include "colex.hxx" -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <svx/colorbox.hxx> diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index 899f640789f5..47396b6926dd 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -23,8 +23,8 @@ #include <svx/langbox.hxx> #include <vcl/idle.hxx> #include <vcl/weld/TreeView.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> -#include <vcl/customweld.hxx> #include <tox.hxx> #include "toxmgr.hxx" diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx index 44293eb76258..f662e0b3ed9e 100644 --- a/sw/source/uibase/inc/unotools.hxx +++ b/sw/source/uibase/inc/unotools.hxx @@ -24,8 +24,8 @@ #include <string_view> #include <vcl/idle.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> -#include <vcl/customweld.hxx> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/text/XTextCursor.hpp> #include <swdllapi.h> diff --git a/vcl/inc/colorpicker.hxx b/vcl/inc/colorpicker.hxx index 4f60833e9ed2..a8a0bc7d4ace 100644 --- a/vcl/inc/colorpicker.hxx +++ b/vcl/inc/colorpicker.hxx @@ -20,9 +20,9 @@ #pragma once #include <vcl/ColorDialog.hxx> -#include <vcl/customweld.hxx> #include <vcl/hexcolorcontrol.hxx> #include <vcl/virdev.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <o3tl/typed_flags_set.hxx> diff --git a/vcl/inc/printdlg.hxx b/vcl/inc/printdlg.hxx index b0d6235205a7..e7ddae417b9a 100644 --- a/vcl/inc/printdlg.hxx +++ b/vcl/inc/printdlg.hxx @@ -23,7 +23,7 @@ #include <vcl/gdimtf.hxx> #include <vcl/idle.hxx> #include <vcl/print.hxx> -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> #include <vcl/weld/weld.hxx> #include <map> diff --git a/vcl/source/app/customweld.cxx b/vcl/source/app/customweld.cxx index c34c0a2ae0ab..bcdf569f0dc9 100644 --- a/vcl/source/app/customweld.cxx +++ b/vcl/source/app/customweld.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <vcl/customweld.hxx> +#include <vcl/weld/customweld.hxx> namespace weld {
