summaryrefslogtreecommitdiff
path: root/desktop/inc
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@collabora.com>2019-03-14 13:17:30 +0100
committerLuboš Luňák <l.lunak@collabora.com>2019-05-09 11:02:03 +0200
commitc6350b36860f3a3681722640b09f221489803e02 (patch)
treec0d4c458b8d6dc62757fd63daf5a28595aab462d /desktop/inc
parenta3e92f9bcf72ebe94da181c0b1dd873ebbc2c9cc (diff)
regenerate PCH headers for the 4 new levels
Plus some build fixes triggered by this. Change-Id: I59b21def706598ceffd45ae5b1f0262ec9c1ad50 Reviewed-on: https://gerrit.libreoffice.org/71581 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
Diffstat (limited to 'desktop/inc')
-rw-r--r--desktop/inc/pch/precompiled_deployment.hxx19
-rw-r--r--desktop/inc/pch/precompiled_deploymentgui.hxx40
-rw-r--r--desktop/inc/pch/precompiled_deploymentmisc.hxx19
-rw-r--r--desktop/inc/pch/precompiled_sofficeapp.hxx112
4 files changed, 63 insertions, 127 deletions
diff --git a/desktop/inc/pch/precompiled_deployment.hxx b/desktop/inc/pch/precompiled_deployment.hxx
index 954337083fbe..77264da13231 100644
--- a/desktop/inc/pch/precompiled_deployment.hxx
+++ b/desktop/inc/pch/precompiled_deployment.hxx
@@ -13,29 +13,31 @@
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 2017-09-20 22:52:21 using:
+ Generated on 2019-04-29 21:18:38 using:
./bin/update_pch desktop deployment --cutoff=3 --exclude:system --exclude:module --exclude:local
If after updating build fails, use the following command to locate conflicting headers:
./bin/update_pch_bisect ./desktop/inc/pch/precompiled_deployment.hxx "make desktop.build" --find-conflicts
*/
+#if PCH_LEVEL >= 1
#include <algorithm>
-#include <config_features.h>
#include <cstddef>
-#include <list>
#include <memory>
#include <ostream>
#include <unordered_map>
#include <vector>
#include <boost/optional.hpp>
+#endif // PCH_LEVEL >= 1
+#if PCH_LEVEL >= 2
#include <osl/diagnose.h>
#include <osl/file.hxx>
#include <osl/mutex.hxx>
#include <osl/security.hxx>
#include <osl/thread.h>
-#include <osl/thread.hxx>
+#include <osl/time.h>
#include <rtl/bootstrap.hxx>
+#include <rtl/byteseq.hxx>
#include <rtl/strbuf.hxx>
#include <rtl/string.h>
#include <rtl/string.hxx>
@@ -48,6 +50,8 @@
#include <sal/log.hxx>
#include <sal/saldllapi.h>
#include <sal/types.h>
+#endif // PCH_LEVEL >= 2
+#if PCH_LEVEL >= 3
#include <com/sun/star/deployment/DeploymentException.hpp>
#include <com/sun/star/deployment/ExtensionRemovedException.hpp>
#include <com/sun/star/deployment/InstallException.hpp>
@@ -61,7 +65,9 @@
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/task/XInteractionApprove.hpp>
+#include <com/sun/star/ucb/CommandAbortedException.hpp>
#include <com/sun/star/ucb/CommandFailedException.hpp>
+#include <com/sun/star/ucb/ContentCreationException.hpp>
#include <com/sun/star/ucb/NameClash.hpp>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <com/sun/star/uno/Any.hxx>
@@ -73,7 +79,7 @@
#include <com/sun/star/util/XUpdatable.hpp>
#include <com/sun/star/xml/dom/XDocumentBuilder.hpp>
#include <com/sun/star/xml/xpath/XXPathAPI.hpp>
-#include <comphelper/anytostring.hxx>
+#include <comphelper/comphelperdllapi.h>
#include <comphelper/sequence.hxx>
#include <comphelper/servicedecl.hxx>
#include <cppu/cppudllapi.h>
@@ -84,5 +90,8 @@
#include <ucbhelper/content.hxx>
#include <unotools/unotoolsdllapi.h>
#include <xmlscript/xml_helper.hxx>
+#endif // PCH_LEVEL >= 3
+#if PCH_LEVEL >= 4
+#endif // PCH_LEVEL >= 4
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/inc/pch/precompiled_deploymentgui.hxx b/desktop/inc/pch/precompiled_deploymentgui.hxx
index 9355d70e1508..de085cceade9 100644
--- a/desktop/inc/pch/precompiled_deploymentgui.hxx
+++ b/desktop/inc/pch/precompiled_deploymentgui.hxx
@@ -13,20 +13,22 @@
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 2017-09-20 22:52:22 using:
+ Generated on 2019-04-29 21:18:38 using:
./bin/update_pch desktop deploymentgui --cutoff=3 --exclude:system --exclude:module --exclude:local
If after updating build fails, use the following command to locate conflicting headers:
./bin/update_pch_bisect ./desktop/inc/pch/precompiled_deploymentgui.hxx "make desktop.build" --find-conflicts
*/
+#if PCH_LEVEL >= 1
#include <algorithm>
#include <cassert>
#include <cstddef>
-#include <cstdlib>
#include <deque>
#include <iomanip>
#include <limits.h>
+#include <limits>
+#include <list>
#include <memory>
#include <new>
#include <ostream>
@@ -34,21 +36,23 @@
#include <utility>
#include <vector>
#include <boost/optional.hpp>
+#endif // PCH_LEVEL >= 1
+#if PCH_LEVEL >= 2
#include <osl/conditn.hxx>
+#include <osl/diagnose.h>
#include <osl/endian.h>
#include <osl/file.hxx>
#include <osl/interlck.h>
#include <osl/mutex.hxx>
-#include <osl/thread.h>
#include <osl/time.h>
#include <rtl/alloc.h>
+#include <rtl/locale.h>
#include <rtl/ref.hxx>
#include <rtl/textcvt.h>
#include <rtl/ustrbuf.hxx>
#include <rtl/ustring.h>
#include <rtl/ustring.hxx>
#include <sal/config.h>
-#include <sal/detail/log.h>
#include <sal/macros.h>
#include <sal/saldllapi.h>
#include <sal/types.h>
@@ -56,25 +60,33 @@
#include <salhelper/thread.hxx>
#include <vcl/accel.hxx>
#include <vcl/bitmapex.hxx>
-#include <vcl/builderfactory.hxx>
#include <vcl/ctrl.hxx>
#include <vcl/dialog.hxx>
#include <vcl/dllapi.h>
-#include <vcl/edit.hxx>
#include <vcl/idle.hxx>
#include <vcl/image.hxx>
-#include <vcl/layout.hxx>
+#include <vcl/keycod.hxx>
+#include <vcl/menu.hxx>
#include <vcl/mnemonicengine.hxx>
#include <vcl/outdev.hxx>
#include <vcl/quickselectionengine.hxx>
-#include <vcl/salnativewidgets.hxx>
-#include <vcl/seleng.hxx>
+#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/timer.hxx>
+#include <vcl/transfer.hxx>
+#include <vcl/treelist.hxx>
+#include <vcl/treelistbox.hxx>
+#include <vcl/vclenum.hxx>
+#include <vcl/vclevent.hxx>
+#include <vcl/vclptr.hxx>
+#include <vcl/vclreferencebase.hxx>
+#include <vcl/weld.hxx>
#include <vcl/window.hxx>
+#endif // PCH_LEVEL >= 2
+#if PCH_LEVEL >= 3
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/deployment/DependencyException.hpp>
#include <com/sun/star/deployment/DeploymentException.hpp>
+#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/ucb/CommandAbortedException.hpp>
#include <com/sun/star/ucb/CommandFailedException.hpp>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
@@ -91,7 +103,6 @@
#include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/uno/genfunc.hxx>
#include <comphelper/anytostring.hxx>
-#include <comphelper/fileformat.h>
#include <comphelper/processfactory.hxx>
#include <cppu/cppudllapi.h>
#include <cppu/unotype.hxx>
@@ -100,7 +111,6 @@
#include <cppuhelper/implbase.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <svtools/controldims.hxx>
-#include <svtools/svtdllapi.h>
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/color.hxx>
#include <tools/contnr.hxx>
@@ -113,8 +123,8 @@
#include <uno/data.h>
#include <uno/sequence2.h>
#include <unotools/configmgr.hxx>
-#include <vcl/transfer.hxx>
-#include <vcl/treelist.hxx>
-#include <vcl/treelistbox.hxx>
+#endif // PCH_LEVEL >= 3
+#if PCH_LEVEL >= 4
+#endif // PCH_LEVEL >= 4
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/inc/pch/precompiled_deploymentmisc.hxx b/desktop/inc/pch/precompiled_deploymentmisc.hxx
index e821ab04d46f..9adcd84b63f7 100644
--- a/desktop/inc/pch/precompiled_deploymentmisc.hxx
+++ b/desktop/inc/pch/precompiled_deploymentmisc.hxx
@@ -13,24 +13,25 @@
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 2017-09-20 22:52:23 using:
+ Generated on 2019-04-29 21:18:39 using:
./bin/update_pch desktop deploymentmisc --cutoff=3 --exclude:system --exclude:module --exclude:local
If after updating build fails, use the following command to locate conflicting headers:
./bin/update_pch_bisect ./desktop/inc/pch/precompiled_deploymentmisc.hxx "make desktop.build" --find-conflicts
*/
+#if PCH_LEVEL >= 1
#include <cassert>
-#include <config_folders.h>
#include <cstddef>
#include <cstdlib>
-#include <exception>
#include <memory>
#include <sstream>
#include <string>
#include <utility>
#include <vector>
#include <boost/optional.hpp>
+#endif // PCH_LEVEL >= 1
+#if PCH_LEVEL >= 2
#include <osl/diagnose.h>
#include <osl/doublecheckedlocking.h>
#include <osl/getglobalmutex.hxx>
@@ -44,7 +45,6 @@
#include <osl/time.h>
#include <rtl/alloc.h>
#include <rtl/bootstrap.hxx>
-#include <rtl/byteseq.hxx>
#include <rtl/digest.h>
#include <rtl/instance.hxx>
#include <rtl/locale.h>
@@ -61,14 +61,14 @@
#include <sal/saldllapi.h>
#include <sal/types.h>
#include <salhelper/linkhelper.hxx>
-#include <com/sun/star/io/XInputStream.hpp>
+#endif // PCH_LEVEL >= 2
+#if PCH_LEVEL >= 3
#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Any.h>
#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/uno/Type.hxx>
+#include <com/sun/star/uno/Type.h>
#include <com/sun/star/uno/XWeak.hpp>
#include <com/sun/star/uno/genfunc.hxx>
#include <comphelper/comphelperdllapi.h>
@@ -81,5 +81,8 @@
#include <typelib/typedescription.h>
#include <uno/data.h>
#include <unotools/unotoolsdllapi.h>
+#endif // PCH_LEVEL >= 3
+#if PCH_LEVEL >= 4
+#endif // PCH_LEVEL >= 4
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/desktop/inc/pch/precompiled_sofficeapp.hxx b/desktop/inc/pch/precompiled_sofficeapp.hxx
index ccc4286c8dcc..e89281c1fd6e 100644
--- a/desktop/inc/pch/precompiled_sofficeapp.hxx
+++ b/desktop/inc/pch/precompiled_sofficeapp.hxx
@@ -13,22 +13,17 @@
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 2017-09-20 22:52:27 using:
+ Generated on 2019-04-29 21:18:39 using:
./bin/update_pch desktop sofficeapp --cutoff=6 --exclude:system --include:module --include:local
If after updating build fails, use the following command to locate conflicting headers:
./bin/update_pch_bisect ./desktop/inc/pch/precompiled_sofficeapp.hxx "make desktop.build" --find-conflicts
*/
+#if PCH_LEVEL >= 1
#include <algorithm>
#include <cassert>
-#include <climits>
-#include <config_features.h>
-#include <config_global.h>
-#include <config_typesizes.h>
-#include <config_vcl.h>
#include <cstddef>
-#include <cstdlib>
#include <cstring>
#include <deque>
#include <float.h>
@@ -36,23 +31,18 @@
#include <iomanip>
#include <limits.h>
#include <limits>
-#include <list>
-#include <locale>
-#include <map>
#include <math.h>
#include <memory>
#include <new>
#include <ostream>
-#include <set>
-#include <stack>
#include <stddef.h>
#include <string.h>
#include <type_traits>
-#include <typeinfo>
-#include <unordered_map>
#include <utility>
#include <vector>
#include <boost/optional.hpp>
+#endif // PCH_LEVEL >= 1
+#if PCH_LEVEL >= 2
#include <osl/conditn.hxx>
#include <osl/diagnose.h>
#include <osl/doublecheckedlocking.h>
@@ -62,21 +52,16 @@
#include <osl/getglobalmutex.hxx>
#include <osl/interlck.h>
#include <osl/module.h>
-#include <osl/module.hxx>
#include <osl/mutex.h>
#include <osl/mutex.hxx>
-#include <osl/pipe.h>
-#include <osl/process.h>
#include <osl/security.h>
#include <osl/security.hxx>
-#include <osl/socket.h>
#include <osl/thread.h>
#include <osl/thread.hxx>
#include <osl/time.h>
#include <rtl/alloc.h>
#include <rtl/bootstrap.hxx>
-#include <rtl/byteseq.h>
-#include <rtl/character.hxx>
+#include <rtl/byteseq.hxx>
#include <rtl/digest.h>
#include <rtl/instance.hxx>
#include <rtl/locale.h>
@@ -89,83 +74,49 @@
#include <rtl/string.h>
#include <rtl/string.hxx>
#include <rtl/stringutils.hxx>
-#include <rtl/tencinfo.h>
#include <rtl/textcvt.h>
#include <rtl/textenc.h>
-#include <rtl/unload.h>
#include <rtl/uri.hxx>
#include <rtl/ustrbuf.h>
#include <rtl/ustrbuf.hxx>
#include <rtl/ustring.h>
#include <rtl/ustring.hxx>
#include <sal/config.h>
-#include <sal/detail/log.h>
#include <sal/log.hxx>
#include <sal/macros.h>
#include <sal/mathconf.h>
#include <sal/saldllapi.h>
#include <sal/types.h>
#include <sal/typesizes.h>
-#include <salhelper/singletonref.hxx>
-#include <vcl/EnumContext.hxx>
-#include <vcl/NotebookbarContextControl.hxx>
-#include <vcl/accel.hxx>
#include <vcl/alpha.hxx>
-#include <vcl/animate/Animation.hxx>
#include <vcl/bitmap.hxx>
#include <vcl/bitmapex.hxx>
-#include <vcl/builder.hxx>
#include <vcl/cairo.hxx>
#include <vcl/checksum.hxx>
-#include <vcl/commandevent.hxx>
-#include <vcl/ctrl.hxx>
-#include <vcl/cursor.hxx>
#include <vcl/devicecoordinate.hxx>
#include <vcl/dllapi.h>
-#include <vcl/dndhelp.hxx>
-#include <vcl/edit.hxx>
#include <vcl/errcode.hxx>
-#include <vcl/errinf.hxx>
-#include <vcl/event.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/hatch.hxx>
-#include <vcl/inputctx.hxx>
-#include <vcl/inputtypes.hxx>
-#include <vcl/keycod.hxx>
#include <vcl/keycodes.hxx>
-#include <vcl/lineinfo.hxx>
#include <vcl/mapmod.hxx>
-#include <vcl/menu.hxx>
-#include <vcl/metaact.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/salnativewidgets.hxx>
#include <vcl/scopedbitmapaccess.hxx>
-#include <vcl/settings.hxx>
#include <vcl/task.hxx>
#include <vcl/timer.hxx>
#include <vcl/uitest/factory.hxx>
#include <vcl/vclenum.hxx>
-#include <vcl/vclevent.hxx>
#include <vcl/vclptr.hxx>
#include <vcl/vclreferencebase.hxx>
-#include <vcl/vectorgraphicdata.hxx>
#include <vcl/wall.hxx>
-#include <vcl/window.hxx>
-#include <vcl/wmfexternal.hxx>
-#include <app.hxx>
+#endif // PCH_LEVEL >= 2
+#if PCH_LEVEL >= 3
#include <basegfx/basegfxdllapi.h>
#include <basegfx/color/bcolor.hxx>
-#include <basegfx/color/bcolormodifier.hxx>
#include <basegfx/numeric/ftools.hxx>
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/point/b2ipoint.hxx>
@@ -176,40 +127,15 @@
#include <basegfx/tuple/b2dtuple.hxx>
#include <basegfx/tuple/b2ituple.hxx>
#include <basegfx/tuple/b3dtuple.hxx>
-#include <basegfx/vector/b2dsize.hxx>
#include <basegfx/vector/b2dvector.hxx>
#include <basegfx/vector/b2enums.hxx>
#include <basegfx/vector/b2ivector.hxx>
#include <basic/basicdllapi.h>
#include <basic/sbxcore.hxx>
#include <basic/sbxdef.hxx>
-#include <basic/sbxvar.hxx>
#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/NamedValue.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/bridge/oleautomation/Decimal.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>
#include <com/sun/star/drawing/LineCap.hpp>
-#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/graphic/XPrimitive2D.hpp>
-#include <com/sun/star/i18n/DirectionProperty.hpp>
-#include <com/sun/star/i18n/KCharacterType.hpp>
-#include <com/sun/star/i18n/KParseTokens.hpp>
-#include <com/sun/star/i18n/KParseType.hpp>
-#include <com/sun/star/i18n/LocaleItem.hpp>
-#include <com/sun/star/i18n/ParseResult.hpp>
-#include <com/sun/star/i18n/UnicodeScript.hpp>
-#include <com/sun/star/i18n/XCharacterClassification.hpp>
-#include <com/sun/star/i18n/XLocaleData4.hpp>
-#include <com/sun/star/i18n/reservedWords.hpp>
-#include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
-#include <com/sun/star/ui/XContextChangeEventListener.hpp>
#include <com/sun/star/uno/Any.h>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.h>
@@ -220,61 +146,49 @@
#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>
#include <com/sun/star/uno/genfunc.h>
#include <com/sun/star/uno/genfunc.hxx>
-#include <com/sun/star/util/DateTime.hpp>
#include <comphelper/comphelperdllapi.h>
-#include <comphelper/fileformat.h>
#include <comphelper/processfactory.hxx>
#include <cppu/cppudllapi.h>
#include <cppu/unotype.hxx>
#include <cppuhelper/cppuhelperdllapi.h>
-#include <cppuhelper/weak.hxx>
-#include <cppuhelper/weakref.hxx>
-#include <i18nlangtag/i18nlangtagdllapi.h>
#include <i18nlangtag/lang.h>
-#include <i18nlangtag/languagetag.hxx>
#include <o3tl/cow_wrapper.hxx>
#include <o3tl/strong_int.hxx>
#include <o3tl/typed_flags_set.hxx>
+#include <o3tl/underlyingenumvalue.hxx>
#include <sfx2/dllapi.h>
#include <svl/hint.hxx>
#include <svl/lstner.hxx>
#include <svl/poolitem.hxx>
#include <svl/svldllapi.h>
+#include <svl/typedwhich.hxx>
#include <svtools/svtdllapi.h>
-#include <svtools/svtresid.hxx>
#include <tools/color.hxx>
-#include <tools/debug.hxx>
#include <tools/fldunit.hxx>
#include <tools/fontenum.hxx>
#include <tools/gen.hxx>
-#include <tools/lineend.hxx>
#include <tools/link.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/wintypes.hxx>
#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/charclass.hxx>
#include <unotools/fontdefs.hxx>
-#include <unotools/localedatawrapper.hxx>
#include <unotools/options.hxx>
-#include <unotools/readwritemutexguard.hxx>
-#include <unotools/resmgr.hxx>
#include <unotools/syslocale.hxx>
#include <unotools/unotoolsdllapi.h>
+#endif // PCH_LEVEL >= 3
+#if PCH_LEVEL >= 4
+#include <app.hxx>
+#endif // PCH_LEVEL >= 4
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */