diff options
43 files changed, 598 insertions, 427 deletions
diff --git a/accessibility/inc/pch/precompiled_acc.hxx b/accessibility/inc/pch/precompiled_acc.hxx index fcbbd9f1f0c1..5b3bbb51d3f7 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 2022-06-27 18:57:49 using: + Generated on 2023-07-19 09:19:19 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: @@ -24,10 +24,7 @@ #if PCH_LEVEL >= 1 #include <algorithm> #include <array> -#include <assert.h> -#include <atomic> #include <cassert> -#include <chrono> #include <cmath> #include <cstddef> #include <cstdlib> @@ -52,7 +49,6 @@ #include <string> #include <string_view> #include <type_traits> -#include <unordered_map> #include <utility> #include <vector> #endif // PCH_LEVEL >= 1 @@ -64,8 +60,6 @@ #include <osl/interlck.h> #include <osl/mutex.h> #include <osl/mutex.hxx> -#include <osl/thread.h> -#include <osl/time.h> #include <rtl/alloc.h> #include <rtl/instance.hxx> #include <rtl/math.h> @@ -104,22 +98,22 @@ #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> #include <vcl/ctrl.hxx> -#include <vcl/devicecoordinate.hxx> #include <vcl/dllapi.h> #include <vcl/dndhelp.hxx> #include <vcl/dockwin.hxx> -#include <comphelper/errcode.hxx> #include <vcl/event.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> #include <vcl/gradient.hxx> #include <vcl/idle.hxx> #include <vcl/image.hxx> +#include <vcl/kernarray.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/mapmod.hxx> #include <vcl/menu.hxx> #include <vcl/metaactiontypes.hxx> +#include <vcl/mnemonic.hxx> #include <vcl/outdev.hxx> #include <vcl/quickselectionengine.hxx> #include <vcl/region.hxx> @@ -165,6 +159,8 @@ #if PCH_LEVEL >= 3 #include <basegfx/basegfxdllapi.h> #include <basegfx/color/bcolor.hxx> +#include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/matrix/hommatrixtemplate.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/point/b2ipoint.hxx> @@ -173,14 +169,17 @@ #include <basegfx/range/Range2D.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/range/basicrange.hxx> +#include <basegfx/tuple/Size2D.hxx> #include <basegfx/tuple/Tuple2D.hxx> #include <basegfx/tuple/Tuple3D.hxx> #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/tuple/b2ituple.hxx> #include <basegfx/tuple/b3dtuple.hxx> #include <basegfx/utils/common.hxx> +#include <basegfx/vector/b2dsize.hxx> #include <basegfx/vector/b2dvector.hxx> #include <basegfx/vector/b2enums.hxx> +#include <basegfx/vector/b2isize.hxx> #include <basegfx/vector/b2ivector.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRelationType.hpp> @@ -202,6 +201,7 @@ #include <com/sun/star/accessibility/XAccessibleText.hpp> #include <com/sun/star/accessibility/XAccessibleValue.hpp> #include <com/sun/star/awt/DeviceInfo.hpp> +#include <com/sun/star/awt/GradientStyle.hpp> #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyGroup.hpp> #include <com/sun/star/awt/KeyModifier.hpp> @@ -262,24 +262,19 @@ #include <comphelper/accessiblekeybindinghelper.hxx> #include <comphelper/accessibletexthelper.hxx> #include <comphelper/comphelperdllapi.h> +#include <comphelper/errcode.hxx> #include <comphelper/sequence.hxx> #include <comphelper/servicehelper.hxx> -#include <comphelper/solarmutex.hxx> #include <comphelper/uno3.hxx> #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase2.hxx> -#include <cppuhelper/compbase4.hxx> -#include <cppuhelper/compbase5.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/compbase_ex.hxx> #include <cppuhelper/cppuhelperdllapi.h> #include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase3.hxx> -#include <cppuhelper/implbase4.hxx> -#include <cppuhelper/implbase5.hxx> #include <cppuhelper/implbase_ex.hxx> #include <cppuhelper/implbase_ex_post.hxx> #include <cppuhelper/implbase_ex_pre.hxx> diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index 257159149a3b..1775e51f3758 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-08-13 18:00:51 using: + Generated on 2023-07-19 09:19:46 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: @@ -24,8 +24,6 @@ #if PCH_LEVEL >= 1 #include <algorithm> #include <array> -#include <assert.h> -#include <atomic> #include <cassert> #include <chrono> #include <climits> @@ -54,8 +52,8 @@ #include <string.h> #include <string> #include <string_view> -#include <thread> #include <type_traits> +#include <typeinfo> #include <unordered_map> #include <unordered_set> #include <utility> @@ -119,9 +117,8 @@ #include <vcl/checksum.hxx> #include <vcl/commandevent.hxx> #include <vcl/ctrl.hxx> -#include <vcl/devicecoordinate.hxx> #include <vcl/dllapi.h> -#include <comphelper/errcode.hxx> +#include <vcl/dockwin.hxx> #include <vcl/event.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> @@ -132,6 +129,7 @@ #include <vcl/graph.hxx> #include <vcl/idle.hxx> #include <vcl/jobset.hxx> +#include <vcl/kernarray.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/mapmod.hxx> @@ -182,6 +180,7 @@ #include <basegfx/basegfxdllapi.h> #include <basegfx/color/bcolor.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/matrix/hommatrixtemplate.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/point/b2ipoint.hxx> @@ -193,16 +192,19 @@ #include <basegfx/range/b2irange.hxx> #include <basegfx/range/b2irectangle.hxx> #include <basegfx/range/basicrange.hxx> +#include <basegfx/tuple/Size2D.hxx> #include <basegfx/tuple/Tuple2D.hxx> #include <basegfx/tuple/Tuple3D.hxx> #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/tuple/b2i64tuple.hxx> #include <basegfx/tuple/b2ituple.hxx> #include <basegfx/tuple/b3dtuple.hxx> +#include <basegfx/utils/bgradient.hxx> #include <basegfx/utils/common.hxx> #include <basegfx/vector/b2dsize.hxx> #include <basegfx/vector/b2dvector.hxx> #include <basegfx/vector/b2enums.hxx> +#include <basegfx/vector/b2isize.hxx> #include <basegfx/vector/b2ivector.hxx> #include <basic/basicdllapi.h> #include <basic/basmgr.hxx> @@ -217,7 +219,7 @@ #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> #include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp> #include <com/sun/star/awt/DeviceInfo.hpp> -#include <com/sun/star/awt/Gradient.hpp> +#include <com/sun/star/awt/Gradient2.hpp> #include <com/sun/star/awt/GradientStyle.hpp> #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyGroup.hpp> @@ -267,6 +269,7 @@ #include <com/sun/star/frame/XTitle.hpp> #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp> #include <com/sun/star/frame/XToolbarController.hpp> +#include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/graphic/XPrimitive2D.hpp> #include <com/sun/star/i18n/Calendar2.hpp> #include <com/sun/star/i18n/DirectionProperty.hpp> @@ -283,6 +286,11 @@ #include <com/sun/star/i18n/WordType.hpp> #include <com/sun/star/i18n/XNumberFormatCode.hpp> #include <com/sun/star/i18n/reservedWords.hpp> +#include <com/sun/star/io/XInputStream.hpp> +#include <com/sun/star/io/XOutputStream.hpp> +#include <com/sun/star/io/XSeekable.hpp> +#include <com/sun/star/io/XStream.hpp> +#include <com/sun/star/io/XTruncate.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/lang/Locale.hpp> @@ -331,11 +339,12 @@ #include <com/sun/star/util/XAccounting.hpp> #include <com/sun/star/util/XUpdatable.hpp> #include <com/sun/star/view/PrintableState.hpp> -#include <comphelper/accessiblecontexthelper.hxx> #include <comphelper/accessibleeventnotifier.hxx> #include <comphelper/broadcasthelper.hxx> #include <comphelper/compbase.hxx> #include <comphelper/comphelperdllapi.h> +#include <comphelper/diagnose_ex.hxx> +#include <comphelper/errcode.hxx> #include <comphelper/interfacecontainer2.hxx> #include <comphelper/interfacecontainer4.hxx> #include <comphelper/multicontainer2.hxx> @@ -348,27 +357,27 @@ #include <comphelper/propstate.hxx> #include <comphelper/sequence.hxx> #include <comphelper/servicehelper.hxx> -#include <comphelper/solarmutex.hxx> #include <comphelper/string.hxx> #include <comphelper/uno3.hxx> +#include <comphelper/unoimplbase.hxx> #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase2.hxx> +#include <cppuhelper/compbase.hxx> #include <cppuhelper/compbase_ex.hxx> #include <cppuhelper/cppuhelperdllapi.h> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase2.hxx> -#include <cppuhelper/implbase_ex.hxx> -#include <cppuhelper/implbase_ex_post.hxx> -#include <cppuhelper/implbase_ex_pre.hxx> #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/propshlp.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/weakagg.hxx> #include <cppuhelper/weakref.hxx> +#include <docmodel/color/ComplexColor.hxx> +#include <docmodel/color/Transformation.hxx> +#include <docmodel/dllapi.h> +#include <docmodel/theme/ThemeColor.hxx> +#include <docmodel/theme/ThemeColorType.hxx> #include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <drawinglayer/primitive2d/CommonTypes.hxx> @@ -399,6 +408,7 @@ #include <o3tl/cow_wrapper.hxx> #include <o3tl/deleter.hxx> #include <o3tl/enumarray.hxx> +#include <o3tl/hash_combine.hxx> #include <o3tl/safeint.hxx> #include <o3tl/sorted_vector.hxx> #include <o3tl/span.hxx> @@ -430,6 +440,7 @@ #include <sot/sotdllapi.h> #include <svl/SfxBroadcaster.hxx> #include <svl/cenumitm.hxx> +#include <svl/cintitem.hxx> #include <svl/eitem.hxx> #include <svl/hint.hxx> #include <svl/itempool.hxx> @@ -455,6 +466,7 @@ #include <svtools/colorcfg.hxx> #include <svtools/statusbarcontroller.hxx> #include <svtools/svtdllapi.h> +#include <svtools/toolbarmenu.hxx> #include <svtools/toolboxcontroller.hxx> #include <svx/XPropertyEntry.hxx> #include <svx/ipolypolygoneditorcontroller.hxx> @@ -509,7 +521,6 @@ #include <tools/datetime.hxx> #include <tools/debug.hxx> #include <tools/degree.hxx> -#include <comphelper/diagnose_ex.hxx> #include <tools/fldunit.hxx> #include <tools/fontenum.hxx> #include <tools/fract.hxx> @@ -523,11 +534,11 @@ #include <tools/poly.hxx> #include <tools/ref.hxx> #include <tools/solar.h> +#include <tools/stream.hxx> #include <tools/time.hxx> #include <tools/toolsdllapi.h> #include <tools/urlobj.hxx> #include <tools/weakbase.h> -#include <tools/weakbase.hxx> #include <typelib/typeclass.h> #include <typelib/typedescription.h> #include <typelib/uik.h> @@ -545,8 +556,10 @@ #include <unotools/options.hxx> #include <unotools/resmgr.hxx> #include <unotools/syslocale.hxx> +#include <unotools/tempfile.hxx> #include <unotools/transliterationwrapper.hxx> #include <unotools/unotoolsdllapi.h> +#include <unotools/weakref.hxx> #include <xmlscript/xmldlg_imexp.hxx> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx index ba4ccbddf15e..098284dba674 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-08-13 18:00:53 using: + Generated on 2023-07-19 09:20: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: @@ -52,6 +52,7 @@ #include <string> #include <string_view> #include <type_traits> +#include <typeinfo> #include <unordered_map> #include <unordered_set> #include <utility> @@ -69,6 +70,7 @@ #include <osl/mutex.h> #include <osl/mutex.hxx> #include <rtl/alloc.h> +#include <rtl/character.hxx> #include <rtl/instance.hxx> #include <rtl/locale.h> #include <rtl/math.h> @@ -110,10 +112,8 @@ #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> #include <vcl/customweld.hxx> -#include <vcl/devicecoordinate.hxx> #include <vcl/dllapi.h> #include <vcl/dockwin.hxx> -#include <comphelper/errcode.hxx> #include <vcl/event.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> @@ -123,6 +123,7 @@ #include <vcl/graph.hxx> #include <vcl/idle.hxx> #include <vcl/image.hxx> +#include <vcl/kernarray.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/mapmod.hxx> @@ -166,6 +167,7 @@ #include <basegfx/color/bcolor.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> +#include <basegfx/matrix/hommatrixtemplate.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/point/b2ipoint.hxx> @@ -177,22 +179,25 @@ #include <basegfx/range/b2drectangle.hxx> #include <basegfx/range/b3drange.hxx> #include <basegfx/range/basicrange.hxx> +#include <basegfx/tuple/Size2D.hxx> #include <basegfx/tuple/Tuple2D.hxx> #include <basegfx/tuple/Tuple3D.hxx> #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/tuple/b2ituple.hxx> #include <basegfx/tuple/b3dtuple.hxx> +#include <basegfx/utils/bgradient.hxx> #include <basegfx/utils/common.hxx> #include <basegfx/vector/b2dsize.hxx> #include <basegfx/vector/b2dvector.hxx> #include <basegfx/vector/b2enums.hxx> +#include <basegfx/vector/b2isize.hxx> #include <basegfx/vector/b2ivector.hxx> #include <basegfx/vector/b3dvector.hxx> #include <chartview/ChartSfxItemIds.hxx> #include <chartview/DrawModelWrapper.hxx> #include <chartview/ExplicitValueProvider.hxx> #include <com/sun/star/awt/DeviceInfo.hpp> -#include <com/sun/star/awt/Gradient.hpp> +#include <com/sun/star/awt/Gradient2.hpp> #include <com/sun/star/awt/GradientStyle.hpp> #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyGroup.hpp> @@ -227,6 +232,7 @@ #include <com/sun/star/frame/XModel3.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/frame/XToolbarController.hpp> +#include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/graphic/XPrimitive2D.hpp> #include <com/sun/star/i18n/CharacterIteratorMode.hpp> #include <com/sun/star/i18n/ForbiddenCharacters.hpp> @@ -235,16 +241,19 @@ #include <com/sun/star/i18n/LocaleItem.hpp> #include <com/sun/star/i18n/WordType.hpp> #include <com/sun/star/i18n/reservedWords.hpp> +#include <com/sun/star/io/XInputStream.hpp> +#include <com/sun/star/io/XOutputStream.hpp> +#include <com/sun/star/io/XSeekable.hpp> +#include <com/sun/star/io/XStream.hpp> +#include <com/sun/star/io/XTruncate.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/XEventListener.hpp> #include <com/sun/star/lang/XInitialization.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> @@ -268,11 +277,15 @@ #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/XModifyListener.hpp> #include <com/sun/star/util/XUpdatable.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <comphelper/broadcasthelper.hxx> #include <comphelper/compbase.hxx> #include <comphelper/comphelperdllapi.h> +#include <comphelper/diagnose_ex.hxx> +#include <comphelper/errcode.hxx> #include <comphelper/interfacecontainer2.hxx> #include <comphelper/interfacecontainer4.hxx> #include <comphelper/lok.hxx> @@ -285,10 +298,10 @@ #include <comphelper/sequence.hxx> #include <comphelper/servicehelper.hxx> #include <comphelper/uno3.hxx> +#include <comphelper/unoimplbase.hxx> #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase_ex.hxx> #include <cppuhelper/cppuhelperdllapi.h> #include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase_ex.hxx> @@ -301,6 +314,11 @@ #include <cppuhelper/weak.hxx> #include <cppuhelper/weakagg.hxx> #include <cppuhelper/weakref.hxx> +#include <docmodel/color/ComplexColor.hxx> +#include <docmodel/color/Transformation.hxx> +#include <docmodel/dllapi.h> +#include <docmodel/theme/ThemeColor.hxx> +#include <docmodel/theme/ThemeColorType.hxx> #include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <drawinglayer/primitive2d/CommonTypes.hxx> @@ -330,6 +348,7 @@ #include <o3tl/cow_wrapper.hxx> #include <o3tl/deleter.hxx> #include <o3tl/enumarray.hxx> +#include <o3tl/hash_combine.hxx> #include <o3tl/safeint.hxx> #include <o3tl/sorted_vector.hxx> #include <o3tl/span.hxx> @@ -417,7 +436,6 @@ #include <tools/date.hxx> #include <tools/datetime.hxx> #include <tools/degree.hxx> -#include <comphelper/diagnose_ex.hxx> #include <tools/fldunit.hxx> #include <tools/fontenum.hxx> #include <tools/fract.hxx> @@ -430,10 +448,10 @@ #include <tools/poly.hxx> #include <tools/ref.hxx> #include <tools/solar.h> +#include <tools/stream.hxx> #include <tools/time.hxx> #include <tools/toolsdllapi.h> #include <tools/weakbase.h> -#include <tools/weakbase.hxx> #include <typelib/typeclass.h> #include <typelib/typedescription.h> #include <typelib/uik.h> @@ -446,7 +464,9 @@ #include <unotools/options.hxx> #include <unotools/resmgr.hxx> #include <unotools/syslocale.hxx> +#include <unotools/tempfile.hxx> #include <unotools/unotoolsdllapi.h> +#include <unotools/weakref.hxx> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 #include <Axis.hxx> @@ -460,6 +480,7 @@ #include <ChartTypeHelper.hxx> #include <ChartTypeManager.hxx> #include <ChartTypeTemplate.hxx> +#include <ChartView.hxx> #include <ChartWindow.hxx> #include <CommonConverters.hxx> #include <ControllerLockGuard.hxx> diff --git a/chart2/inc/pch/precompiled_chartcore.hxx b/chart2/inc/pch/precompiled_chartcore.hxx index 47a8030da161..1f32fd818a0a 100644 --- a/chart2/inc/pch/precompiled_chartcore.hxx +++ b/chart2/inc/pch/precompiled_chartcore.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:16 using: + Generated on 2023-07-19 09:21:03 using: ./bin/update_pch chart2 chartcore --cutoff=3 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -32,6 +32,7 @@ #include <limits> #include <map> #include <memory> +#include <mutex> #include <new> #include <optional> #include <ostream> @@ -39,7 +40,6 @@ #include <string_view> #include <type_traits> #include <unordered_map> -#include <unordered_set> #include <utility> #include <vector> #include <boost/property_tree/ptree_fwd.hpp> @@ -47,9 +47,6 @@ #if PCH_LEVEL >= 2 #include <osl/conditn.hxx> #include <osl/diagnose.h> -#include <osl/doublecheckedlocking.h> -#include <osl/getglobalmutex.hxx> -#include <osl/mutex.h> #include <osl/mutex.hxx> #include <rtl/alloc.h> #include <rtl/character.hxx> @@ -58,6 +55,7 @@ #include <rtl/math.h> #include <rtl/math.hxx> #include <rtl/ref.hxx> +#include <rtl/strbuf.hxx> #include <rtl/string.hxx> #include <rtl/stringconcat.hxx> #include <rtl/stringutils.hxx> @@ -69,51 +67,29 @@ #include <sal/log.hxx> #include <sal/macros.h> #include <sal/types.h> -#include <vcl/bitmap.hxx> -#include <vcl/cairo.hxx> -#include <vcl/devicecoordinate.hxx> #include <vcl/dllapi.h> -#include <comphelper/errcode.hxx> -#include <vcl/font.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> #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include <basegfx/basegfxdllapi.h> #include <basegfx/numeric/ftools.hxx> +#include <basegfx/point/b2dpoint.hxx> +#include <basegfx/point/b2ipoint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/tuple/b2ituple.hxx> +#include <basegfx/vector/b2dsize.hxx> #include <basegfx/vector/b2enums.hxx> #include <basegfx/vector/b2ivector.hxx> #include <chartview/DrawModelWrapper.hxx> -#include <com/sun/star/awt/DeviceInfo.hpp> #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyState.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XFastPropertySet.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/XMultiPropertyStates.hpp> @@ -138,54 +114,43 @@ #include <com/sun/star/chart2/StackingDirection.hpp> #include <com/sun/star/chart2/Symbol.hpp> #include <com/sun/star/chart2/SymbolStyle.hpp> -#include <com/sun/star/chart2/XAxis.hpp> -#include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/chart2/XChartTypeContainer.hpp> -#include <com/sun/star/chart2/XCoordinateSystem.hpp> -#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> #include <com/sun/star/chart2/XDataSeries.hpp> -#include <com/sun/star/chart2/XDataSeriesContainer.hpp> -#include <com/sun/star/chart2/XRegressionCurveCalculator.hpp> -#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> +#include <com/sun/star/chart2/XFormattedString2.hpp> #include <com/sun/star/chart2/data/XDataSequence.hpp> -#include <com/sun/star/chart2/data/XDataSink.hpp> #include <com/sun/star/chart2/data/XDataSource.hpp> #include <com/sun/star/chart2/data/XNumericalDataSequence.hpp> #include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp> #include <com/sun/star/chart2/data/XTextualDataSequence.hpp> #include <com/sun/star/container/NoSuchElementException.hpp> -#include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/drawing/BitmapMode.hpp> -#include <com/sun/star/drawing/Direction3D.hpp> #include <com/sun/star/drawing/DoubleSequence.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/HomogenMatrix.hpp> #include <com/sun/star/drawing/LineCap.hpp> +#include <com/sun/star/drawing/LineDash.hpp> #include <com/sun/star/drawing/LineJoint.hpp> #include <com/sun/star/drawing/LineStyle.hpp> -#include <com/sun/star/drawing/PolyPolygonShape3D.hpp> #include <com/sun/star/drawing/Position3D.hpp> #include <com/sun/star/drawing/RectanglePoint.hpp> +#include <com/sun/star/drawing/ShadeMode.hpp> #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> #include <com/sun/star/drawing/TextVerticalAdjust.hpp> -#include <com/sun/star/drawing/XDrawPage.hpp> -#include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/frame/XModel.hpp> +#include <com/sun/star/io/XInputStream.hpp> +#include <com/sun/star/io/XOutputStream.hpp> +#include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/XComponent.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/XServiceName.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> -#include <com/sun/star/style/XStyleSupplier.hpp> #include <com/sun/star/text/WritingMode2.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.hxx> @@ -199,24 +164,26 @@ #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/util/CloseVetoException.hpp> #include <com/sun/star/util/XCloneable.hpp> -#include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/util/XModifyListener.hpp> -#include <com/sun/star/view/XSelectionChangeListener.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <comphelper/comphelperdllapi.h> +#include <comphelper/diagnose_ex.hxx> +#include <comphelper/errcode.hxx> +#include <comphelper/interfacecontainer4.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/property.hxx> +#include <comphelper/scopeguard.hxx> #include <comphelper/sequence.hxx> #include <comphelper/servicehelper.hxx> #include <comphelper/uno3.hxx> #include <cppu/cppudllapi.h> -#include <cppuhelper/compbase.hxx> -#include <cppuhelper/compbase_ex.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/cppuhelperdllapi.h> #include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase_ex.hxx> #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/propshlp.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> @@ -224,57 +191,53 @@ #include <editeng/unoprnms.hxx> #include <i18nlangtag/i18nlangtagdllapi.h> #include <i18nlangtag/lang.h> +#include <i18nlangtag/languagetag.hxx> #include <libxml/xmlwriter.h> #include <o3tl/cow_wrapper.hxx> +#include <o3tl/safeint.hxx> +#include <o3tl/span.hxx> +#include <o3tl/string_view.hxx> #include <o3tl/typed_flags_set.hxx> #include <officecfg/Office/Compatibility.hxx> #include <salhelper/simplereferenceobject.hxx> -#include <svl/cenumitm.hxx> #include <svl/cintitem.hxx> #include <svl/eitem.hxx> #include <svl/intitem.hxx> -#include <svl/itemset.hxx> -#include <svl/lstner.hxx> #include <svl/numformat.hxx> #include <svl/poolitem.hxx> #include <svl/svldllapi.h> #include <svl/typedwhich.hxx> -#include <svl/zforlist.hxx> -#include <svx/svdobj.hxx> -#include <svx/svdobjkind.hxx> -#include <svx/svdtypes.hxx> +#include <svx/svdpage.hxx> #include <svx/svxdllapi.h> #include <svx/unoshape.hxx> #include <tools/UnitConversion.hxx> #include <tools/color.hxx> -#include <tools/date.hxx> -#include <tools/degree.hxx> -#include <comphelper/diagnose_ex.hxx> #include <tools/gen.hxx> #include <tools/helpers.hxx> #include <tools/lineend.hxx> #include <tools/link.hxx> #include <tools/long.hxx> -#include <tools/poly.hxx> #include <tools/ref.hxx> -#include <tools/solar.h> +#include <tools/stream.hxx> #include <tools/toolsdllapi.h> -#include <tools/weakbase.h> -#include <unotools/fontdefs.hxx> #include <unotools/options.hxx> -#include <unotools/resmgr.hxx> -#include <unotools/saveopt.hxx> #include <unotools/unotoolsdllapi.h> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 +#include <Axis.hxx> #include <AxisHelper.hxx> #include <AxisIndexDefines.hxx> +#include <BaseCoordinateSystem.hxx> #include <BaseGFXHelper.hxx> #include <CartesianCoordinateSystem.hxx> #include <CharacterProperties.hxx> #include <ChartModel.hxx> #include <ChartModelHelper.hxx> +#include <ChartType.hxx> #include <ChartTypeHelper.hxx> +#include <ChartTypeManager.hxx> +#include <ChartTypeTemplate.hxx> +#include <ChartView.hxx> #include <ChartViewHelper.hxx> #include <Clipping.hxx> #include <CloneHelper.hxx> @@ -283,32 +246,37 @@ #include <ControllerLockGuard.hxx> #include <DataSeries.hxx> #include <DataSeriesHelper.hxx> +#include <DataSeriesProperties.hxx> #include <DataSource.hxx> #include <DataSourceHelper.hxx> +#include <DataTable.hxx> #include <DateHelper.hxx> +#include <Diagram.hxx> #include <DiagramHelper.hxx> -#include <EventListenerHelper.hxx> #include <ExplicitCategoriesProvider.hxx> #include <FillProperties.hxx> +#include <FormattedString.hxx> +#include <GridProperties.hxx> +#include <InternalDataProvider.hxx> #include <LabelPositionHelper.hxx> #include <LabeledDataSequence.hxx> -#include <LegendEntryProvider.hxx> +#include <Legend.hxx> #include <LinePropertiesHelper.hxx> #include <MediaDescriptorHelper.hxx> -#include <MinimumAndMaximumSupplier.hxx> #include <ModifyListenerHelper.hxx> #include <NumberFormatterWrapper.hxx> -#include <OPropertySet.hxx> #include <ObjectIdentifier.hxx> #include <PlottingPositionHelper.hxx> #include <PolarCoordinateSystem.hxx> #include <PolarLabelPositionHelper.hxx> #include <PropertyHelper.hxx> #include <PropertyMapper.hxx> +#include <RangeHighlighter.hxx> #include <ReferenceSizeProvider.hxx> #include <RegressionCalculationHelper.hxx> #include <RegressionCurveCalculator.hxx> #include <RegressionCurveHelper.hxx> +#include <RegressionCurveModel.hxx> #include <RelativePositionHelper.hxx> #include <RelativeSizeHelper.hxx> #include <ResId.hxx> @@ -317,11 +285,12 @@ #include <SpecialCharacters.hxx> #include <Stripe.hxx> #include <ThreeDHelper.hxx> +#include <Title.hxx> #include <TitleHelper.hxx> #include <UserDefinedProperties.hxx> #include <VLineProperties.hxx> +#include <VSeriesPlotter.hxx> #include <ViewDefines.hxx> -#include <WeakListenerAdapter.hxx> #include <WrappedProperty.hxx> #include <charttoolsdllapi.hxx> #include <defines.hxx> diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index 7b7688c74ad9..4ba3f3f6b29a 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 2023-01-10 23:29:57 using: + Generated on 2023-07-19 09:21:23 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: @@ -103,6 +103,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/AnimationFrame.hxx> @@ -113,7 +114,6 @@ #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> #include <vcl/customweld.hxx> -#include <vcl/devicecoordinate.hxx> #include <vcl/dllapi.h> #include <vcl/event.hxx> #include <vcl/fntstyle.hxx> @@ -123,10 +123,7 @@ #include <vcl/graph.hxx> #include <vcl/idle.hxx> #include <vcl/image.hxx> -#include <vcl/imap.hxx> -#include <vcl/imapobj.hxx> #include <vcl/kernarray.hxx> -#include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/mapmod.hxx> #include <vcl/metaactiontypes.hxx> @@ -146,11 +143,11 @@ #include <vcl/rendercontext/SalLayoutFlags.hxx> #include <vcl/rendercontext/State.hxx> #include <vcl/rendercontext/SystemTextColorFlags.hxx> -#include <vcl/salctype.hxx> #include <vcl/salnativewidgets.hxx> #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> @@ -163,12 +160,14 @@ #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> #include <basegfx/color/bcolor.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/matrix/hommatrixtemplate.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/point/b2ipoint.hxx> @@ -193,6 +192,7 @@ #include <basic/basicdllapi.h> #include <basic/sbxdef.hxx> #include <com/sun/star/awt/DeviceInfo.hpp> +#include <com/sun/star/awt/GradientStyle.hpp> #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyGroup.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -217,6 +217,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/graphic/XGraphic.hpp> #include <com/sun/star/graphic/XPrimitive2D.hpp> #include <com/sun/star/i18n/ForbiddenCharacters.hpp> #include <com/sun/star/i18n/LanguageCountryInfo.hpp> @@ -227,6 +228,11 @@ #include <com/sun/star/i18n/TransliterationModulesExtra.hpp> #include <com/sun/star/i18n/WordType.hpp> #include <com/sun/star/i18n/reservedWords.hpp> +#include <com/sun/star/io/XInputStream.hpp> +#include <com/sun/star/io/XOutputStream.hpp> +#include <com/sun/star/io/XSeekable.hpp> +#include <com/sun/star/io/XStream.hpp> +#include <com/sun/star/io/XTruncate.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/lang/Locale.hpp> @@ -234,7 +240,6 @@ #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/script/browse/XBrowseNode.hpp> #include <com/sun/star/style/NumberingType.hpp> #include <com/sun/star/style/XStyle.hpp> @@ -259,6 +264,7 @@ #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/util/SearchAlgorithms.hpp> +#include <com/sun/star/util/SearchAlgorithms2.hpp> #include <com/sun/star/util/SearchOptions2.hpp> #include <com/sun/star/util/Time.hpp> #include <com/sun/star/util/XAccounting.hpp> @@ -271,6 +277,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/propertyvalue.hxx> #include <comphelper/string.hxx> +#include <comphelper/unoimplbase.hxx> #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> #include <cppuhelper/cppuhelperdllapi.h> @@ -281,6 +288,10 @@ #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> +#include <docmodel/color/ComplexColor.hxx> +#include <docmodel/color/Transformation.hxx> +#include <docmodel/dllapi.h> +#include <docmodel/theme/ThemeColor.hxx> #include <docmodel/theme/ThemeColorType.hxx> #include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/geometry/viewinformation2d.hxx> @@ -307,7 +318,9 @@ #include <i18nutil/searchopt.hxx> #include <i18nutil/transliteration.hxx> #include <o3tl/cow_wrapper.hxx> +#include <o3tl/deleter.hxx> #include <o3tl/enumarray.hxx> +#include <o3tl/hash_combine.hxx> #include <o3tl/safeint.hxx> #include <o3tl/sorted_vector.hxx> #include <o3tl/span.hxx> @@ -432,12 +445,12 @@ #include <uno/any2.h> #include <uno/data.h> #include <uno/sequence2.h> -#include <unotools/configitem.hxx> #include <unotools/fontdefs.hxx> #include <unotools/options.hxx> #include <unotools/pathoptions.hxx> #include <unotools/resmgr.hxx> #include <unotools/syslocale.hxx> +#include <unotools/tempfile.hxx> #include <unotools/unotoolsdllapi.h> #include <unotools/weakref.hxx> #endif // PCH_LEVEL >= 3 diff --git a/dbaccess/inc/pch/precompiled_dbu.hxx b/dbaccess/inc/pch/precompiled_dbu.hxx index cff3aace4daa..fccd7b67d7e3 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 2022-06-27 18:57:36 using: + Generated on 2023-07-19 09:21:53 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: @@ -53,6 +53,7 @@ #include <osl/process.h> #include <osl/thread.hxx> #include <rtl/bootstrap.hxx> +#include <rtl/character.hxx> #include <rtl/instance.hxx> #include <rtl/math.h> #include <rtl/ref.hxx> @@ -78,12 +79,12 @@ #include <vcl/bitmapex.hxx> #include <vcl/cairo.hxx> #include <vcl/ctrl.hxx> -#include <vcl/devicecoordinate.hxx> #include <vcl/dllapi.h> #include <vcl/event.hxx> #include <vcl/font.hxx> #include <vcl/gradient.hxx> #include <vcl/idle.hxx> +#include <vcl/kernarray.hxx> #include <vcl/keycodes.hxx> #include <vcl/mapmod.hxx> #include <vcl/metaactiontypes.hxx> @@ -119,12 +120,15 @@ #if PCH_LEVEL >= 3 #include <basegfx/color/bcolor.hxx> #include <basegfx/numeric/ftools.hxx> +#include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/vector/b2enums.hxx> #include <com/sun/star/awt/DeviceInfo.hpp> #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> @@ -140,6 +144,7 @@ #include <com/sun/star/frame/FrameAction.hpp> #include <com/sun/star/frame/XController2.hpp> #include <com/sun/star/frame/XDispatch.hpp> +#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> @@ -150,7 +155,6 @@ #include <com/sun/star/lang/XInitialization.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/sdb/CommandType.hpp> #include <com/sun/star/sdbc/ColumnSearch.hpp> #include <com/sun/star/sdbc/DataType.hpp> @@ -173,6 +177,7 @@ #include <com/sun/star/util/URL.hpp> #include <com/sun/star/util/XNumberFormatter.hpp> #include <comphelper/comphelperdllapi.h> +#include <comphelper/diagnose_ex.hxx> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/sequence.hxx> #include <comphelper/types.hxx> @@ -190,7 +195,6 @@ #include <o3tl/span.hxx> #include <o3tl/typed_flags_set.hxx> #include <salhelper/simplereferenceobject.hxx> -#include <salhelper/singletonref.hxx> #include <sfx2/dllapi.h> #include <sot/exchange.hxx> #include <sot/formats.hxx> @@ -206,9 +210,9 @@ #include <toolkit/helper/vclunohelper.hxx> #include <tools/color.hxx> #include <tools/degree.hxx> -#include <comphelper/diagnose_ex.hxx> #include <tools/gen.hxx> #include <tools/globname.hxx> +#include <tools/lineend.hxx> #include <tools/link.hxx> #include <tools/long.hxx> #include <tools/mapunit.hxx> @@ -229,7 +233,7 @@ #include <IClipBoardTest.hxx> #include <QEnumTypes.hxx> #include <TableConnectionData.hxx> -#include <TableFieldDescription.hxx> +#include <TableWindowData.hxx> #include <TypeInfo.hxx> #include <UITools.hxx> #include <browserids.hxx> diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx index 4fde66301111..21bf74fae766 100644 --- a/framework/inc/pch/precompiled_fwk.hxx +++ b/framework/inc/pch/precompiled_fwk.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:56 using: + Generated on 2023-07-19 09:22:12 using: ./bin/update_pch framework fwk --cutoff=7 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -29,12 +29,14 @@ #include <cmath> #include <cstddef> #include <cstdlib> +#include <cstring> #include <float.h> #include <functional> #include <initializer_list> #include <iomanip> #include <limits.h> #include <limits> +#include <list> #include <map> #include <math.h> #include <memory> @@ -51,9 +53,9 @@ #include <unordered_map> #include <utility> #include <vector> +#include <boost/property_tree/ptree_fwd.hpp> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 -#include <osl/conditn.h> #include <osl/conditn.hxx> #include <osl/diagnose.h> #include <osl/endian.h> @@ -70,6 +72,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> @@ -80,6 +83,7 @@ #include <rtl/ustrbuf.hxx> #include <rtl/ustring.h> #include <rtl/ustring.hxx> +#include <rtl/uuid.h> #include <sal/detail/log.h> #include <sal/log.hxx> #include <sal/macros.h> @@ -87,36 +91,23 @@ #include <sal/types.h> #include <sal/typesizes.h> #include <vcl/Scanline.hxx> +#include <vcl/WindowPosSize.hxx> #include <vcl/alpha.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmap/BitmapTypes.hxx> #include <vcl/bitmapex.hxx> -#include <vcl/cairo.hxx> #include <vcl/checksum.hxx> #include <vcl/commandinfoprovider.hxx> -#include <vcl/devicecoordinate.hxx> #include <vcl/dllapi.h> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> #include <vcl/gradient.hxx> +#include <vcl/graph.hxx> +#include <vcl/keycod.hxx> +#include <vcl/keycodes.hxx> #include <vcl/mapmod.hxx> -#include <vcl/menu.hxx> -#include <vcl/metaactiontypes.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/scopedbitmapaccess.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> @@ -126,19 +117,23 @@ #include <vcl/vclenum.hxx> #include <vcl/vclptr.hxx> #include <vcl/vclreferencebase.hxx> -#include <vcl/wall.hxx> #include <vcl/window.hxx> +#include <vcl/windowstate.hxx> #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include <basegfx/basegfxdllapi.h> #include <basegfx/color/bcolor.hxx> +#include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/matrix/hommatrixtemplate.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> #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/Size2D.hxx> #include <basegfx/tuple/Tuple2D.hxx> #include <basegfx/tuple/Tuple3D.hxx> #include <basegfx/tuple/b2dtuple.hxx> @@ -146,11 +141,13 @@ #include <basegfx/tuple/b2ituple.hxx> #include <basegfx/tuple/b3dtuple.hxx> #include <basegfx/utils/common.hxx> +#include <basegfx/vector/b2dsize.hxx> #include <basegfx/vector/b2dvector.hxx> #include <basegfx/vector/b2enums.hxx> +#include <basegfx/vector/b2isize.hxx> #include <basegfx/vector/b2ivector.hxx> #include <classes/fwkresid.hxx> -#include <com/sun/star/awt/DeviceInfo.hpp> +#include <com/sun/star/awt/GradientStyle.hpp> #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyEvent.hpp> #include <com/sun/star/awt/KeyGroup.hpp> @@ -166,7 +163,6 @@ #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/drawing/LineCap.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/frame/ControlCommand.hpp> #include <com/sun/star/frame/Desktop.hpp> @@ -183,6 +179,8 @@ #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/frame/XUIControllerFactory.hpp> #include <com/sun/star/io/IOException.hpp> +#include <com/sun/star/io/XInputStream.hpp> +#include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> @@ -191,7 +189,8 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> +#include <com/sun/star/lang/XTypeProvider.hpp> +#include <com/sun/star/task/XInteractionRequest.hpp> #include <com/sun/star/ui/ItemStyle.hpp> #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/XUIConfigurationListener.hpp> @@ -201,7 +200,6 @@ #include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.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> @@ -210,6 +208,7 @@ #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/XComponentContext.hpp> #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/XWeak.hpp> @@ -222,7 +221,10 @@ #include <com/sun/star/util/XUpdatable.hpp> #include <com/sun/star/xml/sax/SAXException.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> +#include <comphelper/compbase.hxx> #include <comphelper/comphelperdllapi.h> +#include <comphelper/diagnose_ex.hxx> +#include <comphelper/errcode.hxx> #include <comphelper/interfacecontainer2.hxx> #include <comphelper/lok.hxx> #include <comphelper/multicontainer2.hxx> @@ -231,11 +233,9 @@ #include <comphelper/propertyvalue.hxx> #include <comphelper/sequence.hxx> #include <comphelper/sequenceashashmap.hxx> -#include <comphelper/servicehelper.hxx> #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/interfacecontainer.h> @@ -251,6 +251,7 @@ #include <o3tl/cow_wrapper.hxx> #include <o3tl/safeint.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> @@ -267,15 +268,16 @@ #include <tools/color.hxx> #include <tools/date.hxx> #include <tools/degree.hxx> -#include <comphelper/diagnose_ex.hxx> #include <tools/fontenum.hxx> #include <tools/gen.hxx> +#include <tools/lineend.hxx> #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 <typelib/typeclass.h> @@ -286,8 +288,6 @@ #include <uno/data.h> #include <uno/sequence2.h> #include <unotools/configmgr.hxx> -#include <unotools/fontdefs.hxx> -#include <unotools/mediadescriptor.hxx> #include <unotools/options.hxx> #include <unotools/unotoolsdllapi.h> #endif // PCH_LEVEL >= 3 diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index 7a225d3b9488..45d1400e10b1 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -307,9 +307,6 @@ excludelist: include/vcl/decoview.hxx: # Full definition needed for VclPtr - vcl/outdev.hxx - include/vcl/devicecoordinate.hxx: - # Needed for #if configure switch - - basegfx/point/b2ipoint.hxx include/vcl/event.hxx: # Needed for enum type - vcl/window.hxx diff --git a/include/vcl/devicecoordinate.hxx b/include/vcl/devicecoordinate.hxx deleted file mode 100644 index edc39a80258a..000000000000 --- a/include/vcl/devicecoordinate.hxx +++ /dev/null @@ -1,15 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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/. - */ - -#pragma once - -#include <basegfx/point/b2dpoint.hxx> -typedef basegfx::B2DPoint DevicePoint; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 89e62bacd50b..7e0a17fec545 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -29,7 +29,6 @@ #include <tools/poly.hxx> #include <vcl/bitmap.hxx> #include <vcl/cairo.hxx> -#include <vcl/devicecoordinate.hxx> #include <vcl/dllapi.h> #include <vcl/font.hxx> #include <vcl/kernarray.hxx> @@ -55,6 +54,7 @@ #include <vcl/vclreferencebase.hxx> #include <basegfx/numeric/ftools.hxx> +#include <basegfx/point/b2dpoint.hxx> #include <basegfx/vector/b2enums.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> @@ -1680,7 +1680,7 @@ public: @returns Physical point on the device. */ SAL_DLLPRIVATE Point ImplLogicToDevicePixel( const Point& rLogicPt ) const; - SAL_DLLPRIVATE DevicePoint ImplLogicToDeviceSubPixel(const Point& rLogicPt) const; + SAL_DLLPRIVATE basegfx::B2DPoint ImplLogicToDeviceSubPixel(const Point& rLogicPt) const; /** Convert a logical width to a width in units of device pixels. @@ -1708,7 +1708,7 @@ public: SAL_DLLPRIVATE tools::Long ImplLogicHeightToDevicePixel( tools::Long nHeight ) const; SAL_DLLPRIVATE double ImplLogicHeightToDeviceSubPixel(tools::Long nHeight) const; - SAL_DLLPRIVATE Point SubPixelToLogic(const DevicePoint& rDevicePt) const; + SAL_DLLPRIVATE Point SubPixelToLogic(const basegfx::B2DPoint& rDevicePt) const; /** Convert device pixels to a width in logical units. diff --git a/include/vcl/vcllayout.hxx b/include/vcl/vcllayout.hxx index ff9e2d926e88..dda07f1c710e 100644 --- a/include/vcl/vcllayout.hxx +++ b/include/vcl/vcllayout.hxx @@ -19,12 +19,12 @@ #pragma once +#include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <i18nlangtag/languagetag.hxx> #include <tools/gen.hxx> #include <tools/degree.hxx> -#include <vcl/devicecoordinate.hxx> #include <vcl/glyphitem.hxx> #include <vcl/dllapi.h> @@ -69,11 +69,11 @@ class VCL_DLLPUBLIC SalLayout public: virtual ~SalLayout(); // used by upper layers - DevicePoint& DrawBase() { return maDrawBase; } - const DevicePoint& DrawBase() const { return maDrawBase; } + basegfx::B2DPoint& DrawBase() { return maDrawBase; } + const basegfx::B2DPoint& DrawBase() const { return maDrawBase; } Point& DrawOffset() { return maDrawOffset; } const Point& DrawOffset() const { return maDrawOffset; } - DevicePoint GetDrawPosition( const DevicePoint& rRelative = DevicePoint(0,0) ) const; + basegfx::B2DPoint GetDrawPosition( const basegfx::B2DPoint& rRelative = basegfx::B2DPoint(0,0) ) const; virtual bool LayoutText( vcl::text::ImplLayoutArgs&, const SalLayoutGlyphsImpl* ) = 0; // first step of layouting virtual void AdjustLayout( vcl::text::ImplLayoutArgs& ); // adjusting after fallback etc. @@ -100,7 +100,7 @@ public: virtual bool IsKashidaPosValid ( int /*nCharPos*/, int /*nNextCharPos*/ ) const = 0; // i60594 // methods using glyph indexing - virtual bool GetNextGlyph(const GlyphItem** pGlyph, DevicePoint& rPos, int& nStart, + virtual bool GetNextGlyph(const GlyphItem** pGlyph, basegfx::B2DPoint& rPos, int& nStart, const LogicalFontInstance** ppGlyphFont = nullptr) const = 0; virtual bool GetOutline(basegfx::B2DPolyPolygonVector&) const; bool GetBoundRect(tools::Rectangle&) const; @@ -123,7 +123,7 @@ protected: Degree10 mnOrientation; mutable Point maDrawOffset; - DevicePoint maDrawBase; + basegfx::B2DPoint maDrawBase; bool mbSubpixelPositioning; }; diff --git a/oox/inc/pch/precompiled_oox.hxx b/oox/inc/pch/precompiled_oox.hxx index cba76097feed..02971960b084 100644 --- a/oox/inc/pch/precompiled_oox.hxx +++ b/oox/inc/pch/precompiled_oox.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 2023-01-10 23:28:48 using: + Generated on 2023-07-19 09:28:54 using: ./bin/update_pch oox oox --cutoff=6 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -90,7 +90,6 @@ #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/cairo.hxx> -#include <vcl/devicecoordinate.hxx> #include <vcl/dllapi.h> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> @@ -131,10 +130,13 @@ #include <basegfx/tuple/Tuple2D.hxx> #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/tuple/b3dtuple.hxx> +#include <basegfx/utils/bgradient.hxx> #include <basegfx/vector/b2dsize.hxx> #include <basegfx/vector/b2enums.hxx> #include <com/sun/star/awt/DeviceInfo.hpp> #include <com/sun/star/awt/FontWeight.hpp> +#include <com/sun/star/awt/Gradient2.hpp> +#include <com/sun/star/awt/GradientStyle.hpp> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/PropertyState.hpp> @@ -192,6 +194,7 @@ #include <comphelper/comphelperdllapi.h> #include <comphelper/diagnose_ex.hxx> #include <comphelper/processfactory.hxx> +#include <comphelper/propertysequence.hxx> #include <comphelper/propertyvalue.hxx> #include <comphelper/sequence.hxx> #include <comphelper/sequenceashashmap.hxx> @@ -202,6 +205,10 @@ #include <cppuhelper/implbase_ex.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> +#include <docmodel/color/ComplexColor.hxx> +#include <docmodel/dllapi.h> +#include <docmodel/theme/ColorSet.hxx> +#include <docmodel/theme/ThemeColor.hxx> #include <docmodel/theme/ThemeColorType.hxx> #include <drawinglayer/primitive2d/Primitive2DContainer.hxx> #include <drawingml/colorchoicecontext.hxx> @@ -219,6 +226,9 @@ #include <drawingml/textparagraph.hxx> #include <drawingml/textspacing.hxx> #include <filter/msfilter/msfilterdllapi.h> +#include <frozen/bits/defines.h> +#include <frozen/bits/elsa_std.h> +#include <frozen/unordered_map.h> #include <i18nlangtag/lang.h> #include <o3tl/cow_wrapper.hxx> #include <o3tl/safeint.hxx> @@ -236,7 +246,6 @@ #include <svl/svldllapi.h> #include <svl/typedwhich.hxx> #include <svl/whichranges.hxx> -#include <svx/ColorSets.hxx> #include <svx/itextprovider.hxx> #include <svx/msdffdef.hxx> #include <svx/sdtaditm.hxx> diff --git a/reportdesign/inc/pch/precompiled_rpt.hxx b/reportdesign/inc/pch/precompiled_rpt.hxx index d58b548163ae..e590409ae968 100644 --- a/reportdesign/inc/pch/precompiled_rpt.hxx +++ b/reportdesign/inc/pch/precompiled_rpt.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-08-13 18:00:55 using: + Generated on 2023-07-19 09:28:24 using: ./bin/update_pch reportdesign rpt --cutoff=9 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -51,6 +51,7 @@ #include <string> #include <string_view> #include <type_traits> +#include <typeinfo> #include <unordered_map> #include <unordered_set> #include <utility> @@ -68,10 +69,12 @@ #include <osl/mutex.hxx> #include <osl/thread.h> #include <rtl/alloc.h> +#include <rtl/character.hxx> #include <rtl/instance.hxx> #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> @@ -102,14 +105,13 @@ #include <vcl/bitmapex.hxx> #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> -#include <vcl/devicecoordinate.hxx> #include <vcl/dllapi.h> -#include <comphelper/errcode.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> #include <vcl/gfxlink.hxx> #include <vcl/gradient.hxx> #include <vcl/graph.hxx> +#include <vcl/kernarray.hxx> #include <vcl/mapmod.hxx> #include <vcl/metaactiontypes.hxx> #include <vcl/outdev.hxx> @@ -129,6 +131,7 @@ #include <vcl/rendercontext/SystemTextColorFlags.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/scopedbitmapaccess.hxx> +#include <vcl/settings.hxx> #include <vcl/task.hxx> #include <vcl/timer.hxx> #include <vcl/vclenum.hxx> @@ -140,6 +143,8 @@ #if PCH_LEVEL >= 3 #include <basegfx/basegfxdllapi.h> #include <basegfx/color/bcolor.hxx> +#include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/matrix/hommatrixtemplate.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/point/b2ipoint.hxx> @@ -148,6 +153,7 @@ #include <basegfx/range/Range2D.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/range/basicrange.hxx> +#include <basegfx/tuple/Size2D.hxx> #include <basegfx/tuple/Tuple2D.hxx> #include <basegfx/tuple/Tuple3D.hxx> #include <basegfx/tuple/b2dtuple.hxx> @@ -157,15 +163,26 @@ #include <basegfx/vector/b2dsize.hxx> #include <basegfx/vector/b2dvector.hxx> #include <basegfx/vector/b2enums.hxx> +#include <basegfx/vector/b2isize.hxx> #include <basegfx/vector/b2ivector.hxx> #include <com/sun/star/awt/DeviceInfo.hpp> +#include <com/sun/star/awt/FontDescriptor.hpp> +#include <com/sun/star/awt/GradientStyle.hpp> #include <com/sun/star/beans/XFastPropertySet.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> +#include <com/sun/star/beans/XPropertyAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/container/XChild.hpp> #include <com/sun/star/drawing/LineCap.hpp> #include <com/sun/star/drawing/TextFitToSizeType.hpp> +#include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/graphic/XPrimitive2D.hpp> +#include <com/sun/star/io/XInputStream.hpp> +#include <com/sun/star/io/XOutputStream.hpp> +#include <com/sun/star/io/XSeekable.hpp> +#include <com/sun/star/io/XStream.hpp> +#include <com/sun/star/io/XTruncate.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/lang/Locale.hpp> @@ -198,9 +215,13 @@ #include <com/sun/star/util/XAccounting.hpp> #include <comphelper/compbase.hxx> #include <comphelper/comphelperdllapi.h> +#include <comphelper/diagnose_ex.hxx> +#include <comphelper/errcode.hxx> +#include <comphelper/interfacecontainer3.hxx> #include <comphelper/interfacecontainer4.hxx> #include <comphelper/sequence.hxx> #include <comphelper/uno3.hxx> +#include <comphelper/unoimplbase.hxx> #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> #include <cppuhelper/basemutex.hxx> @@ -212,6 +233,7 @@ #include <cppuhelper/implbase_ex_post.hxx> #include <cppuhelper/implbase_ex_pre.hxx> #include <cppuhelper/interfacecontainer.h> +#include <cppuhelper/propertysetmixin.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weak.hxx> @@ -236,6 +258,7 @@ #include <o3tl/unit_conversion.hxx> #include <salhelper/salhelperdllapi.h> #include <salhelper/simplereferenceobject.hxx> +#include <sfx2/dllapi.h> #include <svl/SfxBroadcaster.hxx> #include <svl/cenumitm.hxx> #include <svl/eitem.hxx> @@ -268,22 +291,21 @@ #include <tools/date.hxx> #include <tools/datetime.hxx> #include <tools/degree.hxx> -#include <comphelper/diagnose_ex.hxx> #include <tools/fldunit.hxx> #include <tools/fontenum.hxx> #include <tools/fract.hxx> #include <tools/gen.hxx> #include <tools/helpers.hxx> +#include <tools/lineend.hxx> #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/time.hxx> #include <tools/toolsdllapi.h> -#include <tools/weakbase.h> -#include <tools/weakbase.hxx> #include <typelib/typeclass.h> #include <typelib/typedescription.h> #include <typelib/uik.h> @@ -293,7 +315,9 @@ #include <unotools/fontdefs.hxx> #include <unotools/resmgr.hxx> #include <unotools/syslocale.hxx> +#include <unotools/tempfile.hxx> #include <unotools/unotoolsdllapi.h> +#include <unotools/weakref.hxx> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 #include <RptModel.hxx> diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx index 46c40c5437d3..d2a442e51251 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 2022-08-13 18:00:56 using: + Generated on 2023-07-19 09:28:34 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: @@ -68,12 +68,16 @@ #include <osl/endian.h> #include <osl/getglobalmutex.hxx> #include <osl/interlck.h> +#include <osl/mutex.h> #include <osl/mutex.hxx> #include <rtl/alloc.h> +#include <rtl/character.hxx> #include <rtl/instance.hxx> #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> @@ -113,9 +117,7 @@ #include <vcl/checksum.hxx> #include <vcl/commandevent.hxx> #include <vcl/ctrl.hxx> -#include <vcl/devicecoordinate.hxx> #include <vcl/dllapi.h> -#include <comphelper/errcode.hxx> #include <vcl/event.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> @@ -125,6 +127,7 @@ #include <vcl/graph.hxx> #include <vcl/headbar.hxx> #include <vcl/idle.hxx> +#include <vcl/kernarray.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/mapmod.hxx> @@ -166,6 +169,7 @@ #include <basegfx/basegfxdllapi.h> #include <basegfx/color/bcolor.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/matrix/hommatrixtemplate.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/point/b2ipoint.hxx> @@ -177,23 +181,26 @@ #include <basegfx/range/b2drectangle.hxx> #include <basegfx/range/b2irange.hxx> #include <basegfx/range/basicrange.hxx> +#include <basegfx/tuple/Size2D.hxx> #include <basegfx/tuple/Tuple2D.hxx> #include <basegfx/tuple/Tuple3D.hxx> #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/tuple/b2i64tuple.hxx> #include <basegfx/tuple/b2ituple.hxx> #include <basegfx/tuple/b3dtuple.hxx> +#include <basegfx/utils/bgradient.hxx> #include <basegfx/utils/common.hxx> #include <basegfx/vector/b2dsize.hxx> #include <basegfx/vector/b2dvector.hxx> #include <basegfx/vector/b2enums.hxx> +#include <basegfx/vector/b2isize.hxx> #include <basegfx/vector/b2ivector.hxx> #include <basegfx/vector/b3dvector.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp> #include <com/sun/star/awt/DeviceInfo.hpp> #include <com/sun/star/awt/FontSlant.hpp> -#include <com/sun/star/awt/Gradient.hpp> +#include <com/sun/star/awt/Gradient2.hpp> #include <com/sun/star/awt/GradientStyle.hpp> #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyGroup.hpp> @@ -203,6 +210,7 @@ #include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> +#include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/container/XIndexReplace.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/datatransfer/DataFlavor.hpp> @@ -225,11 +233,17 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XStatusbarController.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> +#include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/graphic/XPrimitive2D.hpp> #include <com/sun/star/i18n/CharacterIteratorMode.hpp> #include <com/sun/star/i18n/ForbiddenCharacters.hpp> #include <com/sun/star/i18n/WordType.hpp> #include <com/sun/star/inspection/XPropertyHandler.hpp> +#include <com/sun/star/io/XInputStream.hpp> +#include <com/sun/star/io/XOutputStream.hpp> +#include <com/sun/star/io/XSeekable.hpp> +#include <com/sun/star/io/XStream.hpp> +#include <com/sun/star/io/XTruncate.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> @@ -266,8 +280,11 @@ #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/view/XSelectionChangeListener.hpp> #include <comphelper/compbase.hxx> #include <comphelper/comphelperdllapi.h> +#include <comphelper/diagnose_ex.hxx> +#include <comphelper/errcode.hxx> #include <comphelper/interfacecontainer2.hxx> #include <comphelper/interfacecontainer4.hxx> #include <comphelper/multicontainer2.hxx> @@ -275,7 +292,9 @@ #include <comphelper/propertysetinfo.hxx> #include <comphelper/propertyvalue.hxx> #include <comphelper/sequence.hxx> +#include <comphelper/servicehelper.hxx> #include <comphelper/types.hxx> +#include <comphelper/unoimplbase.hxx> #include <connectivity/dbtools.hxx> #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> @@ -294,6 +313,11 @@ #include <cppuhelper/weak.hxx> #include <cppuhelper/weakagg.hxx> #include <cppuhelper/weakref.hxx> +#include <docmodel/color/ComplexColor.hxx> +#include <docmodel/color/Transformation.hxx> +#include <docmodel/dllapi.h> +#include <docmodel/theme/ThemeColor.hxx> +#include <docmodel/theme/ThemeColorType.hxx> #include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <drawinglayer/primitive2d/CommonTypes.hxx> @@ -329,6 +353,7 @@ #include <o3tl/cow_wrapper.hxx> #include <o3tl/deleter.hxx> #include <o3tl/enumarray.hxx> +#include <o3tl/hash_combine.hxx> #include <o3tl/intcmp.hxx> #include <o3tl/safeint.hxx> #include <o3tl/sorted_vector.hxx> @@ -428,7 +453,6 @@ #include <tools/datetime.hxx> #include <tools/debug.hxx> #include <tools/degree.hxx> -#include <comphelper/diagnose_ex.hxx> #include <tools/fldunit.hxx> #include <tools/fontenum.hxx> #include <tools/fract.hxx> @@ -442,10 +466,10 @@ #include <tools/poly.hxx> #include <tools/ref.hxx> #include <tools/solar.h> +#include <tools/stream.hxx> #include <tools/time.hxx> #include <tools/toolsdllapi.h> #include <tools/weakbase.h> -#include <tools/weakbase.hxx> #include <typelib/typeclass.h> #include <typelib/typedescription.h> #include <typelib/uik.h> @@ -457,7 +481,9 @@ #include <unotools/options.hxx> #include <unotools/resmgr.hxx> #include <unotools/syslocale.hxx> +#include <unotools/tempfile.hxx> #include <unotools/unotoolsdllapi.h> +#include <unotools/weakref.hxx> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 #include <AddField.hxx> diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx index 37682da2f713..c200ce9aab23 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 2022-08-13 18:01:16 using: + Generated on 2023-07-19 09:28:08 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: @@ -47,13 +47,13 @@ #include <optional> #include <ostream> #include <set> -#include <sstream> #include <stddef.h> #include <stdexcept> #include <string.h> #include <string> #include <string_view> #include <type_traits> +#include <typeinfo> #include <unordered_map> #include <unordered_set> #include <utility> @@ -61,6 +61,7 @@ #include <boost/property_tree/ptree_fwd.hpp> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 +#include <osl/conditn.hxx> #include <osl/diagnose.h> #include <osl/doublecheckedlocking.h> #include <osl/endian.h> @@ -73,6 +74,7 @@ #include <osl/time.h> #include <rtl/alloc.h> #include <rtl/byteseq.h> +#include <rtl/character.hxx> #include <rtl/instance.hxx> #include <rtl/locale.h> #include <rtl/math.h> @@ -91,7 +93,6 @@ #include <rtl/ustring.hxx> #include <rtl/uuid.h> #include <sal/backtrace.hxx> -#include <sal/detail/log.h> #include <sal/log.hxx> #include <sal/macros.h> #include <sal/saldllapi.h> @@ -106,6 +107,7 @@ #include <vcl/GraphicObject.hxx> #include <vcl/IDialogRenderable.hxx> #include <vcl/ITiledRenderable.hxx> +#include <vcl/InterimItemWindow.hxx> #include <vcl/Scanline.hxx> #include <vcl/WindowPosSize.hxx> #include <vcl/alpha.hxx> @@ -117,11 +119,10 @@ #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> #include <vcl/dockwin.hxx> -#include <comphelper/errcode.hxx> #include <vcl/event.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> @@ -132,6 +133,7 @@ #include <vcl/graph.hxx> #include <vcl/idle.hxx> #include <vcl/image.hxx> +#include <vcl/kernarray.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/mapmod.hxx> @@ -156,6 +158,7 @@ #include <vcl/salgtype.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/scopedbitmapaccess.hxx> +#include <vcl/scrollable.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/syswin.hxx> @@ -178,6 +181,7 @@ #include <basegfx/basegfxdllapi.h> #include <basegfx/color/bcolor.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/matrix/hommatrixtemplate.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/point/b2ipoint.hxx> @@ -187,24 +191,30 @@ #include <basegfx/range/b2drange.hxx> #include <basegfx/range/b2drectangle.hxx> #include <basegfx/range/basicrange.hxx> +#include <basegfx/tuple/Size2D.hxx> #include <basegfx/tuple/Tuple2D.hxx> #include <basegfx/tuple/Tuple3D.hxx> #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/tuple/b2i64tuple.hxx> #include <basegfx/tuple/b2ituple.hxx> #include <basegfx/tuple/b3dtuple.hxx> +#include <basegfx/utils/bgradient.hxx> #include <basegfx/utils/common.hxx> #include <basegfx/vector/b2dsize.hxx> #include <basegfx/vector/b2dvector.hxx> #include <basegfx/vector/b2enums.hxx> +#include <basegfx/vector/b2isize.hxx> #include <basegfx/vector/b2ivector.hxx> #include <com/sun/star/awt/DeviceInfo.hpp> -#include <com/sun/star/awt/Gradient.hpp> +#include <com/sun/star/awt/Gradient2.hpp> #include <com/sun/star/awt/GradientStyle.hpp> #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyGroup.hpp> +#include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/awt/SystemPointer.hpp> #include <com/sun/star/awt/XWindow.hpp> +#include <com/sun/star/awt/XWindowPeer.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XIndexContainer.hpp> @@ -246,6 +256,8 @@ #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <com/sun/star/drawing/XLayerSupplier.hpp> #include <com/sun/star/drawing/XMasterPagesSupplier.hpp> +#include <com/sun/star/drawing/XPresenterHelper.hpp> +#include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/XVisualObject.hpp> @@ -261,14 +273,21 @@ #include <com/sun/star/frame/XTitle.hpp> #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp> #include <com/sun/star/frame/XUntitledNumbers.hpp> +#include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/graphic/XPrimitive2D.hpp> #include <com/sun/star/i18n/ForbiddenCharacters.hpp> #include <com/sun/star/i18n/WordType.hpp> +#include <com/sun/star/io/XInputStream.hpp> +#include <com/sun/star/io/XOutputStream.hpp> +#include <com/sun/star/io/XSeekable.hpp> +#include <com/sun/star/io/XStream.hpp> +#include <com/sun/star/io/XTruncate.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/XEventListener.hpp> +#include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> @@ -278,6 +297,8 @@ #include <com/sun/star/presentation/XHandoutMasterSupplier.hpp> #include <com/sun/star/presentation/XPresentationSupplier.hpp> #include <com/sun/star/rdf/XDocumentMetadataAccess.hpp> +#include <com/sun/star/rendering/CompositeOperation.hpp> +#include <com/sun/star/rendering/TextDirection.hpp> #include <com/sun/star/script/XStarBasicAccess.hpp> #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp> #include <com/sun/star/style/NumberingType.hpp> @@ -311,12 +332,14 @@ #include <com/sun/star/view/XRenderable.hpp> #include <comphelper/compbase.hxx> #include <comphelper/comphelperdllapi.h> -#include <comphelper/interfacecontainer3.hxx> +#include <comphelper/errcode.hxx> #include <comphelper/interfacecontainer4.hxx> #include <comphelper/servicehelper.hxx> +#include <comphelper/unoimplbase.hxx> #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/implbase_ex.hxx> @@ -326,6 +349,11 @@ #include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> #include <cui/cuidllapi.h> +#include <docmodel/color/ComplexColor.hxx> +#include <docmodel/color/Transformation.hxx> +#include <docmodel/dllapi.h> +#include <docmodel/theme/ThemeColor.hxx> +#include <docmodel/theme/ThemeColorType.hxx> #include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <drawinglayer/primitive2d/CommonTypes.hxx> @@ -347,11 +375,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/hash_combine.hxx> #include <o3tl/safeint.hxx> #include <o3tl/sorted_vector.hxx> #include <o3tl/span.hxx> @@ -364,6 +395,7 @@ #include <salhelper/thread.hxx> #include <sfx2/basedlgs.hxx> #include <sfx2/dllapi.h> +#include <sfx2/namedcolor.hxx> #include <sfx2/objsh.hxx> #include <sfx2/sfxbasemodel.hxx> #include <sfx2/shell.hxx> @@ -387,11 +419,11 @@ #include <svl/svldllapi.h> #include <svl/typedwhich.hxx> #include <svl/undo.hxx> +#include <svl/urlbmk.hxx> #include <svl/whichranges.hxx> #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> @@ -468,7 +500,6 @@ #include <tools/toolsdllapi.h> #include <tools/urlobj.hxx> #include <tools/weakbase.h> -#include <tools/weakbase.hxx> #include <typelib/typeclass.h> #include <typelib/typedescription.h> #include <typelib/uik.h> @@ -480,12 +511,16 @@ #include <unotools/options.hxx> #include <unotools/resmgr.hxx> #include <unotools/syslocale.hxx> +#include <unotools/tempfile.hxx> #include <unotools/unotoolsdllapi.h> +#include <unotools/weakref.hxx> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 +#include <DrawController.hxx> #include <DrawDocShell.hxx> #include <View.hxx> #include <drawdoc.hxx> +#include <fupoor.hxx> #include <pres.hxx> #include <sddllapi.h> #include <sdmod.hxx> diff --git a/slideshow/inc/pch/precompiled_slideshow.hxx b/slideshow/inc/pch/precompiled_slideshow.hxx index 2134b1a0ae84..234c3c09c839 100644 --- a/slideshow/inc/pch/precompiled_slideshow.hxx +++ b/slideshow/inc/pch/precompiled_slideshow.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-08-13 18:01:17 using: + Generated on 2023-07-19 09:27:50 using: ./bin/update_pch slideshow slideshow --cutoff=4 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -26,6 +26,7 @@ #include <array> #include <cassert> #include <chrono> +#include <cmath> #include <cstddef> #include <cstdlib> #include <cstring> @@ -50,6 +51,7 @@ #include <string> #include <string_view> #include <type_traits> +#include <typeinfo> #include <unordered_set> #include <utility> #include <vector> @@ -68,6 +70,7 @@ #include <osl/time.h> #include <rtl/alloc.h> #include <rtl/instance.hxx> +#include <rtl/math.h> #include <rtl/math.hxx> #include <rtl/ref.hxx> #include <rtl/strbuf.h> @@ -100,15 +103,14 @@ #include <vcl/bitmapex.hxx> #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> -#include <vcl/devicecoordinate.hxx> #include <vcl/dllapi.h> -#include <comphelper/errcode.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> #include <vcl/gdimtf.hxx> #include <vcl/gfxlink.hxx> #include <vcl/gradient.hxx> #include <vcl/graph.hxx> +#include <vcl/kernarray.hxx> #include <vcl/mapmod.hxx> #include <vcl/metaactiontypes.hxx> #include <vcl/outdev.hxx> @@ -128,6 +130,7 @@ #include <vcl/rendercontext/SystemTextColorFlags.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/scopedbitmapaccess.hxx> +#include <vcl/settings.hxx> #include <vcl/task.hxx> #include <vcl/timer.hxx> #include <vcl/vclenum.hxx> @@ -151,8 +154,8 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/range/Range2D.hxx> #include <basegfx/range/b2drange.hxx> -#include <basegfx/range/b2drectangle.hxx> #include <basegfx/range/basicrange.hxx> +#include <basegfx/tuple/Size2D.hxx> #include <basegfx/tuple/Tuple2D.hxx> #include <basegfx/tuple/Tuple3D.hxx> #include <basegfx/tuple/b2i64tuple.hxx> @@ -164,12 +167,14 @@ #include <basegfx/vector/b2dvector.hxx> #include <basegfx/vector/b2enums.hxx> #include <basegfx/vector/b2isize.hxx> -#include <basegfx/vector/b2ivector.hxx> #include <canvas/canvastools.hxx> +#include <com/sun/star/animations/Timing.hpp> #include <com/sun/star/animations/TransitionSubType.hpp> #include <com/sun/star/animations/TransitionType.hpp> +#include <com/sun/star/animations/XAnimationNode.hpp> #include <com/sun/star/awt/DeviceInfo.hpp> #include <com/sun/star/awt/FontSlant.hpp> +#include <com/sun/star/awt/GradientStyle.hpp> #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyGroup.hpp> #include <com/sun/star/awt/MouseButton.hpp> @@ -182,14 +187,18 @@ #include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/form/FormComponentType.hpp> -#include <com/sun/star/geometry/IntegerSize2D.hpp> #include <com/sun/star/graphic/XPrimitive2D.hpp> +#include <com/sun/star/io/XInputStream.hpp> +#include <com/sun/star/io/XOutputStream.hpp> +#include <com/sun/star/io/XSeekable.hpp> +#include <com/sun/star/io/XStream.hpp> +#include <com/sun/star/io/XTruncate.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/lang/NoSupportException.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> +#include <com/sun/star/media/ZoomLevel.hpp> #include <com/sun/star/presentation/ParagraphTarget.hpp> #include <com/sun/star/presentation/XSlideShowView.hpp> #include <com/sun/star/rendering/XCanvas.hpp> @@ -204,6 +213,7 @@ #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> @@ -214,27 +224,28 @@ #include <com/sun/star/util/XAccounting.hpp> #include <comphelper/compbase.hxx> #include <comphelper/comphelperdllapi.h> +#include <comphelper/diagnose_ex.hxx> +#include <comphelper/errcode.hxx> #include <comphelper/interfacecontainer4.hxx> +#include <comphelper/unoimplbase.hxx> #include <cppcanvas/basegfxfactory.hxx> -#include <cppcanvas/bitmap.hxx> #include <cppcanvas/bitmapcanvas.hxx> #include <cppcanvas/canvas.hxx> #include <cppcanvas/canvasgraphic.hxx> #include <cppcanvas/color.hxx> #include <cppcanvas/customsprite.hxx> -#include <cppcanvas/renderer.hxx> #include <cppcanvas/vclfactory.hxx> #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/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 <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/geometry/viewinformation2d.hxx> @@ -292,7 +303,6 @@ #include <tools/date.hxx> #include <tools/datetime.hxx> #include <tools/degree.hxx> -#include <comphelper/diagnose_ex.hxx> #include <tools/fldunit.hxx> #include <tools/fontenum.hxx> #include <tools/fract.hxx> @@ -305,10 +315,9 @@ #include <tools/poly.hxx> #include <tools/ref.hxx> #include <tools/solar.h> +#include <tools/stream.hxx> #include <tools/time.hxx> #include <tools/toolsdllapi.h> -#include <tools/weakbase.h> -#include <tools/weakbase.hxx> #include <typelib/typeclass.h> #include <typelib/typedescription.h> #include <typelib/uik.h> @@ -318,20 +327,20 @@ #include <unotools/fontdefs.hxx> #include <unotools/resmgr.hxx> #include <unotools/syslocale.hxx> +#include <unotools/tempfile.hxx> #include <unotools/unotoolsdllapi.h> +#include <unotools/weakref.hxx> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 #include <activitiesfactory.hxx> #include <activitiesqueue.hxx> -#include <animatableshape.hxx> -#include <animatedsprite.hxx> #include <animationfactory.hxx> -#include <attributableshape.hxx> +#include <animationnode.hxx> #include <cursormanager.hxx> #include <delayevent.hxx> #include <disposable.hxx> #include <doctreenode.hxx> -#include <doctreenodesupplier.hxx> +#include <event.hxx> #include <eventmultiplexer.hxx> #include <eventqueue.hxx> #include <rgbcolor.hxx> @@ -346,7 +355,6 @@ #include <unoview.hxx> #include <unoviewcontainer.hxx> #include <usereventqueue.hxx> -#include <viewlayer.hxx> #endif // PCH_LEVEL >= 4 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/starmath/inc/pch/precompiled_sm.hxx b/starmath/inc/pch/precompiled_sm.hxx index 02e0d90abb71..8d4da78fb60a 100644 --- a/starmath/inc/pch/precompiled_sm.hxx +++ b/starmath/inc/pch/precompiled_sm.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:19 using: + Generated on 2023-07-19 09:27:30 using: ./bin/update_pch starmath sm --cutoff=5 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -23,13 +23,16 @@ #include <sal/config.h> #if PCH_LEVEL >= 1 #include <algorithm> +#include <assert.h> #include <cassert> +#include <cmath> #include <cstddef> #include <cstdlib> #include <cstring> #include <functional> #include <limits.h> #include <limits> +#include <math.h> #include <memory> #include <new> #include <optional> @@ -44,12 +47,14 @@ #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include <osl/diagnose.h> -#include <osl/mutex.hxx> +#include <osl/interlck.h> #include <rtl/alloc.h> #include <rtl/character.hxx> #include <rtl/locale.h> +#include <rtl/math.h> #include <rtl/math.hxx> #include <rtl/ref.hxx> +#include <rtl/strbuf.hxx> #include <rtl/string.hxx> #include <rtl/stringconcat.hxx> #include <rtl/stringutils.hxx> @@ -59,15 +64,15 @@ #include <rtl/ustring.h> #include <rtl/ustring.hxx> #include <sal/log.hxx> +#include <sal/saldllapi.h> #include <sal/types.h> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/cairo.hxx> -#include <vcl/devicecoordinate.hxx> #include <vcl/dllapi.h> -#include <comphelper/errcode.hxx> #include <vcl/font.hxx> #include <vcl/gradient.hxx> +#include <vcl/kernarray.hxx> #include <vcl/mapmod.hxx> #include <vcl/metaactiontypes.hxx> #include <vcl/outdev.hxx> @@ -95,54 +100,59 @@ #include <vcl/wall.hxx> #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 +#include <basegfx/basegfxdllapi.h> #include <basegfx/numeric/ftools.hxx> +#include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/vector/b2enums.hxx> +#include <com/sun/star/accessibility/XAccessibleRelationSet.hpp> #include <com/sun/star/awt/DeviceInfo.hpp> +#include <com/sun/star/beans/PropertyAttribute.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/drawing/LineCap.hpp> -#include <com/sun/star/i18n/WordType.hpp> -#include <com/sun/star/text/textfield/Type.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.h> #include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/uno/genfunc.hxx> #include <comphelper/comphelperdllapi.h> -#include <comphelper/fileformat.h> +#include <comphelper/diagnose_ex.hxx> +#include <comphelper/errcode.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propertysetinfo.hxx> #include <comphelper/servicehelper.hxx> +#include <cppu/unotype.hxx> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weakref.hxx> -#include <editeng/editdata.hxx> #include <editeng/editengdllapi.h> -#include <editeng/editobj.hxx> -#include <editeng/editstat.hxx> -#include <editeng/eedata.hxx> -#include <editeng/macros.hxx> #include <i18nlangtag/lang.h> #include <o3tl/cow_wrapper.hxx> +#include <o3tl/safeint.hxx> +#include <o3tl/span.hxx> +#include <o3tl/string_view.hxx> #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/unit_conversion.hxx> #include <salhelper/simplereferenceobject.hxx> +#include <sfx2/dispatch.hxx> #include <sfx2/dllapi.h> #include <sfx2/docfile.hxx> #include <sfx2/shell.hxx> #include <sot/storage.hxx> -#include <svl/SfxBroadcaster.hxx> #include <svl/hint.hxx> #include <svl/itemset.hxx> #include <svl/languageoptions.hxx> +#include <svl/lstner.hxx> #include <svl/poolitem.hxx> #include <svl/stritem.hxx> -#include <svl/style.hxx> #include <svl/svldllapi.h> #include <svl/typedwhich.hxx> #include <svx/svxdllapi.h> #include <tools/color.hxx> #include <tools/degree.hxx> -#include <comphelper/diagnose_ex.hxx> +#include <tools/fldunit.hxx> #include <tools/gen.hxx> #include <tools/lineend.hxx> #include <tools/link.hxx> @@ -152,14 +162,15 @@ #include <tools/ref.hxx> #include <tools/solar.h> #include <tools/toolsdllapi.h> +#include <typelib/typedescription.h> +#include <uno/data.h> #include <unotools/fontdefs.hxx> -#include <unotools/options.hxx> +#include <unotools/resmgr.hxx> #include <unotools/streamwrap.hxx> #include <unotools/unotoolsdllapi.h> #include <xmloff/dllapi.h> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 -#include <ElementsDockingWindow.hxx> #include <cfgitem.hxx> #include <dialog.hxx> #include <document.hxx> diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx index 5750fdf09267..18d1a1d58f61 100644 --- a/sw/inc/pch/precompiled_msword.hxx +++ b/sw/inc/pch/precompiled_msword.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-08-13 18:01:38 using: + Generated on 2023-07-19 09:26:53 using: ./bin/update_pch sw msword --cutoff=4 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -57,6 +57,7 @@ #include <string> #include <string_view> #include <type_traits> +#include <typeinfo> #include <unordered_map> #include <unordered_set> #include <utility> @@ -66,6 +67,7 @@ #include <boost/multi_index/mem_fun.hpp> #include <boost/multi_index/ordered_index.hpp> #include <boost/multi_index/random_access_index.hpp> +#include <boost/multi_index/tag.hpp> #include <boost/multi_index_container.hpp> #include <boost/property_tree/ptree_fwd.hpp> #endif // PCH_LEVEL >= 1 @@ -123,9 +125,7 @@ #include <vcl/bitmapex.hxx> #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> -#include <vcl/devicecoordinate.hxx> #include <vcl/dllapi.h> -#include <comphelper/errcode.hxx> #include <vcl/event.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> @@ -134,12 +134,12 @@ #include <vcl/gradient.hxx> #include <vcl/graph.hxx> #include <vcl/idle.hxx> +#include <vcl/kernarray.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/mapmod.hxx> #include <vcl/metaactiontypes.hxx> #include <vcl/outdev.hxx> -#include <vcl/ptrstyle.hxx> #include <vcl/region.hxx> #include <vcl/rendercontext/AddFontSubstituteFlags.hxx> #include <vcl/rendercontext/AntialiasingFlags.hxx> @@ -173,6 +173,7 @@ #include <basegfx/basegfxdllapi.h> #include <basegfx/color/bcolor.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/matrix/hommatrixtemplate.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/point/b2ipoint.hxx> @@ -183,16 +184,19 @@ #include <basegfx/range/b2drectangle.hxx> #include <basegfx/range/b2irange.hxx> #include <basegfx/range/basicrange.hxx> +#include <basegfx/tuple/Size2D.hxx> #include <basegfx/tuple/Tuple2D.hxx> #include <basegfx/tuple/Tuple3D.hxx> #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/tuple/b2i64tuple.hxx> #include <basegfx/tuple/b2ituple.hxx> #include <basegfx/tuple/b3dtuple.hxx> +#include <basegfx/utils/bgradient.hxx> #include <basegfx/utils/common.hxx> #include <basegfx/vector/b2dsize.hxx> #include <basegfx/vector/b2dvector.hxx> #include <basegfx/vector/b2enums.hxx> +#include <basegfx/vector/b2isize.hxx> #include <basegfx/vector/b2ivector.hxx> #include <basic/basicdllapi.h> #include <basic/sbdef.hxx> @@ -204,7 +208,7 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp> #include <com/sun/star/awt/DeviceInfo.hpp> -#include <com/sun/star/awt/Gradient.hpp> +#include <com/sun/star/awt/Gradient2.hpp> #include <com/sun/star/awt/GradientStyle.hpp> #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyGroup.hpp> @@ -220,12 +224,14 @@ #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/container/XEnumerationAccess.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/datatransfer/XTransferable.hpp> #include <com/sun/star/document/EventObject.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/document/XEventsSupplier.hpp> +#include <com/sun/star/document/XExporter.hpp> +#include <com/sun/star/document/XFilter.hpp> +#include <com/sun/star/document/XImporter.hpp> #include <com/sun/star/drawing/BitmapMode.hpp> #include <com/sun/star/drawing/DashStyle.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp> @@ -246,6 +252,7 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XModel3.hpp> #include <com/sun/star/geometry/IntegerRectangle2D.hpp> +#include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/graphic/XPrimitive2D.hpp> #include <com/sun/star/i18n/Calendar2.hpp> #include <com/sun/star/i18n/CollatorOptions.hpp> @@ -264,15 +271,19 @@ #include <com/sun/star/i18n/WordType.hpp> #include <com/sun/star/i18n/XBreakIterator.hpp> #include <com/sun/star/i18n/reservedWords.hpp> +#include <com/sun/star/io/XInputStream.hpp> +#include <com/sun/star/io/XOutputStream.hpp> +#include <com/sun/star/io/XSeekable.hpp> +#include <com/sun/star/io/XStream.hpp> +#include <com/sun/star/io/XTruncate.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/EventObject.hpp> -#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/XComponent.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/rdf/XDocumentMetadataAccess.hpp> #include <com/sun/star/style/NumberingType.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> @@ -292,7 +303,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/XComponentContext.hpp> #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/XWeak.hpp> #include <com/sun/star/uno/genfunc.h> @@ -305,15 +315,17 @@ #include <com/sun/star/xml/sax/XFastAttributeList.hpp> #include <comphelper/compbase.hxx> #include <comphelper/comphelperdllapi.h> +#include <comphelper/diagnose_ex.hxx> +#include <comphelper/errcode.hxx> #include <comphelper/interfacecontainer4.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propertysequence.hxx> #include <comphelper/sequence.hxx> #include <comphelper/sequenceashashmap.hxx> #include <comphelper/string.hxx> +#include <comphelper/unoimplbase.hxx> #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> -#include <cppuhelper/basemutex.hxx> #include <cppuhelper/cppuhelperdllapi.h> #include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase_ex.hxx> @@ -322,6 +334,12 @@ #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> +#include <docmodel/color/ComplexColor.hxx> +#include <docmodel/color/Transformation.hxx> +#include <docmodel/dllapi.h> +#include <docmodel/theme/FormatScheme.hxx> +#include <docmodel/theme/ThemeColor.hxx> +#include <docmodel/theme/ThemeColorType.hxx> #include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <drawinglayer/primitive2d/CommonTypes.hxx> @@ -382,9 +400,11 @@ #include <i18nlangtag/i18nlangtagdllapi.h> #include <i18nlangtag/lang.h> #include <i18nlangtag/languagetag.hxx> +#include <i18nlangtag/mslangid.hxx> #include <o3tl/cow_wrapper.hxx> #include <o3tl/deleter.hxx> #include <o3tl/enumarray.hxx> +#include <o3tl/hash_combine.hxx> #include <o3tl/safeint.hxx> #include <o3tl/sorted_vector.hxx> #include <o3tl/span.hxx> @@ -393,8 +413,8 @@ #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> #include <o3tl/unit_conversion.hxx> -#include <ooo/vba/XHelperInterface.hpp> -#include <ooo/vba/word/XWrapFormat.hpp> +#include <ooo/vba/word/WdSaveFormat.hpp> +#include <oox/core/filterbase.hxx> #include <oox/dllapi.h> #include <oox/drawingml/drawingmltypes.hxx> #include <oox/export/utils.hxx> @@ -406,6 +426,7 @@ #include <salhelper/simplereferenceobject.hxx> #include <sax/fshelper.hxx> #include <sax/saxdllapi.h> +#include <sfx2/AccessibilityIssue.hxx> #include <sfx2/dllapi.h> #include <sfx2/docfile.hxx> #include <sot/formats.hxx> @@ -503,7 +524,6 @@ #include <tools/datetime.hxx> #include <tools/debug.hxx> #include <tools/degree.hxx> -#include <comphelper/diagnose_ex.hxx> #include <tools/fldunit.hxx> #include <tools/fontenum.hxx> #include <tools/fract.hxx> @@ -520,7 +540,6 @@ #include <tools/time.hxx> #include <tools/toolsdllapi.h> #include <tools/weakbase.h> -#include <tools/weakbase.hxx> #include <typelib/typeclass.h> #include <typelib/typedescription.h> #include <typelib/uik.h> @@ -535,12 +554,10 @@ #include <unotools/resmgr.hxx> #include <unotools/streamwrap.hxx> #include <unotools/syslocale.hxx> +#include <unotools/tempfile.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/unotoolsdllapi.h> #include <unotools/weakref.hxx> -#include <vbahelper/vbadllapi.h> -#include <vbahelper/vbahelper.hxx> -#include <vbahelper/vbahelperinterface.hxx> #include <xmloff/odffields.hxx> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 @@ -586,6 +603,7 @@ #include <fmturl.hxx> #include <format.hxx> #include <formatcontentcontrol.hxx> +#include <formatflysplit.hxx> #include <formatlinebreak.hxx> #include <frmatr.hxx> #include <frmfmt.hxx> diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx index 0892da517c9e..fdf0e16b69e0 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-08-13 18:01:29 using: + Generated on 2023-07-19 09:26:30 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: @@ -97,6 +97,7 @@ #include <sal/typesizes.h> #include <vcl/AccessibleBrowseBoxObjType.hxx> #include <vcl/BinaryDataContainer.hxx> +#include <vcl/BitmapColor.hxx> #include <vcl/GraphicAttributes.hxx> #include <vcl/GraphicExternalLink.hxx> #include <vcl/GraphicObject.hxx> @@ -115,10 +116,8 @@ #include <vcl/checksum.hxx> #include <vcl/ctrl.hxx> #include <vcl/customweld.hxx> -#include <vcl/devicecoordinate.hxx> #include <vcl/dllapi.h> #include <vcl/dockwin.hxx> -#include <comphelper/errcode.hxx> #include <vcl/event.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> @@ -130,6 +129,7 @@ #include <vcl/headbar.hxx> #include <vcl/idle.hxx> #include <vcl/image.hxx> +#include <vcl/kernarray.hxx> #include <vcl/keycodes.hxx> #include <vcl/mapmod.hxx> #include <vcl/metaactiontypes.hxx> @@ -178,6 +178,8 @@ #if PCH_LEVEL >= 3 #include <basegfx/basegfxdllapi.h> #include <basegfx/color/bcolor.hxx> +#include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/matrix/hommatrixtemplate.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/point/b2ipoint.hxx> @@ -186,21 +188,26 @@ #include <basegfx/range/Range2D.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/range/basicrange.hxx> +#include <basegfx/tuple/Size2D.hxx> #include <basegfx/tuple/Tuple2D.hxx> #include <basegfx/tuple/Tuple3D.hxx> #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/tuple/b2ituple.hxx> #include <basegfx/tuple/b3dtuple.hxx> +#include <basegfx/utils/bgradient.hxx> #include <basegfx/utils/common.hxx> #include <basegfx/vector/b2dsize.hxx> #include <basegfx/vector/b2dvector.hxx> #include <basegfx/vector/b2enums.hxx> +#include <basegfx/vector/b2isize.hxx> #include <basegfx/vector/b2ivector.hxx> #include <basic/basicdllapi.h> #include <basic/sbxcore.hxx> #include <basic/sbxdef.hxx> +#include <basic/sbxmeth.hxx> +#include <basic/sbxvar.hxx> #include <com/sun/star/awt/DeviceInfo.hpp> -#include <com/sun/star/awt/Gradient.hpp> +#include <com/sun/star/awt/Gradient2.hpp> #include <com/sun/star/awt/GradientStyle.hpp> #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyGroup.hpp> @@ -210,6 +217,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XEnumeration.hpp> +#include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XIndexReplace.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNameContainer.hpp> @@ -241,7 +249,6 @@ #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> @@ -257,13 +264,20 @@ #include <com/sun/star/frame/XTitle.hpp> #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp> #include <com/sun/star/frame/XUntitledNumbers.hpp> +#include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/graphic/XPrimitive2D.hpp> +#include <com/sun/star/i18n/ForbiddenCharacters.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/XBreakIterator.hpp> #include <com/sun/star/i18n/XExtendedIndexEntrySupplier.hpp> #include <com/sun/star/i18n/XForbiddenCharacters.hpp> +#include <com/sun/star/io/XInputStream.hpp> +#include <com/sun/star/io/XOutputStream.hpp> +#include <com/sun/star/io/XSeekable.hpp> +#include <com/sun/star/io/XStream.hpp> +#include <com/sun/star/io/XTruncate.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> @@ -291,8 +305,13 @@ #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/text/VertOrientation.hpp> #include <com/sun/star/text/XFootnote.hpp> +#include <com/sun/star/text/XRelativeTextContentInsert.hpp> +#include <com/sun/star/text/XRelativeTextContentRemove.hpp> +#include <com/sun/star/text/XTextAppendAndConvert.hpp> #include <com/sun/star/text/XTextContent.hpp> +#include <com/sun/star/text/XTextCopy.hpp> #include <com/sun/star/text/XTextField.hpp> +#include <com/sun/star/text/XTextRangeCompare.hpp> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/XFilePicker3.hpp> @@ -306,7 +325,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/XComponentContext.hpp> #include <com/sun/star/uno/XCurrentContext.hpp> #include <com/sun/star/uno/XInterface.hpp> @@ -324,25 +342,28 @@ #include <com/sun/star/view/XPrintable.hpp> #include <comphelper/compbase.hxx> #include <comphelper/comphelperdllapi.h> +#include <comphelper/errcode.hxx> #include <comphelper/interfacecontainer4.hxx> #include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> +#include <comphelper/unoimplbase.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 <docmodel/color/ComplexColor.hxx> +#include <docmodel/color/Transformation.hxx> +#include <docmodel/dllapi.h> +#include <docmodel/theme/ThemeColor.hxx> +#include <docmodel/theme/ThemeColorType.hxx> #include <drawinglayer/attribute/fillgradientattribute.hxx> #include <drawinglayer/attribute/sdrfillattribute.hxx> #include <drawinglayer/drawinglayerdllapi.h> @@ -359,6 +380,7 @@ #include <editeng/editstat.hxx> #include <editeng/eedata.hxx> #include <editeng/fontitem.hxx> +#include <editeng/forbiddencharacterstable.hxx> #include <editeng/frmdiritem.hxx> #include <editeng/keepitem.hxx> #include <editeng/langitem.hxx> @@ -381,6 +403,8 @@ #include <i18nutil/paper.hxx> #include <o3tl/cow_wrapper.hxx> #include <o3tl/deleter.hxx> +#include <o3tl/enumarray.hxx> +#include <o3tl/hash_combine.hxx> #include <o3tl/safeint.hxx> #include <o3tl/sorted_vector.hxx> #include <o3tl/span.hxx> @@ -389,12 +413,14 @@ #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> #include <o3tl/unit_conversion.hxx> +#include <officecfg/Office/Common.hxx> #include <officecfg/Office/Writer.hxx> #include <ooo/vba/XHelperInterface.hpp> +#include <ooo/vba/word/WdSaveFormat.hpp> #include <ooo/vba/word/XSection.hpp> -#include <ooo/vba/word/XWrapFormat.hpp> #include <salhelper/salhelperdllapi.h> #include <salhelper/simplereferenceobject.hxx> +#include <sfx2/AccessibilityIssue.hxx> #include <sfx2/basedlgs.hxx> #include <sfx2/bindings.hxx> #include <sfx2/chalign.hxx> @@ -408,6 +434,7 @@ #include <sfx2/htmlmode.hxx> #include <sfx2/linksrc.hxx> #include <sfx2/lnkbase.hxx> +#include <sfx2/namedcolor.hxx> #include <sfx2/objsh.hxx> #include <sfx2/printer.hxx> #include <sfx2/request.hxx> @@ -429,6 +456,7 @@ #include <svl/itempool.hxx> #include <svl/itemset.hxx> #include <svl/languageoptions.hxx> +#include <svl/listener.hxx> #include <svl/lstner.hxx> #include <svl/macitem.hxx> #include <svl/numformat.hxx> @@ -456,7 +484,6 @@ #include <svx/charmap.hxx> #include <svx/colorbox.hxx> #include <svx/colorwindow.hxx> -#include <svx/ctredlin.hxx> #include <svx/dialmgr.hxx> #include <svx/flagsdef.hxx> #include <svx/framelinkarray.hxx> @@ -464,6 +491,8 @@ #include <svx/pagectrl.hxx> #include <svx/rotmodit.hxx> #include <svx/sdr/attribute/sdrallfillattributeshelper.hxx> +#include <svx/svdmodel.hxx> +#include <svx/svdtypes.hxx> #include <svx/svxdlg.hxx> #include <svx/svxdllapi.h> #include <svx/swframetypes.hxx> @@ -471,6 +500,7 @@ #include <svx/xdash.hxx> #include <svx/xdef.hxx> #include <svx/xhatch.hxx> +#include <svx/xtable.hxx> #include <tools/color.hxx> #include <tools/date.hxx> #include <tools/datetime.hxx> @@ -489,9 +519,11 @@ #include <tools/poly.hxx> #include <tools/ref.hxx> #include <tools/solar.h> +#include <tools/stream.hxx> #include <tools/time.hxx> #include <tools/toolsdllapi.h> #include <tools/urlobj.hxx> +#include <tools/weakbase.h> #include <typelib/typeclass.h> #include <typelib/typedescription.h> #include <typelib/uik.h> @@ -508,6 +540,7 @@ #include <unotools/resmgr.hxx> #include <unotools/sharedunocomponent.hxx> #include <unotools/syslocale.hxx> +#include <unotools/tempfile.hxx> #include <unotools/unotoolsdllapi.h> #include <unotools/viewoptions.hxx> #include <unotools/weakref.hxx> @@ -530,7 +563,6 @@ #include <cmdid.h> #include <cnttab.hxx> #include <column.hxx> -#include <condedit.hxx> #include <contentindex.hxx> #include <dbmgr.hxx> #include <doc.hxx> @@ -617,6 +649,8 @@ #include <uiitems.hxx> #include <uitool.hxx> #include <undobj.hxx> +#include <unobaseclass.hxx> +#include <unotext.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 0f6c09d6150c..903b077097d5 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 2022-06-27 18:32:51 using: + Generated on 2023-07-19 09:26:05 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: @@ -47,7 +47,6 @@ #include <map> #include <math.h> #include <memory> -#include <mutex> #include <new> #include <numeric> #include <optional> @@ -58,9 +57,9 @@ #include <string.h> #include <string> #include <string_view> +#include <thread> #include <type_traits> #include <unordered_map> -#include <unordered_set> #include <utility> #include <vector> #include <boost/property_tree/ptree_fwd.hpp> @@ -88,8 +87,6 @@ #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> @@ -110,14 +107,13 @@ #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> #include <vcl/cursor.hxx> -#include <vcl/devicecoordinate.hxx> #include <vcl/dllapi.h> -#include <comphelper/errcode.hxx> #include <vcl/exceptiontypes.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> #include <vcl/gradient.hxx> #include <vcl/inputtypes.hxx> +#include <vcl/kernarray.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/lazydelete.hxx> @@ -140,6 +136,7 @@ #include <vcl/rendercontext/SystemTextColorFlags.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/scopedbitmapaccess.hxx> +#include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/task.hxx> #include <vcl/timer.hxx> @@ -157,6 +154,8 @@ #if PCH_LEVEL >= 3 #include <basegfx/basegfxdllapi.h> #include <basegfx/color/bcolor.hxx> +#include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/matrix/hommatrixtemplate.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/point/b2ipoint.hxx> @@ -166,6 +165,7 @@ #include <basegfx/range/b2drange.hxx> #include <basegfx/range/b2irange.hxx> #include <basegfx/range/basicrange.hxx> +#include <basegfx/tuple/Size2D.hxx> #include <basegfx/tuple/Tuple2D.hxx> #include <basegfx/tuple/Tuple3D.hxx> #include <basegfx/tuple/b2dtuple.hxx> @@ -173,19 +173,27 @@ #include <basegfx/tuple/b2ituple.hxx> #include <basegfx/tuple/b3dtuple.hxx> #include <basegfx/utils/common.hxx> +#include <basegfx/vector/b2dsize.hxx> #include <basegfx/vector/b2dvector.hxx> #include <basegfx/vector/b2enums.hxx> +#include <basegfx/vector/b2isize.hxx> #include <basegfx/vector/b2ivector.hxx> +#include <basic/basicdllapi.h> #include <basic/sberrors.hxx> +#include <basic/sbxcore.hxx> +#include <basic/sbxdef.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleRelationSet.hpp> #include <com/sun/star/awt/DeviceInfo.hpp> +#include <com/sun/star/awt/GradientStyle.hpp> #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/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/NoSuchElementException.hpp> #include <com/sun/star/container/XEnumeration.hpp> +#include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XIndexReplace.hpp> #include <com/sun/star/container/XNameAccess.hpp> @@ -193,30 +201,13 @@ #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> @@ -231,13 +222,14 @@ #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/RubyAdjust.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/XFootnote.hpp> #include <com/sun/star/text/XPageCursor.hpp> -#include <com/sun/star/text/XPasteListener.hpp> +#include <com/sun/star/text/XTextContent.hpp> #include <com/sun/star/text/XTextDocument.hpp> +#include <com/sun/star/text/XTextField.hpp> #include <com/sun/star/text/XTextRangeCompare.hpp> #include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/uno/Any.h> @@ -259,15 +251,13 @@ #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/util/thePathSettings.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/errcode.hxx> #include <comphelper/processfactory.hxx> +#include <comphelper/sequence.hxx> #include <comphelper/solarmutex.hxx> #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> @@ -276,20 +266,12 @@ #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> @@ -303,10 +285,7 @@ #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/safeint.hxx> @@ -318,13 +297,13 @@ #include <o3tl/unit_conversion.hxx> #include <ooo/vba/XCollection.hpp> #include <ooo/vba/XHelperInterface.hpp> +#include <ooo/vba/word/WdSaveFormat.hpp> #include <ooo/vba/word/XSection.hpp> -#include <ooo/vba/word/XWrapFormat.hpp> #include <salhelper/salhelperdllapi.h> #include <salhelper/simplereferenceobject.hxx> +#include <sfx2/AccessibilityIssue.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> @@ -346,9 +325,6 @@ #include <svl/typedwhich.hxx> #include <svl/undo.hxx> #include <svl/whichranges.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> @@ -369,24 +345,19 @@ #include <tools/time.hxx> #include <tools/toolsdllapi.h> #include <tools/urlobj.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 <unotools/weakref.hxx> #include <vbahelper/vbadllapi.h> #include <vbahelper/vbahelper.hxx> #include <vbahelper/vbahelperinterface.hxx> @@ -401,21 +372,21 @@ #include <bparr.hxx> #include <calbck.hxx> #include <charfmt.hxx> -#include <crsrsh.hxx> +#include <contentindex.hxx> #include <crstate.hxx> #include <cshtyp.hxx> +#include <doc.hxx> #include <docary.hxx> #include <docsh.hxx> -#include <editsh.hxx> #include <fldbas.hxx> #include <fldupde.hxx> -#include <flyenum.hxx> #include <fmtcol.hxx> +#include <fmtornt.hxx> #include <format.hxx> #include <frmfmt.hxx> #include <hintids.hxx> -#include <contentindex.hxx> #include <ndarr.hxx> +#include <ndhints.hxx> #include <ndindex.hxx> #include <ndtyp.hxx> #include <node.hxx> @@ -423,6 +394,7 @@ #include <numrule.hxx> #include <pam.hxx> #include <paratr.hxx> +#include <reffld.hxx> #include <ring.hxx> #include <section.hxx> #include <swatrset.hxx> @@ -441,8 +413,6 @@ #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/vbahelper/inc/pch/precompiled_msforms.hxx b/vbahelper/inc/pch/precompiled_msforms.hxx index fc76984d7276..d22c1e31356c 100644 --- a/vbahelper/inc/pch/precompiled_msforms.hxx +++ b/vbahelper/inc/pch/precompiled_msforms.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:53:04 using: + Generated on 2023-07-19 09:24:46 using: ./bin/update_pch vbahelper msforms --cutoff=3 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -28,6 +28,7 @@ #include <cmath> #include <cstddef> #include <cstdlib> +#include <cstring> #include <float.h> #include <functional> #include <initializer_list> @@ -51,9 +52,11 @@ #include <boost/property_tree/ptree_fwd.hpp> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 +#include <osl/diagnose.h> #include <osl/endian.h> #include <osl/interlck.h> #include <rtl/alloc.h> +#include <rtl/character.hxx> #include <rtl/math.h> #include <rtl/ref.hxx> #include <rtl/string.h> @@ -66,6 +69,7 @@ #include <rtl/ustring.h> #include <rtl/ustring.hxx> #include <sal/backtrace.hxx> +#include <sal/detail/log.h> #include <sal/log.hxx> #include <sal/macros.h> #include <sal/saldllapi.h> @@ -78,12 +82,11 @@ #include <vcl/bitmapex.hxx> #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> -#include <vcl/devicecoordinate.hxx> #include <vcl/dllapi.h> -#include <comphelper/errcode.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> #include <vcl/gradient.hxx> +#include <vcl/kernarray.hxx> #include <vcl/mapmod.hxx> #include <vcl/metaactiontypes.hxx> #include <vcl/ptrstyle.hxx> @@ -103,6 +106,7 @@ #include <vcl/rendercontext/SystemTextColorFlags.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/scopedbitmapaccess.hxx> +#include <vcl/settings.hxx> #include <vcl/vclenum.hxx> #include <vcl/vclptr.hxx> #include <vcl/vclreferencebase.hxx> @@ -111,23 +115,35 @@ #if PCH_LEVEL >= 3 #include <basegfx/basegfxdllapi.h> #include <basegfx/color/bcolor.hxx> +#include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/matrix/hommatrixtemplate.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> #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/Size2D.hxx> #include <basegfx/tuple/Tuple2D.hxx> #include <basegfx/tuple/Tuple3D.hxx> #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/tuple/b2ituple.hxx> #include <basegfx/tuple/b3dtuple.hxx> #include <basegfx/utils/common.hxx> +#include <basegfx/vector/b2dsize.hxx> #include <basegfx/vector/b2dvector.hxx> #include <basegfx/vector/b2enums.hxx> +#include <basegfx/vector/b2isize.hxx> #include <basegfx/vector/b2ivector.hxx> +#include <basic/basicdllapi.h> +#include <basic/sbxcore.hxx> +#include <basic/sbxdef.hxx> +#include <basic/sbxmeth.hxx> +#include <basic/sbxvar.hxx> #include <com/sun/star/awt/DeviceInfo.hpp> +#include <com/sun/star/awt/GradientStyle.hpp> #include <com/sun/star/awt/SystemPointer.hpp> #include <com/sun/star/awt/XControl.hpp> #include <com/sun/star/container/XNameContainer.hpp> @@ -145,17 +161,22 @@ #include <com/sun/star/uno/Type.hxx> #include <com/sun/star/uno/TypeClass.hdl> #include <com/sun/star/uno/XInterface.hpp> +#include <com/sun/star/uno/XWeak.hpp> #include <com/sun/star/uno/genfunc.h> #include <com/sun/star/uno/genfunc.hxx> +#include <comphelper/comphelperdllapi.h> +#include <comphelper/errcode.hxx> #include <comphelper/sequence.hxx> #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> #include <cppuhelper/cppuhelperdllapi.h> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> #include <i18nlangtag/lang.h> #include <o3tl/cow_wrapper.hxx> #include <o3tl/safeint.hxx> +#include <o3tl/span.hxx> #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> diff --git a/vcl/inc/impglyphitem.hxx b/vcl/inc/impglyphitem.hxx index c729d0cc9b7e..8860243c0f4e 100644 --- a/vcl/inc/impglyphitem.hxx +++ b/vcl/inc/impglyphitem.hxx @@ -51,7 +51,7 @@ template <> struct typed_flags<GlyphItemFlags> : is_typed_flags<GlyphItemFlags, class VCL_DLLPUBLIC GlyphItem { - DevicePoint m_aLinearPos; // absolute position of non rotated string + basegfx::B2DPoint m_aLinearPos; // absolute position of non rotated string double m_nOrigWidth; // original glyph width sal_Int32 m_nCharPos; // index in string double m_nXOffset; @@ -62,8 +62,9 @@ class VCL_DLLPUBLIC GlyphItem sal_Int8 m_nCharCount; // number of characters making up this glyph public: - GlyphItem(int nCharPos, int nCharCount, sal_GlyphId aGlyphId, const DevicePoint& rLinearPos, - GlyphItemFlags nFlags, double nOrigWidth, double nXOffset, double nYOffset) + GlyphItem(int nCharPos, int nCharCount, sal_GlyphId aGlyphId, + const basegfx::B2DPoint& rLinearPos, GlyphItemFlags nFlags, double nOrigWidth, + double nXOffset, double nYOffset) : m_aLinearPos(rLinearPos) , m_nOrigWidth(nOrigWidth) , m_nCharPos(nCharPos) @@ -99,11 +100,11 @@ public: double xOffset() const { return m_nXOffset; } double yOffset() const { return m_nYOffset; } double newWidth() const { return m_nNewWidth; } - const DevicePoint& linearPos() const { return m_aLinearPos; } + const basegfx::B2DPoint& linearPos() const { return m_aLinearPos; } void setNewWidth(double width) { m_nNewWidth = width; } void addNewWidth(double width) { m_nNewWidth += width; } - void setLinearPos(const DevicePoint& point) { m_aLinearPos = point; } + void setLinearPos(const basegfx::B2DPoint& point) { m_aLinearPos = point; } void setLinearPosX(double x) { m_aLinearPos.setX(x); } void adjustLinearPosX(double diff) { m_aLinearPos.adjustX(diff); } bool isLayoutEquivalent(const GlyphItem& other) const diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index 295b546b1699..eace78ec0d85 100644 --- a/vcl/inc/pch/precompiled_vcl.hxx +++ b/vcl/inc/pch/precompiled_vcl.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-08-08 12:39:25 using: + Generated on 2023-07-19 09:24:26 using: ./bin/update_pch vcl vcl --cutoff=6 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -29,6 +29,7 @@ #include <chrono> #include <cmath> #include <cstddef> +#include <cstdio> #include <cstdlib> #include <cstring> #include <deque> @@ -58,6 +59,7 @@ #include <unordered_set> #include <utility> #include <vector> +#include <boost/container/small_vector.hpp> #include <boost/math/special_functions/sinc.hpp> #include <boost/multi_array.hpp> #include <boost/property_tree/json_parser.hpp> @@ -131,18 +133,21 @@ #include <basegfx/range/Range2D.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/range/basicrange.hxx> +#include <basegfx/tuple/Size2D.hxx> #include <basegfx/tuple/Tuple2D.hxx> #include <basegfx/tuple/Tuple3D.hxx> #include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/tuple/b2ituple.hxx> #include <basegfx/tuple/b3dtuple.hxx> #include <basegfx/utils/common.hxx> +#include <basegfx/vector/b2dsize.hxx> #include <basegfx/vector/b2dvector.hxx> #include <basegfx/vector/b2enums.hxx> +#include <basegfx/vector/b2isize.hxx> #include <basegfx/vector/b2ivector.hxx> #include <bitmap/BitmapWriteAccess.hxx> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/datatransfer/DataFlavor.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/datatransfer/XTransferable2.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp> @@ -155,6 +160,12 @@ #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp> #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> +#include <com/sun/star/i18n/Calendar2.hpp> +#include <com/sun/star/io/XInputStream.hpp> +#include <com/sun/star/io/XOutputStream.hpp> +#include <com/sun/star/io/XSeekable.hpp> +#include <com/sun/star/io/XStream.hpp> +#include <com/sun/star/io/XTruncate.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/lang/Locale.hpp> @@ -162,7 +173,6 @@ #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/uno/Any.h> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.h> @@ -182,17 +192,21 @@ #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/DateTime.hpp> #include <comphelper/comphelperdllapi.h> +#include <comphelper/diagnose_ex.hxx> #include <comphelper/fileformat.h> +#include <comphelper/interfacecontainer4.hxx> #include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propertyvalue.hxx> #include <comphelper/scopeguard.hxx> #include <comphelper/sequence.hxx> #include <comphelper/string.hxx> +#include <comphelper/unoimplbase.hxx> #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> #include <cppuhelper/cppuhelperdllapi.h> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/weakagg.hxx> @@ -221,7 +235,6 @@ #include <salhelper/thread.hxx> #include <sot/exchange.hxx> #include <sot/formats.hxx> -#include <sot/sotdllapi.h> #include <svl/hint.hxx> #include <svl/macitem.hxx> #include <svl/poolitem.hxx> @@ -234,7 +247,6 @@ #include <tools/datetime.hxx> #include <tools/debug.hxx> #include <tools/degree.hxx> -#include <comphelper/diagnose_ex.hxx> #include <tools/fldunit.hxx> #include <tools/fontenum.hxx> #include <tools/fract.hxx> @@ -260,11 +272,13 @@ #include <uno/any2.h> #include <uno/data.h> #include <uno/sequence2.h> +#include <unotools/calendarwrapper.hxx> #include <unotools/configmgr.hxx> #include <unotools/fontdefs.hxx> #include <unotools/localedatawrapper.hxx> #include <unotools/resmgr.hxx> #include <unotools/syslocale.hxx> +#include <unotools/tempfile.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/unotoolsdllapi.h> #endif // PCH_LEVEL >= 3 @@ -275,7 +289,6 @@ #include <configsettings.hxx> #include <drawmode.hxx> #include <fontattributes.hxx> -#include <fontsubset.hxx> #include <glyphid.hxx> #include <impfontcache.hxx> #include <impglyphitem.hxx> @@ -316,11 +329,12 @@ #include <vcl/cursor.hxx> #include <vcl/cvtgrf.hxx> #include <vcl/decoview.hxx> -#include <vcl/devicecoordinate.hxx> #include <vcl/dibtools.hxx> #include <vcl/dllapi.h> #include <vcl/dockwin.hxx> #include <vcl/event.hxx> +#include <vcl/filter/PngImageReader.hxx> +#include <vcl/filter/PngImageWriter.hxx> #include <vcl/filter/SvmReader.hxx> #include <vcl/filter/SvmWriter.hxx> #include <vcl/fntstyle.hxx> @@ -345,7 +359,9 @@ #include <vcl/outdev.hxx> #include <vcl/ptrstyle.hxx> #include <vcl/quickselectionengine.hxx> +#include <vcl/region.hxx> #include <vcl/salnativewidgets.hxx> +#include <vcl/scheduler.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> #include <vcl/syswin.hxx> diff --git a/vcl/inc/pdf/Matrix3.hxx b/vcl/inc/pdf/Matrix3.hxx index da88cc31399b..1cc5c47372fa 100644 --- a/vcl/inc/pdf/Matrix3.hxx +++ b/vcl/inc/pdf/Matrix3.hxx @@ -11,7 +11,7 @@ #pragma once #include <vcl/dllapi.h> -#include <vcl/devicecoordinate.hxx> +#include <basegfx/point/b2dpoint.hxx> #include <tools/gen.hxx> namespace vcl::pdf @@ -46,7 +46,7 @@ public: double get(size_t i) const { return f[i]; } Point transform(const Point& rPoint) const; - DevicePoint transform(const DevicePoint& rPoint) const; + basegfx::B2DPoint transform(const basegfx::B2DPoint& rPoint) const; }; } diff --git a/vcl/inc/pdf/pdfwriter_impl.hxx b/vcl/inc/pdf/pdfwriter_impl.hxx index edf88459b4f4..48ebf50beaae 100644 --- a/vcl/inc/pdf/pdfwriter_impl.hxx +++ b/vcl/inc/pdf/pdfwriter_impl.hxx @@ -616,7 +616,7 @@ struct PDFStructureElement // helper structure for drawLayout and friends struct PDFGlyph { - DevicePoint const m_aPos; + basegfx::B2DPoint const m_aPos; const GlyphItem* m_pGlyph; const LogicalFontInstance* m_pFont; sal_Int32 const m_nNativeWidth; @@ -624,7 +624,7 @@ struct PDFGlyph sal_uInt8 const m_nMappedGlyphId; int const m_nCharPos; - PDFGlyph( const DevicePoint& rPos, + PDFGlyph( const basegfx::B2DPoint& rPos, const GlyphItem* pGlyph, const LogicalFontInstance* pFont, sal_Int32 nNativeWidth, diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index 274de68a0400..f96eb7df2977 100644 --- a/vcl/inc/sallayout.hxx +++ b/vcl/inc/sallayout.hxx @@ -22,13 +22,13 @@ #include <sal/config.h> +#include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <tools/gen.hxx> #include <tools/degree.hxx> #include <i18nlangtag/languagetag.hxx> #include <vcl/dllapi.h> -#include <vcl/devicecoordinate.hxx> #include <vcl/vclenum.hxx> // for typedef sal_UCS4 #include <vcl/vcllayout.hxx> @@ -65,7 +65,7 @@ public: double GetTextWidth() const final override; double FillDXArray(std::vector<double>* pDXArray, const OUString& rStr) const override; void GetCaretPositions(int nArraySize, sal_Int32* pCaretXArray) const override; - bool GetNextGlyph(const GlyphItem** pGlyph, DevicePoint& rPos, int& nStart, + bool GetNextGlyph(const GlyphItem** pGlyph, basegfx::B2DPoint& rPos, int& nStart, const LogicalFontInstance** ppGlyphFont = nullptr) const override; bool GetOutline(basegfx::B2DPolyPolygonVector&) const override; bool IsKashidaPosValid(int nCharPos, int nNextCharPos) const override; @@ -126,7 +126,7 @@ public: LogicalFontInstance& GetFont() const { return *m_GlyphItems.GetFont(); } - bool GetNextGlyph(const GlyphItem** pGlyph, DevicePoint& rPos, int& nStart, + bool GetNextGlyph(const GlyphItem** pGlyph, basegfx::B2DPoint& rPos, int& nStart, const LogicalFontInstance** ppGlyphFont = nullptr) const override; const SalLayoutGlyphsImpl& GlyphsImpl() const { return m_GlyphItems; } diff --git a/vcl/qa/cppunit/complextext.cxx b/vcl/qa/cppunit/complextext.cxx index 6c2491a27010..bcb0c9622361 100644 --- a/vcl/qa/cppunit/complextext.cxx +++ b/vcl/qa/cppunit/complextext.cxx @@ -472,7 +472,7 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf153440) auto pLayout = pOutDev->ImplLayout(aText, 0, -1, Point(0, 0), 0, {}, {}); int nStart = 0; - DevicePoint aPos; + basegfx::B2DPoint aPos; const GlyphItem* pGlyphItem; while (pLayout->GetNextGlyph(&pGlyphItem, aPos, nStart)) { @@ -507,7 +507,7 @@ CPPUNIT_TEST_FIXTURE(VclComplexTextTest, testTdf107718) auto pLayout = pOutDev->ImplLayout(aText, 0, -1, Point(0, 0), 0, {}, {}); int nStart = 0; - DevicePoint aPos; + basegfx::B2DPoint aPos; const GlyphItem* pGlyphItem; while (pLayout->GetNextGlyph(&pGlyphItem, aPos, nStart)) { diff --git a/vcl/qt5/QtGraphics_Text.cxx b/vcl/qt5/QtGraphics_Text.cxx index 163cb6de56e5..f189a04e005d 100644 --- a/vcl/qt5/QtGraphics_Text.cxx +++ b/vcl/qt5/QtGraphics_Text.cxx @@ -190,7 +190,7 @@ void QtGraphics::DrawTextLayout(const GenericSalLayout& rLayout) if (nOrientation) pQtLayout->SetOrientation(0_deg10); - DevicePoint aPos; + basegfx::B2DPoint aPos; const GlyphItem* pGlyph; int nStart = 0; while (rLayout.GetNextGlyph(&pGlyph, aPos, nStart)) diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index bd0d03b216ce..26f1cc32184a 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -330,7 +330,7 @@ void AquaGraphicsBackend::drawTextLayout(const GenericSalLayout& rLayout) CTFontRef pCTFont = rFont.GetCTFont(); CGAffineTransform aRotMatrix = CGAffineTransformMakeRotation(-rFont.mfFontRotation); - DevicePoint aPos; + basegfx::B2DPoint aPos; const GlyphItem* pGlyph; std::vector<CGGlyph> aGlyphIds; std::vector<CGPoint> aGlyphPos; diff --git a/vcl/skia/gdiimpl.cxx b/vcl/skia/gdiimpl.cxx index fef54c8c1326..40341bba85f7 100644 --- a/vcl/skia/gdiimpl.cxx +++ b/vcl/skia/gdiimpl.cxx @@ -2129,7 +2129,7 @@ void SkiaSalGraphicsImpl::drawGenericLayout(const GenericSalLayout& layout, Colo glyphIds.reserve(256); glyphForms.reserve(256); verticals.reserve(256); - DevicePoint aPos; + basegfx::B2DPoint aPos; const GlyphItem* pGlyph; int nStart = 0; while (layout.GetNextGlyph(&pGlyph, aPos, nStart)) diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx index 3324d492e3cf..3a5fdbef0ad0 100644 --- a/vcl/source/gdi/CommonSalLayout.cxx +++ b/vcl/source/gdi/CommonSalLayout.cxx @@ -273,7 +273,7 @@ bool GenericSalLayout::LayoutText(vcl::text::ImplLayoutArgs& rArgs, const SalLay double nYScale = 0; GetFont().GetScale(&nXScale, &nYScale); - DevicePoint aCurrPos(0, 0); + basegfx::B2DPoint aCurrPos(0, 0); while (true) { int nBidiMinRunPos, nBidiEndRunPos; @@ -544,7 +544,7 @@ bool GenericSalLayout::LayoutText(vcl::text::ImplLayoutArgs& rArgs, const SalLay nYOffset = std::lround(nYOffset); } - DevicePoint aNewPos(aCurrPos.getX() + nXOffset, aCurrPos.getY() + nYOffset); + basegfx::B2DPoint aNewPos(aCurrPos.getX() + nXOffset, aCurrPos.getY() + nYOffset); const GlyphItem aGI(nCharPos, nCharCount, nGlyphIndex, aNewPos, nGlyphFlags, nAdvance, nXOffset, nYOffset); m_GlyphItems.push_back(aGI); @@ -791,7 +791,7 @@ void GenericSalLayout::ApplyDXArray(const double* pDXArray, const sal_Bool* pKas nOverlap = nExcess / (nCopies - 1); } - DevicePoint aPos = pGlyphIter->linearPos(); + basegfx::B2DPoint aPos = pGlyphIter->linearPos(); int nCharPos = pGlyphIter->charPos(); GlyphItemFlags const nFlags = GlyphItemFlags::IS_IN_CLUSTER | GlyphItemFlags::IS_RTL_GLYPH; // Move to the left side of the adjusted width and start inserting diff --git a/vcl/source/gdi/impglyphitem.cxx b/vcl/source/gdi/impglyphitem.cxx index 0607c790886a..1de52c7597ce 100644 --- a/vcl/source/gdi/impglyphitem.cxx +++ b/vcl/source/gdi/impglyphitem.cxx @@ -146,7 +146,8 @@ SalLayoutGlyphsImpl* SalLayoutGlyphsImpl::cloneCharRange(sal_Int32 index, sal_In return nullptr; // LinearPos needs adjusting to start at xOffset/yOffset for the first item, // that's how it's computed in GenericSalLayout::LayoutText(). - DevicePoint zeroPoint = pos->linearPos() - DevicePoint(pos->xOffset(), pos->yOffset()); + basegfx::B2DPoint zeroPoint + = pos->linearPos() - basegfx::B2DPoint(pos->xOffset(), pos->yOffset()); // Add and adjust all glyphs until the given length. // The check is written as 'charPos + charCount <= endPos' rather than 'charPos < endPos' // (or similarly for RTL) to make sure we include complete glyphs. If a glyph is composed diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 533fd62f2ae6..408bc5a5f4d8 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -6477,9 +6477,9 @@ void PDFWriterImpl::drawShadow( SalLayout& rLayout, const OUString& rText, bool tools::Long nOff = 1 + ((GetFontInstance()->mnLineHeight-24)/24); if( rFont.IsOutline() ) nOff++; - rLayout.DrawBase() += DevicePoint(nOff, nOff); + rLayout.DrawBase() += basegfx::B2DPoint(nOff, nOff); drawLayout( rLayout, rText, bTextLines ); - rLayout.DrawBase() -= DevicePoint(nOff, nOff); + rLayout.DrawBase() -= basegfx::B2DPoint(nOff, nOff); setFont( aSaveFont ); setTextLineColor( aSaveTextLineColor ); @@ -6523,7 +6523,7 @@ void PDFWriterImpl::drawVerticalGlyphs( fSkewA = -fSkewB; fSkewB = 0.0; } - aDeltaPos += SubPixelToLogic(DevicePoint(nXOffset / fXScale, 0)) - SubPixelToLogic(DevicePoint()); + aDeltaPos += SubPixelToLogic(basegfx::B2DPoint(nXOffset / fXScale, 0)) - SubPixelToLogic(basegfx::B2DPoint()); if( i < rGlyphs.size()-1 ) // #i120627# the text on the Y axis is reversed when export ppt file to PDF format { @@ -6640,8 +6640,8 @@ void PDFWriterImpl::drawHorizontalGlyphs( { appendHex( rGlyphs[nPos].m_nMappedGlyphId, aUnkernedLine ); // check if default glyph positioning is sufficient - const DevicePoint aThisPos = aMat.transform( rGlyphs[nPos].m_aPos ); - const DevicePoint aPrevPos = aMat.transform( rGlyphs[nPos-1].m_aPos ); + const basegfx::B2DPoint aThisPos = aMat.transform( rGlyphs[nPos].m_aPos ); + const basegfx::B2DPoint aPrevPos = aMat.transform( rGlyphs[nPos-1].m_aPos ); double fAdvance = aThisPos.getX() - aPrevPos.getX(); fAdvance *= 1000.0 / nPixelFontHeight; const double fAdjustment = rGlyphs[nPos-1].m_nNativeWidth - fAdvance + 0.5; @@ -6795,7 +6795,7 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const OUString& rText, bool std::vector< PDFGlyph > aGlyphs; aGlyphs.reserve( nMaxGlyphs ); // first get all the glyphs and register them; coordinates still in Pixel - DevicePoint aPos; + basegfx::B2DPoint aPos; while (rLayout.GetNextGlyph(&pGlyph, aPos, nIndex, &pGlyphFont)) { const auto* pFace = pGlyphFont->GetFontFace(); @@ -6881,7 +6881,7 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const OUString& rText, bool // The rectangle is the bounding box of the text, but also includes // ascent / descent to match the on-screen rendering. // This is the top left of the text without ascent / descent. - DevicePoint aDrawPosition(rLayout.GetDrawPosition()); + basegfx::B2DPoint aDrawPosition(rLayout.GetDrawPosition()); tools::Rectangle aRectangle(SubPixelToLogic(aDrawPosition), Size(ImplDevicePixelToLogicWidth(rLayout.GetTextWidth()), 0)); aRectangle.AdjustTop(-aRefDevFontMetric.GetAscent()); @@ -6982,7 +6982,7 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const OUString& rText, bool bool bUnderlineAbove = m_aCurrentPDFState.m_aFont.IsUnderlineAbove(); if( m_aCurrentPDFState.m_aFont.IsWordLineMode() ) { - DevicePoint aStartPt; + basegfx::B2DPoint aStartPt; double nWidth = 0; nIndex = 0; while (rLayout.GetNextGlyph(&pGlyph, aPos, nIndex)) @@ -7012,7 +7012,7 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const OUString& rText, bool } else { - DevicePoint aStartPt = rLayout.GetDrawPosition(); + basegfx::B2DPoint aStartPt = rLayout.GetDrawPosition(); int nWidth = rLayout.GetTextWidth(); drawTextLine( SubPixelToLogic(aStartPt), ImplDevicePixelToLogicWidth( nWidth ), @@ -7085,23 +7085,23 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const OUString& rText, bool if (!pGlyph->IsSpacing()) { - DevicePoint aAdjOffset; + basegfx::B2DPoint aAdjOffset; if (pGlyph->IsVertical()) { - aAdjOffset = DevicePoint(aOffsetVert.X(), aOffsetVert.Y()); + aAdjOffset = basegfx::B2DPoint(aOffsetVert.X(), aOffsetVert.Y()); aAdjOffset.adjustX((-pGlyph->origWidth() + aEmphasisMark.GetWidth()) / 2); } else { - aAdjOffset = DevicePoint(aOffset.X(), aOffset.Y()); + aAdjOffset = basegfx::B2DPoint(aOffset.X(), aOffset.Y()); aAdjOffset.adjustX(aRectangle.Left() + (aRectangle.GetWidth() - aEmphasisMark.GetWidth()) / 2 ); } aAdjOffset = aRotScale.transform( aAdjOffset ); - aAdjOffset -= DevicePoint(nEmphWidth2, nEmphHeight2); + aAdjOffset -= basegfx::B2DPoint(nEmphWidth2, nEmphHeight2); - DevicePoint aMarkDevPos(aPos); + basegfx::B2DPoint aMarkDevPos(aPos); aMarkDevPos += aAdjOffset; Point aMarkPos = SubPixelToLogic(aMarkDevPos); drawEmphasisMark( aMarkPos.X(), aMarkPos.Y(), diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index 3e1bbf546fa6..65bf46f1dec0 100644 --- a/vcl/source/gdi/sallayout.cxx +++ b/vcl/source/gdi/sallayout.cxx @@ -141,10 +141,10 @@ void SalLayout::AdjustLayout( vcl::text::ImplLayoutArgs& rArgs ) maLanguageTag = rArgs.maLanguageTag; } -DevicePoint SalLayout::GetDrawPosition(const DevicePoint& rRelative) const +basegfx::B2DPoint SalLayout::GetDrawPosition(const basegfx::B2DPoint& rRelative) const { - DevicePoint aPos(maDrawBase); - DevicePoint aOfs(rRelative.getX() + maDrawOffset.X(), + basegfx::B2DPoint aPos(maDrawBase); + basegfx::B2DPoint aOfs(rRelative.getX() + maDrawOffset.X(), rRelative.getY() + maDrawOffset.Y()); if( mnOrientation == 0_deg10 ) @@ -168,13 +168,13 @@ DevicePoint SalLayout::GetDrawPosition(const DevicePoint& rRelative) const { double nX = +fCos * fX + fSin * fY; double nY = +fCos * fY - fSin * fX; - aPos += DevicePoint(nX, nY); + aPos += basegfx::B2DPoint(nX, nY); } else { tools::Long nX = static_cast<tools::Long>( +fCos * fX + fSin * fY ); tools::Long nY = static_cast<tools::Long>( +fCos * fY - fSin * fX ); - aPos += DevicePoint(nX, nY); + aPos += basegfx::B2DPoint(nX, nY); } } @@ -188,7 +188,7 @@ bool SalLayout::GetOutline(basegfx::B2DPolyPolygonVector& rVector) const basegfx::B2DPolyPolygon aGlyphOutline; - DevicePoint aPos; + basegfx::B2DPoint aPos; const GlyphItem* pGlyph; int nStart = 0; const LogicalFontInstance* pGlyphFont; @@ -221,7 +221,7 @@ bool SalLayout::GetBoundRect(tools::Rectangle& rRect) const tools::Rectangle aRectangle; - DevicePoint aPos; + basegfx::B2DPoint aPos; const GlyphItem* pGlyph; int nStart = 0; const LogicalFontInstance* pGlyphFont; @@ -494,7 +494,7 @@ sal_Int32 GenericSalLayout::GetTextBreak(double nMaxWidth, double nCharExtra, in } bool GenericSalLayout::GetNextGlyph(const GlyphItem** pGlyph, - DevicePoint& rPos, int& nStart, + basegfx::B2DPoint& rPos, int& nStart, const LogicalFontInstance** ppGlyphFont) const { std::vector<GlyphItem>::const_iterator pGlyphIter = m_GlyphItems.begin(); @@ -523,7 +523,7 @@ bool GenericSalLayout::GetNextGlyph(const GlyphItem** pGlyph, *ppGlyphFont = m_GlyphItems.GetFont().get(); // calculate absolute position in pixel units - DevicePoint aRelativePos = pGlyphIter->linearPos(); + basegfx::B2DPoint aRelativePos = pGlyphIter->linearPos(); rPos = GetDrawPosition( aRelativePos ); @@ -714,7 +714,7 @@ void MultiSalLayout::ImplAdjustMultiLayout(vcl::text::ImplLayoutArgs& rArgs, const GlyphItem* pGlyphs[MAX_FALLBACK]; bool bValid[MAX_FALLBACK] = { false }; - DevicePoint aPos; + basegfx::B2DPoint aPos; int nLevel = 0, n; for( n = 0; n < mnLevel; ++n ) { @@ -1011,7 +1011,7 @@ double MultiSalLayout::GetTextWidth() const // missing chars, so we use GetNextGlyph() to get the glyphs across all // layouts. int nStart = 0; - DevicePoint aPos; + basegfx::B2DPoint aPos; const GlyphItem* pGlyphItem; double nWidth = 0; @@ -1073,7 +1073,7 @@ void MultiSalLayout::GetCaretPositions( int nMaxIndex, sal_Int32* pCaretXArray ) } bool MultiSalLayout::GetNextGlyph(const GlyphItem** pGlyph, - DevicePoint& rPos, int& nStart, + basegfx::B2DPoint& rPos, int& nStart, const LogicalFontInstance** ppGlyphFont) const { // NOTE: nStart is tagged with current font index diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx index e8e3f9fefc18..b62c037a2db7 100644 --- a/vcl/source/outdev/font.cxx +++ b/vcl/source/outdev/font.cxx @@ -950,7 +950,7 @@ void OutputDevice::ImplDrawEmphasisMarks( SalLayout& rSalLayout ) tools::Long nEmphasisHeight2 = nEmphasisHeight / 2; aOffset += Point( nEmphasisWidth2, nEmphasisHeight2 ); - DevicePoint aOutPoint; + basegfx::B2DPoint aOutPoint; tools::Rectangle aRectangle; const GlyphItem* pGlyph; const LogicalFontInstance* pGlyphFont; diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx index c625abbf859a..7181b52db6b5 100644 --- a/vcl/source/outdev/map.cxx +++ b/vcl/source/outdev/map.cxx @@ -1132,7 +1132,7 @@ Point OutputDevice::PixelToLogic( const Point& rDevicePt ) const maMapRes.mnMapScNumY, maMapRes.mnMapScDenomY ) - maMapRes.mnMapOfsY - mnOutOffLogicY ); } -Point OutputDevice::SubPixelToLogic(const DevicePoint& rDevicePt) const +Point OutputDevice::SubPixelToLogic(const basegfx::B2DPoint& rDevicePt) const { if (!mbMap) { @@ -1865,12 +1865,12 @@ double OutputDevice::ImplLogicHeightToDeviceSubPixel(tools::Long nHeight) const maMapRes.mnMapScNumY, maMapRes.mnMapScDenomY); } -DevicePoint OutputDevice::ImplLogicToDeviceSubPixel(const Point& rPoint) const +basegfx::B2DPoint OutputDevice::ImplLogicToDeviceSubPixel(const Point& rPoint) const { if (!mbMap) - return DevicePoint(rPoint.X() + mnOutOffX, rPoint.Y() + mnOutOffY); + return basegfx::B2DPoint(rPoint.X() + mnOutOffX, rPoint.Y() + mnOutOffY); - return DevicePoint(ImplLogicToSubPixel(rPoint.X() + maMapRes.mnMapOfsX, mnDPIX, + return basegfx::B2DPoint(ImplLogicToSubPixel(rPoint.X() + maMapRes.mnMapOfsX, mnDPIX, maMapRes.mnMapScNumX, maMapRes.mnMapScDenomX) + mnOutOffX + mnOutOffOrigX, ImplLogicToSubPixel(rPoint.Y() + maMapRes.mnMapOfsY, mnDPIY, diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx index f9aac9aed1c8..aaa165b8f208 100644 --- a/vcl/source/outdev/text.cxx +++ b/vcl/source/outdev/text.cxx @@ -170,7 +170,7 @@ void OutputDevice::ImplDrawTextRect( tools::Long nBaseX, tools::Long nBaseY, void OutputDevice::ImplDrawTextBackground( const SalLayout& rSalLayout ) { const double nWidth = rSalLayout.GetTextWidth(); - const DevicePoint aBase = rSalLayout.DrawBase(); + const basegfx::B2DPoint aBase = rSalLayout.DrawBase(); const tools::Long nX = aBase.getX(); const tools::Long nY = aBase.getY(); @@ -189,7 +189,7 @@ void OutputDevice::ImplDrawTextBackground( const SalLayout& rSalLayout ) tools::Rectangle OutputDevice::ImplGetTextBoundRect( const SalLayout& rSalLayout ) const { - DevicePoint aPoint = rSalLayout.GetDrawPosition(); + basegfx::B2DPoint aPoint = rSalLayout.GetDrawPosition(); tools::Long nX = aPoint.getX(); tools::Long nY = aPoint.getY(); @@ -231,7 +231,7 @@ bool OutputDevice::ImplDrawRotateText( SalLayout& rSalLayout ) tools::Long nY = rSalLayout.DrawBase().getY(); tools::Rectangle aBoundRect; - rSalLayout.DrawBase() = DevicePoint( 0, 0 ); + rSalLayout.DrawBase() = basegfx::B2DPoint( 0, 0 ); rSalLayout.DrawOffset() = Point( 0, 0 ); if (!rSalLayout.GetBoundRect(aBoundRect)) { @@ -348,7 +348,7 @@ void OutputDevice::ImplDrawSpecialText( SalLayout& rSalLayout ) Color aOldOverlineColor = GetOverlineColor(); FontRelief eRelief = maFont.GetRelief(); - DevicePoint aOrigPos = rSalLayout.DrawBase(); + basegfx::B2DPoint aOrigPos = rSalLayout.DrawBase(); if ( eRelief != FontRelief::NONE ) { Color aReliefColor( COL_LIGHTGRAY ); @@ -416,9 +416,9 @@ void OutputDevice::ImplDrawSpecialText( SalLayout& rSalLayout ) else SetTextColor( COL_BLACK ); ImplInitTextColor(); - rSalLayout.DrawBase() += DevicePoint( nOff, nOff ); + rSalLayout.DrawBase() += basegfx::B2DPoint( nOff, nOff ); ImplDrawTextDirect( rSalLayout, mbTextLines ); - rSalLayout.DrawBase() -= DevicePoint( nOff, nOff ); + rSalLayout.DrawBase() -= basegfx::B2DPoint( nOff, nOff ); SetTextColor( aOldColor ); SetTextLineColor( aOldTextLineColor ); SetOverlineColor( aOldOverlineColor ); @@ -430,21 +430,21 @@ void OutputDevice::ImplDrawSpecialText( SalLayout& rSalLayout ) if ( maFont.IsOutline() ) { - rSalLayout.DrawBase() = aOrigPos + DevicePoint(-1,-1); + rSalLayout.DrawBase() = aOrigPos + basegfx::B2DPoint(-1,-1); ImplDrawTextDirect( rSalLayout, mbTextLines ); - rSalLayout.DrawBase() = aOrigPos + DevicePoint(+1,+1); + rSalLayout.DrawBase() = aOrigPos + basegfx::B2DPoint(+1,+1); ImplDrawTextDirect( rSalLayout, mbTextLines ); - rSalLayout.DrawBase() = aOrigPos + DevicePoint(-1,+0); + rSalLayout.DrawBase() = aOrigPos + basegfx::B2DPoint(-1,+0); ImplDrawTextDirect( rSalLayout, mbTextLines ); - rSalLayout.DrawBase() = aOrigPos + DevicePoint(-1,+1); + rSalLayout.DrawBase() = aOrigPos + basegfx::B2DPoint(-1,+1); ImplDrawTextDirect( rSalLayout, mbTextLines ); - rSalLayout.DrawBase() = aOrigPos + DevicePoint(+0,+1); + rSalLayout.DrawBase() = aOrigPos + basegfx::B2DPoint(+0,+1); ImplDrawTextDirect( rSalLayout, mbTextLines ); - rSalLayout.DrawBase() = aOrigPos + DevicePoint(+0,-1); + rSalLayout.DrawBase() = aOrigPos + basegfx::B2DPoint(+0,-1); ImplDrawTextDirect( rSalLayout, mbTextLines ); - rSalLayout.DrawBase() = aOrigPos + DevicePoint(+1,-1); + rSalLayout.DrawBase() = aOrigPos + basegfx::B2DPoint(+1,-1); ImplDrawTextDirect( rSalLayout, mbTextLines ); - rSalLayout.DrawBase() = aOrigPos + DevicePoint(+1,+0); + rSalLayout.DrawBase() = aOrigPos + basegfx::B2DPoint(+1,+0); ImplDrawTextDirect( rSalLayout, mbTextLines ); rSalLayout.DrawBase() = aOrigPos; @@ -471,7 +471,7 @@ void OutputDevice::ImplDrawText( SalLayout& rSalLayout ) if( mbInitTextColor ) ImplInitTextColor(); - rSalLayout.DrawBase() += DevicePoint(mnTextOffX, mnTextOffY); + rSalLayout.DrawBase() += basegfx::B2DPoint(mnTextOffX, mnTextOffY); if( IsTextFillColor() ) ImplDrawTextBackground( rSalLayout ); @@ -1401,7 +1401,7 @@ std::unique_ptr<SalLayout> OutputDevice::ImplLayout(const OUString& rOrigStr, else { Point aDevicePos = ImplLogicToDevicePixel(rLogicalPos); - pSalLayout->DrawBase() = DevicePoint(aDevicePos.X(), aDevicePos.Y()); + pSalLayout->DrawBase() = basegfx::B2DPoint(aDevicePos.X(), aDevicePos.Y()); } // adjust to right alignment if necessary @@ -2328,7 +2328,7 @@ bool OutputDevice::GetTextBoundRect( tools::Rectangle& rRect, if( bRet ) { Point aRotatedOfs( mnTextOffX, mnTextOffY ); - DevicePoint aPos = pSalLayout->GetDrawPosition(DevicePoint(nXOffset, 0)); + basegfx::B2DPoint aPos = pSalLayout->GetDrawPosition(basegfx::B2DPoint(nXOffset, 0)); aRotatedOfs -= Point(aPos.getX(), aPos.getY()); aPixelRect += aRotatedOfs; rRect = PixelToLogic( aPixelRect ); @@ -2397,8 +2397,8 @@ bool OutputDevice::GetTextOutlines( basegfx::B2DPolyPolygonVector& rVector, if (nXOffset || mnTextOffX || mnTextOffY) { - DevicePoint aRotatedOfs(mnTextOffX, mnTextOffY); - aRotatedOfs -= pSalLayout->GetDrawPosition(DevicePoint(nXOffset, 0)); + basegfx::B2DPoint aRotatedOfs(mnTextOffX, mnTextOffY); + aRotatedOfs -= pSalLayout->GetDrawPosition(basegfx::B2DPoint(nXOffset, 0)); aMatrix.translate( aRotatedOfs.getX(), aRotatedOfs.getY() ); } diff --git a/vcl/source/outdev/textline.cxx b/vcl/source/outdev/textline.cxx index e5404369305c..98f737c62647 100644 --- a/vcl/source/outdev/textline.cxx +++ b/vcl/source/outdev/textline.cxx @@ -725,7 +725,7 @@ void OutputDevice::ImplDrawStrikeoutChar( tools::Long nBaseX, tools::Long nBaseY SetTextColor( aColor ); ImplInitTextColor(); - pLayout->DrawBase() = DevicePoint(nBaseX + mnTextOffX, nBaseY + mnTextOffY); + pLayout->DrawBase() = basegfx::B2DPoint(nBaseX + mnTextOffX, nBaseY + mnTextOffY); tools::Rectangle aPixelRect; aPixelRect.SetLeft( nBaseX+mnTextOffX ); @@ -826,10 +826,10 @@ void OutputDevice::ImplDrawTextLines( SalLayout& rSalLayout, FontStrikeout eStri if( bWordLine ) { // draw everything relative to the layout base point - const DevicePoint aStartPt = rSalLayout.DrawBase(); + const basegfx::B2DPoint aStartPt = rSalLayout.DrawBase(); // calculate distance of each word from the base point - DevicePoint aPos; + basegfx::B2DPoint aPos; double nDist = 0; double nWidth = 0; const GlyphItem* pGlyph; @@ -872,7 +872,7 @@ void OutputDevice::ImplDrawTextLines( SalLayout& rSalLayout, FontStrikeout eStri } else { - DevicePoint aStartPt = rSalLayout.GetDrawPosition(); + basegfx::B2DPoint aStartPt = rSalLayout.GetDrawPosition(); ImplDrawTextLine( aStartPt.getX(), aStartPt.getY(), 0, rSalLayout.GetTextWidth(), eStrikeout, eUnderline, eOverline, bUnderlineAbove ); diff --git a/vcl/source/pdf/Matrix3.cxx b/vcl/source/pdf/Matrix3.cxx index 7b225c3a68b4..0f7aead024dd 100644 --- a/vcl/source/pdf/Matrix3.cxx +++ b/vcl/source/pdf/Matrix3.cxx @@ -30,10 +30,10 @@ Point Matrix3::transform(const Point& rOrig) const return Point(x * f[0] + y * f[2] + f[4], x * f[1] + y * f[3] + f[5]); } -DevicePoint Matrix3::transform(const DevicePoint& rOrig) const +basegfx::B2DPoint Matrix3::transform(const basegfx::B2DPoint& rOrig) const { double x = rOrig.getX(), y = rOrig.getY(); - return DevicePoint(x * f[0] + y * f[2] + f[4], x * f[1] + y * f[3] + f[5]); + return basegfx::B2DPoint(x * f[0] + y * f[2] + f[4], x * f[1] + y * f[3] + f[5]); } void Matrix3::skew(double alpha, double beta) diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx index ef3f05fd7416..0fce1b1a82e5 100644 --- a/vcl/unx/generic/gdi/cairotextrender.cxx +++ b/vcl/unx/generic/gdi/cairotextrender.cxx @@ -265,7 +265,7 @@ void CairoTextRender::DrawTextLayout(const GenericSalLayout& rLayout, const SalG double nXScale, nYScale; dl_cairo_surface_get_device_scale(cairo_get_target(cr), &nXScale, &nYScale); - DevicePoint aPos; + basegfx::B2DPoint aPos; const GlyphItem* pGlyph; const GlyphItem* pPrevGlyph = nullptr; int nStart = 0; diff --git a/vcl/unx/generic/print/genpspgraphics.cxx b/vcl/unx/generic/print/genpspgraphics.cxx index 24d0515c3b03..412b0121ec40 100644 --- a/vcl/unx/generic/print/genpspgraphics.cxx +++ b/vcl/unx/generic/print/genpspgraphics.cxx @@ -131,7 +131,7 @@ void PspSalLayout::InitFont() const void GenPspGraphics::DrawTextLayout(const GenericSalLayout& rLayout) { const GlyphItem* pGlyph; - DevicePoint aPos; + basegfx::B2DPoint aPos; int nStart = 0; while (rLayout.GetNextGlyph(&pGlyph, aPos, nStart)) m_pPrinterGfx->DrawGlyph(Point(aPos.getX(), aPos.getY()), *pGlyph); diff --git a/vcl/win/gdi/DWriteTextRenderer.cxx b/vcl/win/gdi/DWriteTextRenderer.cxx index b7d7c03e9995..3d3dac83c6dd 100644 --- a/vcl/win/gdi/DWriteTextRenderer.cxx +++ b/vcl/win/gdi/DWriteTextRenderer.cxx @@ -246,7 +246,7 @@ bool D2DWriteTextOutRenderer::performRender(GenericSalLayout const & rLayout, Sa mpRT->BeginDraw(); int nStart = 0; - DevicePoint aPos; + basegfx::B2DPoint aPos; const GlyphItem* pGlyph; while (rLayout.GetNextGlyph(&pGlyph, aPos, nStart)) { diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx index 925965ce6650..eb5c740580c5 100644 --- a/vcl/win/gdi/winlayout.cxx +++ b/vcl/win/gdi/winlayout.cxx @@ -83,7 +83,7 @@ bool ExTextOutRenderer::operator()(GenericSalLayout const& rLayout, SalGraphics& HDC hDC, bool /*bRenderingModeNatural*/) { int nStart = 0; - DevicePoint aPos; + basegfx::B2DPoint aPos; const GlyphItem* pGlyph; const WinFontInstance* pWinFont = static_cast<const WinFontInstance*>(&rLayout.GetFont()); UINT nTextAlign = GetTextAlign(hDC); |