accessibility/inc/helper/IComboListBoxHelper.hxx | 2 accessibility/inc/pch/precompiled_acc.hxx | 13 ++- basctl/inc/pch/precompiled_basctl.hxx | 9 ++ basic/inc/pch/precompiled_sb.hxx | 51 +++----------- basic/source/runtime/methods.cxx | 2 chart2/inc/pch/precompiled_chartcontroller.hxx | 25 +++---- cui/inc/pch/precompiled_cui.hxx | 33 ++++----- dbaccess/inc/pch/precompiled_dbu.hxx | 11 +-- forms/source/richtext/richtextcontrol.hxx | 2 framework/source/helper/tagwindowasmodified.cxx | 2 include/dbaccess/dataview.hxx | 2 include/svtools/valueset.hxx | 2 include/svx/fmgridif.hxx | 2 include/vcl/builder.hxx | 2 include/vcl/stdtext.hxx | 2 include/vcl/toolkit/vclmedit.hxx | 2 include/vcl/window.hxx | 2 include/vcl/wintypes.hxx | 6 - reportdesign/inc/pch/precompiled_rptui.hxx | 21 ++++-- sc/inc/pch/precompiled_sc.hxx | 17 +++- sd/inc/pch/precompiled_sd.hxx | 57 +++++++--------- sd/inc/pch/precompiled_sdui.hxx | 28 ++++---- sfx2/source/control/listview.cxx | 2 solenv/clang-format/excludelist | 2 svx/inc/pch/precompiled_svxcore.hxx | 16 +++- sw/inc/pch/precompiled_swui.hxx | 53 +++++++-------- sw/inc/pch/precompiled_vbaswobj.hxx | 79 +++++++++++++++++++---- toolkit/inc/helper/imagealign.hxx | 2 toolkit/source/awt/vclxtoolkit.cxx | 2 vcl/source/treelist/svimpbox.cxx | 2 30 files changed, 247 insertions(+), 204 deletions(-)
New commits: commit 845393b9aa9057c5ace3c41ad5ac629b895d7f7f Author: Chris Sherlock <chris.sherloc...@gmail.com> AuthorDate: Mon Jun 27 19:04:24 2022 +1000 Commit: Tomaž Vajngerl <qui...@gmail.com> CommitDate: Wed Jul 20 12:20:59 2022 +0200 move wintypes.hxx from tools to vcl Change-Id: Ief9949fd4252de9e33df172af07aa7ed097b5520 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136560 Tested-by: Jenkins Reviewed-by: Tomaž Vajngerl <qui...@gmail.com> diff --git a/accessibility/inc/helper/IComboListBoxHelper.hxx b/accessibility/inc/helper/IComboListBoxHelper.hxx index e786311fd0df..eed2a757c1e4 100644 --- a/accessibility/inc/helper/IComboListBoxHelper.hxx +++ b/accessibility/inc/helper/IComboListBoxHelper.hxx @@ -21,7 +21,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <rtl/ustring.hxx> -#include <tools/wintypes.hxx> +#include <vcl/wintypes.hxx> #include <tools/long.hxx> namespace com::sun::star::datatransfer::clipboard { diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index 33dcf9125def..07f6fa2c8e8d 100644 --- a/accessibility/inc/pch/precompiled_acc.hxx +++ b/accessibility/inc/pch/precompiled_acc.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2021-11-29 09:45:37 using: + Generated on 2022-06-27 18:57:49 using: ./bin/update_pch accessibility acc --cutoff=4 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -52,6 +52,7 @@ #include <string> #include <string_view> #include <type_traits> +#include <unordered_map> #include <utility> #include <vector> #endif // PCH_LEVEL >= 1 @@ -69,6 +70,7 @@ #include <rtl/instance.hxx> #include <rtl/math.h> #include <rtl/ref.hxx> +#include <rtl/strbuf.h> #include <rtl/strbuf.hxx> #include <rtl/string.h> #include <rtl/string.hxx> @@ -92,6 +94,7 @@ #include <vcl/EnumContext.hxx> #include <vcl/NotebookbarContextControl.hxx> #include <vcl/Scanline.hxx> +#include <vcl/WindowPosSize.hxx> #include <vcl/accessibletable.hxx> #include <vcl/accessibletableprovider.hxx> #include <vcl/alpha.hxx> @@ -142,7 +145,7 @@ #include <vcl/task.hxx> #include <vcl/textfilter.hxx> #include <vcl/timer.hxx> -#include <vcl/toolbox.hxx> +#include <vcl/toolboxid.hxx> #include <vcl/toolkit/lstbox.hxx> #include <vcl/toolkit/treelist.hxx> #include <vcl/toolkit/treelistbox.hxx> @@ -157,6 +160,7 @@ #include <vcl/wall.hxx> #include <vcl/window.hxx> #include <vcl/windowstate.hxx> +#include <vcl/wintypes.hxx> #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include <basegfx/basegfxdllapi.h> @@ -166,6 +170,7 @@ #include <basegfx/point/b2ipoint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <basegfx/range/Range2D.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/range/basicrange.hxx> #include <basegfx/tuple/Tuple2D.hxx> @@ -238,7 +243,6 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.hxx> -#include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/RuntimeException.hpp> @@ -291,7 +295,6 @@ #include <extended/AccessibleGridControlTableBase.hxx> #include <extended/AccessibleGridControlTableCell.hxx> #include <extended/accessiblebrowseboxcell.hxx> -#include <extended/accessibletabbarbase.hxx> #include <helper/accresmgr.hxx> #include <helper/characterattributeshelper.hxx> #include <i18nlangtag/lang.h> @@ -316,7 +319,6 @@ #include <svl/SfxBroadcaster.hxx> #include <svl/hint.hxx> #include <svl/svldllapi.h> -#include <svtools/tabbar.hxx> #include <toolkit/awt/vclxaccessiblecomponent.hxx> #include <toolkit/awt/vclxdevice.hxx> #include <toolkit/awt/vclxwindows.hxx> @@ -336,7 +338,6 @@ #include <tools/ref.hxx> #include <tools/solar.h> #include <tools/toolsdllapi.h> -#include <tools/wintypes.hxx> #include <typelib/typeclass.h> #include <typelib/typedescription.h> #include <typelib/uik.h> diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index 30f9f2560029..9728e1df71b2 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2022-01-26 09:11:03 using: + Generated on 2022-06-27 18:59:37 using: ./bin/update_pch basctl basctl --cutoff=3 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -78,6 +78,8 @@ #include <rtl/locale.h> #include <rtl/math.h> #include <rtl/ref.hxx> +#include <rtl/strbuf.h> +#include <rtl/strbuf.hxx> #include <rtl/string.h> #include <rtl/string.hxx> #include <rtl/stringconcat.hxx> @@ -105,6 +107,7 @@ #include <vcl/InterimItemWindow.hxx> #include <vcl/PrinterSupport.hxx> #include <vcl/Scanline.hxx> +#include <vcl/WindowPosSize.hxx> #include <vcl/alpha.hxx> #include <vcl/animate/Animation.hxx> #include <vcl/animate/AnimationBitmap.hxx> @@ -173,6 +176,7 @@ #include <vcl/weld.hxx> #include <vcl/window.hxx> #include <vcl/windowstate.hxx> +#include <vcl/wintypes.hxx> #include <vcl/xtextedt.hxx> #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 @@ -184,6 +188,7 @@ #include <basegfx/point/b2ipoint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <basegfx/range/Range2D.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/range/b2drectangle.hxx> #include <basegfx/range/b2irange.hxx> @@ -399,6 +404,7 @@ #include <o3tl/safeint.hxx> #include <o3tl/sorted_vector.hxx> #include <o3tl/span.hxx> +#include <o3tl/string_view.hxx> #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> @@ -525,7 +531,6 @@ #include <tools/urlobj.hxx> #include <tools/weakbase.h> #include <tools/weakbase.hxx> -#include <tools/wintypes.hxx> #include <typelib/typeclass.h> #include <typelib/typedescription.h> #include <typelib/uik.h> diff --git a/basic/inc/pch/precompiled_sb.hxx b/basic/inc/pch/precompiled_sb.hxx index d327c88c5f58..eb0f33eafe5f 100644 --- a/basic/inc/pch/precompiled_sb.hxx +++ b/basic/inc/pch/precompiled_sb.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2021-09-12 11:49:52 using: + Generated on 2022-06-27 18:57:27 using: ./bin/update_pch basic sb --cutoff=2 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -24,6 +24,7 @@ #if PCH_LEVEL >= 1 #include <chrono> #include <cstddef> +#include <limits> #include <math.h> #include <memory> #include <ostream> @@ -31,13 +32,13 @@ #include <stdlib.h> #include <string_view> #include <type_traits> +#include <utility> #include <vector> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include <osl/endian.h> #include <osl/file.hxx> #include <osl/process.h> -#include <osl/thread.h> #include <osl/time.h> #include <rtl/character.hxx> #include <rtl/math.h> @@ -50,75 +51,45 @@ #include <sal/log.hxx> #include <sal/saldllapi.h> #include <sal/types.h> -#include <vcl/bitmap.hxx> -#include <vcl/cairo.hxx> -#include <vcl/devicecoordinate.hxx> #include <vcl/dllapi.h> #include <vcl/errcode.hxx> -#include <vcl/font.hxx> #include <vcl/graph.hxx> #include <vcl/mapmod.hxx> -#include <vcl/metaactiontypes.hxx> -#include <vcl/outdev.hxx> -#include <vcl/region.hxx> -#include <vcl/rendercontext/AddFontSubstituteFlags.hxx> -#include <vcl/rendercontext/AntialiasingFlags.hxx> -#include <vcl/rendercontext/DrawGridFlags.hxx> -#include <vcl/rendercontext/DrawImageFlags.hxx> -#include <vcl/rendercontext/DrawModeFlags.hxx> -#include <vcl/rendercontext/DrawTextFlags.hxx> -#include <vcl/rendercontext/GetDefaultFontFlags.hxx> -#include <vcl/rendercontext/ImplMapRes.hxx> -#include <vcl/rendercontext/InvertFlags.hxx> -#include <vcl/rendercontext/RasterOp.hxx> -#include <vcl/rendercontext/SalLayoutFlags.hxx> -#include <vcl/rendercontext/State.hxx> -#include <vcl/rendercontext/SystemTextColorFlags.hxx> -#include <vcl/salnativewidgets.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> -#include <vcl/vclreferencebase.hxx> -#include <vcl/wall.hxx> #include <vcl/weld.hxx> +#include <vcl/wintypes.hxx> #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include <basegfx/color/bcolor.hxx> -#include <basegfx/numeric/ftools.hxx> -#include <basegfx/polygon/b2dpolypolygon.hxx> -#include <basegfx/vector/b2enums.hxx> -#include <com/sun/star/awt/DeviceInfo.hpp> -#include <com/sun/star/drawing/LineCap.hpp> +#include <com/sun/star/i18n/TransliterationModules.hpp> +#include <com/sun/star/i18n/TransliterationModulesExtra.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.h> -#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> -#include <cppuhelper/weakref.hxx> #include <i18nlangtag/lang.h> -#include <o3tl/char16_t2wchar_t.hxx> +#include <i18nutil/transliteration.hxx> #include <o3tl/cow_wrapper.hxx> -#include <o3tl/float_int_conversion.hxx> #include <o3tl/safeint.hxx> +#include <o3tl/string_view.hxx> +#include <o3tl/typed_flags_set.hxx> #include <svl/SfxBroadcaster.hxx> #include <svl/numformat.hxx> #include <svl/zforlist.hxx> #include <tools/color.hxx> #include <tools/debug.hxx> -#include <tools/gen.hxx> #include <tools/link.hxx> #include <tools/mapunit.hxx> -#include <tools/poly.hxx> #include <tools/ref.hxx> -#include <tools/solar.h> #include <tools/stream.hxx> #include <tools/toolsdllapi.h> #include <tools/urlobj.hxx> -#include <tools/wintypes.hxx> #include <unotools/charclass.hxx> -#include <unotools/fontdefs.hxx> #include <unotools/syslocale.hxx> +#include <unotools/transliterationwrapper.hxx> #include <unotools/unotoolsdllapi.h> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 @@ -129,10 +100,12 @@ #include <basic/sbstar.hxx> #include <basic/sbuno.hxx> #include <basic/sbx.hxx> +#include <basic/sbxcore.hxx> #include <basic/sbxmeth.hxx> #include <basic/sbxobj.hxx> #include <basic/sbxvar.hxx> #include <date.hxx> +#include <global.hxx> #include <iosys.hxx> #include <rtlproto.hxx> #include <runtime.hxx> diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index a397a31fddf5..c2f979f2cb8f 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -27,7 +27,7 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/sound.hxx> -#include <tools/wintypes.hxx> +#include <vcl/wintypes.hxx> #include <vcl/stdtext.hxx> #include <vcl/weld.hxx> #include <basic/sbx.hxx> diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx index 2debda6b0836..8b1f8a09e82f 100644 --- a/chart2/inc/pch/precompiled_chartcontroller.hxx +++ b/chart2/inc/pch/precompiled_chartcontroller.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2022-01-26 09:11:52 using: + Generated on 2022-06-27 18:58:36 using: ./bin/update_pch chart2 chartcontroller --cutoff=6 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -74,6 +74,8 @@ #include <rtl/math.h> #include <rtl/math.hxx> #include <rtl/ref.hxx> +#include <rtl/strbuf.h> +#include <rtl/strbuf.hxx> #include <rtl/string.h> #include <rtl/string.hxx> #include <rtl/stringconcat.hxx> @@ -97,6 +99,7 @@ #include <vcl/GraphicObject.hxx> #include <vcl/IDialogRenderable.hxx> #include <vcl/Scanline.hxx> +#include <vcl/WindowPosSize.hxx> #include <vcl/alpha.hxx> #include <vcl/animate/Animation.hxx> #include <vcl/animate/AnimationBitmap.hxx> @@ -156,6 +159,7 @@ #include <vcl/weld.hxx> #include <vcl/window.hxx> #include <vcl/windowstate.hxx> +#include <vcl/wintypes.hxx> #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include <basegfx/basegfxdllapi.h> @@ -168,6 +172,7 @@ #include <basegfx/point/b3dpoint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <basegfx/range/Range2D.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/range/b2drectangle.hxx> #include <basegfx/range/b3drange.hxx> @@ -208,14 +213,7 @@ #include <com/sun/star/chart/ErrorBarStyle.hpp> #include <com/sun/star/chart2/AxisType.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> -#include <com/sun/star/chart2/XAxis.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/chart2/XChartType.hpp> -#include <com/sun/star/chart2/XChartTypeContainer.hpp> -#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> #include <com/sun/star/chart2/XDataSeries.hpp> -#include <com/sun/star/chart2/XDiagram.hpp> -#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <com/sun/star/container/XIndexReplace.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/drawing/DashStyle.hpp> @@ -226,7 +224,6 @@ #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XModel3.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/frame/XToolbarController.hpp> @@ -244,10 +241,10 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> +#include <com/sun/star/sheet/XRangeSelectionListener.hpp> #include <com/sun/star/style/NumberingType.hpp> #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/text/textfield/Type.hpp> @@ -271,7 +268,6 @@ #include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/util/Time.hpp> #include <com/sun/star/util/XAccounting.hpp> -#include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/util/XUpdatable.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <comphelper/broadcasthelper.hxx> @@ -279,6 +275,7 @@ #include <comphelper/comphelperdllapi.h> #include <comphelper/interfacecontainer2.hxx> #include <comphelper/interfacecontainer4.hxx> +#include <comphelper/lok.hxx> #include <comphelper/multicontainer2.hxx> #include <comphelper/propagg.hxx> #include <comphelper/proparrhlp.hxx> @@ -311,6 +308,7 @@ #include <drawinglayer/primitive2d/Primitive2DContainer.hxx> #include <drawinglayer/primitive2d/Primitive2DVisitor.hxx> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> +#include <editeng/colritem.hxx> #include <editeng/editdata.hxx> #include <editeng/editengdllapi.h> #include <editeng/editobj.hxx> @@ -438,7 +436,6 @@ #include <tools/toolsdllapi.h> #include <tools/weakbase.h> #include <tools/weakbase.hxx> -#include <tools/wintypes.hxx> #include <typelib/typeclass.h> #include <typelib/typedescription.h> #include <typelib/uik.h> @@ -454,6 +451,7 @@ #include <unotools/unotoolsdllapi.h> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 +#include <Axis.hxx> #include <AxisHelper.hxx> #include <BaseCoordinateSystem.hxx> #include <CharacterPropertyItemConverter.hxx> @@ -467,6 +465,7 @@ #include <ChartWindow.hxx> #include <CommonConverters.hxx> #include <ControllerLockGuard.hxx> +#include <DataSeries.hxx> #include <DataSeriesHelper.hxx> #include <DataSourceHelper.hxx> #include <Diagram.hxx> @@ -477,11 +476,13 @@ #include <GraphicPropertyItemConverter.hxx> #include <ItemConverter.hxx> #include <ItemPropertyMap.hxx> +#include <Legend.hxx> #include <LegendHelper.hxx> #include <LinePropertiesHelper.hxx> #include <ObjectIdentifier.hxx> #include <ObjectNameProvider.hxx> #include <RegressionCurveHelper.hxx> +#include <RegressionCurveModel.hxx> #include <ResId.hxx> #include <StatisticsHelper.hxx> #include <ThreeDHelper.hxx> diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index c784c49a2c1b..b9de39fea919 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2021-09-28 05:29:25 using: + Generated on 2022-06-27 18:58:21 using: ./bin/update_pch cui cui --cutoff=8 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -71,7 +71,6 @@ #include <osl/process.h> #include <osl/security.hxx> #include <osl/thread.h> -#include <osl/time.h> #include <rtl/alloc.h> #include <rtl/bootstrap.hxx> #include <rtl/character.hxx> @@ -151,7 +150,6 @@ #include <vcl/scopedbitmapaccess.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> -#include <vcl/syswin.hxx> #include <vcl/task.hxx> #include <vcl/timer.hxx> #include <vcl/transfer.hxx> @@ -164,7 +162,7 @@ #include <vcl/wall.hxx> #include <vcl/weld.hxx> #include <vcl/window.hxx> -#include <vcl/windowstate.hxx> +#include <vcl/wintypes.hxx> #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include <basegfx/basegfxdllapi.h> @@ -175,6 +173,7 @@ #include <basegfx/point/b2ipoint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <basegfx/range/Range2D.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/range/b2drectangle.hxx> #include <basegfx/range/basicrange.hxx> @@ -216,23 +215,19 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> #include <com/sun/star/graphic/XPrimitive2D.hpp> -#include <com/sun/star/i18n/Calendar2.hpp> -#include <com/sun/star/i18n/DirectionProperty.hpp> #include <com/sun/star/i18n/ForbiddenCharacters.hpp> -#include <com/sun/star/i18n/KCharacterType.hpp> #include <com/sun/star/i18n/LanguageCountryInfo.hpp> #include <com/sun/star/i18n/LocaleDataItem2.hpp> #include <com/sun/star/i18n/LocaleItem.hpp> -#include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp> -#include <com/sun/star/i18n/ParseResult.hpp> #include <com/sun/star/i18n/ScriptType.hpp> #include <com/sun/star/i18n/TransliterationModules.hpp> #include <com/sun/star/i18n/TransliterationModulesExtra.hpp> -#include <com/sun/star/i18n/UnicodeScript.hpp> #include <com/sun/star/i18n/WordType.hpp> #include <com/sun/star/i18n/reservedWords.hpp> +#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/lang/Locale.hpp> +#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -242,11 +237,9 @@ #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/text/textfield/Type.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> -#include <com/sun/star/ui/dialogs/FolderPicker.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.hxx> -#include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/RuntimeException.hpp> @@ -265,10 +258,13 @@ #include <com/sun/star/util/SearchAlgorithms.hpp> #include <com/sun/star/util/SearchOptions2.hpp> #include <com/sun/star/util/Time.hpp> +#include <com/sun/star/util/XAccounting.hpp> +#include <comphelper/compbase.hxx> #include <comphelper/comphelperdllapi.h> -#include <comphelper/dispatchcommand.hxx> +#include <comphelper/interfacecontainer4.hxx> #include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> +#include <comphelper/propertyvalue.hxx> #include <comphelper/string.hxx> #include <comphelper/weak.hxx> #include <cppu/cppudllapi.h> @@ -278,12 +274,15 @@ #include <cppuhelper/implbase_ex.hxx> #include <cppuhelper/implbase_ex_post.hxx> #include <cppuhelper/implbase_ex_pre.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> #include <drawinglayer/drawinglayerdllapi.h> +#include <drawinglayer/geometry/viewinformation2d.hxx> #include <drawinglayer/primitive2d/CommonTypes.hxx> #include <drawinglayer/primitive2d/Primitive2DContainer.hxx> #include <drawinglayer/primitive2d/Primitive2DVisitor.hxx> +#include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <editeng/editdata.hxx> #include <editeng/editengdllapi.h> #include <editeng/editstat.hxx> @@ -299,14 +298,14 @@ #include <editeng/svxfont.hxx> #include <i18nlangtag/lang.h> #include <i18nlangtag/languagetag.hxx> -#include <i18nutil/i18nutildllapi.h> #include <i18nutil/searchopt.hxx> #include <i18nutil/transliteration.hxx> #include <o3tl/cow_wrapper.hxx> -#include <o3tl/deleter.hxx> #include <o3tl/enumarray.hxx> #include <o3tl/safeint.hxx> #include <o3tl/sorted_vector.hxx> +#include <o3tl/span.hxx> +#include <o3tl/string_view.hxx> #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> @@ -351,6 +350,7 @@ #include <svtools/svtdllapi.h> #include <svtools/unitconv.hxx> #include <svtools/valueset.hxx> +#include <svx/colorbox.hxx> #include <svx/dialmgr.hxx> #include <svx/dlgutil.hxx> #include <svx/ipolypolygoneditorcontroller.hxx> @@ -422,14 +422,13 @@ #include <tools/urlobj.hxx> #include <tools/weakbase.h> #include <tools/weakbase.hxx> -#include <tools/wintypes.hxx> #include <typelib/typeclass.h> #include <typelib/typedescription.h> #include <typelib/uik.h> #include <uno/any2.h> #include <uno/data.h> #include <uno/sequence2.h> -#include <unotools/charclass.hxx> +#include <unotools/configitem.hxx> #include <unotools/fontdefs.hxx> #include <unotools/options.hxx> #include <unotools/pathoptions.hxx> diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx b/dbaccess/inc/pch/precompiled_dbu.hxx index 9bfc030bc5ab..ea24298ef633 100644 --- a/dbaccess/inc/pch/precompiled_dbu.hxx +++ b/dbaccess/inc/pch/precompiled_dbu.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2021-09-12 11:51:31 using: + Generated on 2022-06-27 18:57:36 using: ./bin/update_pch dbaccess dbu --cutoff=12 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -114,6 +114,7 @@ #include <vcl/wall.hxx> #include <vcl/weld.hxx> #include <vcl/window.hxx> +#include <vcl/wintypes.hxx> #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include <basegfx/color/bcolor.hxx> @@ -124,8 +125,6 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/datatransfer/DataFlavor.hpp> #include <com/sun/star/datatransfer/XTransferable2.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> @@ -182,12 +181,13 @@ #include <connectivity/dbtools.hxx> #include <connectivity/dbtoolsdllapi.hxx> #include <cppu/unotype.hxx> -#include <cppuhelper/compbase.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase_ex.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> +#include <o3tl/safeint.hxx> +#include <o3tl/span.hxx> #include <o3tl/typed_flags_set.hxx> #include <salhelper/simplereferenceobject.hxx> #include <salhelper/singletonref.hxx> @@ -216,7 +216,6 @@ #include <tools/ref.hxx> #include <tools/solar.h> #include <tools/toolsdllapi.h> -#include <tools/wintypes.hxx> #include <typelib/typedescription.h> #include <uno/data.h> #include <unotools/eventlisteneradapter.hxx> @@ -230,7 +229,7 @@ #include <IClipBoardTest.hxx> #include <QEnumTypes.hxx> #include <TableConnectionData.hxx> -#include <TableWindowData.hxx> +#include <TableFieldDescription.hxx> #include <TypeInfo.hxx> #include <UITools.hxx> #include <browserids.hxx> diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx index 9cda83bb5257..81e0ad2a0f01 100644 --- a/forms/source/richtext/richtextcontrol.hxx +++ b/forms/source/richtext/richtextcontrol.hxx @@ -26,7 +26,7 @@ #include <comphelper/uno3.hxx> #include <cppuhelper/implbase1.hxx> #include <rtl/ref.hxx> -#include <tools/wintypes.hxx> +#include <vcl/wintypes.hxx> #include "rtattributes.hxx" #include "textattributelistener.hxx" diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx index b113c4b96f6d..cc27a194e1fb 100644 --- a/framework/source/helper/tagwindowasmodified.cxx +++ b/framework/source/helper/tagwindowasmodified.cxx @@ -26,7 +26,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <vcl/window.hxx> #include <vcl/svapp.hxx> -#include <tools/wintypes.hxx> +#include <vcl/wintypes.hxx> namespace framework{ diff --git a/include/dbaccess/dataview.hxx b/include/dbaccess/dataview.hxx index 1c2cacdcf1c0..b6308663366a 100644 --- a/include/dbaccess/dataview.hxx +++ b/include/dbaccess/dataview.hxx @@ -24,7 +24,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <dbaccess/dbaccessdllapi.h> #include <rtl/ref.hxx> -#include <tools/wintypes.hxx> +#include <vcl/wintypes.hxx> #include <vcl/outdev.hxx> #include <vcl/window.hxx> diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx index 9fe1b885e686..92c3e4e361cc 100644 --- a/include/svtools/valueset.hxx +++ b/include/svtools/valueset.hxx @@ -20,7 +20,7 @@ #pragma once #include <svtools/svtdllapi.h> -#include <tools/wintypes.hxx> +#include <vcl/wintypes.hxx> #include <vcl/customweld.hxx> #include <vcl/image.hxx> #include <memory> diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx index 668eb13350fe..f3e7f25cd32f 100644 --- a/include/svx/fmgridif.hxx +++ b/include/svx/fmgridif.hxx @@ -41,7 +41,7 @@ #include <com/sun/star/util/XModifyListener.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> -#include <tools/wintypes.hxx> +#include <vcl/wintypes.hxx> #include <toolkit/controls/unocontrol.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <comphelper/interfacecontainer3.hxx> diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx index 041e4c5c3fd0..2baa0f520f59 100644 --- a/include/vcl/builder.hxx +++ b/include/vcl/builder.hxx @@ -19,7 +19,7 @@ #include <vcl/window.hxx> #include <vcl/vclptr.hxx> #include <vcl/toolboxid.hxx> -#include <tools/wintypes.hxx> +#include <vcl/wintypes.hxx> #include <vcl/EnumContext.hxx> #include <memory> diff --git a/include/vcl/stdtext.hxx b/include/vcl/stdtext.hxx index c77e5ebfca42..561bbd18cb1d 100644 --- a/include/vcl/stdtext.hxx +++ b/include/vcl/stdtext.hxx @@ -25,7 +25,7 @@ #include <string_view> #include <rtl/ustring.hxx> -#include <tools/wintypes.hxx> +#include <vcl/wintypes.hxx> #include <vcl/dllapi.h> class Image; diff --git a/include/vcl/toolkit/vclmedit.hxx b/include/vcl/toolkit/vclmedit.hxx index 3a7c4e274f2c..fedcb80687c7 100644 --- a/include/vcl/toolkit/vclmedit.hxx +++ b/include/vcl/toolkit/vclmedit.hxx @@ -24,7 +24,7 @@ #endif #include <tools/lineend.hxx> -#include <tools/wintypes.hxx> +#include <vcl/wintypes.hxx> #include <vcl/toolkit/edit.hxx> #include <vcl/dllapi.h> #include <vcl/timer.hxx> diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 5ad39489f2cb..51324a2c8060 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -23,7 +23,7 @@ #include <vcl/dllapi.h> #include <vcl/outdev.hxx> #include <tools/link.hxx> -#include <tools/wintypes.hxx> +#include <vcl/wintypes.hxx> #include <vcl/vclenum.hxx> #include <vcl/keycodes.hxx> #include <vcl/region.hxx> diff --git a/include/tools/wintypes.hxx b/include/vcl/wintypes.hxx similarity index 99% rename from include/tools/wintypes.hxx rename to include/vcl/wintypes.hxx index fcccd9a0d0fa..3a50b2eb3d61 100644 --- a/include/tools/wintypes.hxx +++ b/include/vcl/wintypes.hxx @@ -16,8 +16,8 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_TOOLS_WINTYPES_HXX -#define INCLUDED_TOOLS_WINTYPES_HXX + +#pragma once #include <sal/types.h> @@ -260,6 +260,4 @@ enum class StandardButtonType Count = 14, }; -#endif - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx index d67a85cf3164..9c263192c45e 100644 --- a/reportdesign/inc/pch/precompiled_rptui.hxx +++ b/reportdesign/inc/pch/precompiled_rptui.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2021-09-12 11:51:58 using: + Generated on 2022-06-27 18:33:32 using: ./bin/update_pch reportdesign rptui --cutoff=4 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -26,7 +26,6 @@ #include <array> #include <assert.h> #include <cassert> -#include <chrono> #include <cmath> #include <cstddef> #include <cstdlib> @@ -70,8 +69,6 @@ #include <osl/getglobalmutex.hxx> #include <osl/interlck.h> #include <osl/mutex.hxx> -#include <osl/thread.h> -#include <osl/time.h> #include <rtl/alloc.h> #include <rtl/instance.hxx> #include <rtl/locale.h> @@ -103,6 +100,7 @@ #include <vcl/GraphicObject.hxx> #include <vcl/IDialogRenderable.hxx> #include <vcl/Scanline.hxx> +#include <vcl/WindowPosSize.hxx> #include <vcl/abstdlg.hxx> #include <vcl/alpha.hxx> #include <vcl/animate/Animation.hxx> @@ -162,6 +160,7 @@ #include <vcl/weld.hxx> #include <vcl/window.hxx> #include <vcl/windowstate.hxx> +#include <vcl/wintypes.hxx> #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include <basegfx/basegfxdllapi.h> @@ -173,6 +172,7 @@ #include <basegfx/point/b3dpoint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <basegfx/range/Range2D.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/range/b2drectangle.hxx> #include <basegfx/range/b2irange.hxx> @@ -200,7 +200,6 @@ #include <com/sun/star/awt/XVclWindowPeer.hpp> #include <com/sun/star/beans/PropertyChangeEvent.hpp> #include <com/sun/star/beans/PropertyState.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> @@ -248,7 +247,6 @@ #include <com/sun/star/text/textfield/Type.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.hxx> -#include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/RuntimeException.hpp> @@ -267,11 +265,15 @@ #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/util/Time.hpp> +#include <com/sun/star/util/XAccounting.hpp> +#include <comphelper/compbase.hxx> #include <comphelper/comphelperdllapi.h> #include <comphelper/interfacecontainer2.hxx> +#include <comphelper/interfacecontainer4.hxx> #include <comphelper/multicontainer2.hxx> #include <comphelper/propertysequence.hxx> #include <comphelper/propertysetinfo.hxx> +#include <comphelper/propertyvalue.hxx> #include <comphelper/sequence.hxx> #include <comphelper/types.hxx> #include <comphelper/weak.hxx> @@ -288,14 +290,18 @@ #include <cppuhelper/implbase_ex_post.hxx> #include <cppuhelper/implbase_ex_pre.hxx> #include <cppuhelper/interfacecontainer.h> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/weakagg.hxx> #include <cppuhelper/weakref.hxx> #include <drawinglayer/drawinglayerdllapi.h> +#include <drawinglayer/geometry/viewinformation2d.hxx> #include <drawinglayer/primitive2d/CommonTypes.hxx> #include <drawinglayer/primitive2d/Primitive2DContainer.hxx> #include <drawinglayer/primitive2d/Primitive2DVisitor.hxx> +#include <drawinglayer/primitive2d/baseprimitive2d.hxx> +#include <editeng/colritem.hxx> #include <editeng/editdata.hxx> #include <editeng/editeng.hxx> #include <editeng/editengdllapi.h> @@ -324,8 +330,10 @@ #include <o3tl/cow_wrapper.hxx> #include <o3tl/deleter.hxx> #include <o3tl/enumarray.hxx> +#include <o3tl/intcmp.hxx> #include <o3tl/safeint.hxx> #include <o3tl/sorted_vector.hxx> +#include <o3tl/span.hxx> #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> @@ -440,7 +448,6 @@ #include <tools/toolsdllapi.h> #include <tools/weakbase.h> #include <tools/weakbase.hxx> -#include <tools/wintypes.hxx> #include <typelib/typeclass.h> #include <typelib/typedescription.h> #include <typelib/uik.h> diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index 532c11de6b77..80fd335243e3 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2022-01-26 09:14:15 using: + Generated on 2022-06-27 18:59:25 using: ./bin/update_pch sc sc --cutoff=12 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -89,6 +89,7 @@ #include <rtl/math.h> #include <rtl/math.hxx> #include <rtl/ref.hxx> +#include <rtl/strbuf.h> #include <rtl/strbuf.hxx> #include <rtl/string.h> #include <rtl/string.hxx> @@ -110,11 +111,13 @@ #include <sal/types.h> #include <sal/typesizes.h> #include <vcl/BinaryDataContainer.hxx> +#include <vcl/EnumContext.hxx> #include <vcl/GraphicAttributes.hxx> #include <vcl/GraphicExternalLink.hxx> #include <vcl/GraphicObject.hxx> #include <vcl/IDialogRenderable.hxx> #include <vcl/Scanline.hxx> +#include <vcl/WindowPosSize.hxx> #include <vcl/alpha.hxx> #include <vcl/animate/Animation.hxx> #include <vcl/animate/AnimationBitmap.hxx> @@ -126,7 +129,6 @@ #include <vcl/ctrl.hxx> #include <vcl/customweld.hxx> #include <vcl/dllapi.h> -#include <vcl/dockwin.hxx> #include <vcl/errcode.hxx> #include <vcl/event.hxx> #include <vcl/fntstyle.hxx> @@ -156,6 +158,7 @@ #include <vcl/weld.hxx> #include <vcl/window.hxx> #include <vcl/windowstate.hxx> +#include <vcl/wintypes.hxx> #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include <basegfx/basegfxdllapi.h> @@ -166,6 +169,7 @@ #include <basegfx/point/b2ipoint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <basegfx/range/Range2D.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/range/b2drectangle.hxx> #include <basegfx/range/basicrange.hxx> @@ -342,6 +346,7 @@ #include <o3tl/safeint.hxx> #include <o3tl/sorted_vector.hxx> #include <o3tl/span.hxx> +#include <o3tl/string_view.hxx> #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> @@ -382,6 +387,7 @@ #include <svl/lstner.hxx> #include <svl/numformat.hxx> #include <svl/poolitem.hxx> +#include <svl/sharedstring.hxx> #include <svl/sharedstringpool.hxx> #include <svl/stritem.hxx> #include <svl/style.hxx> @@ -467,7 +473,6 @@ #include <tools/urlobj.hxx> #include <tools/weakbase.h> #include <tools/weakbase.hxx> -#include <tools/wintypes.hxx> #include <typelib/typeclass.h> #include <typelib/typedescription.h> #include <typelib/uik.h> @@ -492,6 +497,8 @@ #if PCH_LEVEL >= 4 #include <AccessibleContextBase.hxx> #include <IAnyRefDialog.hxx> +#include <Sparkline.hxx> +#include <SparklineGroup.hxx> #include <TableFillingAndNavigationTools.hxx> #include <address.hxx> #include <anyrefdg.hxx> @@ -572,7 +579,6 @@ #include <refundo.hxx> #include <refupdat.hxx> #include <refupdatecontext.hxx> -#include <root.hxx> #include <rowheightcontext.hxx> #include <scabstdlg.hxx> #include <scdllapi.h> @@ -581,6 +587,7 @@ #include <scmod.hxx> #include <scopetools.hxx> #include <scresid.hxx> +#include <segmenttree.hxx> #include <sheetdata.hxx> #include <sheetevents.hxx> #include <shellids.hxx> @@ -596,12 +603,12 @@ #include <transobj.hxx> #include <types.hxx> #include <uiitems.hxx> +#include <undobase.hxx> #include <undoblk.hxx> #include <unonames.hxx> #include <userdat.hxx> #include <validat.hxx> #include <viewdata.hxx> -#include <xiroot.hxx> #include <xlconst.hxx> #include <xlroot.hxx> #endif // PCH_LEVEL >= 4 diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 7654305cc1fc..13d31e340a9e 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2021-04-08 13:51:32 using: + Generated on 2022-06-27 18:58:59 using: ./bin/update_pch sd sd --cutoff=4 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -25,13 +25,14 @@ #include <algorithm> #include <cassert> #include <cstddef> -#include <cstdlib> #include <functional> #include <initializer_list> #include <iomanip> +#include <iterator> #include <locale> #include <map> #include <memory> +#include <mutex> #include <new> #include <optional> #include <ostream> @@ -57,10 +58,10 @@ #include <osl/module.hxx> #include <osl/mutex.hxx> #include <osl/socket_decl.hxx> -#include <osl/thread.h> #include <osl/time.h> #include <rtl/alloc.h> #include <rtl/character.hxx> +#include <rtl/locale.h> #include <rtl/math.hxx> #include <rtl/ref.hxx> #include <rtl/strbuf.hxx> @@ -81,12 +82,12 @@ #include <vcl/commandinfoprovider.hxx> #include <vcl/customweld.hxx> #include <vcl/dllapi.h> -#include <vcl/dockwin.hxx> #include <vcl/errcode.hxx> #include <vcl/errinf.hxx> #include <vcl/event.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> +#include <vcl/gradient.hxx> #include <vcl/graph.hxx> #include <vcl/graphicfilter.hxx> #include <vcl/help.hxx> @@ -96,6 +97,7 @@ #include <vcl/keycod.hxx> #include <vcl/outdev.hxx> #include <vcl/ptrstyle.hxx> +#include <vcl/region.hxx> #include <vcl/scrbar.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> @@ -109,10 +111,10 @@ #include <vcl/weld.hxx> #include <vcl/weldutils.hxx> #include <vcl/window.hxx> +#include <vcl/wintypes.hxx> #include <vcl/wrkwin.hxx> #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 -#include <avmedia/avmediadllapi.h> #include <avmedia/mediaplayer.hxx> #include <avmedia/mediawindow.hxx> #include <basegfx/basegfxdllapi.h> @@ -124,6 +126,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <basegfx/range/Range2D.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/range/basicrange.hxx> #include <basegfx/tuple/b2dtuple.hxx> @@ -133,20 +136,12 @@ #include <basic/sbstar.hxx> #include <cache/SlsPageCache.hxx> #include <cache/SlsPageCacheManager.hxx> -#include <com/sun/star/accessibility/AccessibleEventId.hpp> -#include <com/sun/star/accessibility/AccessibleRole.hpp> -#include <com/sun/star/accessibility/AccessibleStateType.hpp> -#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp> -#include <com/sun/star/accessibility/XAccessibleGroupPosition.hpp> -#include <com/sun/star/accessibility/XAccessibleSelection.hpp> #include <com/sun/star/animations/AnimationFill.hpp> #include <com/sun/star/animations/AnimationNodeType.hpp> #include <com/sun/star/animations/ParallelTimeContainer.hpp> #include <com/sun/star/animations/XAnimate.hpp> #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/awt/FontSlant.hpp> -#include <com/sun/star/awt/Rectangle.hpp> -#include <com/sun/star/awt/Size.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyState.hpp> @@ -169,12 +164,12 @@ #include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp> #include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp> #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp> +#include <com/sun/star/drawing/LineCap.hpp> #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <com/sun/star/drawing/XDrawView.hpp> #include <com/sun/star/drawing/XMasterPagesSupplier.hpp> -#include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/framework/ResourceId.hpp> #include <com/sun/star/drawing/framework/XConfiguration.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> @@ -190,6 +185,7 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> +#include <com/sun/star/i18n/UnicodeScript.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> @@ -213,7 +209,6 @@ #include <com/sun/star/text/XTextRangeCompare.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.hxx> -#include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/RuntimeException.hpp> @@ -228,13 +223,14 @@ #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XCloneable.hpp> -#include <com/sun/star/view/XSelectionSupplier.hpp> #include <comphelper/classids.hxx> +#include <comphelper/compbase.hxx> #include <comphelper/comphelperdllapi.h> #include <comphelper/extract.hxx> #include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propertysequence.hxx> +#include <comphelper/propertyvalue.hxx> #include <comphelper/scopeguard.hxx> #include <comphelper/sequence.hxx> #include <comphelper/servicehelper.hxx> @@ -256,15 +252,13 @@ #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase.hxx> #include <cppuhelper/cppuhelperdllapi.h> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weakagg.hxx> +#include <cppuhelper/weakref.hxx> #include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/geometry/viewinformation2d.hxx> -#include <editeng/AccessibleComponentBase.hxx> -#include <editeng/AccessibleContextBase.hxx> #include <editeng/adjustitem.hxx> #include <editeng/boxitem.hxx> #include <editeng/cmapitem.hxx> @@ -303,6 +297,7 @@ #include <framework/FrameworkHelper.hxx> #include <framework/Pane.hxx> #include <framework/ViewShellWrapper.hxx> +#include <i18nlangtag/i18nlangtagdllapi.h> #include <i18nlangtag/lang.h> #include <i18nlangtag/languagetag.hxx> #include <model/SlideSorterModel.hxx> @@ -312,10 +307,12 @@ #include <o3tl/deleter.hxx> #include <o3tl/safeint.hxx> #include <o3tl/sorted_vector.hxx> +#include <o3tl/span.hxx> +#include <o3tl/string_view.hxx> #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> -#include <officecfg/Office/Impress.hxx> +#include <officecfg/Office/Common.hxx> #include <salhelper/simplereferenceobject.hxx> #include <salhelper/thread.hxx> #include <sfx2/app.hxx> @@ -345,7 +342,6 @@ #include <sfx2/shell.hxx> #include <sfx2/sidebar/Sidebar.hxx> #include <sfx2/sidebar/SidebarChildWindow.hxx> -#include <sfx2/sidebar/Theme.hxx> #include <sfx2/stbitem.hxx> #include <sfx2/tbxctrl.hxx> #include <sfx2/tplpitem.hxx> @@ -356,12 +352,12 @@ #include <sot/exchange.hxx> #include <sot/formats.hxx> #include <svl/SfxBroadcaster.hxx> +#include <svl/cjkoptions.hxx> #include <svl/eitem.hxx> #include <svl/hint.hxx> #include <svl/intitem.hxx> #include <svl/itempool.hxx> #include <svl/itemset.hxx> -#include <svl/languageoptions.hxx> #include <svl/lstner.hxx> #include <svl/macitem.hxx> #include <svl/metitem.hxx> @@ -378,14 +374,10 @@ #include <svtools/sfxecode.hxx> #include <svtools/svtdllapi.h> #include <svtools/svtresid.hxx> -#include <svtools/toolbarmenu.hxx> -#include <svx/AccessibleShapeTreeInfo.hxx> -#include <svx/IAccessibleViewForwarder.hxx> -#include <svx/IAccessibleViewForwarderListener.hxx> #include <svx/ImageMapInfo.hxx> -#include <svx/ShapeTypeHandler.hxx> #include <svx/SvxColorChildWindow.hxx> #include <svx/bmpmask.hxx> +#include <svx/clipfmtitem.hxx> #include <svx/dialmgr.hxx> #include <svx/drawitem.hxx> #include <svx/extrusionbar.hxx> @@ -402,6 +394,7 @@ #include <svx/rulritem.hxx> #include <svx/scene3d.hxx> #include <svx/sdmetitm.hxx> +#include <svx/sdooitm.hxx> #include <svx/sdr/contact/viewcontact.hxx> #include <svx/sdr/contact/viewobjectcontact.hxx> #include <svx/sdr/overlay/overlayobject.hxx> @@ -447,7 +440,9 @@ #include <svx/xlnedit.hxx> #include <svx/xlnstit.hxx> #include <svx/xlnwtit.hxx> +#include <svx/xpoly.hxx> #include <svx/xtable.hxx> +#include <svx/zoomslideritem.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/UnitConversion.hxx> #include <tools/color.hxx> @@ -462,13 +457,13 @@ #include <tools/link.hxx> #include <tools/long.hxx> #include <tools/mapunit.hxx> +#include <tools/poly.hxx> #include <tools/ref.hxx> #include <tools/solar.h> #include <tools/stream.hxx> #include <tools/toolsdllapi.h> #include <tools/urlobj.hxx> #include <tools/weakbase.h> -#include <tools/wintypes.hxx> #include <typelib/typedescription.h> #include <undo/undomanager.hxx> #include <undo/undoobjects.hxx> @@ -479,8 +474,9 @@ #include <unotools/localedatawrapper.hxx> #include <unotools/moduleoptions.hxx> #include <unotools/options.hxx> -#include <unotools/saveopt.hxx> +#include <unotools/resmgr.hxx> #include <unotools/streamwrap.hxx> +#include <unotools/syslocale.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/unotoolsdllapi.h> #include <unotools/useroptions.hxx> @@ -491,7 +487,6 @@ #include <xmloff/autolayout.hxx> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 -#include <AccessibleViewForwarder.hxx> #include <AnimationChildWindow.hxx> #include <Annotation.hxx> #include <Client.hxx> @@ -516,7 +511,6 @@ #include <PaneChildWindows.hxx> #include <PresentationViewShell.hxx> #include <PreviewRenderer.hxx> -#include <SdShapeTypes.hxx> #include <SlideSorter.hxx> #include <SlideSorterViewShell.hxx> #include <SpellDialogChildWindow.hxx> @@ -567,6 +561,7 @@ #include <stlpool.hxx> #include <stlsheet.hxx> #include <strings.hxx> +#include <titledockwin.hxx> #include <unchss.hxx> #include <undoanim.hxx> #include <unmodpg.hxx> diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx index 237dd892c4dc..3cdcc98ee6b8 100644 --- a/sd/inc/pch/precompiled_sdui.hxx +++ b/sd/inc/pch/precompiled_sdui.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2021-09-12 11:52:07 using: + Generated on 2022-06-27 18:58:50 using: ./bin/update_pch sd sdui --cutoff=4 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -77,6 +77,7 @@ #include <rtl/locale.h> #include <rtl/math.h> #include <rtl/ref.hxx> +#include <rtl/strbuf.h> #include <rtl/strbuf.hxx> #include <rtl/string.h> #include <rtl/string.hxx> @@ -106,6 +107,7 @@ #include <vcl/IDialogRenderable.hxx> #include <vcl/ITiledRenderable.hxx> #include <vcl/Scanline.hxx> +#include <vcl/WindowPosSize.hxx> #include <vcl/alpha.hxx> #include <vcl/animate/Animation.hxx> #include <vcl/animate/AnimationBitmap.hxx> @@ -115,7 +117,6 @@ #include <vcl/builderpage.hxx> #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> -#include <vcl/ctrl.hxx> #include <vcl/customweld.hxx> #include <vcl/devicecoordinate.hxx> #include <vcl/dllapi.h> @@ -168,8 +169,10 @@ #include <vcl/vectorgraphicdata.hxx> #include <vcl/wall.hxx> #include <vcl/weld.hxx> +#include <vcl/weldutils.hxx> #include <vcl/window.hxx> #include <vcl/windowstate.hxx> +#include <vcl/wintypes.hxx> #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include <basegfx/basegfxdllapi.h> @@ -180,6 +183,7 @@ #include <basegfx/point/b2ipoint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <basegfx/range/Range2D.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/range/b2drectangle.hxx> #include <basegfx/range/basicrange.hxx> @@ -284,7 +288,6 @@ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.hxx> -#include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/RuntimeException.hpp> @@ -293,7 +296,6 @@ #include <com/sun/star/uno/Type.h> #include <com/sun/star/uno/Type.hxx> #include <com/sun/star/uno/TypeClass.hdl> -#include <com/sun/star/uno/XAggregation.hpp> #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/XWeak.hpp> #include <com/sun/star/uno/genfunc.h> @@ -301,34 +303,36 @@ #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/util/Time.hpp> +#include <com/sun/star/util/XAccounting.hpp> #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/util/XModifiable2.hpp> #include <com/sun/star/view/XPrintJobBroadcaster.hpp> #include <com/sun/star/view/XPrintable.hpp> #include <com/sun/star/view/XRenderable.hpp> +#include <comphelper/compbase.hxx> #include <comphelper/comphelperdllapi.h> -#include <comphelper/interfacecontainer2.hxx> +#include <comphelper/interfacecontainer3.hxx> +#include <comphelper/interfacecontainer4.hxx> #include <comphelper/servicehelper.hxx> #include <comphelper/weak.hxx> #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase.hxx> -#include <cppuhelper/compbase_ex.hxx> #include <cppuhelper/cppuhelperdllapi.h> #include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase_ex.hxx> #include <cppuhelper/implbase_ex_post.hxx> #include <cppuhelper/implbase_ex_pre.hxx> -#include <cppuhelper/interfacecontainer.h> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/weak.hxx> -#include <cppuhelper/weakagg.hxx> #include <cppuhelper/weakref.hxx> #include <cui/cuidllapi.h> #include <drawinglayer/drawinglayerdllapi.h> +#include <drawinglayer/geometry/viewinformation2d.hxx> #include <drawinglayer/primitive2d/CommonTypes.hxx> #include <drawinglayer/primitive2d/Primitive2DContainer.hxx> #include <drawinglayer/primitive2d/Primitive2DVisitor.hxx> +#include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <editeng/editdata.hxx> #include <editeng/editengdllapi.h> #include <editeng/editstat.hxx> @@ -344,15 +348,14 @@ #include <editeng/paragraphdata.hxx> #include <editeng/svxenum.hxx> #include <editeng/svxfont.hxx> -#include <helper/simplereferencecomponent.hxx> #include <i18nlangtag/i18nlangtagdllapi.h> #include <i18nlangtag/lang.h> -#include <i18nlangtag/languagetag.hxx> #include <o3tl/cow_wrapper.hxx> #include <o3tl/deleter.hxx> #include <o3tl/enumarray.hxx> #include <o3tl/safeint.hxx> #include <o3tl/sorted_vector.hxx> +#include <o3tl/span.hxx> #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> @@ -389,6 +392,7 @@ #include <svtools/accessibilityoptions.hxx> #include <svtools/colorcfg.hxx> #include <svtools/svtdllapi.h> +#include <svtools/tabbar.hxx> #include <svtools/unitconv.hxx> #include <svtools/valueset.hxx> #include <svx/XPropertyEntry.hxx> @@ -467,7 +471,6 @@ #include <tools/urlobj.hxx> #include <tools/weakbase.h> #include <tools/weakbase.hxx> -#include <tools/wintypes.hxx> #include <typelib/typeclass.h> #include <typelib/typedescription.h> #include <typelib/uik.h> @@ -485,7 +488,6 @@ #include <DrawDocShell.hxx> #include <View.hxx> #include <drawdoc.hxx> -#include <fupoor.hxx> #include <pres.hxx> #include <sddllapi.h> #include <sdmod.hxx> diff --git a/sfx2/source/control/listview.cxx b/sfx2/source/control/listview.cxx index a53e85d7157b..d516eea5d160 100644 --- a/sfx2/source/control/listview.cxx +++ b/sfx2/source/control/listview.cxx @@ -23,7 +23,7 @@ #include <unotools/collatorwrapper.hxx> #include <unotools/syslocale.hxx> #include <unotools/intlwrapper.hxx> -#include <tools/wintypes.hxx> +#include <vcl/wintypes.hxx> #include <bitmaps.hlst> #include <rtl/math.hxx> diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist index 21c7e937d8d8..b3ccb4fb5e05 100644 --- a/solenv/clang-format/excludelist +++ b/solenv/clang-format/excludelist @@ -6177,7 +6177,6 @@ include/tools/time.hxx include/tools/urlobj.hxx include/tools/weakbase.h include/tools/weakbase.hxx -include/tools/wintypes.hxx include/tools/wldcrd.hxx include/tools/zcodec.hxx include/typelib/typedescription.h @@ -6457,6 +6456,7 @@ include/vcl/vectorgraphicdata.hxx include/vcl/virdev.hxx include/vcl/wall.hxx include/vcl/window.hxx +include/vcl/wintypes.hxx include/vcl/wizardmachine.hxx include/vcl/wmf.hxx include/vcl/wrkwin.hxx diff --git a/svx/inc/pch/precompiled_svxcore.hxx b/svx/inc/pch/precompiled_svxcore.hxx index 1f963c6e999a..27d4b88a9aef 100644 --- a/svx/inc/pch/precompiled_svxcore.hxx +++ b/svx/inc/pch/precompiled_svxcore.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2022-01-26 09:16:35 using: + Generated on 2022-06-27 18:59:31 using: ./bin/update_pch svx svxcore --cutoff=7 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -35,6 +35,7 @@ #include <functional> #include <initializer_list> #include <iomanip> +#include <iterator> #include <limits.h> #include <limits> #include <map> @@ -55,7 +56,6 @@ #include <unordered_map> #include <utility> #include <vector> -#include <boost/optional/optional.hpp> #include <boost/property_tree/json_parser.hpp> #include <boost/property_tree/ptree.hpp> #include <boost/property_tree/ptree_fwd.hpp> @@ -71,6 +71,7 @@ #include <osl/mutex.h> #include <osl/mutex.hxx> #include <osl/process.h> +#include <osl/thread.h> #include <osl/time.h> #include <rtl/alloc.h> #include <rtl/character.hxx> @@ -80,6 +81,7 @@ #include <rtl/math.hxx> #include <rtl/ref.hxx> #include <rtl/strbuf.h> +#include <rtl/strbuf.hxx> #include <rtl/string.h> #include <rtl/string.hxx> #include <rtl/stringconcat.hxx> @@ -104,6 +106,7 @@ #include <vcl/GraphicExternalLink.hxx> #include <vcl/InterimItemWindow.hxx> #include <vcl/Scanline.hxx> +#include <vcl/WindowPosSize.hxx> #include <vcl/alpha.hxx> #include <vcl/animate/Animation.hxx> #include <vcl/animate/AnimationBitmap.hxx> @@ -128,6 +131,8 @@ #include <vcl/headbar.hxx> #include <vcl/idle.hxx> #include <vcl/image.hxx> +#include <vcl/keycod.hxx> +#include <vcl/keycodes.hxx> #include <vcl/mapmod.hxx> #include <vcl/outdev.hxx> #include <vcl/ptrstyle.hxx> @@ -147,6 +152,7 @@ #include <vcl/weld.hxx> #include <vcl/window.hxx> #include <vcl/windowstate.hxx> +#include <vcl/wintypes.hxx> #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include <basegfx/basegfxdllapi.h> @@ -181,9 +187,10 @@ #include <basic/basicdllapi.h> #include <basic/sbxcore.hxx> #include <basic/sbxdef.hxx> +#include <com/sun/star/awt/Key.hpp> +#include <com/sun/star/awt/KeyGroup.hpp> #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/awt/XControl.hpp> -#include <com/sun/star/awt/XFocusListener.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/beans/Property.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> @@ -355,6 +362,7 @@ #include <o3tl/safeint.hxx> #include <o3tl/sorted_vector.hxx> #include <o3tl/span.hxx> +#include <o3tl/string_view.hxx> #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> @@ -395,7 +403,6 @@ #include <svtools/optionsdrawinglayer.hxx> #include <svtools/svtdllapi.h> #include <svtools/valueset.hxx> -#include <toolkit/dllapi.h> #include <toolkit/helper/vclunohelper.hxx> #include <tools/UnitConversion.hxx> #include <tools/bigint.hxx> @@ -421,7 +428,6 @@ #include <tools/time.hxx> #include <tools/toolsdllapi.h> #include <tools/urlobj.hxx> -#include <tools/wintypes.hxx> #include <typelib/typeclass.h> #include <typelib/typedescription.h> #include <typelib/uik.h> diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx index 84e43f673ede..34a6e54ec8c1 100644 --- a/sw/inc/pch/precompiled_swui.hxx +++ b/sw/inc/pch/precompiled_swui.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2022-01-26 09:17:05 using: + Generated on 2022-06-27 18:58:17 using: ./bin/update_pch sw swui --cutoff=3 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -36,6 +36,7 @@ #include <initializer_list> #include <iomanip> #include <iostream> +#include <iterator> #include <limits.h> #include <limits> #include <list> @@ -76,6 +77,7 @@ #include <rtl/math.hxx> #include <rtl/ref.hxx> #include <rtl/strbuf.h> +#include <rtl/strbuf.hxx> #include <rtl/string.h> #include <rtl/string.hxx> #include <rtl/stringconcat.hxx> @@ -100,6 +102,7 @@ #include <vcl/GraphicObject.hxx> #include <vcl/IDialogRenderable.hxx> #include <vcl/Scanline.hxx> +#include <vcl/WindowPosSize.hxx> #include <vcl/accessibletableprovider.hxx> #include <vcl/alpha.hxx> #include <vcl/animate/Animation.hxx> @@ -148,6 +151,7 @@ #include <vcl/rendercontext/SalLayoutFlags.hxx> #include <vcl/rendercontext/State.hxx> #include <vcl/rendercontext/SystemTextColorFlags.hxx> +#include <vcl/salgtype.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/scopedbitmapaccess.hxx> #include <vcl/settings.hxx> @@ -163,10 +167,12 @@ #include <vcl/vclptr.hxx> #include <vcl/vclreferencebase.hxx> #include <vcl/vectorgraphicdata.hxx> +#include <vcl/virdev.hxx> #include <vcl/wall.hxx> #include <vcl/weld.hxx> #include <vcl/window.hxx> #include <vcl/windowstate.hxx> +#include <vcl/wintypes.hxx> #include <vcl/wizardmachine.hxx> #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 @@ -177,6 +183,7 @@ #include <basegfx/point/b2ipoint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <basegfx/range/Range2D.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/range/basicrange.hxx> #include <basegfx/tuple/Tuple2D.hxx> @@ -199,15 +206,13 @@ #include <com/sun/star/awt/KeyGroup.hpp> #include <com/sun/star/awt/SystemPointer.hpp> #include <com/sun/star/awt/XWindow.hpp> -#include <com/sun/star/beans/XMultiPropertySet.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/container/XIndexReplace.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/datatransfer/DataFlavor.hpp> #include <com/sun/star/datatransfer/XTransferable.hpp> #include <com/sun/star/datatransfer/XTransferable2.hpp> @@ -236,6 +241,7 @@ #include <com/sun/star/drawing/DashStyle.hpp> #include <com/sun/star/drawing/HatchStyle.hpp> #include <com/sun/star/drawing/LineCap.hpp> +#include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/XVisualObject.hpp> @@ -273,13 +279,10 @@ #include <com/sun/star/mail/XConnectionListener.hpp> #include <com/sun/star/mail/XMailMessage.hpp> #include <com/sun/star/rdf/XDocumentMetadataAccess.hpp> -#include <com/sun/star/rdf/XMetadatable.hpp> #include <com/sun/star/script/XStarBasicAccess.hpp> #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp> #include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/style/LineSpacing.hpp> #include <com/sun/star/style/NumberingType.hpp> -#include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/table/BorderLineStyle.hpp> #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/PositionLayoutDir.hpp> @@ -287,7 +290,9 @@ #include <com/sun/star/text/RubyAdjust.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/text/VertOrientation.hpp> -#include <com/sun/star/text/XTextSection.hpp> +#include <com/sun/star/text/XFootnote.hpp> +#include <com/sun/star/text/XTextContent.hpp> +#include <com/sun/star/text/XTextField.hpp> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/XFilePicker3.hpp> @@ -322,7 +327,6 @@ #include <comphelper/interfacecontainer4.hxx> #include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/servicehelper.hxx> #include <comphelper/string.hxx> #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> @@ -347,7 +351,6 @@ #include <drawinglayer/primitive2d/Primitive2DContainer.hxx> #include <drawinglayer/primitive2d/Primitive2DVisitor.hxx> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> -#include <editeng/adjustitem.hxx> #include <editeng/borderline.hxx> #include <editeng/boxitem.hxx> #include <editeng/brushitem.hxx> @@ -356,33 +359,21 @@ #include <editeng/editstat.hxx> #include <editeng/eedata.hxx> #include <editeng/fontitem.hxx> -#include <editeng/forbiddenruleitem.hxx> -#include <editeng/formatbreakitem.hxx> #include <editeng/frmdiritem.hxx> -#include <editeng/hngpnctitem.hxx> -#include <editeng/hyphenzoneitem.hxx> #include <editeng/keepitem.hxx> #include <editeng/langitem.hxx> #include <editeng/lrspitem.hxx> -#include <editeng/lspcitem.hxx> #include <editeng/numdef.hxx> #include <editeng/numitem.hxx> -#include <editeng/orphitem.hxx> #include <editeng/outliner.hxx> #include <editeng/overflowingtxt.hxx> #include <editeng/paperinf.hxx> #include <editeng/paragraphdata.hxx> -#include <editeng/paravertalignitem.hxx> -#include <editeng/pgrditem.hxx> -#include <editeng/scriptspaceitem.hxx> #include <editeng/shaditem.hxx> #include <editeng/sizeitem.hxx> -#include <editeng/spltitem.hxx> #include <editeng/svxenum.hxx> #include <editeng/svxfont.hxx> -#include <editeng/tstpitem.hxx> #include <editeng/ulspitem.hxx> -#include <editeng/widwitem.hxx> #include <i18nlangtag/i18nlangtagdllapi.h> #include <i18nlangtag/lang.h> #include <i18nlangtag/languagetag.hxx> @@ -393,16 +384,17 @@ #include <o3tl/safeint.hxx> #include <o3tl/sorted_vector.hxx> #include <o3tl/span.hxx> +#include <o3tl/string_view.hxx> #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> #include <o3tl/unit_conversion.hxx> #include <officecfg/Office/Writer.hxx> #include <ooo/vba/XHelperInterface.hpp> -#include <ooo/vba/word/XParagraphFormat.hpp> +#include <ooo/vba/word/XSection.hpp> +#include <ooo/vba/word/XWrapFormat.hpp> #include <salhelper/salhelperdllapi.h> #include <salhelper/simplereferenceobject.hxx> -#include <sfx2/Metadatable.hxx> #include <sfx2/basedlgs.hxx> #include <sfx2/bindings.hxx> #include <sfx2/chalign.hxx> @@ -461,6 +453,7 @@ #include <svx/SvxColorValueSet.hxx> #include <svx/XPropertyEntry.hxx> #include <svx/autoformathelper.hxx> +#include <svx/charmap.hxx> #include <svx/colorbox.hxx> #include <svx/colorwindow.hxx> #include <svx/ctredlin.hxx> @@ -471,7 +464,6 @@ #include <svx/pagectrl.hxx> #include <svx/rotmodit.hxx> #include <svx/sdr/attribute/sdrallfillattributeshelper.hxx> -#include <svx/svddef.hxx> #include <svx/svxdlg.hxx> #include <svx/svxdllapi.h> #include <svx/swframetypes.hxx> @@ -501,7 +493,6 @@ #include <tools/time.hxx> #include <tools/toolsdllapi.h> #include <tools/urlobj.hxx> -#include <tools/wintypes.hxx> #include <typelib/typeclass.h> #include <typelib/typedescription.h> #include <typelib/uik.h> @@ -515,9 +506,11 @@ #include <unotools/localedatawrapper.hxx> #include <unotools/options.hxx> #include <unotools/pathoptions.hxx> +#include <unotools/resmgr.hxx> #include <unotools/sharedunocomponent.hxx> #include <unotools/syslocale.hxx> #include <unotools/unotoolsdllapi.h> +#include <unotools/viewoptions.hxx> #include <vbahelper/vbadllapi.h> #include <vbahelper/vbahelper.hxx> #include <vbahelper/vbahelperinterface.hxx> @@ -537,6 +530,7 @@ #include <cmdid.h> #include <cnttab.hxx> #include <column.hxx> +#include <condedit.hxx> #include <dbmgr.hxx> #include <doc.hxx> #include <docary.hxx> @@ -560,10 +554,12 @@ #include <fmtftn.hxx> #include <fmtinfmt.hxx> #include <fmtornt.hxx> -#include <fmtpdsc.hxx> #include <fmtrfmrk.hxx> #include <fmtruby.hxx> #include <format.hxx> +#include <formatcontentcontrol.hxx> +#include <formatlinebreak.hxx> +#include <frmatr.hxx> #include <frmdlg.hxx> #include <frmfmt.hxx> #include <frmpage.hxx> @@ -577,6 +573,7 @@ #include <ndarr.hxx> #include <ndhints.hxx> #include <ndindex.hxx> +#include <ndtxt.hxx> #include <ndtyp.hxx> #include <node.hxx> #include <nodeoffset.hxx> @@ -616,10 +613,10 @@ #include <tgrditem.hxx> #include <tox.hxx> #include <toxe.hxx> +#include <txatbase.hxx> #include <uiitems.hxx> #include <uitool.hxx> #include <undobj.hxx> -#include <unobaseclass.hxx> #include <unotools.hxx> #include <usrpref.hxx> #include <view.hxx> diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx index 9377406e97d1..a7bfad5dbf54 100644 --- a/sw/inc/pch/precompiled_vbaswobj.hxx +++ b/sw/inc/pch/precompiled_vbaswobj.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2021-12-11 12:59:19 using: + Generated on 2022-06-27 18:32:51 using: ./bin/update_pch sw vbaswobj --cutoff=4 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -32,6 +32,7 @@ #include <cmath> #include <cstddef> #include <cstdlib> +#include <cstring> #include <deque> #include <exception> #include <float.h> @@ -46,6 +47,7 @@ #include <map> #include <math.h> #include <memory> +#include <mutex> #include <new> #include <numeric> #include <optional> @@ -58,6 +60,7 @@ #include <string_view> #include <type_traits> #include <unordered_map> +#include <unordered_set> #include <utility> #include <vector> #include <boost/property_tree/ptree_fwd.hpp> @@ -85,6 +88,8 @@ #include <rtl/stringutils.hxx> #include <rtl/textcvt.h> #include <rtl/textenc.h> +#include <rtl/ustrbuf.h> +#include <rtl/ustrbuf.hxx> #include <rtl/ustring.h> #include <rtl/ustring.hxx> #include <rtl/uuid.h> @@ -97,6 +102,7 @@ #include <sal/typesizes.h> #include <vcl/IDialogRenderable.hxx> #include <vcl/Scanline.hxx> +#include <vcl/WindowPosSize.hxx> #include <vcl/alpha.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmap/BitmapTypes.hxx> @@ -143,7 +149,10 @@ #include <vcl/vclptr.hxx> #include <vcl/vclreferencebase.hxx> #include <vcl/wall.hxx> +#include <vcl/weld.hxx> #include <vcl/window.hxx> +#include <vcl/windowstate.hxx> +#include <vcl/wintypes.hxx> #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include <basegfx/basegfxdllapi.h> @@ -153,6 +162,7 @@ #include <basegfx/point/b2ipoint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <basegfx/range/Range2D.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/range/b2irange.hxx> #include <basegfx/range/basicrange.hxx> @@ -173,9 +183,7 @@ #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyGroup.hpp> #include <com/sun/star/awt/SystemPointer.hpp> -#include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/container/NoSuchElementException.hpp> #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/container/XIndexAccess.hpp> @@ -185,34 +193,52 @@ #include <com/sun/star/datatransfer/XTransferable.hpp> #include <com/sun/star/document/EventObject.hpp> #include <com/sun/star/drawing/LineCap.hpp> +#include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XModel3.hpp> +#include <com/sun/star/graphic/XPrimitive2D.hpp> +#include <com/sun/star/i18n/Calendar2.hpp> #include <com/sun/star/i18n/CollatorOptions.hpp> +#include <com/sun/star/i18n/DirectionProperty.hpp> +#include <com/sun/star/i18n/ForbiddenCharacters.hpp> +#include <com/sun/star/i18n/KCharacterType.hpp> +#include <com/sun/star/i18n/LanguageCountryInfo.hpp> +#include <com/sun/star/i18n/LocaleDataItem2.hpp> +#include <com/sun/star/i18n/LocaleItem.hpp> +#include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp> +#include <com/sun/star/i18n/ParseResult.hpp> +#include <com/sun/star/i18n/TransliterationModules.hpp> +#include <com/sun/star/i18n/TransliterationModulesExtra.hpp> +#include <com/sun/star/i18n/UnicodeScript.hpp> #include <com/sun/star/i18n/WordType.hpp> +#include <com/sun/star/i18n/reservedWords.hpp> +#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> +#include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/WrappedTargetException.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -#include <com/sun/star/rdf/XMetadatable.hpp> #include <com/sun/star/security/DocumentSignatureInformation.hpp> -#include <com/sun/star/style/LineSpacing.hpp> #include <com/sun/star/style/NumberingType.hpp> -#include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/table/XCellRange.hpp> #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/PositionLayoutDir.hpp> +#include <com/sun/star/text/RelOrientation.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> +#include <com/sun/star/text/VertOrientation.hpp> +#include <com/sun/star/text/WritingMode2.hpp> +#include <com/sun/star/text/XAutoTextGroup.hpp> #include <com/sun/star/text/XPageCursor.hpp> +#include <com/sun/star/text/XPasteListener.hpp> #include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/text/XTextRangeCompare.hpp> -#include <com/sun/star/text/XTextSection.hpp> #include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.hxx> @@ -233,11 +259,15 @@ #include <com/sun/star/uno/genfunc.hxx> #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/DateTime.hpp> +#include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/util/Time.hpp> +#include <com/sun/star/util/XAccounting.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> +#include <comphelper/compbase.hxx> #include <comphelper/comphelperdllapi.h> +#include <comphelper/interfacecontainer3.hxx> +#include <comphelper/interfacecontainer4.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/servicehelper.hxx> #include <comphelper/solarmutex.hxx> #include <comphelper/weak.hxx> #include <cppu/cppudllapi.h> @@ -247,12 +277,20 @@ #include <cppuhelper/implbase_ex.hxx> #include <cppuhelper/implbase_ex_post.hxx> #include <cppuhelper/implbase_ex_pre.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/weakagg.hxx> #include <cppuhelper/weakref.hxx> +#include <drawinglayer/drawinglayerdllapi.h> +#include <drawinglayer/geometry/viewinformation2d.hxx> +#include <drawinglayer/primitive2d/CommonTypes.hxx> +#include <drawinglayer/primitive2d/Primitive2DContainer.hxx> +#include <drawinglayer/primitive2d/Primitive2DVisitor.hxx> +#include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <editeng/adjustitem.hxx> #include <editeng/editengdllapi.h> #include <editeng/forbiddenruleitem.hxx> +#include <editeng/frmdir.hxx> #include <editeng/hngpnctitem.hxx> #include <editeng/hyphenzoneitem.hxx> #include <editeng/lspcitem.hxx> @@ -266,10 +304,12 @@ #include <editeng/svxenum.hxx> #include <editeng/tstpitem.hxx> #include <editeng/widwitem.hxx> +#include <i18nlangtag/i18nlangtagdllapi.h> #include <i18nlangtag/lang.h> +#include <i18nlangtag/languagetag.hxx> +#include <i18nutil/transliteration.hxx> #include <o3tl/cow_wrapper.hxx> #include <o3tl/deleter.hxx> -#include <o3tl/enumarray.hxx> #include <o3tl/safeint.hxx> #include <o3tl/sorted_vector.hxx> #include <o3tl/span.hxx> @@ -279,12 +319,13 @@ #include <o3tl/unit_conversion.hxx> #include <ooo/vba/XCollection.hpp> #include <ooo/vba/XHelperInterface.hpp> -#include <ooo/vba/word/XParagraphFormat.hpp> +#include <ooo/vba/word/XSection.hpp> +#include <ooo/vba/word/XWrapFormat.hpp> #include <salhelper/salhelperdllapi.h> #include <salhelper/simplereferenceobject.hxx> -#include <sfx2/Metadatable.hxx> #include <sfx2/dllapi.h> #include <sfx2/shell.hxx> +#include <sfx2/zoomitem.hxx> #include <sot/formats.hxx> #include <sot/sotdllapi.h> #include <svl/SfxBroadcaster.hxx> @@ -306,7 +347,9 @@ #include <svl/typedwhich.hxx> #include <svl/undo.hxx> #include <svl/whichranges.hxx> -#include <svx/flagsdef.hxx> +#include <svx/svdobj.hxx> +#include <svx/svdobjkind.hxx> +#include <svx/svdtypes.hxx> #include <svx/svxdllapi.h> #include <svx/swframetypes.hxx> #include <svx/xdef.hxx> @@ -327,18 +370,23 @@ #include <tools/time.hxx> #include <tools/toolsdllapi.h> #include <tools/urlobj.hxx> -#include <tools/wintypes.hxx> +#include <tools/weakbase.h> #include <typelib/typeclass.h> #include <typelib/typedescription.h> #include <typelib/uik.h> #include <uno/any2.h> #include <uno/data.h> #include <uno/sequence2.h> +#include <unotools/calendarwrapper.hxx> +#include <unotools/charclass.hxx> #include <unotools/fontcvt.hxx> #include <unotools/fontdefs.hxx> +#include <unotools/localedatawrapper.hxx> +#include <unotools/nativenumberwrapper.hxx> #include <unotools/options.hxx> #include <unotools/resmgr.hxx> #include <unotools/syslocale.hxx> +#include <unotools/transliterationwrapper.hxx> #include <unotools/unotoolsdllapi.h> #include <vbahelper/vbadllapi.h> #include <vbahelper/vbahelper.hxx> @@ -354,12 +402,15 @@ #include <bparr.hxx> #include <calbck.hxx> #include <charfmt.hxx> +#include <crsrsh.hxx> #include <crstate.hxx> #include <cshtyp.hxx> #include <docary.hxx> #include <docsh.hxx> +#include <editsh.hxx> #include <fldbas.hxx> #include <fldupde.hxx> +#include <flyenum.hxx> #include <fmtcol.hxx> #include <format.hxx> #include <frmfmt.hxx> @@ -391,6 +442,8 @@ #include <toxe.hxx> #include <undobj.hxx> #include <unobaseclass.hxx> +#include <unocrsr.hxx> +#include <viewopt.hxx> #include <viewsh.hxx> #include <viscrs.hxx> #endif // PCH_LEVEL >= 4 diff --git a/toolkit/inc/helper/imagealign.hxx b/toolkit/inc/helper/imagealign.hxx index 087a9f540b77..b3c68cd210a3 100644 --- a/toolkit/inc/helper/imagealign.hxx +++ b/toolkit/inc/helper/imagealign.hxx @@ -21,7 +21,7 @@ #define INCLUDED_TOOLKIT_INC_HELPER_IMAGEALIGN_HXX #include <sal/types.h> -#include <tools/wintypes.hxx> +#include <vcl/wintypes.hxx> namespace toolkit { diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 4916352aa5c5..a2e98ff17202 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -61,7 +61,7 @@ #include <rtl/process.h> #include <sal/log.hxx> #include <tools/link.hxx> -#include <tools/wintypes.hxx> +#include <vcl/wintypes.hxx> #ifdef MACOSX #include <premac.h> diff --git a/vcl/source/treelist/svimpbox.cxx b/vcl/source/treelist/svimpbox.cxx index cea89cdbd33c..363e2b344d93 100644 --- a/vcl/source/treelist/svimpbox.cxx +++ b/vcl/source/treelist/svimpbox.cxx @@ -32,7 +32,7 @@ #include <vcl/toolkit/treelistbox.hxx> #include <vcl/toolkit/svlbitm.hxx> -#include <tools/wintypes.hxx> +#include <vcl/wintypes.hxx> #include <bitmaps.hlst> #include <svimpbox.hxx> #include <comphelper/processfactory.hxx>