1 files changed, 206 insertions, 209 deletions
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 821f8570c7a0..cc94f50591aa 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.hxx
@@ -13,43 +13,32 @@
  manual changes will be rewritten by the next run of update_pch.sh (which presumably
  also fixes all possible problems, so it's usually better to use it).
 
- Generated on 2017-09-20 22:54:58 using:
+ Generated on 2019-04-29 21:16:05 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 "make sw.build" --find-conflicts
 */
 
+#if PCH_LEVEL >= 1
 #include <algorithm>
 #include <cassert>
-#include <climits>
-#include <cmdid.h>
-#include <config_features.h>
-#include <config_global.h>
 #include <cstddef>
 #include <cstdlib>
+#include <cstring>
 #include <deque>
-#include <exception>
 #include <float.h>
 #include <functional>
-#include <helpids.h>
 #include <limits.h>
-#include <limits>
-#include <list>
 #include <map>
 #include <memory>
 #include <new>
 #include <ostream>
 #include <set>
-#include <stack>
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
-#include <swdllapi.h>
-#include <swerror.h>
 #include <type_traits>
-#include <typeinfo>
-#include <unomid.h>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
@@ -58,6 +47,8 @@
 #include <boost/optional.hpp>
 #include <boost/optional/optional.hpp>
 #include <boost/property_tree/json_parser.hpp>
+#endif // PCH_LEVEL >= 1
+#if PCH_LEVEL >= 2
 #include <osl/diagnose.h>
 #include <osl/diagnose.hxx>
 #include <osl/doublecheckedlocking.h>
@@ -65,7 +56,6 @@
 #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/thread.hxx>
@@ -94,81 +84,56 @@
 #include <salhelper/simplereferenceobject.hxx>
 #include <salhelper/singletonref.hxx>
 #include <vcl/EnumContext.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
-#include <vcl/builder.hxx>
-#include <vcl/builderfactory.hxx>
 #include <vcl/button.hxx>
 #include <vcl/checksum.hxx>
-#include <vcl/combobox.hxx>
+#include <vcl/commandevent.hxx>
 #include <vcl/ctrl.hxx>
+#include <vcl/dialog.hxx>
 #include <vcl/dllapi.h>
-#include <vcl/dockwin.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/errcode.hxx>
 #include <vcl/errinf.hxx>
-#include <vcl/field.hxx>
+#include <vcl/event.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/fntstyle.hxx>
 #include <vcl/font.hxx>
 #include <vcl/graph.hxx>
-#include <vcl/GraphicObject.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/help.hxx>
 #include <vcl/image.hxx>
-#include <vcl/layout.hxx>
+#include <vcl/imap.hxx>
+#include <vcl/imapobj.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/region.hxx>
-#include <vcl/salnativewidgets.hxx>
 #include <vcl/scopedbitmapaccess.hxx>
 #include <vcl/settings.hxx>
-#include <vcl/spinfld.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/syswin.hxx>
 #include <vcl/tabctrl.hxx>
 #include <vcl/tabpage.hxx>
-#include <vcl/task.hxx>
-#include <vcl/timer.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/virdev.hxx>
+#include <vcl/weld.hxx>
 #include <vcl/window.hxx>
 #include <vcl/wrkwin.hxx>
-#include <AnnotationWin.hxx>
-#include <EnhancedPDFExportHelper.hxx>
-#include <IDocumentChartDataProviderAccess.hxx>
-#include <IDocumentContentOperations.hxx>
-#include <IDocumentDeviceAccess.hxx>
-#include <IDocumentDrawModelAccess.hxx>
-#include <IDocumentFieldsAccess.hxx>
-#include <IDocumentLayoutAccess.hxx>
-#include <IDocumentLinksAdministration.hxx>
-#include <IDocumentRedlineAccess.hxx>
-#include <IDocumentSettingAccess.hxx>
-#include <IDocumentState.hxx>
-#include <IDocumentStatistics.hxx>
-#include <IDocumentStylePoolAccess.hxx>
-#include <IDocumentUndoRedo.hxx>
-#include <IMark.hxx>
-#include <PostItMgr.hxx>
-#include <SwNodeNum.hxx>
-#include <SwRewriter.hxx>
-#include <SwSmartTagMgr.hxx>
-#include <SwStyleNameMapper.hxx>
-#include <TextCursorHelper.hxx>
-#include <accmap.hxx>
-#include <authfld.hxx>
+#endif // PCH_LEVEL >= 2
+#if PCH_LEVEL >= 3
 #include <basegfx/basegfxdllapi.h>
 #include <basegfx/color/bcolor.hxx>
-#include <basegfx/color/bcolormodifier.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/range/b2drange.hxx>
 #include <basegfx/range/basicrange.hxx>
@@ -179,43 +144,27 @@
 #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/accessibility/TextSegment.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/datatransfer/DataFlavor.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/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/WordType.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
-#include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
+#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
@@ -228,6 +177,7 @@
 #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>
@@ -235,23 +185,20 @@
 #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/XComponentContext.hpp>
+#include <com/sun/star/uno/TypeClass.hdl>
 #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/Time.hpp>
 #include <com/sun/star/util/XAccounting.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/classids.hxx>
 #include <comphelper/comphelperdllapi.h>
+#include <comphelper/fileformat.h>
 #include <comphelper/interfacecontainer2.hxx>
 #include <comphelper/lok.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertysequence.hxx>
+#include <comphelper/scopeguard.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/servicehelper.hxx>
 #include <comphelper/storagehelper.hxx>
@@ -263,25 +210,13 @@
 #include <cppuhelper/compbase.hxx>
 #include <cppuhelper/compbase_ex.hxx>
 #include <cppuhelper/cppuhelperdllapi.h>
+#include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
-#include <cppuhelper/weak.hxx>
-#include <crsrsh.hxx>
-#include <crstate.hxx>
-#include <dbfld.hxx>
-#include <dbmgr.hxx>
-#include <dcontact.hxx>
-#include <ddefld.hxx>
-#include <docary.hxx>
-#include <docsh.hxx>
-#include <docstat.hxx>
-#include <docstyle.hxx>
-#include <docufld.hxx>
-#include <drawdoc.hxx>
+#include <cppuhelper/typeprovider.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>
@@ -289,13 +224,16 @@
 #include <editeng/brushitem.hxx>
 #include <editeng/charhiddenitem.hxx>
 #include <editeng/charrotateitem.hxx>
+#include <editeng/charscaleitem.hxx>
 #include <editeng/cmapitem.hxx>
 #include <editeng/colritem.hxx>
+#include <editeng/contouritem.hxx>
 #include <editeng/crossedoutitem.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/editengdllapi.h>
 #include <editeng/editview.hxx>
 #include <editeng/eeitem.hxx>
+#include <editeng/emphasismarkitem.hxx>
 #include <editeng/escapementitem.hxx>
 #include <editeng/fhgtitem.hxx>
 #include <editeng/flstitem.hxx>
@@ -312,94 +250,38 @@
 #include <editeng/opaqitem.hxx>
 #include <editeng/orphitem.hxx>
 #include <editeng/outliner.hxx>
+#include <editeng/outlobj.hxx>
 #include <editeng/paperinf.hxx>
 #include <editeng/pbinitem.hxx>
 #include <editeng/postitem.hxx>
 #include <editeng/protitem.hxx>
+#include <editeng/rsiditem.hxx>
 #include <editeng/scripttypeitem.hxx>
 #include <editeng/shaditem.hxx>
+#include <editeng/shdditem.hxx>
 #include <editeng/sizeitem.hxx>
 #include <editeng/spltitem.hxx>
 #include <editeng/svxacorr.hxx>
 #include <editeng/tstpitem.hxx>
+#include <editeng/twolinesitem.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>
-#include <frmfmt.hxx>
-#include <ftnidx.hxx>
-#include <ftninfo.hxx>
-#include <globdoc.hxx>
-#include <grfatr.hxx>
-#include <hintids.hxx>
-#include <hints.hxx>
-#include <htmltbl.hxx>
 #include <i18nlangtag/lang.h>
 #include <i18nlangtag/languagetag.hxx>
 #include <i18nlangtag/mslangid.hxx>
-#include <init.hxx>
-#include <istyleaccess.hxx>
 #include <libxml/xmlwriter.h>
-#include <lineinfo.hxx>
 #include <linguistic/lngprops.hxx>
-#include <mdiexp.hxx>
-#include <modcfg.hxx>
-#include <ndgrf.hxx>
-#include <ndindex.hxx>
-#include <ndnotxt.hxx>
-#include <ndole.hxx>
-#include <ndtxt.hxx>
-#include <node.hxx>
-#include <numrule.hxx>
 #include <o3tl/any.hxx>
 #include <o3tl/cow_wrapper.hxx>
+#include <o3tl/safeint.hxx>
 #include <o3tl/strong_int.hxx>
 #include <o3tl/typed_flags_set.hxx>
-#include <pagedesc.hxx>
-#include <pam.hxx>
-#include <paratr.hxx>
-#include <poolfmt.hxx>
-#include <printdata.hxx>
-#include <prtopt.hxx>
-#include <redline.hxx>
-#include <reffld.hxx>
+#include <o3tl/underlyingenumvalue.hxx>
+#include <officecfg/Office/Common.hxx>
 #include <sax/fastattribs.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/basedlgs.hxx>
@@ -423,17 +305,12 @@
 #include <sfx2/printer.hxx>
 #include <sfx2/progress.hxx>
 #include <sfx2/request.hxx>
-#include <sfx2/shell.hxx>
 #include <sfx2/sidebar/ControlFactory.hxx>
 #include <sfx2/tbxctrl.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
-#include <shellio.hxx>
-#include <shellres.hxx>
-#include <sortopt.hxx>
 #include <sot/exchange.hxx>
 #include <sot/formats.hxx>
-#include <sot/sotdllapi.h>
 #include <sot/storage.hxx>
 #include <svl/SfxBroadcaster.hxx>
 #include <svl/cjkoptions.hxx>
@@ -443,8 +320,10 @@
 #include <svl/intitem.hxx>
 #include <svl/itemiter.hxx>
 #include <svl/itempool.hxx>
+#include <svl/itemprop.hxx>
 #include <svl/itemset.hxx>
 #include <svl/languageoptions.hxx>
+#include <svl/listener.hxx>
 #include <svl/lstner.hxx>
 #include <svl/macitem.hxx>
 #include <svl/metitem.hxx>
@@ -456,20 +335,20 @@
 #include <svl/style.hxx>
 #include <svl/stylesheetuser.hxx>
 #include <svl/svldllapi.h>
+#include <svl/typedwhich.hxx>
 #include <svl/urihelper.hxx>
 #include <svl/whiter.hxx>
 #include <svl/zforlist.hxx>
 #include <svl/zformat.hxx>
 #include <svtools/ctrltool.hxx>
+#include <svtools/embedhlp.hxx>
 #include <svtools/htmlcfg.hxx>
 #include <svtools/htmlkywd.hxx>
 #include <svtools/htmlout.hxx>
 #include <svtools/htmltokn.h>
 #include <svtools/langtab.hxx>
 #include <svtools/svtdllapi.h>
-#include <svtools/valueset.hxx>
 #include <svx/dataaccessdescriptor.hxx>
-#include <svx/dialmgr.hxx>
 #include <svx/dlgutil.hxx>
 #include <svx/drawitem.hxx>
 #include <svx/fmglob.hxx>
@@ -478,6 +357,7 @@
 #include <svx/pageitem.hxx>
 #include <svx/ruler.hxx>
 #include <svx/rulritem.hxx>
+#include <svx/sdr/attribute/sdrallfillattributeshelper.hxx>
 #include <svx/srchdlg.hxx>
 #include <svx/svddef.hxx>
 #include <svx/svditer.hxx>
@@ -501,6 +381,168 @@
 #include <svx/xit.hxx>
 #include <svx/xoutbmp.hxx>
 #include <svx/xtable.hxx>
+#include <toolkit/helper/vclunohelper.hxx>
+#include <tools/color.hxx>
+#include <tools/date.hxx>
+#include <tools/datetime.hxx>
+#include <tools/datetimeutils.hxx>
+#include <tools/diagnose_ex.h>
+#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/solar.h>
+#include <tools/stream.hxx>
+#include <tools/time.hxx>
+#include <tools/toolsdllapi.h>
+#include <tools/urlobj.hxx>
+#include <typelib/typedescription.h>
+#include <uno/any2.h>
+#include <uno/sequence2.h>
+#include <unotools/accessiblestatesethelper.hxx>
+#include <unotools/charclass.hxx>
+#include <unotools/configmgr.hxx>
+#include <unotools/lingucfg.hxx>
+#include <unotools/linguprops.hxx>
+#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/tempfile.hxx>
+#include <unotools/transliterationwrapper.hxx>
+#include <unotools/ucbstreamhelper.hxx>
+#include <unotools/unotoolsdllapi.h>
+#include <unotools/useroptions.hxx>
+#include <xmloff/dllapi.h>
+#include <xmloff/nmspmap.hxx>
+#include <xmloff/odffields.hxx>
+#include <xmloff/xmlictxt.hxx>
+#include <xmloff/xmlnmspe.hxx>
+#include <xmloff/xmlstyle.hxx>
+#include <xmloff/xmluconv.hxx>
+#endif // PCH_LEVEL >= 3
+#if PCH_LEVEL >= 4
+#include <AnnotationWin.hxx>
+#include <EnhancedPDFExportHelper.hxx>
+#include <IDocumentChartDataProviderAccess.hxx>
+#include <IDocumentContentOperations.hxx>
+#include <IDocumentDeviceAccess.hxx>
+#include <IDocumentDrawModelAccess.hxx>
+#include <IDocumentFieldsAccess.hxx>
+#include <IDocumentLayoutAccess.hxx>
+#include <IDocumentLinksAdministration.hxx>
+#include <IDocumentMarkAccess.hxx>
+#include <IDocumentRedlineAccess.hxx>
+#include <IDocumentSettingAccess.hxx>
+#include <IDocumentState.hxx>
+#include <IDocumentStatistics.hxx>
+#include <IDocumentStylePoolAccess.hxx>
+#include <IDocumentUndoRedo.hxx>
+#include <IMark.hxx>
+#include <PostItMgr.hxx>
+#include <SwNodeNum.hxx>
+#include <SwRewriter.hxx>
+#include <SwSmartTagMgr.hxx>
+#include <SwStyleNameMapper.hxx>
+#include <TextCursorHelper.hxx>
+#include <accmap.hxx>
+#include <authfld.hxx>
+#include <breakit.hxx>
+#include <calbck.hxx>
+#include <calc.hxx>
+#include <cellatr.hxx>
+#include <charatr.hxx>
+#include <charfmt.hxx>
+#include <chpfld.hxx>
+#include <cmdid.h>
+#include <crsrsh.hxx>
+#include <crstate.hxx>
+#include <dbfld.hxx>
+#include <dbmgr.hxx>
+#include <dcontact.hxx>
+#include <ddefld.hxx>
+#include <docary.hxx>
+#include <docsh.hxx>
+#include <docstat.hxx>
+#include <docstyle.hxx>
+#include <docufld.hxx>
+#include <drawdoc.hxx>
+#include <edimp.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>
+#include <frmfmt.hxx>
+#include <ftnidx.hxx>
+#include <ftninfo.hxx>
+#include <globdoc.hxx>
+#include <grfatr.hxx>
+#include <helpids.h>
+#include <hintids.hxx>
+#include <hints.hxx>
+#include <htmltbl.hxx>
+#include <init.hxx>
+#include <iodetect.hxx>
+#include <istyleaccess.hxx>
+#include <lineinfo.hxx>
+#include <mdiexp.hxx>
+#include <modcfg.hxx>
+#include <modeltoviewhelper.hxx>
+#include <ndgrf.hxx>
+#include <ndindex.hxx>
+#include <ndnotxt.hxx>
+#include <ndole.hxx>
+#include <ndtxt.hxx>
+#include <node.hxx>
+#include <numrule.hxx>
+#include <pagedesc.hxx>
+#include <pam.hxx>
+#include <paratr.hxx>
+#include <poolfmt.hxx>
+#include <printdata.hxx>
+#include <prtopt.hxx>
+#include <redline.hxx>
+#include <reffld.hxx>
+#include <shellio.hxx>
+#include <shellres.hxx>
+#include <sortopt.hxx>
 #include <swabstdlg.hxx>
 #include <swatrset.hxx>
 #include <swbaslnk.hxx>
@@ -508,6 +550,8 @@
 #include <swcrsr.hxx>
 #include <swddetbl.hxx>
 #include <swdll.hxx>
+#include <swdllapi.h>
+#include <swerror.h>
 #include <swevent.hxx>
 #include <swmodule.hxx>
 #include <swrect.hxx>
@@ -524,26 +568,6 @@
 #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/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/solar.h>
-#include <tools/stream.hxx>
-#include <tools/time.hxx>
-#include <tools/toolsdllapi.h>
-#include <tools/urlobj.hxx>
-#include <tools/wintypes.hxx>
 #include <txatbase.hxx>
 #include <txtatr.hxx>
 #include <txtflcnt.hxx>
@@ -552,9 +576,7 @@
 #include <txtinet.hxx>
 #include <txtrfmrk.hxx>
 #include <txttxmrk.hxx>
-#include <typelib/typedescription.h>
 #include <undobj.hxx>
-#include <uno/sequence2.h>
 #include <unobaseclass.hxx>
 #include <unochart.hxx>
 #include <unocoll.hxx>
@@ -563,6 +585,7 @@
 #include <unodraw.hxx>
 #include <unoframe.hxx>
 #include <unomap.hxx>
+#include <unomid.h>
 #include <unoparagraph.hxx>
 #include <unoprnms.hxx>
 #include <unosett.hxx>
@@ -570,38 +593,12 @@
 #include <unotbl.hxx>
 #include <unotextcursor.hxx>
 #include <unotextrange.hxx>
-#include <unotools/accessiblestatesethelper.hxx>
-#include <unotools/charclass.hxx>
-#include <unotools/configmgr.hxx>
-#include <unotools/lingucfg.hxx>
-#include <unotools/localedatawrapper.hxx>
-#include <unotools/moduleoptions.hxx>
-#include <unotools/options.hxx>
-#include <unotools/pathoptions.hxx>
-#include <unotools/resmgr.hxx>
-#include <unotools/streamwrap.hxx>
-#include <unotools/syslocale.hxx>
-#include <unotools/tempfile.hxx>
-#include <unotools/transliterationwrapper.hxx>
-#include <unotools/ucbstreamhelper.hxx>
-#include <unotools/unotoolsdllapi.h>
-#include <unotools/useroptions.hxx>
 #include <unotxdoc.hxx>
 #include <usrfld.hxx>
-#include <vcl/imap.hxx>
-#include <vcl/imapobj.hxx>
 #include <viewopt.hxx>
 #include <viewsh.hxx>
 #include <viscrs.hxx>
 #include <wdocsh.hxx>
-#include <xmloff/dllapi.h>
-#include <xmloff/nmspmap.hxx>
-#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>
+#endif // PCH_LEVEL >= 4
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */