diff options
-rwxr-xr-x | bin/update_pch | 27 | ||||
-rw-r--r-- | connectivity/inc/pch/precompiled_ado.hxx | 9 | ||||
-rw-r--r-- | connectivity/inc/pch/precompiled_odbc.hxx | 6 | ||||
-rw-r--r-- | include/prewin.h | 23 | ||||
-rw-r--r-- | officecfg/registry/cppheader.xsl | 2 | ||||
-rw-r--r-- | sc/qa/unit/ucalc_formula.cxx | 3 | ||||
-rw-r--r-- | sw/inc/pch/precompiled_msword.hxx | 3 | ||||
-rw-r--r-- | sw/inc/pch/precompiled_sw.hxx | 131 | ||||
-rw-r--r-- | sw/inc/pch/precompiled_swui.hxx | 3 | ||||
-rw-r--r-- | sw/inc/pch/precompiled_vbaswobj.hxx | 4 | ||||
-rw-r--r-- | vcl/win/app/salinst.cxx | 2 | ||||
-rw-r--r-- | writerfilter/inc/pch/precompiled_writerfilter.hxx | 66 | ||||
-rw-r--r-- | xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx | 8 | ||||
-rw-r--r-- | xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 5 |
14 files changed, 173 insertions, 119 deletions
diff --git a/bin/update_pch b/bin/update_pch index fa2294d4cd57..47c2d15a4644 100755 --- a/bin/update_pch +++ b/bin/update_pch @@ -107,7 +107,7 @@ DEFAULTS = \ 'svx.svx' : ( 3, EXCLUDE, EXCLUDE, INCLUDE), # 20.7 'svx.svxcore' : ( 7, EXCLUDE, INCLUDE, EXCLUDE), # 37.0 'sw.msword' : ( 4, EXCLUDE, INCLUDE, INCLUDE), # 22.4 - 'sw.sw' : (11, EXCLUDE, EXCLUDE, INCLUDE), # 212.3 + 'sw.sw' : ( 7, EXCLUDE, EXCLUDE, INCLUDE), # 129.6 'sw.swui' : ( 3, EXCLUDE, INCLUDE, INCLUDE), # 26.1 'sw.vbaswobj' : ( 4, EXCLUDE, INCLUDE, INCLUDE), # 13.1 'tools.tl' : ( 5, EXCLUDE, EXCLUDE, EXCLUDE), # 4.2 @@ -117,7 +117,7 @@ DEFAULTS = \ 'vbahelper.msforms' : ( 3, EXCLUDE, INCLUDE, INCLUDE), # 5.2 'vbahelper.vbahelper' : ( 3, EXCLUDE, EXCLUDE, INCLUDE), # 7.0 'vcl.vcl' : ( 6, EXCLUDE, INCLUDE, INCLUDE), # 35.7 - 'writerfilter.writerfilter' : ( 3, EXCLUDE, EXCLUDE, INCLUDE), # 15.8 + 'writerfilter.writerfilter' : ( 5, EXCLUDE, EXCLUDE, EXCLUDE), # 19.7/27.3 'xmloff.xo' : ( 7, EXCLUDE, INCLUDE, INCLUDE), # 22.1 'xmloff.xof' : ( 1, EXCLUDE, EXCLUDE, INCLUDE), # 4.4 'xmlscript.xmlscript' : ( 4, EXCLUDE, EXCLUDE, INCLUDE), # 3.6 @@ -393,10 +393,6 @@ def filter_ignore(line, module): ignore_list += [ 'tbunosearchcontrollers.hxx', # Anonymous namespace ] - if module == 'sw': - ignore_list += [ - 'com/sun/star/ucb/NameClash.hpp', # conflicts with ERROR from Windows.h - ] if module == 'vcl': ignore_list += [ 'accmgr.hxx', # redefines ImplAccelList @@ -748,8 +744,8 @@ def generate(includes, libname, filename, module): if module == 'svx' and libname == 'svx': svx_define = """ #ifdef WNT -#define UNICODE -#define _UNICODE +# define UNICODE +# define _UNICODE #endif """ f.write(svx_define) @@ -759,12 +755,14 @@ def generate(includes, libname, filename, module): for i in includes: f.write(i + '\n') - # ado needs to guard against macro polution - if module == 'connectivity' and libname == 'ado': + # Some libraries pull windows headers that aren't self contained. + if (module == 'connectivity' and libname == 'ado') or \ + (module == 'xmlsecurity' and libname == 'xsec_xmlsec'): ado_define = """ -// Prevent windows header macro pollution. -#undef OPTIONAL -#undef DELETE +// Cleanup windows header macro pollution. +#ifdef WNT +# include <postwin.h> +#endif """ f.write(ado_define) @@ -835,8 +833,7 @@ def main(): header = make_pch_filename(root, module, libname) if not os.path.exists(os.path.join(root, module)): - raise Exception('Error: module [' + str(module) + - '] not found. Not running from the root of LO repository?') + raise Exception('Error: module [{}] not found.'.format(module)) key = '{}.{}'.format(module, libname) if key in DEFAULTS: diff --git a/connectivity/inc/pch/precompiled_ado.hxx b/connectivity/inc/pch/precompiled_ado.hxx index 22018806b9f7..1f4b17ca83ad 100644 --- a/connectivity/inc/pch/precompiled_ado.hxx +++ b/connectivity/inc/pch/precompiled_ado.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:28 using: + Generated on 2015-12-02 12:47:53 using: ./bin/update_pch connectivity ado --cutoff=2 --exclude:system --exclude:module --exclude:local If after updating build fails, use the following command to locate conflicting headers: @@ -69,8 +69,9 @@ #include <connectivity/dbtoolsdllapi.hxx> #include <connectivity/sdbcx/IRefreshable.hxx> -// Prevent windows header macro pollution. -#undef OPTIONAL -#undef DELETE +// Cleanup windows header macro pollution. +#ifdef WNT +# include <postwin.h> +#endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/pch/precompiled_odbc.hxx b/connectivity/inc/pch/precompiled_odbc.hxx index 05804081d956..94aeae5accb1 100644 --- a/connectivity/inc/pch/precompiled_odbc.hxx +++ b/connectivity/inc/pch/precompiled_odbc.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:28 using: + Generated on 2015-12-02 12:47:53 using: ./bin/update_pch connectivity odbc --cutoff=2 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -22,8 +22,6 @@ #include <algorithm> #include <cstddef> -#include <stddef.h> -#include <stdlib.h> #include <string.h> #include <boost/type_traits/is_same.hpp> #include <boost/type_traits/remove_reference.hpp> @@ -38,10 +36,8 @@ #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> #include <sal/config.h> -#include <sal/macros.h> #include <sal/saldllapi.h> #include <sal/types.h> -#include <sal/typesizes.h> #include <salhelper/singletonref.hxx> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/include/prewin.h b/include/prewin.h index d64d517bc6fe..e7ad06975d44 100644 --- a/include/prewin.h +++ b/include/prewin.h @@ -24,33 +24,40 @@ #define Rectangle BLA_Rectangle #define Folder WIN_Folder #define GradientStyle_RECT WIN_GradientStyle_RECT + #ifndef IN -#define IN +# define IN #endif #ifndef OUT -#define OUT +# define OUT #endif #if !defined STRICT -#define STRICT +# define STRICT #endif #ifdef _MSC_VER -#pragma warning(push, 1) -#pragma warning (disable: 4005) +# pragma warning(push, 1) +# pragma warning (disable: 4005) #endif + #include <windows.h> + #ifdef _MSC_VER -#pragma warning(pop) +# pragma warning(pop) #endif + #include <shellapi.h> #include <commdlg.h> #include <dlgs.h> + #ifdef _MSC_VER -#pragma warning(push, 1) +# pragma warning(push, 1) #endif + #include <commctrl.h> + #ifdef _MSC_VER -#pragma warning(pop) +# pragma warning(pop) #endif #endif diff --git a/officecfg/registry/cppheader.xsl b/officecfg/registry/cppheader.xsl index 1477b84b94db..a09043f4f8f8 100644 --- a/officecfg/registry/cppheader.xsl +++ b/officecfg/registry/cppheader.xsl @@ -93,8 +93,6 @@ </xsl:if> <xsl:text>#include "comphelper/configuration.hxx"
</xsl:text> <xsl:text>
</xsl:text> - <xsl:text>#undef RGB
</xsl:text> - <xsl:text>
</xsl:text> <xsl:text>namespace officecfg { namespace </xsl:text> <xsl:value-of select="$ns1"/> <xsl:if test="$ns2"> diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx index 69b46bb85b22..b5eafc24cc80 100644 --- a/sc/qa/unit/ucalc_formula.cxx +++ b/sc/qa/unit/ucalc_formula.cxx @@ -29,6 +29,9 @@ #include <docpool.hxx> #include <formula/vectortoken.hxx> + +// RGB is leaked macro from wingdi.h which conflicts in Office/Common.hxx. +#undef RGB #include <officecfg/Office/Common.hxx> #include <svl/broadcast.hxx> diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx index c649d704ebd3..916fcdf70c41 100644 --- a/sw/inc/pch/precompiled_msword.hxx +++ b/sw/inc/pch/precompiled_msword.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:58 using: + Generated on 2015-12-02 12:43:17 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: @@ -162,6 +162,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> diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx index 7c849dd692d2..0ec82a82788d 100644 --- a/sw/inc/pch/precompiled_sw.hxx +++ b/sw/inc/pch/precompiled_sw.hxx @@ -13,8 +13,8 @@ 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:52 using: - ./bin/update_pch sw sw --cutoff=11 --exclude:system --exclude:module --include:local + Generated on 2015-12-02 12:43:10 using: + ./bin/update_pch sw sw --cutoff=7 --exclude:system --exclude:module --include:local If after updating build fails, use the following command to locate conflicting headers: ./bin/update_pch_bisect ./sw/inc/pch/precompiled_sw.hxx "/opt/lo/bin/make sw.build" --find-conflicts @@ -25,14 +25,13 @@ #include <climits> #include <cmdid.h> #include <config_features.h> -#include <cstdarg> #include <cstddef> #include <cstdlib> -#include <exception> +#include <deque> +#include <float.h> #include <functional> #include <helpid.h> #include <limits.h> -#include <limits> #include <list> #include <map> #include <memory> @@ -42,6 +41,7 @@ #include <sstream> #include <stack> #include <stddef.h> +#include <stdlib.h> #include <string.h> #include <string> #include <swdllapi.h> @@ -52,7 +52,6 @@ #include <utility> #include <vector> #include <boost/current_function.hpp> -#include <boost/intrusive_ptr.hpp> #include <boost/noncopyable.hpp> #include <boost/numeric/conversion/cast.hpp> #include <boost/optional.hpp> @@ -61,29 +60,21 @@ #include <boost/tuple/tuple.hpp> #include <osl/diagnose.h> #include <osl/diagnose.hxx> -#include <osl/doublecheckedlocking.h> #include <osl/endian.h> #include <osl/file.hxx> -#include <osl/getglobalmutex.hxx> #include <osl/interlck.h> #include <osl/module.h> #include <osl/module.hxx> #include <osl/mutex.hxx> -#include <osl/process.h> #include <osl/thread.hxx> #include <rtl/alloc.h> #include <rtl/bootstrap.hxx> #include <rtl/character.hxx> -#include <rtl/instance.hxx> #include <rtl/math.hxx> #include <rtl/random.h> #include <rtl/ref.hxx> #include <rtl/strbuf.hxx> -#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> @@ -103,6 +94,7 @@ #include <vcl/alpha.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> +#include <vcl/builder.hxx> #include <vcl/button.hxx> #include <vcl/checksum.hxx> #include <vcl/combobox.hxx> @@ -112,13 +104,16 @@ #include <vcl/edit.hxx> #include <vcl/field.hxx> #include <vcl/fixed.hxx> +#include <vcl/floatwin.hxx> #include <vcl/fntstyle.hxx> #include <vcl/font.hxx> #include <vcl/graph.hxx> #include <vcl/graphicfilter.hxx> +#include <vcl/help.hxx> #include <vcl/image.hxx> #include <vcl/layout.hxx> #include <vcl/mapmod.hxx> +#include <vcl/metric.hxx> #include <vcl/msgbox.hxx> #include <vcl/outdev.hxx> #include <vcl/region.hxx> @@ -129,11 +124,15 @@ #include <vcl/spinfld.hxx> #include <vcl/svapp.hxx> #include <vcl/syswin.hxx> +#include <vcl/tabctrl.hxx> +#include <vcl/tabpage.hxx> #include <vcl/timer.hxx> #include <vcl/vclenum.hxx> #include <vcl/vclptr.hxx> +#include <vcl/virdev.hxx> #include <vcl/window.hxx> #include <vcl/wrkwin.hxx> +#include <EnhancedPDFExportHelper.hxx> #include <IDocumentChartDataProviderAccess.hxx> #include <IDocumentContentOperations.hxx> #include <IDocumentDeviceAccess.hxx> @@ -149,11 +148,14 @@ #include <IDocumentUndoRedo.hxx> #include <IMark.hxx> #include <PostItMgr.hxx> +#include <SidebarWin.hxx> #include <SwNodeNum.hxx> #include <SwRewriter.hxx> #include <SwSmartTagMgr.hxx> #include <SwStyleNameMapper.hxx> +#include <TextCursorHelper.hxx> #include <accmap.hxx> +#include <authfld.hxx> #include <basegfx/basegfxdllapi.h> #include <basegfx/color/bcolor.hxx> #include <basegfx/color/bcolormodifier.hxx> @@ -167,30 +169,43 @@ #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/sbxvar.hxx> #include <breakit.hxx> #include <calbck.hxx> #include <calc.hxx> #include <cellatr.hxx> #include <charatr.hxx> #include <charfmt.hxx> +#include <chpfld.hxx> +#include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/beans/XPropertySetInfo.hpp> +#include <com/sun/star/bridge/oleautomation/Decimal.hpp> +#include <com/sun/star/chart2/XChartDocument.hpp> +#include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/datatransfer/dnd/DNDConstants.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> +#include <com/sun/star/embed/Aspects.hpp> +#include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/EmbedStates.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/frame/FeatureStateEvent.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XModel.hpp> +#include <com/sun/star/frame/XTerminateListener.hpp> #include <com/sun/star/graphic/XPrimitive2D.hpp> #include <com/sun/star/i18n/ScriptType.hpp> +#include <com/sun/star/i18n/TransliterationModules.hpp> #include <com/sun/star/i18n/WordType.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> @@ -198,12 +213,17 @@ #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XSingleComponentFactory.hpp> +#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/registry/XRegistryKey.hpp> #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> +#include <com/sun/star/text/VertOrientation.hpp> #include <com/sun/star/text/WrapTextMode.hpp> #include <com/sun/star/text/XTextDocument.hpp> +#include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Reference.hxx> @@ -211,29 +231,37 @@ #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/uno/Sequence.hxx> #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/XComponentContext.hpp> #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/XWeak.hpp> #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/DateTime.hpp> +#include <com/sun/star/util/SearchFlags.hpp> +#include <com/sun/star/util/SearchOptions.hpp> #include <com/sun/star/util/Time.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> +#include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/xml/sax/XFastContextHandler.hpp> #include <comphelper/broadcasthelper.hxx> #include <comphelper/classids.hxx> #include <comphelper/comphelperdllapi.h> +#include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> +#include <comphelper/sequence.hxx> #include <comphelper/servicehelper.hxx> +#include <comphelper/storagehelper.hxx> #include <comphelper/string.hxx> #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> #include <cppuhelper/compbase1.hxx> #include <cppuhelper/cppuhelperdllapi.h> +#include <cppuhelper/factory.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase1.hxx> -#include <cppuhelper/implbase_ex.hxx> +#include <cppuhelper/interfacecontainer.h> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/typeprovider.hxx> #include <cppuhelper/weak.hxx> #include <crsrsh.hxx> #include <crsskip.hxx> @@ -250,9 +278,11 @@ #include <drawdoc.hxx> #include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> +#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> #include <edimp.hxx> #include <editeng/acorrcfg.hxx> #include <editeng/adjustitem.hxx> +#include <editeng/blinkitem.hxx> #include <editeng/boxitem.hxx> #include <editeng/brushitem.hxx> #include <editeng/charrotateitem.hxx> @@ -269,49 +299,63 @@ #include <editeng/fontitem.hxx> #include <editeng/formatbreakitem.hxx> #include <editeng/frmdiritem.hxx> +#include <editeng/hyphenzoneitem.hxx> #include <editeng/keepitem.hxx> #include <editeng/kernitem.hxx> #include <editeng/langitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/lspcitem.hxx> #include <editeng/opaqitem.hxx> +#include <editeng/orphitem.hxx> #include <editeng/outliner.hxx> #include <editeng/paperinf.hxx> +#include <editeng/pbinitem.hxx> #include <editeng/postitem.hxx> #include <editeng/protitem.hxx> #include <editeng/scripttypeitem.hxx> #include <editeng/shaditem.hxx> #include <editeng/sizeitem.hxx> +#include <editeng/spltitem.hxx> #include <editeng/svxacorr.hxx> #include <editeng/tstpitem.hxx> #include <editeng/udlnitem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/unolingu.hxx> #include <editeng/wghtitem.hxx> +#include <editeng/widwitem.hxx> +#include <editeng/xmlcnitm.hxx> #include <editsh.hxx> #include <expfld.hxx> #include <fchrfmt.hxx> #include <fesh.hxx> #include <fldbas.hxx> #include <flddat.hxx> +#include <fldupde.hxx> +#include <flypos.hxx> #include <fmtanchr.hxx> #include <fmtautofmt.hxx> +#include <fmtclbl.hxx> #include <fmtclds.hxx> #include <fmtcnct.hxx> #include <fmtcntnt.hxx> #include <fmtcol.hxx> +#include <fmteiro.hxx> #include <fmtflcnt.hxx> #include <fmtfld.hxx> #include <fmtfollowtextflow.hxx> #include <fmtfsize.hxx> #include <fmtftn.hxx> +#include <fmtftntx.hxx> #include <fmthdft.hxx> #include <fmtinfmt.hxx> +#include <fmtline.hxx> #include <fmtlsplt.hxx> #include <fmtmeta.hxx> #include <fmtornt.hxx> #include <fmtpdsc.hxx> #include <fmtrfmrk.hxx> +#include <fmtrowsplt.hxx> +#include <fmtruby.hxx> #include <fmtsrnd.hxx> #include <fmturl.hxx> #include <frmatr.hxx> @@ -328,6 +372,7 @@ #include <i18nlangtag/mslangid.hxx> #include <istyleaccess.hxx> #include <libxml/xmlwriter.h> +#include <lineinfo.hxx> #include <linguistic/lngprops.hxx> #include <mdiexp.hxx> #include <modcfg.hxx> @@ -352,6 +397,7 @@ #include <rsc/rsc-vcl-shared-types.hxx> #include <rsc/rscsfx.hxx> #include <sfx2/app.hxx> +#include <sfx2/basedlgs.hxx> #include <sfx2/bindings.hxx> #include <sfx2/chalign.hxx> #include <sfx2/childwin.hxx> @@ -359,21 +405,29 @@ #include <sfx2/dllapi.h> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> +#include <sfx2/event.hxx> #include <sfx2/fcontnr.hxx> +#include <sfx2/frame.hxx> #include <sfx2/htmlmode.hxx> #include <sfx2/linkmgr.hxx> #include <sfx2/msg.hxx> #include <sfx2/objface.hxx> +#include <sfx2/objsh.hxx> #include <sfx2/printer.hxx> +#include <sfx2/progress.hxx> #include <sfx2/request.hxx> #include <sfx2/shell.hxx> #include <sfx2/sidebar/EnumContext.hxx> #include <sfx2/tbxctrl.hxx> #include <sfx2/viewfrm.hxx> +#include <sfx2/viewsh.hxx> #include <shellio.hxx> #include <shellres.hxx> +#include <sortopt.hxx> #include <sot/formats.hxx> +#include <sot/sotdllapi.h> #include <sot/storage.hxx> +#include <svl/cjkoptions.hxx> #include <svl/ctloptions.hxx> #include <svl/eitem.hxx> #include <svl/hint.hxx> @@ -385,25 +439,41 @@ #include <svl/lstner.hxx> #include <svl/macitem.hxx> #include <svl/poolitem.hxx> +#include <svl/ptitem.hxx> +#include <svl/slstitm.hxx> +#include <svl/smplhint.hxx> #include <svl/srchitem.hxx> #include <svl/stritem.hxx> #include <svl/svldllapi.h> #include <svl/urihelper.hxx> #include <svl/whiter.hxx> #include <svl/zforlist.hxx> +#include <svl/zformat.hxx> +#include <svtools/ctrltool.hxx> #include <svtools/grfmgr.hxx> #include <svtools/htmlcfg.hxx> #include <svtools/htmlkywd.hxx> #include <svtools/htmlout.hxx> #include <svtools/htmltokn.h> #include <svtools/imap.hxx> +#include <svtools/imapobj.hxx> +#include <svtools/langtab.hxx> #include <svtools/svtdllapi.h> +#include <svx/dataaccessdescriptor.hxx> +#include <svx/dlgutil.hxx> #include <svx/drawitem.hxx> #include <svx/fmglob.hxx> +#include <svx/fmshell.hxx> +#include <svx/hlnkitem.hxx> +#include <svx/pageitem.hxx> +#include <svx/ruler.hxx> +#include <svx/srchdlg.hxx> #include <svx/svddef.hxx> +#include <svx/svditer.hxx> #include <svx/svdmodel.hxx> #include <svx/svdobj.hxx> #include <svx/svdogrp.hxx> +#include <svx/svdotext.hxx> #include <svx/svdouno.hxx> #include <svx/svdoutl.hxx> #include <svx/svdpage.hxx> @@ -411,37 +481,57 @@ #include <svx/svdview.hxx> #include <svx/svxdlg.hxx> #include <svx/svxdllapi.h> +#include <svx/unobrushitemhelper.hxx> +#include <svx/unomid.hxx> +#include <svx/xcolit.hxx> #include <svx/xdef.hxx> #include <svx/xenum.hxx> +#include <svx/xfillit0.hxx> +#include <svx/xit.hxx> +#include <svx/xoutbmp.hxx> +#include <svx/xtable.hxx> #include <swabstdlg.hxx> +#include <swatrset.hxx> +#include <swbaslnk.hxx> +#include <swcli.hxx> #include <swcrsr.hxx> #include <swddetbl.hxx> +#include <swdll.hxx> #include <swevent.hxx> #include <swmodule.hxx> #include <swrect.hxx> +#include <swregion.hxx> +#include <swserv.hxx> #include <swtable.hxx> #include <swtblfmt.hxx> #include <swtypes.hxx> #include <swundo.hxx> #include <swunohelper.hxx> #include <swwait.hxx> +#include <tabcol.hxx> +#include <tblafmt.hxx> #include <tblsel.hxx> #include <textboxhelper.hxx> #include <tgrditem.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/color.hxx> #include <tools/date.hxx> +#include <tools/datetime.hxx> +#include <tools/datetimeutils.hxx> #include <tools/debug.hxx> #include <tools/errcode.hxx> #include <tools/fldunit.hxx> #include <tools/fontenum.hxx> +#include <tools/fract.hxx> #include <tools/gen.hxx> +#include <tools/globname.hxx> #include <tools/link.hxx> #include <tools/mapunit.hxx> #include <tools/ref.hxx> #include <tools/resid.hxx> #include <tools/resmgr.hxx> #include <tools/solar.h> +#include <tools/stream.hxx> #include <tools/time.hxx> #include <tools/toolsdllapi.h> #include <tools/urlobj.hxx> @@ -451,19 +541,24 @@ #include <txtfld.hxx> #include <txtftn.hxx> #include <txtinet.hxx> +#include <txtrfmrk.hxx> #include <txttxmrk.hxx> #include <typelib/typedescription.h> +#include <uno/any2.h> #include <uno/sequence2.h> +#include <unobaseclass.hxx> #include <unochart.hxx> #include <unocoll.hxx> #include <unocrsr.hxx> #include <unocrsrhelper.hxx> +#include <unodraw.hxx> #include <unoframe.hxx> #include <unomap.hxx> #include <unoparagraph.hxx> #include <unoprnms.hxx> #include <unosett.hxx> #include <unostyle.hxx> +#include <unotbl.hxx> #include <unotextcursor.hxx> #include <unotextrange.hxx> #include <unotools/accessiblestatesethelper.hxx> @@ -473,8 +568,11 @@ #include <unotools/localedatawrapper.hxx> #include <unotools/moduleoptions.hxx> #include <unotools/options.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/streamwrap.hxx> #include <unotools/syslocale.hxx> #include <unotools/transliterationwrapper.hxx> +#include <unotools/ucbstreamhelper.hxx> #include <unotools/unotoolsdllapi.h> #include <unotools/useroptions.hxx> #include <unotxdoc.hxx> @@ -488,6 +586,7 @@ #include <xmloff/odffields.hxx> #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlnmspe.hxx> +#include <xmloff/xmlstyle.hxx> #include <xmloff/xmltkmap.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx index cffda4dd1bba..9e8992858b35 100644 --- a/sw/inc/pch/precompiled_swui.hxx +++ b/sw/inc/pch/precompiled_swui.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:53 using: + Generated on 2015-12-02 12:43:12 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: @@ -172,6 +172,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> diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx index ce7e63f79ad9..08c3161b5234 100644 --- a/sw/inc/pch/precompiled_vbaswobj.hxx +++ b/sw/inc/pch/precompiled_vbaswobj.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:51 using: + Generated on 2015-12-02 12:43:09 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: @@ -138,7 +138,6 @@ #include <vcl/graph.h> #include <vcl/graph.hxx> #include <vcl/hatch.hxx> -#include <vcl/idle.hxx> #include <vcl/image.hxx> #include <vcl/impdel.hxx> #include <vcl/inputctx.hxx> @@ -161,6 +160,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> diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx index 5cf6c3dd58ba..55f606f77b37 100644 --- a/vcl/win/app/salinst.cxx +++ b/vcl/win/app/salinst.cxx @@ -66,8 +66,6 @@ #include "prewin.h" #include <gdiplus.h> -#include <gdiplusenums.h> -#include <gdipluscolor.h> #include <shlobj.h> #ifdef _WIN32_WINNT_WINBLUE diff --git a/writerfilter/inc/pch/precompiled_writerfilter.hxx b/writerfilter/inc/pch/precompiled_writerfilter.hxx index 12a403e9ccc6..67990b76e03d 100644 --- a/writerfilter/inc/pch/precompiled_writerfilter.hxx +++ b/writerfilter/inc/pch/precompiled_writerfilter.hxx @@ -13,8 +13,8 @@ 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:42 using: - ./bin/update_pch writerfilter writerfilter --cutoff=3 --exclude:system --exclude:module --include:local + Generated on 2015-12-02 15:48:57 using: + ./bin/update_pch writerfilter writerfilter --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 ./writerfilter/inc/pch/precompiled_writerfilter.hxx "/opt/lo/bin/make writerfilter.build" --find-conflicts @@ -22,27 +22,25 @@ #include <cassert> #include <cstddef> -#include <cstdlib> #include <iomanip> #include <iostream> -#include <limits> #include <map> #include <memory> #include <ostream> -#include <sstream> #include <stdlib.h> -#include <string.h> -#include <string> #include <vector> #include <boost/intrusive_ptr.hpp> #include <boost/logic/tribool.hpp> #include <boost/optional.hpp> #include <boost/tuple/tuple.hpp> #include <osl/diagnose.h> +#include <osl/doublecheckedlocking.h> #include <osl/file.hxx> -#include <osl/mutex.h> +#include <osl/getglobalmutex.hxx> #include <osl/mutex.hxx> #include <osl/process.h> +#include <osl/thread.hxx> +#include <rtl/instance.hxx> #include <rtl/math.hxx> #include <rtl/strbuf.hxx> #include <rtl/string.hxx> @@ -51,52 +49,24 @@ #include <rtl/ustring.hxx> #include <rtl/uuid.h> #include <sal/config.h> -#include <sal/detail/log.h> -#include <sal/log.hxx> #include <sal/macros.h> -#include <sal/saldllapi.h> #include <sal/types.h> #include <vcl/dllapi.h> -#include <vcl/svapp.hxx> -#include <basegfx/color/bcolor.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/XPropertyState.hpp> -#include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/container/XNamed.hpp> -#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> -#include <com/sun/star/document/XFilter.hpp> -#include <com/sun/star/document/XImporter.hpp> -#include <com/sun/star/drawing/XControlShape.hpp> -#include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> -#include <com/sun/star/drawing/XShape.hpp> -#include <com/sun/star/embed/XEmbeddedObject.hpp> -#include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/io/XStream.hpp> #include <com/sun/star/lang/Locale.hpp> -#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> -#include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/style/ParagraphAdjust.hpp> -#include <com/sun/star/style/XStyle.hpp> -#include <com/sun/star/style/XStyleFamiliesSupplier.hpp> +#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/table/BorderLine2.hpp> -#include <com/sun/star/table/ShadowFormat.hpp> #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/RelOrientation.hpp> #include <com/sun/star/text/SizeType.hpp> -#include <com/sun/star/text/TableColumnSeparator.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/text/VertOrientation.hpp> #include <com/sun/star/text/WrapTextMode.hpp> -#include <com/sun/star/text/WritingMode.hpp> -#include <com/sun/star/text/XTextColumns.hpp> -#include <com/sun/star/text/XTextFieldsSupplier.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.h> @@ -107,40 +77,18 @@ #include <com/sun/star/uno/Type.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/genfunc.hxx> -#include <com/sun/star/xml/sax/XFastTokenHandler.hpp> #include <comphelper/comphelperdllapi.h> -#include <comphelper/propertyvalue.hxx> #include <comphelper/sequence.hxx> -#include <comphelper/sequenceashashmap.hxx> -#include <comphelper/string.hxx> #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> -#include <cppuhelper/implbase.hxx> -#include <cppuhelper/implbase1.hxx> -#include <cppuhelper/supportsservice.hxx> -#include <dmapper/GraphicZOrderHelper.hxx> -#include <dmapper/resourcemodel.hxx> #include <filter/msfilter/util.hxx> -#include <i18nlangtag/i18nlangtagdllapi.h> -#include <i18nlangtag/lang.h> -#include <i18nlangtag/languagetag.hxx> #include <o3tl/typed_flags_set.hxx> #include <oox/dllapi.h> -#include <oox/drawingml/drawingmltypes.hxx> -#include <oox/helper/storagebase.hxx> -#include <oox/token/namespaces.hxx> #include <oox/token/tokens.hxx> #include <ooxml/QNameToString.hxx> #include <ooxml/resourceids.hxx> -#include <svl/poolitem.hxx> -#include <svx/svxdllapi.h> -#include <tools/color.hxx> -#include <tools/errinf.hxx> #include <tools/gen.hxx> -#include <tools/lineend.hxx> -#include <tools/ref.hxx> #include <tools/solar.h> -#include <tools/stream.hxx> #include <tools/toolsdllapi.h> #include <uno/data.h> #include <uno/sequence2.h> diff --git a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx index 094d9a1740a9..4bf9b0023ca2 100644 --- a/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.hxx +++ b/xmlsecurity/inc/pch/precompiled_xsec_xmlsec.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 2015-12-02 12:42:58 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: @@ -26,6 +26,7 @@ #include <cstring> #include <exception> #include <iomanip> +#include <memory> #include <new> #include <ostream> #include <pk11pub.h> @@ -117,4 +118,9 @@ #include <xmlsecurity/biginteger.hxx> #include <xmlsecurity/xmlsec-wrapper.h> +// Cleanup windows header macro pollution. +#ifdef WNT +# include <postwin.h> +#endif + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx index 2ddcb83fae5d..b903c38592e4 100644 --- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx +++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx @@ -22,16 +22,15 @@ * and turn off the additional virtual methods which are part of some interfaces when compiled * with debug */ -#ifdef DEBUG #undef DEBUG -#endif - #include <com/sun/star/mozilla/XMozillaBootstrap.hpp> #include <com/sun/star/xml/crypto/DigestID.hpp> #include <com/sun/star/xml/crypto/CipherID.hpp> #include <cppuhelper/supportsservice.hxx> +// RGB is leaked macro from wingdi.h which conflicts in Office/Common.hxx. +#undef RGB #include <officecfg/Office/Common.hxx> #include <sal/types.h> |