diff options
author | Luboš Luňák <l.lunak@collabora.com> | 2019-10-17 15:20:31 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@collabora.com> | 2019-10-18 11:00:04 +0200 |
commit | 7d7fea7f75524611238ce1b3546b95646cdcf359 (patch) | |
tree | 0b8f8b14ab4c35653923be643701599135b18612 /sd/inc/pch | |
parent | 06cfc566a4734bd8d517920d3dfc210afe068295 (diff) |
make bin/update_pch.s always include code in trivial #if's
E.g. #ifdef LIBO_INTERNAL_ONLY is always true for code that builds
with our PCHs.
Change-Id: I3cf311ea3621b909105754cfea2cb0116b8b67f5
Reviewed-on: https://gerrit.libreoffice.org/80961
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'sd/inc/pch')
-rw-r--r-- | sd/inc/pch/precompiled_sd.hxx | 3 | ||||
-rw-r--r-- | sd/inc/pch/precompiled_sdui.hxx | 22 |
2 files changed, 6 insertions, 19 deletions
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 739316a87ab4..54379901752d 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2019-10-02 19:36:40 using: + Generated on 2019-10-17 15:16:04 using: ./bin/update_pch sd sd --cutoff=4 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -25,6 +25,7 @@ #include <cassert> #include <cstddef> #include <functional> +#include <initializer_list> #include <iomanip> #include <limits.h> #include <locale> diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx index 0fbdaca068f6..0922819f0e6f 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 2019-09-26 09:12:06 using: + Generated on 2019-10-17 15:16: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: @@ -29,6 +29,7 @@ #include <deque> #include <float.h> #include <functional> +#include <initializer_list> #include <iomanip> #include <iterator> #include <limits.h> @@ -50,6 +51,7 @@ #include <utility> #include <vector> #include <boost/optional.hpp> +#include <boost/property_tree/ptree.hpp> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 #include <osl/diagnose.h> @@ -69,6 +71,7 @@ #include <rtl/strbuf.hxx> #include <rtl/string.h> #include <rtl/string.hxx> +#include <rtl/stringconcat.hxx> #include <rtl/stringutils.hxx> #include <rtl/textcvt.h> #include <rtl/textenc.h> @@ -114,7 +117,6 @@ #include <vcl/graph.hxx> #include <vcl/idle.hxx> #include <vcl/image.hxx> -#include <vcl/imapobj.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/lstbox.hxx> @@ -167,13 +169,6 @@ #include <com/sun/star/awt/KeyGroup.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/datatransfer/DataFlavor.hpp> -#include <com/sun/star/datatransfer/XTransferable2.hpp> -#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> -#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp> -#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp> -#include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp> -#include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp> #include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp> #include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp> #include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp> @@ -181,16 +176,13 @@ #include <com/sun/star/drawing/HatchStyle.hpp> #include <com/sun/star/drawing/LineCap.hpp> #include <com/sun/star/drawing/TextFitToSizeType.hpp> -#include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XTerminateListener.hpp> #include <com/sun/star/graphic/XPrimitive2D.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/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/style/NumberingType.hpp> @@ -239,7 +231,6 @@ #include <editeng/editstat.hxx> #include <editeng/eedata.hxx> #include <editeng/eeitem.hxx> -#include <editeng/flstitem.hxx> #include <editeng/outliner.hxx> #include <editeng/paragraphdata.hxx> #include <editeng/svxenum.hxx> @@ -260,9 +251,7 @@ #include <sfx2/linksrc.hxx> #include <sfx2/objsh.hxx> #include <sfx2/shell.hxx> -#include <sot/exchange.hxx> #include <sot/formats.hxx> -#include <sot/sotdllapi.h> #include <svl/SfxBroadcaster.hxx> #include <svl/aeitem.hxx> #include <svl/eitem.hxx> @@ -272,7 +261,6 @@ #include <svl/itemset.hxx> #include <svl/languageoptions.hxx> #include <svl/lstner.hxx> -#include <svl/macitem.hxx> #include <svl/poolitem.hxx> #include <svl/stritem.hxx> #include <svl/style.hxx> @@ -315,7 +303,6 @@ #include <tools/fontenum.hxx> #include <tools/fract.hxx> #include <tools/gen.hxx> -#include <tools/globname.hxx> #include <tools/helpers.hxx> #include <tools/lineend.hxx> #include <tools/link.hxx> @@ -339,7 +326,6 @@ #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/unotoolsdllapi.h> |