diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2021-09-03 02:19:33 +1000 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2021-09-28 08:20:32 +0200 |
commit | 4dd6af856d574ad66ebb4b822a36ba70af9945e2 (patch) | |
tree | c67ddea9c5551e069cb75fe0901cdcfa3f00b054 /sw/inc/pch | |
parent | 1734e97222324c137ecd084ad2464abdff2698d1 (diff) |
vcl: rename OutDevState to Stack
I have moved the header file to include/vcl/rendercontext as this will
eventually be part of the RenderContext split from OutputDevice.
State and associated enums have also been moved to the vcl namespace. I
have also moved ComplexTextLayoutFlags into the vcl::text namespace.
Change-Id: I0abbf560e75b45a272854b267e948c240cd69091
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121524
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
Diffstat (limited to 'sw/inc/pch')
-rw-r--r-- | sw/inc/pch/precompiled_msword.hxx | 33 | ||||
-rw-r--r-- | sw/inc/pch/precompiled_swui.hxx | 19 | ||||
-rw-r--r-- | sw/inc/pch/precompiled_vbaswobj.hxx | 22 |
3 files changed, 50 insertions, 24 deletions
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx index 8b803a57a446..7f54a5ed9d5d 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 2021-05-14 22:17:12 using: + Generated on 2021-09-28 05:48:51 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: @@ -45,6 +45,7 @@ #include <map> #include <math.h> #include <memory> +#include <mutex> #include <new> #include <optional> #include <ostream> @@ -138,8 +139,6 @@ #include <vcl/mapmod.hxx> #include <vcl/metaactiontypes.hxx> #include <vcl/outdev.hxx> -#include <vcl/outdevstate.hxx> -#include <vcl/ptrstyle.hxx> #include <vcl/region.hxx> #include <vcl/rendercontext/AddFontSubstituteFlags.hxx> #include <vcl/rendercontext/AntialiasingFlags.hxx> @@ -150,7 +149,10 @@ #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> @@ -178,6 +180,8 @@ #include <basegfx/range/b2drectangle.hxx> #include <basegfx/range/b2irange.hxx> #include <basegfx/range/basicrange.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> @@ -206,12 +210,12 @@ #include <com/sun/star/awt/SystemPointer.hpp> #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/beans/PropertyState.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/container/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> @@ -235,27 +239,29 @@ #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/ScriptType.hpp> #include <com/sun/star/i18n/TransliterationModules.hpp> #include <com/sun/star/i18n/TransliterationModulesExtra.hpp> +#include <com/sun/star/i18n/UnicodeScript.hpp> #include <com/sun/star/i18n/WordType.hpp> #include <com/sun/star/i18n/XBreakIterator.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/IllegalArgumentException.hpp> #include <com/sun/star/lang/Locale.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/LineSpacing.hpp> #include <com/sun/star/style/NumberingType.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/style/TabAlign.hpp> @@ -275,7 +281,6 @@ #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> #include <com/sun/star/uno/genfunc.h> @@ -341,6 +346,7 @@ #include <editeng/opaqitem.hxx> #include <editeng/outliner.hxx> #include <editeng/outlobj.hxx> +#include <editeng/overflowingtxt.hxx> #include <editeng/paragraphdata.hxx> #include <editeng/paravertalignitem.hxx> #include <editeng/pgrditem.hxx> @@ -369,8 +375,7 @@ #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> #include <o3tl/unit_conversion.hxx> -#include <ooo/vba/XHelperInterface.hpp> -#include <ooo/vba/word/XParagraphFormat.hpp> +#include <ooo/vba/word/WdSaveFormat.hpp> #include <oox/dllapi.h> #include <oox/drawingml/drawingmltypes.hxx> #include <oox/export/utils.hxx> @@ -411,12 +416,14 @@ #include <svl/typedwhich.hxx> #include <svl/undo.hxx> #include <svl/urihelper.hxx> +#include <svl/whichranges.hxx> #include <svl/whiter.hxx> +#include <svl/zforlist.hxx> #include <svtools/colorcfg.hxx> -#include <svtools/optionsdrawinglayer.hxx> #include <svtools/svtdllapi.h> #include <svx/DiagramDataInterface.hxx> #include <svx/XPropertyEntry.hxx> +#include <svx/flagsdef.hxx> #include <svx/ipolypolygoneditorcontroller.hxx> #include <svx/itextprovider.hxx> #include <svx/msdffdef.hxx> @@ -507,20 +514,18 @@ #include <uno/data.h> #include <uno/sequence2.h> #include <unotools/calendarwrapper.hxx> -#include <unotools/configitem.hxx> +#include <unotools/charclass.hxx> #include <unotools/fltrcfg.hxx> #include <unotools/fontdefs.hxx> #include <unotools/localedatawrapper.hxx> #include <unotools/nativenumberwrapper.hxx> #include <unotools/options.hxx> +#include <unotools/resmgr.hxx> #include <unotools/streamwrap.hxx> #include <unotools/syslocale.hxx> #include <unotools/transliterationwrapper.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/unotoolsdllapi.h> -#include <vbahelper/vbadllapi.h> -#include <vbahelper/vbahelper.hxx> -#include <vbahelper/vbahelperinterface.hxx> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 #include <BorderCacheOwner.hxx> diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx index 241ee3e79d8d..264c90aff4c5 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 2021-05-14 22:17:26 using: + Generated on 2021-09-28 05:49:06 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: @@ -42,6 +42,7 @@ #include <map> #include <math.h> #include <memory> +#include <mutex> #include <new> #include <numeric> #include <optional> @@ -131,7 +132,6 @@ #include <vcl/metaactiontypes.hxx> #include <vcl/metric.hxx> #include <vcl/outdev.hxx> -#include <vcl/outdevstate.hxx> #include <vcl/print.hxx> #include <vcl/ptrstyle.hxx> #include <vcl/region.hxx> @@ -144,7 +144,10 @@ #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> @@ -176,6 +179,8 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/range/basicrange.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> @@ -194,6 +199,7 @@ #include <com/sun/star/awt/KeyGroup.hpp> #include <com/sun/star/awt/SystemPointer.hpp> #include <com/sun/star/awt/XWindow.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XEnumeration.hpp> @@ -272,9 +278,7 @@ #include <com/sun/star/script/XStarBasicAccess.hpp> #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp> #include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/style/LineSpacing.hpp> #include <com/sun/star/style/NumberingType.hpp> -#include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/table/BorderLineStyle.hpp> #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/PositionLayoutDir.hpp> @@ -365,6 +369,7 @@ #include <editeng/numitem.hxx> #include <editeng/orphitem.hxx> #include <editeng/outliner.hxx> +#include <editeng/overflowingtxt.hxx> #include <editeng/paperinf.hxx> #include <editeng/paragraphdata.hxx> #include <editeng/paravertalignitem.hxx> @@ -394,7 +399,7 @@ #include <o3tl/unit_conversion.hxx> #include <officecfg/Office/Writer.hxx> #include <ooo/vba/XHelperInterface.hpp> -#include <ooo/vba/word/XParagraphFormat.hpp> +#include <ooo/vba/word/WdSaveFormat.hpp> #include <ooo/vba/word/XSection.hpp> #include <salhelper/salhelperdllapi.h> #include <salhelper/simplereferenceobject.hxx> @@ -435,6 +440,7 @@ #include <svl/lstner.hxx> #include <svl/macitem.hxx> #include <svl/nfkeytab.hxx> +#include <svl/numformat.hxx> #include <svl/ondemand.hxx> #include <svl/poolitem.hxx> #include <svl/stritem.hxx> @@ -443,6 +449,7 @@ #include <svl/typedwhich.hxx> #include <svl/undo.hxx> #include <svl/urihelper.hxx> +#include <svl/whichranges.hxx> #include <svl/zforlist.hxx> #include <svl/zformat.hxx> #include <svtools/borderline.hxx> @@ -536,6 +543,7 @@ #include <column.hxx> #include <dbmgr.hxx> #include <doc.hxx> +#include <docary.hxx> #include <docsh.hxx> #include <docstyle.hxx> #include <docufld.hxx> @@ -606,6 +614,7 @@ #include <tablemgr.hxx> #include <tblafmt.hxx> #include <tblenum.hxx> +#include <textboxhelper.hxx> #include <tgrditem.hxx> #include <tox.hxx> #include <toxe.hxx> diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx index 14ae9cbfd621..1270444ef8f4 100644 --- a/sw/inc/pch/precompiled_vbaswobj.hxx +++ b/sw/inc/pch/precompiled_vbaswobj.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2021-05-14 22:17:35 using: + Generated on 2021-09-12 11:53:02 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: @@ -39,6 +39,7 @@ #include <initializer_list> #include <iomanip> #include <iostream> +#include <iterator> #include <limits.h> #include <limits> #include <list> @@ -49,6 +50,7 @@ #include <numeric> #include <optional> #include <ostream> +#include <set> #include <stack> #include <stddef.h> #include <string.h> @@ -116,7 +118,6 @@ #include <vcl/mapmod.hxx> #include <vcl/metaactiontypes.hxx> #include <vcl/outdev.hxx> -#include <vcl/outdevstate.hxx> #include <vcl/region.hxx> #include <vcl/rendercontext/AddFontSubstituteFlags.hxx> #include <vcl/rendercontext/AntialiasingFlags.hxx> @@ -127,7 +128,10 @@ #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/svapp.hxx> @@ -152,6 +156,8 @@ #include <basegfx/range/b2drange.hxx> #include <basegfx/range/b2irange.hxx> #include <basegfx/range/basicrange.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> @@ -167,6 +173,7 @@ #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyGroup.hpp> #include <com/sun/star/awt/SystemPointer.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/NoSuchElementException.hpp> #include <com/sun/star/container/XEnumeration.hpp> @@ -191,9 +198,7 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/security/DocumentSignatureInformation.hpp> -#include <com/sun/star/style/LineSpacing.hpp> #include <com/sun/star/style/NumberingType.hpp> -#include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/table/XCellRange.hpp> @@ -259,6 +264,7 @@ #include <editeng/widwitem.hxx> #include <i18nlangtag/lang.h> #include <o3tl/cow_wrapper.hxx> +#include <o3tl/enumarray.hxx> #include <o3tl/safeint.hxx> #include <o3tl/sorted_vector.hxx> #include <o3tl/strong_int.hxx> @@ -267,7 +273,7 @@ #include <o3tl/unit_conversion.hxx> #include <ooo/vba/XCollection.hpp> #include <ooo/vba/XHelperInterface.hpp> -#include <ooo/vba/word/XParagraphFormat.hpp> +#include <ooo/vba/word/WdSaveFormat.hpp> #include <ooo/vba/word/XSection.hpp> #include <salhelper/salhelperdllapi.h> #include <salhelper/simplereferenceobject.hxx> @@ -293,7 +299,10 @@ #include <svl/svldllapi.h> #include <svl/typedwhich.hxx> #include <svl/undo.hxx> +#include <svl/whichranges.hxx> +#include <svx/flagsdef.hxx> #include <svx/svxdllapi.h> +#include <svx/swframetypes.hxx> #include <svx/xdef.hxx> #include <tools/color.hxx> #include <tools/date.hxx> @@ -322,6 +331,8 @@ #include <unotools/fontcvt.hxx> #include <unotools/fontdefs.hxx> #include <unotools/options.hxx> +#include <unotools/resmgr.hxx> +#include <unotools/syslocale.hxx> #include <unotools/unotoolsdllapi.h> #include <vbahelper/vbadllapi.h> #include <vbahelper/vbahelper.hxx> @@ -368,6 +379,7 @@ #include <swundo.hxx> #include <tblenum.hxx> #include <tblsel.hxx> +#include <textboxhelper.hxx> #include <tox.hxx> #include <toxe.hxx> #include <undobj.hxx> |