diff options
| -rwxr-xr-x | bin/update_pch | 12 | ||||
| -rwxr-xr-x | bin/update_pch_autotune.sh | 31 | ||||
| -rwxr-xr-x[-rw-r--r--] | bin/update_pch_bisect | 3 | ||||
| -rw-r--r-- | reportdesign/inc/RptDef.hxx | 14 | ||||
| -rw-r--r-- | reportdesign/inc/pch/precompiled_rpt.hxx | 4 | ||||
| -rw-r--r-- | reportdesign/inc/pch/precompiled_rptui.hxx | 7 | ||||
| -rw-r--r-- | sal/inc/pch/precompiled_sal.hxx | 32 | ||||
| -rw-r--r-- | sfx2/inc/pch/precompiled_sfx.hxx | 16 | ||||
| -rw-r--r-- | vcl/inc/pch/precompiled_vcl.hxx | 16 | ||||
| -rw-r--r-- | xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx | 3 | ||||
| -rw-r--r-- | xmlsecurity/inc/pch/precompiled_xsec_fw.hxx | 2 | ||||
| -rw-r--r-- | xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx | 17 |
12 files changed, 96 insertions, 61 deletions
diff --git a/bin/update_pch b/bin/update_pch index a21b0692b6d1..18eba85368da 100755 --- a/bin/update_pch +++ b/bin/update_pch @@ -88,7 +88,7 @@ DEFAULTS = \ 'reportdesign.rpt' : ( 9, EXCLUDE, INCLUDE, INCLUDE), # 9.4 'reportdesign.rptui' : ( 4, EXCLUDE, INCLUDE, INCLUDE), # 13.1 'reportdesign.rptxml' : ( 2, EXCLUDE, EXCLUDE, INCLUDE), # 7.6 - 'sal.sal' : ( 5, EXCLUDE, INCLUDE, INCLUDE), # 4.2 + 'sal.sal' : ( 2, EXCLUDE, EXCLUDE, INCLUDE), # 4.2 'sc.sc' : (12, EXCLUDE, INCLUDE, INCLUDE), # 92.6 'sc.scfilt' : ( 4, EXCLUDE, EXCLUDE, INCLUDE), # 39.9 'sc.scui' : ( 1, EXCLUDE, EXCLUDE, INCLUDE), # 15.0 @@ -407,6 +407,7 @@ def filter_ignore(line, module): 'vcl/jobset.hxx', 'vcl/oldprintadaptor.hxx', 'vcl/opengl/OpenGLContext.hxx', + 'vcl/opengl/OpenGLHelper.hxx', # Conflicts with X header on *ix 'vcl/print.hxx', 'vcl/prntypes.hxx', # redefines Orientation from filter/jpeg/Exif.hxx 'vcl/sysdata.hxx', @@ -418,6 +419,11 @@ def filter_ignore(line, module): 'XMLEventImportHelper.hxx', # NameMap redefined in XMLEventExport.hxx 'xmloff/XMLEventExport.hxx', # enums redefined ] + if module == 'xmlsecurity': + ignore_list += [ + 'xmlsec/crypto.h', + 'xmlsecurity/xmlsec-wrapper.h', + ] for i in ignore_list: if line.startswith(i): @@ -737,7 +743,7 @@ def generate(includes, libname, filename, module): f.write('\n Generated on {} using:\n {}\n'.format( datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"), make_command_line())) - f.write('\n If after updating build fails, use the following command to locate conflicting headers:\n ./bin/update_pch_bisect {} "/opt/lo/bin/make {}.build" --find-conflicts\n*/\n'.format( + f.write('\n If after updating build fails, use the following command to locate conflicting headers:\n ./bin/update_pch_bisect {} "make {}.build" --find-conflicts\n*/\n'.format( filename, module)) # svx needs this (sendreportw32.cxx) @@ -760,7 +766,7 @@ def generate(includes, libname, filename, module): (module == 'xmlsecurity' and libname == 'xsec_xmlsec'): ado_define = """ // Cleanup windows header macro pollution. -#ifdef WNT +#if defined(WNT) && defined(WINAPI) # include <postwin.h> # undef RGB #endif diff --git a/bin/update_pch_autotune.sh b/bin/update_pch_autotune.sh index 5513a69a3a9c..b3a73783dc77 100755 --- a/bin/update_pch_autotune.sh +++ b/bin/update_pch_autotune.sh @@ -28,16 +28,22 @@ else modules="$@" fi +if [[ "$OSTYPE" == "cygwin" ]]; then + MAKE=/opt/lo/bin/make +else + MAKE=make +fi + function build() { local START=$(date +%s.%N) - /opt/lo/bin/make "$module.build" > /dev/null + $MAKE -sr "$module" > /dev/null status=$? if [ $status -ne 0 ]; then # Spurious failures happen. - /opt/lo/bin/make "$module.build" > /dev/null + $MAKE "$module.build" > /dev/null status=$? fi @@ -48,7 +54,20 @@ function build() score="FAILED" if [ $status -eq 0 ]; then + # The total size of the object files. size="$(du -s workdir/CxxObject/$module/ | awk '{print $1}')" + # Add the pch file size. + filename_rel="workdir/PrecompiledHeader/nodebug/$(basename $header)*" + filename_dbg="workdir/PrecompiledHeader/debug/$(basename $header)*" + if [[ $filename_rel -nt $filename_dbg ]]; then + pch_size="$(du -s $filename_rel | awk '{print $1}' | paste -sd+ | bc)" + else + pch_size="$(du -s $filename_dbg | awk '{print $1}' | paste -sd+ | bc)" + fi + size="$(echo "$pch_size + $size" | bc)" + + # Compute a score based on the build time and size. + # The shorter the build time, and smaller disk usage, the higher the score. score=$(printf %.2f $(echo "10000 / ($build_time * e($size/1048576))" | bc -l)) fi } @@ -134,19 +153,19 @@ for module in $modules; do #run "$root" "$module" --cutoff=999 # Build before updating pch. - /opt/lo/bin/make "$module.build" > /dev/null + $MAKE "$module.build" > /dev/null if [ $? -ne 0 ]; then # Build with dependencies before updating pch. echo "Failed to build $module, building known state with dependencies..." ./bin/update_pch.sh "$module" > /dev/null - /opt/lo/bin/make "$module.clean" > /dev/null - /opt/lo/bin/make "$module.all" > /dev/null + $MAKE "$module.clean" > /dev/null + $MAKE "$module.all" > /dev/null if [ $? -ne 0 ]; then # Build all! echo "Failed to build $module with dependencies, building all..." - /opt/lo/bin/make build-nocheck > /dev/null + $MAKE build-nocheck > /dev/null if [ $? -ne 0 ]; then >&2 echo "Broken build. Please revert changes and try again." diff --git a/bin/update_pch_bisect b/bin/update_pch_bisect index 86cb78396d2c..07f0dbb650ae 100644..100755 --- a/bin/update_pch_bisect +++ b/bin/update_pch_bisect @@ -24,7 +24,7 @@ it contains one or more required include without which it wouldn't compile, which it identifies. -Usage: ./bin/update_pch_bisect ./vcl/inc/pch/precompiled_vcl.hxx "/opt/lo/bin/make vcl.build" --find-required --verbose +Usage: ./bin/update_pch_bisect ./vcl/inc/pch/precompiled_vcl.hxx "make vcl.build" --find-required --verbose """ from __future__ import print_function @@ -240,6 +240,7 @@ if __name__ == '__main__': print(' --find-required - Finds all required includes.') print(' Must compile with all includes.\n') print(' --verbose - print noisy progress.') + print('Example: ./bin/update_pch_bisect ./vcl/inc/pch/precompiled_vcl.hxx "make vcl.build" --find-required --verbose') print('\nRunning unit-tests...') diff --git a/reportdesign/inc/RptDef.hxx b/reportdesign/inc/RptDef.hxx index 869bae875cf7..41c7ea6b77a6 100644 --- a/reportdesign/inc/RptDef.hxx +++ b/reportdesign/inc/RptDef.hxx @@ -20,15 +20,16 @@ #ifndef INCLUDED_REPORTDESIGN_INC_RPTDEF_HXX #define INCLUDED_REPORTDESIGN_INC_RPTDEF_HXX -#include <sal/config.h> - +#include <memory> #include <map> +#include <sal/config.h> + #include "dllapi.h" -#include <svx/svdobj.hxx> +#include <com/sun/star/beans/XPropertySet.hpp> #include <comphelper/uno3.hxx> #include <svx/fmglob.hxx> -#include <memory> +#include <svx/svdobj.hxx> namespace com { namespace sun { namespace star { namespace report { @@ -38,9 +39,6 @@ namespace com { namespace sun { namespace star { namespace style { class XStyle; } - namespace beans { - class XPropertySet; - } }}} namespace rptui @@ -100,7 +98,7 @@ REPORTDESIGN_DLLPUBLIC css::uno::Reference< css::style::XStyle> getUsedStyle(con template < typename T> T getStyleProperty(const css::uno::Reference< css::report::XReportDefinition>& _xReport,const OUString& _sPropertyName) { T nReturn = T(); - css::uno::Reference< css::beans::XPropertySet> xProp(getUsedStyle(_xReport),css::uno::UNO_QUERY_THROW); + css::uno::Reference<css::beans::XPropertySet> xProp(getUsedStyle(_xReport),css::uno::UNO_QUERY_THROW); xProp->getPropertyValue(_sPropertyName) >>= nReturn; return nReturn; } diff --git a/reportdesign/inc/pch/precompiled_rpt.hxx b/reportdesign/inc/pch/precompiled_rpt.hxx index 4b3fa9c6dbba..97dbd4db0a70 100644 --- a/reportdesign/inc/pch/precompiled_rpt.hxx +++ b/reportdesign/inc/pch/precompiled_rpt.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 2015-11-14 14:16:39 using: + Generated on 2016-01-07 21:31:36 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: @@ -23,7 +23,6 @@ #include <algorithm> #include <cassert> #include <climits> -#include <config_features.h> #include <config_global.h> #include <config_typesizes.h> #include <config_vcl.h> @@ -134,7 +133,6 @@ #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/keycod.hxx> diff --git a/reportdesign/inc/pch/precompiled_rptui.hxx b/reportdesign/inc/pch/precompiled_rptui.hxx index 9e224ca87072..7e6e44efc295 100644 --- a/reportdesign/inc/pch/precompiled_rptui.hxx +++ b/reportdesign/inc/pch/precompiled_rptui.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 2015-11-14 14:16:38 using: + Generated on 2016-01-07 21:31:36 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: @@ -23,7 +23,6 @@ #include <algorithm> #include <cassert> #include <climits> -#include <config_features.h> #include <config_global.h> #include <config_typesizes.h> #include <config_vcl.h> @@ -165,6 +164,7 @@ #include <vcl/prntypes.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> @@ -255,6 +255,7 @@ #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp> #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/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> @@ -316,6 +317,8 @@ #include <com/sun/star/util/Date.hpp> #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/XURLTransformer.hpp> #include <com/sun/star/util/XUpdatable.hpp> #include <com/sun/star/view/PrintableState.hpp> diff --git a/sal/inc/pch/precompiled_sal.hxx b/sal/inc/pch/precompiled_sal.hxx index 838e4414e2c3..ab1c7d2602d8 100644 --- a/sal/inc/pch/precompiled_sal.hxx +++ b/sal/inc/pch/precompiled_sal.hxx @@ -13,51 +13,74 @@ 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: - ./bin/update_pch sal sal --cutoff=5 --exclude:system --include:module --include:local + Generated on 2016-01-10 12:04:24 using: + ./bin/update_pch sal sal --cutoff=2 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./sal/inc/pch/precompiled_sal.hxx "/opt/lo/bin/make sal.build" --find-conflicts + ./bin/update_pch_bisect ./sal/inc/pch/precompiled_sal.hxx "make sal.build" --find-conflicts */ +#include <algorithm> #include <cassert> #include <cstddef> #include <cstdlib> #include <cstring> +#include <float.h> +#include <list> +#include <math.h> #include <new> +#include <stdio.h> +#include <stdlib.h> #include <string.h> #include <boost/bind.hpp> #include <boost/noncopyable.hpp> #include <osl/diagnose.h> #include <osl/diagnose.hxx> +#include <osl/doublecheckedlocking.h> #include <osl/endian.h> +#include <osl/file.h> #include <osl/file.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/profile.hxx> #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.h> #include <rtl/bootstrap.hxx> #include <rtl/byteseq.h> +#include <rtl/byteseq.hxx> #include <rtl/character.hxx> #include <rtl/cipher.h> #include <rtl/crc.h> #include <rtl/digest.h> +#include <rtl/instance.hxx> +#include <rtl/locale.h> +#include <rtl/malformeduriexception.hxx> +#include <rtl/math.h> #include <rtl/math.hxx> #include <rtl/process.h> #include <rtl/random.h> +#include <rtl/strbuf.h> #include <rtl/strbuf.hxx> #include <rtl/string.h> -#include <rtl/stringutils.hxx> +#include <rtl/string.hxx> #include <rtl/tencinfo.h> #include <rtl/textcvt.h> #include <rtl/textenc.h> #include <rtl/unload.h> +#include <rtl/uri.h> #include <rtl/uri.hxx> #include <rtl/ustrbuf.h> +#include <rtl/ustrbuf.hxx> #include <rtl/ustring.h> #include <rtl/ustring.hxx> #include <rtl/uuid.h> @@ -66,6 +89,7 @@ #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 <internal/rtllifecycle.h> diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx index 81edabab29df..0d6ba35618fb 100644 --- a/sfx2/inc/pch/precompiled_sfx.hxx +++ b/sfx2/inc/pch/precompiled_sfx.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 2015-11-14 14:16:41 using: + Generated on 2016-01-07 14:31:00 using: ./bin/update_pch sfx2 sfx --cutoff=3 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -52,7 +52,6 @@ #include <osl/file.hxx> #include <osl/module.h> #include <osl/module.hxx> -#include <osl/mutex.h> #include <osl/mutex.hxx> #include <osl/process.h> #include <osl/security.hxx> @@ -83,7 +82,6 @@ #include <sal/macros.h> #include <sal/saldllapi.h> #include <sal/types.h> -#include <salhelper/simplereferenceobject.hxx> #include <vcl/alpha.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> @@ -93,7 +91,6 @@ #include <vcl/cairo.hxx> #include <vcl/checksum.hxx> #include <vcl/combobox.hxx> -#include <vcl/ctrl.hxx> #include <vcl/devicecoordinate.hxx> #include <vcl/dialog.hxx> #include <vcl/dibtools.hxx> @@ -157,13 +154,11 @@ #include <basic/sbxdef.hxx> #include <basic/sbxobj.hxx> #include <com/sun/star/accessibility/AccessibleStateType.hpp> -#include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/awt/KeyModifier.hpp> #include <com/sun/star/awt/MouseButton.hpp> #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/XWindow2.hpp> -#include <com/sun/star/awt/XWindowPeer.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyValue.hpp> @@ -234,8 +229,6 @@ #include <com/sun/star/frame/status/Visibility.hpp> #include <com/sun/star/frame/theGlobalEventBroadcaster.hpp> #include <com/sun/star/frame/theUICommandDescription.hpp> -#include <com/sun/star/graphic/GraphicProvider.hpp> -#include <com/sun/star/graphic/XGraphicProvider.hpp> #include <com/sun/star/i18n/XCharacterClassification.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp> @@ -286,7 +279,6 @@ #include <com/sun/star/ui/dialogs/XFilePicker.hpp> #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> #include <com/sun/star/ui/dialogs/XFilterManager.hpp> -#include <com/sun/star/ui/theUIElementFactoryManager.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Exception.hpp> @@ -317,6 +309,7 @@ #include <comphelper/documentconstants.hxx> #include <comphelper/fileurl.hxx> #include <comphelper/interaction.hxx> +#include <comphelper/lok.hxx> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> @@ -326,7 +319,6 @@ #include <comphelper/types.hxx> #include <cppu/unotype.hxx> #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase.hxx> #include <cppuhelper/compbase1.hxx> #include <cppuhelper/cppuhelperdllapi.h> #include <cppuhelper/exc_hlp.hxx> @@ -361,7 +353,6 @@ #include <sax/tools/converter.hxx> #include <sot/exchange.hxx> #include <sot/formats.hxx> -#include <sot/sotdllapi.h> #include <sot/storage.hxx> #include <sot/storinfo.hxx> #include <svl/SfxBroadcaster.hxx> @@ -375,7 +366,6 @@ #include <svl/lckbitem.hxx> #include <svl/lstner.hxx> #include <svl/macitem.hxx> -#include <svl/ownlist.hxx> #include <svl/poolitem.hxx> #include <svl/rectitem.hxx> #include <svl/sharecontrolfile.hxx> @@ -433,7 +423,6 @@ #include <unotools/bootstrap.hxx> #include <unotools/configitem.hxx> #include <unotools/configmgr.hxx> -#include <unotools/confignode.hxx> #include <unotools/eventcfg.hxx> #include <unotools/fontdefs.hxx> #include <unotools/historyoptions.hxx> @@ -501,7 +490,6 @@ #include <sfx2/sfxresid.hxx> #include <sfx2/sfxuno.hxx> #include <sfx2/sidebar/Accessible.hxx> -#include <vcl/CommandInfoProvider.hxx> #include <sfx2/sidebar/Context.hxx> #include <sfx2/sidebar/ControllerFactory.hxx> #include <sfx2/sidebar/Deck.hxx> diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index 99ba74689424..13c88b1ab32f 100644 --- a/vcl/inc/pch/precompiled_vcl.hxx +++ b/vcl/inc/pch/precompiled_vcl.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-08 23:14:46 using: + Generated on 2016-01-10 11:16:04 using: ./bin/update_pch vcl vcl --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 ./vcl/inc/pch/precompiled_vcl.hxx "/opt/lo/bin/make vcl.build" --find-conflicts + ./bin/update_pch_bisect ./vcl/inc/pch/precompiled_vcl.hxx "make vcl.build" --find-conflicts */ #include <algorithm> @@ -36,6 +36,7 @@ #include <functional> #include <iomanip> #include <limits.h> +#include <map> #include <math.h> #include <memory> #include <new> @@ -129,14 +130,12 @@ #include <salsys.hxx> #include <saltimer.hxx> #include <salvd.hxx> -#include <vcl/FilterConfigItem.hxx> #include <vcl/alpha.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> #include <vcl/bmpacc.hxx> #include <vcl/button.hxx> #include <vcl/canvastools.hxx> -#include <vcl/combobox.hxx> #include <vcl/configsettings.hxx> #include <vcl/ctrl.hxx> #include <vcl/cursor.hxx> @@ -148,10 +147,8 @@ #include <vcl/dockwin.hxx> #include <vcl/edit.hxx> #include <vcl/event.hxx> -#include <vcl/field.hxx> #include <vcl/fixed.hxx> #include <vcl/floatwin.hxx> -#include <vcl/fltcall.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> #include <vcl/fontcharmap.hxx> @@ -174,7 +171,6 @@ #include <vcl/metaact.hxx> #include <vcl/metric.hxx> #include <vcl/mnemonic.hxx> -#include <vcl/opengl/OpenGLHelper.hxx> #include <vcl/outdev.hxx> #include <vcl/region.hxx> #include <vcl/salbtype.hxx> @@ -182,7 +178,6 @@ #include <vcl/salnativewidgets.hxx> #include <vcl/scrbar.hxx> #include <vcl/settings.hxx> -#include <vcl/spinfld.hxx> #include <vcl/svapp.hxx> #include <vcl/syswin.hxx> #include <vcl/tabctrl.hxx> @@ -221,10 +216,6 @@ #include <brdwin.hxx> #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyGroup.hpp> -#include <com/sun/star/awt/Size.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/beans/XPropertyAccess.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp> @@ -235,7 +226,6 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.h> diff --git a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx b/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx index 3028610459a6..7b6487e4dd73 100644 --- a/xmlsecurity/inc/pch/precompiled_xmlsecurity.hxx +++ b/xmlsecurity/inc/pch/precompiled_xmlsecurity.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 2015-11-14 14:16:43 using: + Generated on 2016-01-07 22:00:58 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: @@ -22,7 +22,6 @@ #include <algorithm> #include <cassert> -#include <config_features.h> #include <config_global.h> #include <config_typesizes.h> #include <config_vcl.h> diff --git a/xmlsecurity/inc/pch/precompiled_xsec_fw.hxx b/xmlsecurity/inc/pch/precompiled_xsec_fw.hxx index 3ca0e1ac4be3..8ea24be36a43 100644 --- a/xmlsecurity/inc/pch/precompiled_xsec_fw.hxx +++ b/xmlsecurity/inc/pch/precompiled_xsec_fw.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 2015-11-14 14:16:41 using: + Generated on 2016-01-07 22:01:39 using: ./bin/update_pch xmlsecurity xsec_fw --cutoff=2 --exclude:system --include:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: diff --git a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx index 49dce9e75508..74f207e20d63 100644 --- a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx +++ b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.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:42:58 using: + Generated on 2016-01-10 17:36:56 using: ./bin/update_pch xmlsecurity xsec_xmlsec --cutoff=2 --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_xsec_xmlsec.hxx "/opt/lo/bin/make xmlsecurity.build" --find-conflicts + ./bin/update_pch_bisect ./xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx "make xmlsecurity.build" --find-conflicts */ #include <cassert> @@ -115,11 +115,20 @@ #include <uno/data.h> #include <uno/sequence2.h> #include <xmloff/dllapi.h> +#include <xmlsec/base64.h> +#include <xmlsec/bn.h> +#include <xmlsec/errors.h> +#include <xmlsec/io.h> +#include <xmlsec/keysmngr.h> +#include <xmlsec/strings.h> +#include <xmlsec/xmldsig.h> +#include <xmlsec/xmlenc.h> +#include <xmlsec/xmlsec.h> +#include <xmlsec/xmltree.h> #include <xmlsecurity/biginteger.hxx> -#include <xmlsecurity/xmlsec-wrapper.h> // Cleanup windows header macro pollution. -#ifdef WNT +#if defined(WNT) && defined(WINAPI) # include <postwin.h> # undef RGB #endif |