diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2021-03-07 13:46:52 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-03-09 06:51:51 +0100 |
commit | 083900f88c112b69e098bbe5820b1d077c18e92c (patch) | |
tree | c1f54839b3feb3d5bf0af4139b51bafee81560ed /sw/inc | |
parent | 1c3e170d56d3cad1e7729f839fa63f607b62e4e3 (diff) |
Make sal/config.h the first in pch
By convention, it should be the first include in C/CXX files;
so use of pch should not break that.
Change-Id: Ic329c5f39e8f48ad1778724368e262e48972342b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112123
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/pch/precompiled_msword.hxx | 17 | ||||
-rw-r--r-- | sw/inc/pch/precompiled_sw.hxx | 4 | ||||
-rw-r--r-- | sw/inc/pch/precompiled_swui.hxx | 31 | ||||
-rw-r--r-- | sw/inc/pch/precompiled_vbaswobj.hxx | 15 |
4 files changed, 26 insertions, 41 deletions
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx index 57c01d4f60f2..4ebffe71b2de 100644 --- a/sw/inc/pch/precompiled_msword.hxx +++ b/sw/inc/pch/precompiled_msword.hxx @@ -13,13 +13,14 @@ 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-03-06 18:49:56 using: + Generated on 2021-03-08 13:19:31 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: ./bin/update_pch_bisect ./sw/inc/pch/precompiled_msword.hxx "make sw.build" --find-conflicts */ +#include <sal/config.h> #if PCH_LEVEL >= 1 #include <algorithm> #include <array> @@ -101,7 +102,6 @@ #include <rtl/ustring.h> #include <rtl/ustring.hxx> #include <rtl/uuid.h> -#include <sal/config.h> #include <sal/detail/log.h> #include <sal/log.hxx> #include <sal/macros.h> @@ -137,7 +137,6 @@ #include <vcl/outdev.hxx> #include <vcl/outdevmap.hxx> #include <vcl/outdevstate.hxx> -#include <vcl/ptrstyle.hxx> #include <vcl/region.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/scopedbitmapaccess.hxx> @@ -194,12 +193,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,7 +234,6 @@ #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> @@ -248,7 +246,6 @@ #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/text/RubyAdjust.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> -#include <com/sun/star/text/XTextRange.hpp> #include <com/sun/star/text/textfield/Type.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.hxx> @@ -262,7 +259,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> @@ -356,9 +352,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/XListFormat.hpp> -#include <ooo/vba/word/XListTemplate.hpp> +#include <ooo/vba/word/WdSaveFormat.hpp> #include <oox/dllapi.h> #include <oox/drawingml/drawingmltypes.hxx> #include <oox/export/utils.hxx> @@ -508,9 +502,6 @@ #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_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index 6e9fdfbec5f6..0957201acdbd 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -13,13 +13,14 @@ 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-02-22 20:25:17 using: + Generated on 2021-03-08 13:21:13 using: ./bin/update_pch sw sw --cutoff=7 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: ./bin/update_pch_bisect ./sw/inc/pch/precompiled_sw.hxx "make sw.build" --find-conflicts */ +#include <sal/config.h> #if PCH_LEVEL >= 1 #include <algorithm> #include <array> @@ -80,7 +81,6 @@ #include <rtl/uri.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> -#include <sal/config.h> #include <sal/detail/log.h> #include <sal/log.hxx> #include <sal/macros.h> diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx index 5ccbd956cb17..7f48a35ff4be 100644 --- a/sw/inc/pch/precompiled_swui.hxx +++ b/sw/inc/pch/precompiled_swui.hxx @@ -13,13 +13,14 @@ 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-03-06 18:50:10 using: + Generated on 2021-03-08 13:22:01 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: ./bin/update_pch_bisect ./sw/inc/pch/precompiled_swui.hxx "make sw.build" --find-conflicts */ +#include <sal/config.h> #if PCH_LEVEL >= 1 #include <algorithm> #include <array> @@ -83,7 +84,6 @@ #include <rtl/ustring.h> #include <rtl/ustring.hxx> #include <rtl/uuid.h> -#include <sal/config.h> #include <sal/detail/log.h> #include <sal/log.hxx> #include <sal/macros.h> @@ -182,13 +182,16 @@ #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/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> @@ -243,7 +246,6 @@ #include <com/sun/star/i18n/XForbiddenCharacters.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/XEventListener.hpp> @@ -268,12 +270,7 @@ #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/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/XTextRange.hpp> -#include <com/sun/star/text/XTextRangeCompare.hpp> +#include <com/sun/star/text/XTextSection.hpp> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/XFilePicker3.hpp> @@ -289,7 +286,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/XCurrentContext.hpp> #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/XWeak.hpp> @@ -379,12 +375,10 @@ #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> #include <officecfg/Office/Writer.hxx> -#include <ooo/vba/XHelperInterface.hpp> -#include <ooo/vba/word/XListFormat.hpp> -#include <ooo/vba/word/XListTemplate.hpp> -#include <ooo/vba/word/XSection.hpp> +#include <ooo/vba/word/WdSaveFormat.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,7 +412,6 @@ #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> @@ -445,6 +438,7 @@ #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> @@ -502,9 +496,6 @@ #include <unotools/syslocale.hxx> #include <unotools/transliterationwrapper.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> @@ -570,6 +561,7 @@ #include <optload.hxx> #include <outline.hxx> #include <pagedesc.hxx> +#include <pam.hxx> #include <pardlg.hxx> #include <poolfmt.hxx> #include <reffld.hxx> @@ -600,7 +592,6 @@ #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 84441904e389..a755fcb057e1 100644 --- a/sw/inc/pch/precompiled_vbaswobj.hxx +++ b/sw/inc/pch/precompiled_vbaswobj.hxx @@ -13,13 +13,14 @@ 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-03-06 18:50:13 using: + Generated on 2021-03-08 13:22:26 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: ./bin/update_pch_bisect ./sw/inc/pch/precompiled_vbaswobj.hxx "make sw.build" --find-conflicts */ +#include <sal/config.h> #if PCH_LEVEL >= 1 #include <algorithm> #include <array> @@ -83,7 +84,6 @@ #include <rtl/ustring.h> #include <rtl/ustring.hxx> #include <rtl/uuid.h> -#include <sal/config.h> #include <sal/detail/log.h> #include <sal/log.hxx> #include <sal/macros.h> @@ -153,7 +153,10 @@ #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/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> @@ -175,6 +178,7 @@ #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/NumberingType.hpp> #include <com/sun/star/style/XStyle.hpp> @@ -185,8 +189,8 @@ #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/text/XPageCursor.hpp> #include <com/sun/star/text/XTextDocument.hpp> -#include <com/sun/star/text/XTextRange.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> @@ -249,9 +253,8 @@ #include <o3tl/underlyingenumvalue.hxx> #include <ooo/vba/XCollection.hpp> #include <ooo/vba/XHelperInterface.hpp> -#include <ooo/vba/word/XListFormat.hpp> -#include <ooo/vba/word/XListTemplate.hpp> -#include <ooo/vba/word/XSection.hpp> +#include <ooo/vba/word/WdSaveFormat.hpp> +#include <sfx2/Metadatable.hxx> #include <sfx2/dllapi.h> #include <sfx2/shell.hxx> #include <sot/formats.hxx> |