diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2021-05-05 04:06:41 +1000 |
---|---|---|
committer | Tomaž Vajngerl <quikee@gmail.com> | 2021-06-15 09:25:10 +0200 |
commit | 21405a65c3056fe8c827f3999e5c79f6083d8229 (patch) | |
tree | 6322496968521d1fcc3fc0eb84c55b2481b7e67a /sw/inc/pch | |
parent | 4bb8c8c41f95383839a3d532e39c2353a3d8d275 (diff) |
vcl: outdevmap.hxx -> rendercontext/ImplMapRes.hxx
Change-Id: I96e191999e43e1a4203d548eeacd386ed883cd8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115368
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 | 15 | ||||
-rw-r--r-- | sw/inc/pch/precompiled_swui.hxx | 33 | ||||
-rw-r--r-- | sw/inc/pch/precompiled_vbaswobj.hxx | 26 |
3 files changed, 55 insertions, 19 deletions
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx index b1295d07512e..8b803a57a446 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-04-11 19:48:30 using: + Generated on 2021-05-14 22:17:12 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: @@ -130,6 +130,7 @@ #include <vcl/font.hxx> #include <vcl/gdimtf.hxx> #include <vcl/gfxlink.hxx> +#include <vcl/gradient.hxx> #include <vcl/graph.hxx> #include <vcl/idle.hxx> #include <vcl/keycod.hxx> @@ -137,10 +138,19 @@ #include <vcl/mapmod.hxx> #include <vcl/metaactiontypes.hxx> #include <vcl/outdev.hxx> -#include <vcl/outdevmap.hxx> #include <vcl/outdevstate.hxx> #include <vcl/ptrstyle.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/SalLayoutFlags.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/scopedbitmapaccess.hxx> #include <vcl/settings.hxx> @@ -220,6 +230,7 @@ #include <com/sun/star/embed/XStorage.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/geometry/IntegerRectangle2D.hpp> #include <com/sun/star/graphic/XPrimitive2D.hpp> #include <com/sun/star/i18n/Calendar2.hpp> diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx index 2b69b961d26b..241ee3e79d8d 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-04-11 19:48:47 using: + Generated on 2021-05-14 22:17:26 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: @@ -120,6 +120,7 @@ #include <vcl/formatter.hxx> #include <vcl/gfxlink.hxx> #include <vcl/glyphitem.hxx> +#include <vcl/gradient.hxx> #include <vcl/graph.hxx> #include <vcl/headbar.hxx> #include <vcl/idle.hxx> @@ -130,11 +131,20 @@ #include <vcl/metaactiontypes.hxx> #include <vcl/metric.hxx> #include <vcl/outdev.hxx> -#include <vcl/outdevmap.hxx> #include <vcl/outdevstate.hxx> #include <vcl/print.hxx> #include <vcl/ptrstyle.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/SalLayoutFlags.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/scopedbitmapaccess.hxx> #include <vcl/settings.hxx> @@ -184,15 +194,13 @@ #include <com/sun/star/awt/KeyGroup.hpp> #include <com/sun/star/awt/SystemPointer.hpp> #include <com/sun/star/awt/XWindow.hpp> -#include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XEnumeration.hpp> +#include <com/sun/star/container/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/container/XNamed.hpp> #include <com/sun/star/datatransfer/DataFlavor.hpp> #include <com/sun/star/datatransfer/XTransferable.hpp> #include <com/sun/star/datatransfer/XTransferable2.hpp> @@ -228,7 +236,7 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XLoadable.hpp> #include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/frame/XModel2.hpp> +#include <com/sun/star/frame/XModel3.hpp> #include <com/sun/star/frame/XModule.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/frame/XStorable2.hpp> @@ -274,7 +282,11 @@ #include <com/sun/star/text/RubyAdjust.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/text/VertOrientation.hpp> -#include <com/sun/star/text/XTextSection.hpp> +#include <com/sun/star/text/XRelativeTextContentInsert.hpp> +#include <com/sun/star/text/XRelativeTextContentRemove.hpp> +#include <com/sun/star/text/XTextAppendAndConvert.hpp> +#include <com/sun/star/text/XTextCopy.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> @@ -379,12 +391,13 @@ #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> +#include <o3tl/unit_conversion.hxx> #include <officecfg/Office/Writer.hxx> #include <ooo/vba/XHelperInterface.hpp> #include <ooo/vba/word/XParagraphFormat.hpp> +#include <ooo/vba/word/XSection.hpp> #include <salhelper/salhelperdllapi.h> #include <salhelper/simplereferenceobject.hxx> -#include <sfx2/Metadatable.hxx> #include <sfx2/basedlgs.hxx> #include <sfx2/bindings.hxx> #include <sfx2/chalign.hxx> @@ -418,6 +431,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/nfkeytab.hxx> @@ -444,7 +458,6 @@ #include <svx/autoformathelper.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> @@ -570,7 +583,6 @@ #include <optload.hxx> #include <outline.hxx> #include <pagedesc.hxx> -#include <pam.hxx> #include <pardlg.hxx> #include <poolfmt.hxx> #include <reffld.hxx> @@ -601,6 +613,7 @@ #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 fd017e55b968..14ae9cbfd621 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-04-11 19:48:51 using: + Generated on 2021-05-14 22:17:35 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: @@ -46,6 +46,7 @@ #include <math.h> #include <memory> #include <new> +#include <numeric> #include <optional> #include <ostream> #include <stack> @@ -107,6 +108,7 @@ #include <vcl/exceptiontypes.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> +#include <vcl/gradient.hxx> #include <vcl/inputtypes.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> @@ -114,9 +116,18 @@ #include <vcl/mapmod.hxx> #include <vcl/metaactiontypes.hxx> #include <vcl/outdev.hxx> -#include <vcl/outdevmap.hxx> #include <vcl/outdevstate.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/SalLayoutFlags.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/scopedbitmapaccess.hxx> #include <vcl/svapp.hxx> @@ -156,9 +167,7 @@ #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyGroup.hpp> #include <com/sun/star/awt/SystemPointer.hpp> -#include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/container/NoSuchElementException.hpp> #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/container/XIndexAccess.hpp> @@ -170,6 +179,7 @@ #include <com/sun/star/drawing/LineCap.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/i18n/CollatorOptions.hpp> #include <com/sun/star/i18n/WordType.hpp> #include <com/sun/star/lang/EventObject.hpp> @@ -180,7 +190,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -#include <com/sun/star/rdf/XMetadatable.hpp> #include <com/sun/star/security/DocumentSignatureInformation.hpp> #include <com/sun/star/style/LineSpacing.hpp> #include <com/sun/star/style/NumberingType.hpp> @@ -194,7 +203,6 @@ #include <com/sun/star/text/XPageCursor.hpp> #include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/text/XTextRangeCompare.hpp> -#include <com/sun/star/text/XTextSection.hpp> #include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.hxx> @@ -251,14 +259,18 @@ #include <editeng/widwitem.hxx> #include <i18nlangtag/lang.h> #include <o3tl/cow_wrapper.hxx> +#include <o3tl/safeint.hxx> #include <o3tl/sorted_vector.hxx> #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> +#include <o3tl/unit_conversion.hxx> #include <ooo/vba/XCollection.hpp> #include <ooo/vba/XHelperInterface.hpp> #include <ooo/vba/word/XParagraphFormat.hpp> -#include <sfx2/Metadatable.hxx> +#include <ooo/vba/word/XSection.hpp> +#include <salhelper/salhelperdllapi.h> +#include <salhelper/simplereferenceobject.hxx> #include <sfx2/dllapi.h> #include <sfx2/shell.hxx> #include <sot/formats.hxx> |