diff options
32 files changed, 281 insertions, 233 deletions
diff --git a/basctl/inc/pch/precompiled_basctl.hxx b/basctl/inc/pch/precompiled_basctl.hxx index 490c7591911a..5065be64c607 100644 --- a/basctl/inc/pch/precompiled_basctl.hxx +++ b/basctl/inc/pch/precompiled_basctl.hxx @@ -13,17 +13,16 @@ 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 2015-11-14 14:16:28 using: + Generated on 2016-02-06 12:31:27 using: ./bin/update_pch basctl basctl --cutoff=3 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./basctl/inc/pch/precompiled_basctl.hxx "/opt/lo/bin/make basctl.build" --find-conflicts + ./bin/update_pch_bisect ./basctl/inc/pch/precompiled_basctl.hxx "make basctl.build" --find-conflicts */ #include <algorithm> #include <cassert> #include <climits> -#include <config_features.h> #include <config_global.h> #include <config_typesizes.h> #include <config_vcl.h> @@ -57,7 +56,6 @@ #include <vector> #include <boost/intrusive_ptr.hpp> #include <boost/noncopyable.hpp> -#include <boost/shared_array.hpp> #include <osl/conditn.h> #include <osl/conditn.hxx> #include <osl/diagnose.h> @@ -114,7 +112,6 @@ #include <vcl/accel.hxx> #include <vcl/alpha.hxx> #include <vcl/animate.hxx> -#include <vcl/apptypes.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/builder.hxx> @@ -146,6 +143,7 @@ #include <vcl/image.hxx> #include <vcl/impdel.hxx> #include <vcl/inputctx.hxx> +#include <vcl/inputtypes.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/layout.hxx> @@ -164,6 +162,7 @@ #include <vcl/ptrstyle.hxx> #include <vcl/quickselectionengine.hxx> #include <vcl/region.hxx> +#include <vcl/salgtype.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/scheduler.hxx> #include <vcl/scopedbitmapaccess.hxx> @@ -290,6 +289,7 @@ #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/script/ModuleType.hpp> #include <com/sun/star/script/XLibraryContainerPassword.hpp> +#include <com/sun/star/style/NumberingType.hpp> #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/ucb/ContentCreationException.hpp> @@ -368,8 +368,17 @@ #include <cppuhelper/weakref.hxx> #include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> +#include <editeng/editdata.hxx> #include <editeng/editengdllapi.h> +#include <editeng/editstat.hxx> +#include <editeng/eedata.hxx> #include <editeng/forbiddencharacterstable.hxx> +#include <editeng/numdef.hxx> +#include <editeng/numitem.hxx> +#include <editeng/outliner.hxx> +#include <editeng/paragraphdata.hxx> +#include <editeng/svxenum.hxx> +#include <editeng/svxfont.hxx> #include <i18nlangtag/i18nlangtagdllapi.h> #include <i18nlangtag/lang.h> #include <i18nlangtag/languagetag.hxx> @@ -562,6 +571,7 @@ #include <uno/data.h> #include <uno/sequence2.h> #include <unotools/configitem.hxx> +#include <unotools/fontcvt.hxx> #include <unotools/fontdefs.hxx> #include <unotools/options.hxx> #include <unotools/readwritemutexguard.hxx> diff --git a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx index b695b13eba44..7a6f9a7cd85e 100644 --- a/cppcanvas/inc/pch/precompiled_cppcanvas.hxx +++ b/cppcanvas/inc/pch/precompiled_cppcanvas.hxx @@ -13,16 +13,15 @@ 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 2015-11-14 14:16:28 using: + Generated on 2016-02-06 12:33:16 using: ./bin/update_pch cppcanvas cppcanvas --cutoff=11 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./cppcanvas/inc/pch/precompiled_cppcanvas.hxx "/opt/lo/bin/make cppcanvas.build" --find-conflicts + ./bin/update_pch_bisect ./cppcanvas/inc/pch/precompiled_cppcanvas.hxx "make cppcanvas.build" --find-conflicts */ #include <algorithm> #include <cassert> -#include <config_features.h> #include <config_global.h> #include <config_typesizes.h> #include <config_vcl.h> @@ -49,7 +48,6 @@ #include <boost/intrusive_ptr.hpp> #include <boost/noncopyable.hpp> #include <boost/optional.hpp> -#include <boost/shared_array.hpp> #include <osl/diagnose.h> #include <osl/endian.h> #include <osl/file.h> @@ -79,7 +77,6 @@ #include <rtl/ustrbuf.hxx> #include <rtl/ustring.h> #include <rtl/ustring.hxx> -#include <sal/alloca.h> #include <sal/config.h> #include <sal/detail/log.h> #include <sal/log.hxx> @@ -91,7 +88,6 @@ #include <vcl/accel.hxx> #include <vcl/alpha.hxx> #include <vcl/animate.hxx> -#include <vcl/apptypes.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/cairo.hxx> @@ -110,6 +106,7 @@ #include <vcl/hatch.hxx> #include <vcl/impdel.hxx> #include <vcl/inputctx.hxx> +#include <vcl/inputtypes.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/lineinfo.hxx> diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index 36fa752b552a..fc30947e42b7 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -13,17 +13,16 @@ 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 2015-11-14 14:16:31 using: + Generated on 2016-02-06 12:31:15 using: ./bin/update_pch cui cui --cutoff=8 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./cui/inc/pch/precompiled_cui.hxx "/opt/lo/bin/make cui.build" --find-conflicts + ./bin/update_pch_bisect ./cui/inc/pch/precompiled_cui.hxx "make cui.build" --find-conflicts */ #include <algorithm> #include <cassert> #include <climits> -#include <config_features.h> #include <config_global.h> #include <config_typesizes.h> #include <config_vcl.h> @@ -32,6 +31,7 @@ #include <cstdlib> #include <cstring> #include <deque> +#include <exception> #include <float.h> #include <functional> #include <iomanip> @@ -57,7 +57,6 @@ #include <boost/intrusive_ptr.hpp> #include <boost/optional.hpp> #include <boost/optional/optional.hpp> -#include <boost/shared_array.hpp> #include <osl/diagnose.h> #include <osl/doublecheckedlocking.h> #include <osl/endian.h> @@ -112,7 +111,6 @@ #include <salhelper/singletonref.hxx> #include <vcl/alpha.hxx> #include <vcl/animate.hxx> -#include <vcl/apptypes.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/builder.hxx> @@ -143,6 +141,7 @@ #include <vcl/image.hxx> #include <vcl/impdel.hxx> #include <vcl/inputctx.hxx> +#include <vcl/inputtypes.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/layout.hxx> @@ -160,6 +159,7 @@ #include <vcl/pointr.hxx> #include <vcl/ptrstyle.hxx> #include <vcl/region.hxx> +#include <vcl/salgtype.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/scheduler.hxx> #include <vcl/scopedbitmapaccess.hxx> @@ -221,6 +221,7 @@ #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/FeatureStateEvent.hpp> +#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> @@ -250,6 +251,7 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> +#include <com/sun/star/style/NumberingType.hpp> #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/ui/dialogs/FolderPicker.hpp> @@ -305,9 +307,17 @@ #include <cppuhelper/weakref.hxx> #include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> +#include <editeng/editdata.hxx> #include <editeng/editengdllapi.h> +#include <editeng/editstat.hxx> +#include <editeng/eedata.hxx> #include <editeng/forbiddencharacterstable.hxx> +#include <editeng/numdef.hxx> +#include <editeng/numitem.hxx> +#include <editeng/outliner.hxx> +#include <editeng/paragraphdata.hxx> #include <editeng/svxenum.hxx> +#include <editeng/svxfont.hxx> #include <editeng/unolingu.hxx> #include <i18nlangtag/i18nlangtagdllapi.h> #include <i18nlangtag/lang.h> @@ -336,6 +346,7 @@ #include <svl/hint.hxx> #include <svl/intitem.hxx> #include <svl/itemset.hxx> +#include <svl/languageoptions.hxx> #include <svl/lstner.hxx> #include <svl/macitem.hxx> #include <svl/poolitem.hxx> @@ -434,6 +445,7 @@ #include <svx/xtable.hxx> #include <svx/xtextit0.hxx> #include <tools/color.hxx> +#include <tools/contnr.hxx> #include <tools/date.hxx> #include <tools/datetime.hxx> #include <tools/debug.hxx> @@ -470,6 +482,7 @@ #include <unotools/charclass.hxx> #include <unotools/collatorwrapper.hxx> #include <unotools/configitem.hxx> +#include <unotools/fontcvt.hxx> #include <unotools/fontdefs.hxx> #include <unotools/localedatawrapper.hxx> #include <unotools/options.hxx> diff --git a/dbaccess/inc/pch/precompiled_dbaxml.hxx b/dbaccess/inc/pch/precompiled_dbaxml.hxx index 2d092e6fd2da..1e7d015bf390 100644 --- a/dbaccess/inc/pch/precompiled_dbaxml.hxx +++ b/dbaccess/inc/pch/precompiled_dbaxml.hxx @@ -13,14 +13,13 @@ 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 2015-11-14 14:16:28 using: + Generated on 2016-02-06 12:34:08 using: ./bin/update_pch dbaccess dbaxml --cutoff=2 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./dbaccess/inc/pch/precompiled_dbaxml.hxx "/opt/lo/bin/make dbaccess.build" --find-conflicts + ./bin/update_pch_bisect ./dbaccess/inc/pch/precompiled_dbaxml.hxx "make dbaccess.build" --find-conflicts */ -#include <config_features.h> #include <cstddef> #include <memory> #include <vector> @@ -40,11 +39,11 @@ #include <sal/types.h> #include <salhelper/simplereferenceobject.hxx> #include <salhelper/singletonref.hxx> -#include <vcl/apptypes.hxx> #include <vcl/cursor.hxx> #include <vcl/dllapi.h> #include <vcl/event.hxx> #include <vcl/inputctx.hxx> +#include <vcl/inputtypes.hxx> #include <vcl/keycodes.hxx> #include <vcl/outdev.hxx> #include <vcl/pointr.hxx> diff --git a/dbaccess/inc/pch/precompiled_dbmm.hxx b/dbaccess/inc/pch/precompiled_dbmm.hxx index 54dec4acd734..6948d9c29863 100644 --- a/dbaccess/inc/pch/precompiled_dbmm.hxx +++ b/dbaccess/inc/pch/precompiled_dbmm.hxx @@ -13,16 +13,15 @@ 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 2015-11-14 14:16:28 using: + Generated on 2016-02-06 12:33:59 using: ./bin/update_pch dbaccess dbmm --cutoff=10 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./dbaccess/inc/pch/precompiled_dbmm.hxx "/opt/lo/bin/make dbaccess.build" --find-conflicts + ./bin/update_pch_bisect ./dbaccess/inc/pch/precompiled_dbmm.hxx "make dbaccess.build" --find-conflicts */ #include <algorithm> #include <cassert> -#include <config_features.h> #include <config_global.h> #include <config_typesizes.h> #include <config_vcl.h> @@ -92,7 +91,6 @@ #include <vcl/accel.hxx> #include <vcl/alpha.hxx> #include <vcl/animate.hxx> -#include <vcl/apptypes.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/cairo.hxx> @@ -111,6 +109,7 @@ #include <vcl/hatch.hxx> #include <vcl/impdel.hxx> #include <vcl/inputctx.hxx> +#include <vcl/inputtypes.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/lineinfo.hxx> diff --git a/desktop/inc/pch/precompiled_sofficeapp.hxx b/desktop/inc/pch/precompiled_sofficeapp.hxx index c432c228fdb5..74393787750d 100644 --- a/desktop/inc/pch/precompiled_sofficeapp.hxx +++ b/desktop/inc/pch/precompiled_sofficeapp.hxx @@ -13,17 +13,16 @@ 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 2015-11-14 14:16:31 using: + Generated on 2016-02-06 12:32:57 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 "/opt/lo/bin/make desktop.build" --find-conflicts + ./bin/update_pch_bisect ./desktop/inc/pch/precompiled_sofficeapp.hxx "make desktop.build" --find-conflicts */ #include <algorithm> #include <cassert> #include <climits> -#include <config_features.h> #include <config_global.h> #include <config_typesizes.h> #include <config_vcl.h> @@ -47,6 +46,7 @@ #include <string.h> #include <type_traits> #include <typeinfo> +#include <unordered_map> #include <utility> #include <vector> #include <boost/intrusive_ptr.hpp> @@ -107,7 +107,6 @@ #include <vcl/accel.hxx> #include <vcl/alpha.hxx> #include <vcl/animate.hxx> -#include <vcl/apptypes.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/builder.hxx> @@ -132,6 +131,7 @@ #include <vcl/image.hxx> #include <vcl/impdel.hxx> #include <vcl/inputctx.hxx> +#include <vcl/inputtypes.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/lineinfo.hxx> diff --git a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx index 8ed9ff93c5ca..7191617dc3b6 100644 --- a/drawinglayer/inc/pch/precompiled_drawinglayer.hxx +++ b/drawinglayer/inc/pch/precompiled_drawinglayer.hxx @@ -13,16 +13,15 @@ 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 2015-11-14 14:16:31 using: + Generated on 2016-02-06 12:33:25 using: ./bin/update_pch drawinglayer drawinglayer --cutoff=4 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./drawinglayer/inc/pch/precompiled_drawinglayer.hxx "/opt/lo/bin/make drawinglayer.build" --find-conflicts + ./bin/update_pch_bisect ./drawinglayer/inc/pch/precompiled_drawinglayer.hxx "make drawinglayer.build" --find-conflicts */ #include <algorithm> #include <cassert> -#include <config_features.h> #include <cstddef> #include <cstdlib> #include <limits.h> @@ -30,7 +29,6 @@ #include <new> #include <numeric> #include <ostream> -#include <stdlib.h> #include <string.h> #include <vector> #include <boost/intrusive_ptr.hpp> @@ -54,7 +52,6 @@ #include <sal/log.hxx> #include <sal/saldllapi.h> #include <sal/types.h> -#include <vcl/apptypes.hxx> #include <vcl/bitmapex.hxx> #include <vcl/cursor.hxx> #include <vcl/dllapi.h> @@ -63,6 +60,7 @@ #include <vcl/font.hxx> #include <vcl/graph.hxx> #include <vcl/inputctx.hxx> +#include <vcl/inputtypes.hxx> #include <vcl/keycodes.hxx> #include <vcl/outdev.hxx> #include <vcl/pointr.hxx> @@ -113,6 +111,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <comphelper/broadcasthelper.hxx> #include <comphelper/processfactory.hxx> +#include <comphelper/sequence.hxx> #include <cppuhelper/compbase1.hxx> #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/weakref.hxx> @@ -171,7 +170,6 @@ #include <drawinglayer/primitive2d/transformprimitive2d.hxx> #include <drawinglayer/primitive2d/transparenceprimitive2d.hxx> #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> -#include <drawinglayer/primitive2d/wrongspellprimitive2d.hxx> #include <drawinglayer/primitive3d/baseprimitive3d.hxx> #include <drawinglayer/primitive3d/drawinglayer_primitivetypes3d.hxx> #include <drawinglayer/primitive3d/hatchtextureprimitive3d.hxx> diff --git a/forms/inc/pch/precompiled_frm.hxx b/forms/inc/pch/precompiled_frm.hxx index 7d30b79dc61c..fbd0675dede4 100644 --- a/forms/inc/pch/precompiled_frm.hxx +++ b/forms/inc/pch/precompiled_frm.hxx @@ -13,11 +13,11 @@ 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 2015-11-14 14:16:33 using: + Generated on 2016-02-06 12:33:06 using: ./bin/update_pch forms frm --cutoff=2 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./forms/inc/pch/precompiled_frm.hxx "/opt/lo/bin/make forms.build" --find-conflicts + ./bin/update_pch_bisect ./forms/inc/pch/precompiled_frm.hxx "make forms.build" --find-conflicts */ #include <algorithm> @@ -60,7 +60,6 @@ #include <sal/macros.h> #include <sal/saldllapi.h> #include <sal/types.h> -#include <vcl/apptypes.hxx> #include <vcl/bitmap.hxx> #include <vcl/cursor.hxx> #include <vcl/dllapi.h> @@ -69,17 +68,16 @@ #include <vcl/graph.hxx> #include <vcl/image.hxx> #include <vcl/inputctx.hxx> +#include <vcl/inputtypes.hxx> #include <vcl/keycodes.hxx> #include <vcl/mapmod.hxx> #include <vcl/outdev.hxx> #include <vcl/pointr.hxx> #include <vcl/region.hxx> #include <vcl/salnativewidgets.hxx> -#include <vcl/scheduler.hxx> #include <vcl/settings.hxx> #include <vcl/stdtext.hxx> #include <vcl/svapp.hxx> -#include <vcl/timer.hxx> #include <vcl/vclevent.hxx> #include <vcl/vclptr.hxx> #include <vcl/window.hxx> diff --git a/framework/inc/pch/precompiled_fwe.hxx b/framework/inc/pch/precompiled_fwe.hxx index 82265412fe89..ce87907cad7f 100644 --- a/framework/inc/pch/precompiled_fwe.hxx +++ b/framework/inc/pch/precompiled_fwe.hxx @@ -13,22 +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 2015-11-14 14:16:33 using: + Generated on 2016-02-06 12:32:31 using: ./bin/update_pch framework fwe --cutoff=10 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./framework/inc/pch/precompiled_fwe.hxx "/opt/lo/bin/make framework.build" --find-conflicts + ./bin/update_pch_bisect ./framework/inc/pch/precompiled_fwe.hxx "make framework.build" --find-conflicts */ #include <algorithm> #include <cassert> -#include <config_features.h> #include <config_global.h> #include <config_typesizes.h> #include <config_vcl.h> #include <cstddef> #include <cstdlib> #include <cstring> +#include <exception> #include <float.h> #include <functional> #include <iomanip> @@ -95,7 +95,6 @@ #include <vcl/accel.hxx> #include <vcl/alpha.hxx> #include <vcl/animate.hxx> -#include <vcl/apptypes.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/cairo.hxx> @@ -112,9 +111,9 @@ #include <vcl/gradient.hxx> #include <vcl/graph.hxx> #include <vcl/hatch.hxx> -#include <vcl/idle.hxx> #include <vcl/impdel.hxx> #include <vcl/inputctx.hxx> +#include <vcl/inputtypes.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/lineinfo.hxx> diff --git a/framework/inc/pch/precompiled_fwl.hxx b/framework/inc/pch/precompiled_fwl.hxx index 862d9242deb7..256799de6f1f 100644 --- a/framework/inc/pch/precompiled_fwl.hxx +++ b/framework/inc/pch/precompiled_fwl.hxx @@ -13,16 +13,15 @@ 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 2015-11-14 14:16:33 using: + Generated on 2016-02-06 12:32:22 using: ./bin/update_pch framework fwl --cutoff=5 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./framework/inc/pch/precompiled_fwl.hxx "/opt/lo/bin/make framework.build" --find-conflicts + ./bin/update_pch_bisect ./framework/inc/pch/precompiled_fwl.hxx "make framework.build" --find-conflicts */ #include <algorithm> #include <cassert> -#include <config_features.h> #include <config_global.h> #include <config_typesizes.h> #include <config_vcl.h> @@ -109,7 +108,6 @@ #include <salhelper/singletonref.hxx> #include <vcl/alpha.hxx> #include <vcl/animate.hxx> -#include <vcl/apptypes.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/builder.hxx> @@ -134,6 +132,7 @@ #include <vcl/image.hxx> #include <vcl/impdel.hxx> #include <vcl/inputctx.hxx> +#include <vcl/inputtypes.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/lineinfo.hxx> @@ -158,6 +157,7 @@ #include <vcl/vclenum.hxx> #include <vcl/vclevent.hxx> #include <vcl/vclptr.hxx> +#include <vcl/vclstatuslistener.hxx> #include <vcl/wall.hxx> #include <vcl/window.hxx> #include <basegfx/basegfxdllapi.h> @@ -212,6 +212,8 @@ #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/drawing/LineCap.hpp> +#include <com/sun/star/frame/Desktop.hpp> +#include <com/sun/star/frame/FeatureStateEvent.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XFrame.hpp> @@ -235,6 +237,7 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> +#include <com/sun/star/ui/XAcceleratorConfiguration.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Exception.hpp> @@ -259,12 +262,14 @@ #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/util/Time.hpp> #include <com/sun/star/util/URL.hpp> +#include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/VetoException.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/view/XSelectionChangeListener.hpp> #include <comphelper/broadcasthelper.hxx> #include <comphelper/comphelperdllapi.h> #include <comphelper/fileformat.h> +#include <comphelper/interfacecontainer2.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propstate.hxx> #include <comphelper/sequence.hxx> diff --git a/include/vcl/exceptiontypes.hxx b/include/vcl/exceptiontypes.hxx new file mode 100644 index 000000000000..92df26636b7a --- /dev/null +++ b/include/vcl/exceptiontypes.hxx @@ -0,0 +1,31 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_VCL_EXCEPTIONTYPES_HXX +#define INCLUDED_VCL_EXCEPTIONTYPES_HXX + +#define EXC_RSCNOTLOADED ((sal_uInt16)0x0100) +#define EXC_SYSTEM ((sal_uInt16)0x0300) +#define EXC_DISPLAY ((sal_uInt16)0x0400) +#define EXC_MAJORTYPE ((sal_uInt16)0xFF00) +#define EXC_MINORTYPE ((sal_uInt16)0x00FF) + +#endif // INCLUDED_VCL_EXCEPTIONTYPES_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/apptypes.hxx b/include/vcl/inputtypes.hxx index f63602e238df..c5805084b581 100644 --- a/include/vcl/apptypes.hxx +++ b/include/vcl/inputtypes.hxx @@ -17,18 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_VCL_APPTYPES_HXX -#define INCLUDED_VCL_APPTYPES_HXX +#ifndef INCLUDED_VCL_INPUTTYPES_HXX +#define INCLUDED_VCL_INPUTTYPES_HXX -#include <vcl/dllapi.h> #include <o3tl/typed_flags_set.hxx> -#define EXC_RSCNOTLOADED ((sal_uInt16)0x0100) -#define EXC_SYSTEM ((sal_uInt16)0x0300) -#define EXC_DISPLAY ((sal_uInt16)0x0400) -#define EXC_MAJORTYPE ((sal_uInt16)0xFF00) -#define EXC_MINORTYPE ((sal_uInt16)0x00FF) - enum class VclInputFlags { NONE = 0x0000, MOUSE = 0x0001, @@ -45,6 +38,6 @@ namespace o3tl #define VCL_INPUT_ANY (VclInputFlags::MOUSE | VclInputFlags::KEYBOARD | VclInputFlags::PAINT | VclInputFlags::TIMER | VclInputFlags::OTHER | VclInputFlags::APPEVENT) -#endif // INCLUDED_VCL_APPTYPES_HXX +#endif // INCLUDED_VCL_INPUTTYPES_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 2b7fe62e0bb7..dcb805739721 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -34,7 +34,8 @@ #include <tools/link.hxx> #include <tools/solar.h> #include <vcl/dllapi.h> -#include <vcl/apptypes.hxx> +#include <vcl/inputtypes.hxx> +#include <vcl/exceptiontypes.hxx> #include <vcl/keycod.hxx> #include <vcl/vclevent.hxx> #include <vcl/metric.hxx> @@ -424,7 +425,7 @@ public: @remark This is not actually an exception. It merely takes an error code, then in most cases aborts. The list of exception - identifiers can be found at include/vcl/apptypes.hxx - each + identifiers can be found at include/vcl/inputtypes.hxx - each one starts with EXC_* @param nError The error code identifier @@ -575,7 +576,7 @@ public: /** Determine if there are any pending input events. - @param nType input identifier, defined in include/vcl/apptypes.hxx + @param nType input identifier, defined in include/vcl/inputtypes.hxx The default is VCL_INPUT_ANY. @returns true if there are pending events, false if not. diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 11a81069d1b5..59432a6cc520 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -27,7 +27,7 @@ #include <vcl/pointr.hxx> #include <tools/wintypes.hxx> #include <rsc/rsc-vcl-shared-types.hxx> -#include <vcl/apptypes.hxx> +#include <vcl/inputtypes.hxx> #include <vcl/cursor.hxx> #include <vcl/inputctx.hxx> #include <vcl/keycodes.hxx> diff --git a/reportdesign/inc/pch/precompiled_rpt.hxx b/reportdesign/inc/pch/precompiled_rpt.hxx index adb53d9445d4..c79cdd27f0e1 100644 --- a/reportdesign/inc/pch/precompiled_rpt.hxx +++ b/reportdesign/inc/pch/precompiled_rpt.hxx @@ -13,11 +13,11 @@ 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 2016-01-07 21:31:36 using: + Generated on 2016-02-06 12:32:12 using: ./bin/update_pch reportdesign rpt --cutoff=9 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./reportdesign/inc/pch/precompiled_rpt.hxx "/opt/lo/bin/make reportdesign.build" --find-conflicts + ./bin/update_pch_bisect ./reportdesign/inc/pch/precompiled_rpt.hxx "make reportdesign.build" --find-conflicts */ #include <algorithm> @@ -57,7 +57,6 @@ #include <boost/intrusive_ptr.hpp> #include <boost/noncopyable.hpp> #include <boost/optional.hpp> -#include <boost/shared_array.hpp> #include <osl/conditn.hxx> #include <osl/diagnose.h> #include <osl/diagnose.hxx> @@ -110,7 +109,6 @@ #include <vcl/accel.hxx> #include <vcl/alpha.hxx> #include <vcl/animate.hxx> -#include <vcl/apptypes.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/cairo.hxx> @@ -133,6 +131,7 @@ #include <vcl/hatch.hxx> #include <vcl/impdel.hxx> #include <vcl/inputctx.hxx> +#include <vcl/inputtypes.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/lineinfo.hxx> @@ -338,6 +337,7 @@ #include <uno/data.h> #include <uno/sequence2.h> #include <unotools/charclass.hxx> +#include <unotools/configitem.hxx> #include <unotools/fontdefs.hxx> #include <unotools/localedatawrapper.hxx> #include <unotools/options.hxx> diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx index 0b85b67f5b59..cc753ae4bae1 100644 --- a/reportdesign/inc/pch/precompiled_rptui.hxx +++ b/reportdesign/inc/pch/precompiled_rptui.hxx @@ -13,11 +13,11 @@ 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 2016-01-07 21:31:36 using: + Generated on 2016-02-06 12:32:02 using: ./bin/update_pch reportdesign rptui --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 ./reportdesign/inc/pch/precompiled_rptui.hxx "/opt/lo/bin/make reportdesign.build" --find-conflicts + ./bin/update_pch_bisect ./reportdesign/inc/pch/precompiled_rptui.hxx "make reportdesign.build" --find-conflicts */ #include <algorithm> @@ -54,12 +54,12 @@ #include <type_traits> #include <typeinfo> #include <unordered_map> +#include <unordered_set> #include <utility> #include <vector> #include <boost/bind.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/noncopyable.hpp> -#include <boost/shared_array.hpp> #include <osl/conditn.h> #include <osl/conditn.hxx> #include <osl/diagnose.h> @@ -112,7 +112,6 @@ #include <vcl/abstdlg.hxx> #include <vcl/alpha.hxx> #include <vcl/animate.hxx> -#include <vcl/apptypes.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/builder.hxx> @@ -143,6 +142,7 @@ #include <vcl/image.hxx> #include <vcl/impdel.hxx> #include <vcl/inputctx.hxx> +#include <vcl/inputtypes.hxx> #include <vcl/jobset.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> @@ -367,6 +367,7 @@ #include <editeng/forbiddencharacterstable.hxx> #include <editeng/numdef.hxx> #include <editeng/numitem.hxx> +#include <editeng/outliner.hxx> #include <editeng/paragraphdata.hxx> #include <editeng/svxenum.hxx> #include <editeng/svxfont.hxx> diff --git a/sc/inc/pch/precompiled_sc.hxx b/sc/inc/pch/precompiled_sc.hxx index c73aa98462b9..a0d69734a66f 100644 --- a/sc/inc/pch/precompiled_sc.hxx +++ b/sc/inc/pch/precompiled_sc.hxx @@ -13,11 +13,11 @@ 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 2015-11-14 14:16:55 using: + Generated on 2016-02-06 12:30:53 using: ./bin/update_pch sc sc --cutoff=12 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./sc/inc/pch/precompiled_sc.hxx "/opt/lo/bin/make sc.build" --find-conflicts + ./bin/update_pch_bisect ./sc/inc/pch/precompiled_sc.hxx "make sc.build" --find-conflicts */ #include <algorithm> @@ -60,7 +60,6 @@ #include <boost/intrusive_ptr.hpp> #include <boost/math/special_functions/log1p.hpp> #include <boost/noncopyable.hpp> -#include <boost/optional.hpp> #include <boost/optional/optional.hpp> #include <boost/property_tree/json_parser.hpp> #include <osl/conditn.h> @@ -117,7 +116,6 @@ #include <salhelper/thread.hxx> #include <vcl/alpha.hxx> #include <vcl/animate.hxx> -#include <vcl/apptypes.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/builder.hxx> @@ -130,7 +128,6 @@ #include <vcl/dialog.hxx> #include <vcl/dllapi.h> #include <vcl/dndhelp.hxx> -#include <vcl/dockwin.hxx> #include <vcl/edit.hxx> #include <vcl/event.hxx> #include <vcl/field.hxx> @@ -145,6 +142,7 @@ #include <vcl/image.hxx> #include <vcl/impdel.hxx> #include <vcl/inputctx.hxx> +#include <vcl/inputtypes.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/layout.hxx> @@ -422,10 +420,10 @@ #include <scmatrix.hxx> #include <scmod.hxx> #include <scresid.hxx> +#include <segmenttree.hxx> #include <sfx2/app.hxx> #include <sfx2/bindings.hxx> #include <sfx2/chalign.hxx> -#include <sfx2/childwin.hxx> #include <sfx2/ctrlitem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/dllapi.h> @@ -551,6 +549,7 @@ #include <svx/xtextit0.hxx> #include <tablink.hxx> #include <tabprotection.hxx> +#include <textuno.hxx> #include <tokenarray.hxx> #include <tokenstringcontext.hxx> #include <tools/color.hxx> diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx index a5901f266584..013cd5feddc5 100644 --- a/sd/inc/pch/precompiled_sdui.hxx +++ b/sd/inc/pch/precompiled_sdui.hxx @@ -13,17 +13,16 @@ 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 2015-11-14 14:16:41 using: + Generated on 2016-02-06 12:31:07 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: - ./bin/update_pch_bisect ./sd/inc/pch/precompiled_sdui.hxx "/opt/lo/bin/make sd.build" --find-conflicts + ./bin/update_pch_bisect ./sd/inc/pch/precompiled_sdui.hxx "make sd.build" --find-conflicts */ #include <algorithm> #include <cassert> #include <climits> -#include <config_features.h> #include <config_global.h> #include <config_typesizes.h> #include <config_vcl.h> @@ -51,12 +50,12 @@ #include <type_traits> #include <typeinfo> #include <unordered_map> +#include <unordered_set> #include <utility> #include <vector> #include <boost/intrusive_ptr.hpp> #include <boost/noncopyable.hpp> #include <boost/optional.hpp> -#include <boost/shared_array.hpp> #include <osl/diagnose.h> #include <osl/diagnose.hxx> #include <osl/doublecheckedlocking.h> @@ -110,7 +109,6 @@ #include <vcl/accel.hxx> #include <vcl/alpha.hxx> #include <vcl/animate.hxx> -#include <vcl/apptypes.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/builder.hxx> @@ -141,6 +139,7 @@ #include <vcl/image.hxx> #include <vcl/impdel.hxx> #include <vcl/inputctx.hxx> +#include <vcl/inputtypes.hxx> #include <vcl/jobset.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> @@ -162,6 +161,7 @@ #include <vcl/ptrstyle.hxx> #include <vcl/quickselectionengine.hxx> #include <vcl/region.hxx> +#include <vcl/salgtype.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/scheduler.hxx> #include <vcl/scopedbitmapaccess.hxx> @@ -389,6 +389,7 @@ #include <svtools/colorcfg.hxx> #include <svtools/grfmgr.hxx> #include <svtools/imgdef.hxx> +#include <svtools/miscopt.hxx> #include <svtools/optionsdrawinglayer.hxx> #include <svtools/svtdllapi.h> #include <svtools/transfer.hxx> diff --git a/slideshow/inc/pch/precompiled_slideshow.hxx b/slideshow/inc/pch/precompiled_slideshow.hxx index aee384cdbe09..9bbd82fe5f95 100644 --- a/slideshow/inc/pch/precompiled_slideshow.hxx +++ b/slideshow/inc/pch/precompiled_slideshow.hxx @@ -13,17 +13,16 @@ 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 2015-11-14 14:16:41 using: + Generated on 2016-02-06 12:32:49 using: ./bin/update_pch slideshow slideshow --cutoff=4 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./slideshow/inc/pch/precompiled_slideshow.hxx "/opt/lo/bin/make slideshow.build" --find-conflicts + ./bin/update_pch_bisect ./slideshow/inc/pch/precompiled_slideshow.hxx "make slideshow.build" --find-conflicts */ #include <algorithm> #include <cassert> #include <cmath> -#include <config_features.h> #include <config_global.h> #include <config_typesizes.h> #include <config_vcl.h> @@ -50,7 +49,6 @@ #include <string.h> #include <string> #include <type_traits> -#include <tuple> #include <typeinfo> #include <utility> #include <vector> @@ -59,7 +57,6 @@ #include <boost/mem_fn.hpp> #include <boost/noncopyable.hpp> #include <boost/optional.hpp> -#include <boost/shared_array.hpp> #include <boost/shared_ptr.hpp> #include <boost/weak_ptr.hpp> #include <osl/diagnose.h> @@ -108,7 +105,6 @@ #include <vcl/accel.hxx> #include <vcl/alpha.hxx> #include <vcl/animate.hxx> -#include <vcl/apptypes.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/cairo.hxx> @@ -125,6 +121,7 @@ #include <vcl/graph.hxx> #include <vcl/impdel.hxx> #include <vcl/inputctx.hxx> +#include <vcl/inputtypes.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/mapmod.hxx> diff --git a/starmath/inc/pch/precompiled_sm.hxx b/starmath/inc/pch/precompiled_sm.hxx index 8dcde82152ac..2d3175ac0cef 100644 --- a/starmath/inc/pch/precompiled_sm.hxx +++ b/starmath/inc/pch/precompiled_sm.hxx @@ -13,17 +13,16 @@ 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 2015-11-14 14:16:37 using: + Generated on 2016-02-06 12:33:50 using: ./bin/update_pch starmath sm --cutoff=5 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./starmath/inc/pch/precompiled_sm.hxx "/opt/lo/bin/make starmath.build" --find-conflicts + ./bin/update_pch_bisect ./starmath/inc/pch/precompiled_sm.hxx "make starmath.build" --find-conflicts */ #include <algorithm> #include <cassert> #include <climits> -#include <config_features.h> #include <cstdarg> #include <cstddef> #include <cstdlib> @@ -41,7 +40,6 @@ #include <vector> #include <boost/checked_delete.hpp> #include <boost/intrusive_ptr.hpp> -#include <boost/optional.hpp> #include <boost/optional/optional.hpp> #include <boost/signals2/signal.hpp> #include <osl/diagnose.h> @@ -67,7 +65,6 @@ #include <sal/macros.h> #include <sal/types.h> #include <salhelper/singletonref.hxx> -#include <vcl/apptypes.hxx> #include <vcl/cairo.hxx> #include <vcl/cursor.hxx> #include <vcl/devicecoordinate.hxx> @@ -75,6 +72,7 @@ #include <vcl/event.hxx> #include <vcl/font.hxx> #include <vcl/inputctx.hxx> +#include <vcl/inputtypes.hxx> #include <vcl/keycodes.hxx> #include <vcl/mapmod.hxx> #include <vcl/metaact.hxx> @@ -99,7 +97,6 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/LineCap.hpp> -#include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Reference.hxx> @@ -120,7 +117,6 @@ #include <format.hxx> #include <i18nlangtag/lang.h> #include <node.hxx> -#include <o3tl/cow_wrapper.hxx> #include <o3tl/typed_flags_set.hxx> #include <rect.hxx> #include <rsc/rsc-vcl-shared-types.hxx> @@ -148,7 +144,6 @@ #include <tools/debug.hxx> #include <tools/errcode.hxx> #include <tools/gen.hxx> -#include <tools/globname.hxx> #include <tools/link.hxx> #include <tools/mapunit.hxx> #include <tools/poly.hxx> diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx index 55efe423e8f8..902161f5fedd 100644 --- a/sw/inc/pch/precompiled_msword.hxx +++ b/sw/inc/pch/precompiled_msword.hxx @@ -13,11 +13,11 @@ 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 2015-12-02 12:43:17 using: + Generated on 2016-02-06 12:31:43 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 "/opt/lo/bin/make sw.build" --find-conflicts + ./bin/update_pch_bisect ./sw/inc/pch/precompiled_msword.hxx "make sw.build" --find-conflicts */ #include <algorithm> @@ -59,13 +59,12 @@ #include <type_traits> #include <typeinfo> #include <unordered_map> +#include <unordered_set> #include <utility> #include <vector> -#include <boost/bind.hpp> #include <boost/intrusive_ptr.hpp> #include <boost/noncopyable.hpp> #include <boost/optional.hpp> -#include <boost/shared_array.hpp> #include <osl/diagnose.h> #include <osl/diagnose.hxx> #include <osl/doublecheckedlocking.h> @@ -117,7 +116,6 @@ #include <vcl/accel.hxx> #include <vcl/alpha.hxx> #include <vcl/animate.hxx> -#include <vcl/apptypes.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/cairo.hxx> @@ -144,6 +142,7 @@ #include <vcl/image.hxx> #include <vcl/impdel.hxx> #include <vcl/inputctx.hxx> +#include <vcl/inputtypes.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/lineinfo.hxx> @@ -199,6 +198,9 @@ #include <basegfx/vector/b2enums.hxx> #include <basegfx/vector/b2ivector.hxx> #include <basic/basicdllapi.h> +#include <basic/codecompletecache.hxx> +#include <basic/sbdef.hxx> +#include <basic/sbx.hxx> #include <basic/sbxcore.hxx> #include <basic/sbxdef.hxx> #include <basic/sbxform.hxx> @@ -303,7 +305,9 @@ #include <com/sun/star/lang/XSingleServiceFactory.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/registry/XRegistryKey.hpp> +#include <com/sun/star/script/XInvocation.hpp> #include <com/sun/star/script/XLibraryContainer.hpp> #include <com/sun/star/script/XStarBasicAccess.hpp> #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp> @@ -478,6 +482,7 @@ #include <oox/dllapi.h> #include <oox/drawingml/drawingmltypes.hxx> #include <oox/export/drawingml.hxx> +#include <oox/export/utils.hxx> #include <oox/helper/binarystreambase.hxx> #include <oox/helper/helper.hxx> #include <oox/helper/refmap.hxx> @@ -527,6 +532,7 @@ #include <svtools/colorcfg.hxx> #include <svtools/embedhlp.hxx> #include <svtools/grfmgr.hxx> +#include <svtools/miscopt.hxx> #include <svtools/optionsdrawinglayer.hxx> #include <svtools/svtdllapi.h> #include <svx/XPropertyEntry.hxx> @@ -619,7 +625,6 @@ #include <svx/xpoly.hxx> #include <svx/xtable.hxx> #include <svx/xtextit0.hxx> -#include <swatrset.hxx> #include <swcrsr.hxx> #include <swdbdata.hxx> #include <swmodule.hxx> diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx index bebe25e5e5b9..14beffd4a493 100644 --- a/sw/inc/pch/precompiled_swui.hxx +++ b/sw/inc/pch/precompiled_swui.hxx @@ -13,11 +13,11 @@ 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 2015-12-02 12:43:12 using: + Generated on 2016-02-06 12:31: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 "/opt/lo/bin/make sw.build" --find-conflicts + ./bin/update_pch_bisect ./sw/inc/pch/precompiled_swui.hxx "make sw.build" --find-conflicts */ #include <algorithm> @@ -25,7 +25,6 @@ #include <cassert> #include <climits> #include <cmdid.h> -#include <config_features.h> #include <config_global.h> #include <config_typesizes.h> #include <config_vcl.h> @@ -64,7 +63,6 @@ #include <boost/intrusive_ptr.hpp> #include <boost/noncopyable.hpp> #include <boost/optional.hpp> -#include <boost/shared_array.hpp> #include <osl/diagnose.h> #include <osl/doublecheckedlocking.h> #include <osl/endian.h> @@ -113,7 +111,6 @@ #include <vcl/accel.hxx> #include <vcl/alpha.hxx> #include <vcl/animate.hxx> -#include <vcl/apptypes.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/builder.hxx> @@ -147,6 +144,7 @@ #include <vcl/image.hxx> #include <vcl/impdel.hxx> #include <vcl/inputctx.hxx> +#include <vcl/inputtypes.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/layout.hxx> @@ -208,8 +206,10 @@ #include <basegfx/vector/b2enums.hxx> #include <basegfx/vector/b2ivector.hxx> #include <basic/basicdllapi.h> +#include <basic/codecompletecache.hxx> #include <basic/sbdef.hxx> #include <basic/sberrors.hxx> +#include <basic/sbmod.hxx> #include <basic/sbx.hxx> #include <basic/sbxcore.hxx> #include <basic/sbxdef.hxx> @@ -332,6 +332,7 @@ #include <com/sun/star/rdf/XMetadatable.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/script/ModuleInfo.hpp> +#include <com/sun/star/script/XInvocation.hpp> #include <com/sun/star/script/XStarBasicAccess.hpp> #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp> #include <com/sun/star/style/NumberingType.hpp> @@ -367,7 +368,7 @@ #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/util/NumberFormat.hpp> -#include <com/sun/star/util/SearchOptions.hpp> +#include <com/sun/star/util/SearchOptions2.hpp> #include <com/sun/star/util/Time.hpp> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/util/XChangesBatch.hpp> @@ -376,7 +377,7 @@ #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/util/XModifiable2.hpp> #include <com/sun/star/util/XModifyListener.hpp> -#include <com/sun/star/util/XTextSearch.hpp> +#include <com/sun/star/util/XTextSearch2.hpp> #include <com/sun/star/view/XPrintJobBroadcaster.hpp> #include <com/sun/star/view/XPrintable.hpp> #include <com/sun/star/view/XRenderable.hpp> @@ -423,7 +424,10 @@ #include <editeng/borderline.hxx> #include <editeng/brushitem.hxx> #include <editeng/colritem.hxx> +#include <editeng/editdata.hxx> #include <editeng/editengdllapi.h> +#include <editeng/editstat.hxx> +#include <editeng/eedata.hxx> #include <editeng/flstitem.hxx> #include <editeng/fontitem.hxx> #include <editeng/frmdiritem.hxx> @@ -431,9 +435,11 @@ #include <editeng/lrspitem.hxx> #include <editeng/numdef.hxx> #include <editeng/numitem.hxx> +#include <editeng/paragraphdata.hxx> #include <editeng/scripttypeitem.hxx> #include <editeng/sizeitem.hxx> #include <editeng/svxenum.hxx> +#include <editeng/svxfont.hxx> #include <editeng/ulspitem.hxx> #include <editeng/unolingu.hxx> #include <expfld.hxx> @@ -474,6 +480,7 @@ #include <paratr.hxx> #include <poolfmt.hxx> #include <rsc/rsc-vcl-shared-types.hxx> +#include <rsc/rscsfx.hxx> #include <sfx2/Metadatable.hxx> #include <sfx2/app.hxx> #include <sfx2/basedlgs.hxx> @@ -505,6 +512,7 @@ #include <svl/intitem.hxx> #include <svl/itempool.hxx> #include <svl/itemset.hxx> +#include <svl/languageoptions.hxx> #include <svl/lstner.hxx> #include <svl/nfkeytab.hxx> #include <svl/ondemand.hxx> @@ -523,6 +531,7 @@ #include <svtools/colorcfg.hxx> #include <svtools/ctrlbox.hxx> #include <svtools/embedhlp.hxx> +#include <svtools/grfmgr.hxx> #include <svtools/headbar.hxx> #include <svtools/htmlcfg.hxx> #include <svtools/miscopt.hxx> @@ -545,7 +554,6 @@ #include <svx/xenum.hxx> #include <svx/xtable.hxx> #include <swabstdlg.hxx> -#include <swatrset.hxx> #include <swmodule.hxx> #include <swrect.hxx> #include <swtable.hxx> diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx index 4405c9f360c0..32efe98fafb2 100644 --- a/sw/inc/pch/precompiled_vbaswobj.hxx +++ b/sw/inc/pch/precompiled_vbaswobj.hxx @@ -13,11 +13,11 @@ 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 2015-12-02 12:43:09 using: + Generated on 2016-02-06 12:31:56 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 "/opt/lo/bin/make sw.build" --find-conflicts + ./bin/update_pch_bisect ./sw/inc/pch/precompiled_vbaswobj.hxx "make sw.build" --find-conflicts */ #include <algorithm> @@ -63,7 +63,6 @@ #include <boost/noncopyable.hpp> #include <boost/operators.hpp> #include <boost/optional.hpp> -#include <boost/shared_array.hpp> #include <osl/diagnose.h> #include <osl/doublecheckedlocking.h> #include <osl/endian.h> @@ -127,6 +126,7 @@ #include <vcl/dndhelp.hxx> #include <vcl/edit.hxx> #include <vcl/event.hxx> +#include <vcl/exceptiontypes.hxx> #include <vcl/field.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> @@ -138,6 +138,7 @@ #include <vcl/image.hxx> #include <vcl/impdel.hxx> #include <vcl/inputctx.hxx> +#include <vcl/inputtypes.hxx> #include <vcl/jobset.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> @@ -209,7 +210,6 @@ #include <com/sun/star/container/XIndexReplace.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNamed.hpp> -#include <com/sun/star/datatransfer/DataFlavor.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> @@ -230,8 +230,6 @@ #include <com/sun/star/i18n/XLocaleData4.hpp> #include <com/sun/star/i18n/reservedWords.hpp> #include <com/sun/star/io/XInputStream.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> @@ -341,14 +339,11 @@ #include <pam.hxx> #include <rsc/rsc-vcl-shared-types.hxx> #include <sfx2/dllapi.h> -#include <sot/sotdllapi.h> #include <svl/cenumitm.hxx> #include <svl/cintitem.hxx> #include <svl/eitem.hxx> #include <svl/hint.hxx> #include <svl/intitem.hxx> -#include <svl/itempool.hxx> -#include <svl/itemset.hxx> #include <svl/lstner.hxx> #include <svl/macitem.hxx> #include <svl/poolitem.hxx> @@ -360,7 +355,6 @@ #include <svx/svddef.hxx> #include <svx/svxdllapi.h> #include <svx/xdef.hxx> -#include <swatrset.hxx> #include <swcrsr.hxx> #include <swrect.hxx> #include <swregion.hxx> diff --git a/vbahelper/inc/pch/precompiled_msforms.hxx b/vbahelper/inc/pch/precompiled_msforms.hxx index 1c6649250440..8094283ee14d 100644 --- a/vbahelper/inc/pch/precompiled_msforms.hxx +++ b/vbahelper/inc/pch/precompiled_msforms.hxx @@ -13,23 +13,23 @@ 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 2015-11-14 14:16:41 using: + Generated on 2016-02-06 12:33:34 using: ./bin/update_pch vbahelper msforms --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 ./vbahelper/inc/pch/precompiled_msforms.hxx "/opt/lo/bin/make vbahelper.build" --find-conflicts + ./bin/update_pch_bisect ./vbahelper/inc/pch/precompiled_msforms.hxx "make vbahelper.build" --find-conflicts */ #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> #include <functional> #include <iomanip> @@ -110,6 +110,7 @@ #include <vcl/devicecoordinate.hxx> #include <vcl/dllapi.h> #include <vcl/event.hxx> +#include <vcl/exceptiontypes.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> #include <vcl/gdimtf.hxx> @@ -120,6 +121,7 @@ #include <vcl/image.hxx> #include <vcl/impdel.hxx> #include <vcl/inputctx.hxx> +#include <vcl/inputtypes.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/lineinfo.hxx> @@ -163,8 +165,10 @@ #include <basegfx/vector/b2ivector.hxx> #include <basic/basicdllapi.h> #include <basic/basmgr.hxx> +#include <basic/codecompletecache.hxx> #include <basic/sbdef.hxx> #include <basic/sberrors.hxx> +#include <basic/sbmod.hxx> #include <basic/sbstar.hxx> #include <basic/sbx.hxx> #include <basic/sbxcore.hxx> @@ -188,7 +192,6 @@ #include <com/sun/star/bridge/oleautomation/Decimal.hpp> #include <com/sun/star/connection/XConnection.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/datatransfer/DataFlavor.hpp> #include <com/sun/star/document/CmisVersion.hpp> #include <com/sun/star/drawing/LineCap.hpp> #include <com/sun/star/drawing/XShape.hpp> @@ -227,6 +230,7 @@ #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/script/BasicErrorException.hpp> #include <com/sun/star/script/ModuleInfo.hpp> +#include <com/sun/star/script/XInvocation.hpp> #include <com/sun/star/script/XLibraryContainer.hpp> #include <com/sun/star/script/XStarBasicAccess.hpp> #include <com/sun/star/script/XStorageBasedLibraryContainer.hpp> @@ -317,7 +321,6 @@ #include <tools/fldunit.hxx> #include <tools/fontenum.hxx> #include <tools/gen.hxx> -#include <tools/globname.hxx> #include <tools/lineend.hxx> #include <tools/link.hxx> #include <tools/mapunit.hxx> diff --git a/vbahelper/inc/pch/precompiled_vbahelper.hxx b/vbahelper/inc/pch/precompiled_vbahelper.hxx index 1c336d21655c..0138fa5ba583 100644 --- a/vbahelper/inc/pch/precompiled_vbahelper.hxx +++ b/vbahelper/inc/pch/precompiled_vbahelper.hxx @@ -13,16 +13,16 @@ 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 2015-11-14 14:16:41 using: + Generated on 2016-02-06 12:33:42 using: ./bin/update_pch vbahelper vbahelper --cutoff=3 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./vbahelper/inc/pch/precompiled_vbahelper.hxx "/opt/lo/bin/make vbahelper.build" --find-conflicts + ./bin/update_pch_bisect ./vbahelper/inc/pch/precompiled_vbahelper.hxx "make vbahelper.build" --find-conflicts */ #include <cassert> -#include <config_features.h> #include <cstddef> +#include <deque> #include <exception> #include <functional> #include <memory> @@ -51,24 +51,25 @@ #include <sal/config.h> #include <sal/macros.h> #include <sal/types.h> -#include <vcl/apptypes.hxx> #include <vcl/bitmap.hxx> #include <vcl/cursor.hxx> #include <vcl/dllapi.h> #include <vcl/event.hxx> #include <vcl/inputctx.hxx> +#include <vcl/inputtypes.hxx> #include <vcl/keycodes.hxx> #include <vcl/metric.hxx> #include <vcl/outdev.hxx> #include <vcl/pointr.hxx> #include <vcl/region.hxx> #include <vcl/salnativewidgets.hxx> -#include <vcl/timer.hxx> #include <vcl/vclevent.hxx> #include <vcl/vclptr.hxx> #include <vcl/window.hxx> #include <basic/basicdllapi.h> +#include <basic/codecompletecache.hxx> #include <basic/sbdef.hxx> +#include <basic/sbmod.hxx> #include <basic/sbx.hxx> #include <basic/sbxdef.hxx> #include <basic/sbxform.hxx> @@ -91,6 +92,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/script/XInvocation.hpp> #include <com/sun/star/script/XLibraryContainer.hpp> #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp> #include <com/sun/star/security/DocumentSignatureInformation.hpp> diff --git a/vcl/headless/svpinst.cxx b/vcl/headless/svpinst.cxx index 50f070506f55..8897a1f740a8 100644 --- a/vcl/headless/svpinst.cxx +++ b/vcl/headless/svpinst.cxx @@ -24,25 +24,25 @@ #include <sal/types.h> -#include <vcl/apptypes.hxx> +#include <vcl/inputtypes.hxx> -#include "headless/svpinst.hxx" -#include "headless/svpframe.hxx" -#include "headless/svpdummies.hxx" -#include "headless/svpvd.hxx" +#include <headless/svpinst.hxx> +#include <headless/svpframe.hxx> +#include <headless/svpdummies.hxx> +#include <headless/svpvd.hxx> #ifdef IOS -#include "quartz/salbmp.h" -#include "quartz/salgdi.h" -#include "quartz/salvd.h" +#include <quartz/salbmp.h> +#include <quartz/salgdi.h> +#include <quartz/salvd.h> #endif -#include "headless/svpbmp.hxx" -#include "headless/svpgdi.hxx" +#include <headless/svpbmp.hxx> +#include <headless/svpgdi.hxx> -#include <salframe.hxx> -#include <svdata.hxx> -#include <unx/gendata.hxx> +#include "salframe.hxx" +#include "svdata.hxx" +#include "unx/gendata.hxx" // FIXME: remove when we re-work the svp mainloop -#include <unx/salunxtime.h> +#include "unx/salunxtime.h" bool SvpSalInstance::isFrameAlive( const SalFrame* pFrame ) const { diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 1e75afb64863..94e91022b4e2 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -19,39 +19,39 @@ #include <config_features.h> -#include "comphelper/processfactory.hxx" +#include <comphelper/processfactory.hxx> -#include "osl/module.h" -#include "osl/file.hxx" -#include "osl/thread.h" +#include <osl/module.h> +#include <osl/file.hxx> +#include <osl/thread.h> -#include "rtl/tencinfo.h" -#include "rtl/instance.hxx" +#include <rtl/tencinfo.h> +#include <rtl/instance.hxx> -#include "tools/debug.hxx" -#include "tools/time.hxx" +#include <tools/debug.hxx> +#include <tools/time.hxx> -#include "i18nlangtag/mslangid.hxx" +#include <i18nlangtag/mslangid.hxx> #include <unotools/configmgr.hxx> #include <unotools/syslocaleoptions.hxx> -#include "vcl/dialog.hxx" -#include "vcl/floatwin.hxx" -#include "vcl/settings.hxx" -#include "vcl/keycod.hxx" -#include "vcl/event.hxx" -#include "vcl/vclevent.hxx" -#include "vcl/virdev.hxx" -#include "vcl/wrkwin.hxx" -#include "vcl/svapp.hxx" -#include "vcl/cvtgrf.hxx" -#include "vcl/unowrap.hxx" -#include "vcl/timer.hxx" -#include "vcl/scheduler.hxx" -#include "vcl/unohelp.hxx" -#include "vcl/lazydelete.hxx" -#include "vcl/opengl/OpenGLWrapper.hxx" +#include <vcl/dialog.hxx> +#include <vcl/floatwin.hxx> +#include <vcl/settings.hxx> +#include <vcl/keycod.hxx> +#include <vcl/event.hxx> +#include <vcl/vclevent.hxx> +#include <vcl/virdev.hxx> +#include <vcl/wrkwin.hxx> +#include <vcl/svapp.hxx> +#include <vcl/cvtgrf.hxx> +#include <vcl/unowrap.hxx> +#include <vcl/timer.hxx> +#include <vcl/scheduler.hxx> +#include <vcl/unohelp.hxx> +#include <vcl/lazydelete.hxx> +#include <vcl/opengl/OpenGLWrapper.hxx> #include "salinst.hxx" #include "salframe.hxx" @@ -64,14 +64,14 @@ #include "idlemgr.hxx" #include "svids.hrc" -#include "com/sun/star/uno/Reference.h" -#include "com/sun/star/awt/XToolkit.hpp" +#include <com/sun/star/uno/Reference.h> +#include <com/sun/star/awt/XToolkit.hpp> #include <com/sun/star/frame/Desktop.hpp> -#include "com/sun/star/uno/XNamingService.hpp" +#include <com/sun/star/uno/XNamingService.hpp> #include <com/sun/star/util/XModifiable.hpp> -#include "com/sun/star/lang/XMultiServiceFactory.hpp" -#include "comphelper/solarmutex.hxx" -#include "osl/process.h" +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <comphelper/solarmutex.hxx> +#include <osl/process.h> #include <cassert> #include <utility> diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index 7631df2ea39b..67345868be3f 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -24,25 +24,25 @@ #include <osl/file.hxx> #include <osl/signal.h> -#include "tools/debug.hxx" -#include "tools/resmgr.hxx" - -#include "comphelper/processfactory.hxx" - -#include "unotools/syslocaleoptions.hxx" -#include "vcl/svapp.hxx" -#include "vcl/wrkwin.hxx" -#include "vcl/cvtgrf.hxx" -#include "vcl/scheduler.hxx" -#include "vcl/image.hxx" -#include "vcl/implimagetree.hxx" -#include "vcl/settings.hxx" -#include "vcl/unowrap.hxx" -#include "vcl/commandinfoprovider.hxx" -#include "vcl/configsettings.hxx" -#include "vcl/lazydelete.hxx" -#include "vcl/embeddedfontshelper.hxx" -#include "vcl/debugevent.hxx" +#include <tools/debug.hxx> +#include <tools/resmgr.hxx> + +#include <comphelper/processfactory.hxx> + +#include <unotools/syslocaleoptions.hxx> +#include <vcl/svapp.hxx> +#include <vcl/wrkwin.hxx> +#include <vcl/cvtgrf.hxx> +#include <vcl/scheduler.hxx> +#include <vcl/image.hxx> +#include <vcl/implimagetree.hxx> +#include <vcl/settings.hxx> +#include <vcl/unowrap.hxx> +#include <vcl/commandinfoprovider.hxx> +#include <vcl/configsettings.hxx> +#include <vcl/lazydelete.hxx> +#include <vcl/embeddedfontshelper.hxx> +#include <vcl/debugevent.hxx> #ifdef WNT #include <svsys.h> @@ -58,7 +58,7 @@ #include "salinst.hxx" #include "salwtype.hxx" #include "svdata.hxx" -#include "vcl/svmain.hxx" +#include <vcl/svmain.hxx> #include "dbggui.hxx" #include "accmgr.hxx" #include "idlemgr.hxx" @@ -72,22 +72,22 @@ #include "salimestatus.hxx" #include "xconnection.hxx" -#include "vcl/opengl/OpenGLContext.hxx" +#include <vcl/opengl/OpenGLContext.hxx> -#include "osl/process.h" -#include "com/sun/star/lang/XMultiServiceFactory.hpp" -#include "com/sun/star/lang/XComponent.hpp" -#include "com/sun/star/frame/Desktop.hpp" +#include <osl/process.h> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/frame/Desktop.hpp> #include <cppuhelper/implbase.hxx> -#include "uno/current_context.hxx" +#include <uno/current_context.hxx> -#include "opengl/zone.hxx" -#include "opengl/watchdog.hxx" +#include <opengl/zone.hxx> +#include <opengl/watchdog.hxx> #if OSL_DEBUG_LEVEL > 0 #include <typeinfo> -#include "rtl/strbuf.hxx" +#include <rtl/strbuf.hxx> #endif using namespace ::com::sun::star; diff --git a/vcl/unx/generic/app/salinst.cxx b/vcl/unx/generic/app/salinst.cxx index 74d576b0804c..0ead21f1f7b6 100644 --- a/vcl/unx/generic/app/salinst.cxx +++ b/vcl/unx/generic/app/salinst.cxx @@ -21,19 +21,19 @@ #include <stdio.h> #include <stdlib.h> -#include "osl/module.hxx" - -#include "unx/salunx.h" -#include "unx/saldata.hxx" -#include "unx/saldisp.hxx" -#include "unx/geninst.h" -#include "unx/genpspgraphics.h" -#include "unx/salframe.h" -#include "unx/genprn.h" -#include "unx/sm.hxx" - -#include "vcl/apptypes.hxx" -#include "vcl/helper.hxx" +#include <osl/module.hxx> + +#include <unx/salunx.h> +#include <unx/saldata.hxx> +#include <unx/saldisp.hxx> +#include <unx/geninst.h> +#include <unx/genpspgraphics.h> +#include <unx/salframe.h> +#include <unx/genprn.h> +#include <unx/sm.hxx> + +#include <vcl/inputtypes.hxx> +#include <vcl/helper.hxx> #include "salwtype.hxx" #include <sal/macros.h> diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx index 0c65c35e0bb7..0b3ef7b70460 100644 --- a/vcl/unx/gtk/gtkinst.cxx +++ b/vcl/unx/gtk/gtkinst.cxx @@ -31,7 +31,7 @@ #include <unx/gtk/gtksalmenu.hxx> #include <headless/svpvd.hxx> #include <headless/svpbmp.hxx> -#include <vcl/apptypes.hxx> +#include <vcl/inputtypes.hxx> #include <unx/genpspgraphics.h> #include <rtl/strbuf.hxx> #include <rtl/uri.hxx> diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx index 55f606f77b37..1e37ece50411 100644 --- a/vcl/win/app/salinst.cxx +++ b/vcl/win/app/salinst.cxx @@ -24,23 +24,23 @@ #include <osl/file.hxx> #include <comphelper/solarmutex.hxx> -#include <vcl/apptypes.hxx> +#include <vcl/inputtypes.hxx> #include <vcl/opengl/OpenGLHelper.hxx> #include <vcl/opengl/OpenGLContext.hxx> #include <vcl/timer.hxx> -#include <opengl/salbmp.hxx> -#include <win/wincomp.hxx> -#include <win/salids.hrc> -#include <win/saldata.hxx> -#include <win/salinst.h> -#include <win/salframe.h> -#include <win/salobj.h> -#include <win/saltimer.h> -#include <win/salbmp.h> - -#include <salimestatus.hxx> -#include <salsys.hxx> +#include "opengl/salbmp.hxx" +#include "win/wincomp.hxx" +#include "win/salids.hrc" +#include "win/saldata.hxx" +#include "win/salinst.h" +#include "win/salframe.h" +#include "win/salobj.h" +#include "win/saltimer.h" +#include "win/salbmp.h" + +#include "salimestatus.hxx" +#include "salsys.hxx" #if defined _MSC_VER #ifndef min diff --git a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx index 6b1fe47f71a8..6fb8e050da05 100644 --- a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx +++ b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx @@ -13,11 +13,11 @@ 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 2016-01-07 22:00:58 using: + Generated on 2016-02-06 12:32:41 using: ./bin/update_pch xmlsecurity xmlsecurity --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 ./xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx "/opt/lo/bin/make xmlsecurity.build" --find-conflicts + ./bin/update_pch_bisect ./xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx "make xmlsecurity.build" --find-conflicts */ #include <algorithm> @@ -103,7 +103,6 @@ #include <vcl/accel.hxx> #include <vcl/alpha.hxx> #include <vcl/animate.hxx> -#include <vcl/apptypes.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/builder.hxx> @@ -131,6 +130,7 @@ #include <vcl/image.hxx> #include <vcl/impdel.hxx> #include <vcl/inputctx.hxx> +#include <vcl/inputtypes.hxx> #include <vcl/keycod.hxx> #include <vcl/keycodes.hxx> #include <vcl/lineinfo.hxx> |