5 files changed, 281 insertions, 108 deletions
diff --git a/sw/inc/pch/precompiled_msword.hxx b/sw/inc/pch/precompiled_msword.hxx
index 6eb4c4cf5cd4..dfcc3948e15f 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 2019-10-17 15:16:54 using:
+ Generated on 2020-01-22 15:58:37 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:
@@ -34,8 +34,10 @@
 #include <initializer_list>
 #include <iomanip>
 #include <iostream>
+#include <iterator>
 #include <limits.h>
 #include <limits>
+#include <list>
 #include <locale>
 #include <map>
 #include <math.h>
@@ -53,12 +55,10 @@
 #include <unordered_set>
 #include <utility>
 #include <vector>
-#include <o3tl/optional.hxx>
-#include <boost/property_tree/ptree.hpp>
+#include <boost/property_tree/ptree_fwd.hpp>
 #endif // PCH_LEVEL >= 1
 #if PCH_LEVEL >= 2
 #include <osl/diagnose.h>
-#include <osl/diagnose.hxx>
 #include <osl/doublecheckedlocking.h>
 #include <osl/endian.h>
 #include <osl/file.hxx>
@@ -87,7 +87,7 @@
 #include <rtl/tencinfo.h>
 #include <rtl/textcvt.h>
 #include <rtl/textenc.h>
-#include <rtl/unload.h>
+#include <rtl/ustrbuf.h>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.h>
 #include <rtl/ustring.hxx>
@@ -111,7 +111,6 @@
 #include <vcl/bitmapex.hxx>
 #include <vcl/cairo.hxx>
 #include <vcl/checksum.hxx>
-#include <vcl/cursor.hxx>
 #include <vcl/devicecoordinate.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/errcode.hxx>
@@ -120,11 +119,11 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/gfxlink.hxx>
 #include <vcl/graph.hxx>
-#include <vcl/graphicfilter.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/keycod.hxx>
 #include <vcl/keycodes.hxx>
 #include <vcl/mapmod.hxx>
+#include <vcl/menu.hxx>
 #include <vcl/metaactiontypes.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/outdevmap.hxx>
@@ -137,10 +136,12 @@
 #include <vcl/timer.hxx>
 #include <vcl/uitest/factory.hxx>
 #include <vcl/vclenum.hxx>
+#include <vcl/vclevent.hxx>
 #include <vcl/vclptr.hxx>
 #include <vcl/vclreferencebase.hxx>
 #include <vcl/vectorgraphicdata.hxx>
 #include <vcl/wall.hxx>
+#include <vcl/weld.hxx>
 #include <vcl/window.hxx>
 #endif // PCH_LEVEL >= 2
 #if PCH_LEVEL >= 3
@@ -153,8 +154,10 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/range/b2drange.hxx>
+#include <basegfx/range/b2irange.hxx>
 #include <basegfx/range/basicrange.hxx>
 #include <basegfx/tuple/b2dtuple.hxx>
+#include <basegfx/tuple/b2i64tuple.hxx>
 #include <basegfx/tuple/b2ituple.hxx>
 #include <basegfx/tuple/b3dtuple.hxx>
 #include <basegfx/vector/b2dsize.hxx>
@@ -168,7 +171,8 @@
 #include <basic/sbxdef.hxx>
 #include <basic/sbxobj.hxx>
 #include <basic/sbxvar.hxx>
-#include <com/sun/star/awt/FontSlant.hpp>
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
 #include <com/sun/star/awt/GradientStyle.hpp>
 #include <com/sun/star/awt/Key.hpp>
 #include <com/sun/star/awt/KeyGroup.hpp>
@@ -177,10 +181,9 @@
 #include <com/sun/star/awt/SystemPointer.hpp>
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/beans/PropertyState.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/beans/XPropertyState.hpp>
-#include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/container/XIndexReplace.hpp>
@@ -196,17 +199,13 @@
 #include <com/sun/star/drawing/LineCap.hpp>
 #include <com/sun/star/drawing/TextFitToSizeType.hpp>
 #include <com/sun/star/drawing/TextVerticalAdjust.hpp>
-#include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
-#include <com/sun/star/drawing/XShapeGrouper.hpp>
-#include <com/sun/star/drawing/XShapes2.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/geometry/IntegerRectangle2D.hpp>
 #include <com/sun/star/graphic/XPrimitive2D.hpp>
 #include <com/sun/star/i18n/Calendar2.hpp>
-#include <com/sun/star/i18n/CharacterIteratorMode.hpp>
 #include <com/sun/star/i18n/CollatorOptions.hpp>
 #include <com/sun/star/i18n/ForbiddenCharacters.hpp>
 #include <com/sun/star/i18n/LanguageCountryInfo.hpp>
@@ -232,11 +231,7 @@
 #include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <com/sun/star/style/TabAlign.hpp>
 #include <com/sun/star/style/XStyle.hpp>
-#include <com/sun/star/text/HoriOrientation.hpp>
-#include <com/sun/star/text/XTextContent.hpp>
-#include <com/sun/star/text/XTextCopy.hpp>
-#include <com/sun/star/text/XTextRange.hpp>
-#include <com/sun/star/text/XTextRangeCompare.hpp>
+#include <com/sun/star/text/RubyAdjust.hpp>
 #include <com/sun/star/text/textfield/Type.hpp>
 #include <com/sun/star/uno/Any.h>
 #include <com/sun/star/uno/Any.hxx>
@@ -260,10 +255,8 @@
 #include <com/sun/star/util/XAccounting.hpp>
 #include <com/sun/star/xml/sax/XFastAttributeList.hpp>
 #include <comphelper/comphelperdllapi.h>
-#include <comphelper/interfacecontainer2.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertysequence.hxx>
-#include <comphelper/propertysetinfo.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/servicehelper.hxx>
@@ -276,18 +269,18 @@
 #include <cppuhelper/compbase_ex.hxx>
 #include <cppuhelper/cppuhelperdllapi.h>
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/implbase6.hxx>
 #include <cppuhelper/implbase_ex.hxx>
 #include <cppuhelper/implbase_ex_post.hxx>
 #include <cppuhelper/implbase_ex_pre.hxx>
 #include <cppuhelper/interfacecontainer.h>
-#include <cppuhelper/interfacecontainer.hxx>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/weakagg.hxx>
 #include <cppuhelper/weakref.hxx>
 #include <drawinglayer/drawinglayerdllapi.h>
+#include <drawinglayer/primitive2d/CommonTypes.hxx>
+#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
+#include <drawinglayer/primitive2d/Primitive2DVisitor.hxx>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <editeng/adjustitem.hxx>
 #include <editeng/autokernitem.hxx>
 #include <editeng/blinkitem.hxx>
 #include <editeng/boxitem.hxx>
@@ -301,7 +294,6 @@
 #include <editeng/contouritem.hxx>
 #include <editeng/crossedoutitem.hxx>
 #include <editeng/editdata.hxx>
-#include <editeng/editeng.hxx>
 #include <editeng/editengdllapi.h>
 #include <editeng/editobj.hxx>
 #include <editeng/editstat.hxx>
@@ -312,6 +304,7 @@
 #include <editeng/fhgtitem.hxx>
 #include <editeng/flditem.hxx>
 #include <editeng/fontitem.hxx>
+#include <editeng/forbiddencharacterstable.hxx>
 #include <editeng/formatbreakitem.hxx>
 #include <editeng/frmdiritem.hxx>
 #include <editeng/hyphenzoneitem.hxx>
@@ -319,10 +312,10 @@
 #include <editeng/kernitem.hxx>
 #include <editeng/langitem.hxx>
 #include <editeng/lrspitem.hxx>
-#include <editeng/mutxhelp.hxx>
 #include <editeng/opaqitem.hxx>
+#include <editeng/outliner.hxx>
 #include <editeng/outlobj.hxx>
-#include <editeng/paperinf.hxx>
+#include <editeng/paragraphdata.hxx>
 #include <editeng/paravertalignitem.hxx>
 #include <editeng/pgrditem.hxx>
 #include <editeng/postitem.hxx>
@@ -330,6 +323,7 @@
 #include <editeng/shdditem.hxx>
 #include <editeng/spltitem.hxx>
 #include <editeng/svxenum.hxx>
+#include <editeng/svxfont.hxx>
 #include <editeng/tstpitem.hxx>
 #include <editeng/twolinesitem.hxx>
 #include <editeng/udlnitem.hxx>
@@ -340,15 +334,16 @@
 #include <i18nlangtag/i18nlangtagdllapi.h>
 #include <i18nlangtag/lang.h>
 #include <i18nlangtag/languagetag.hxx>
-#include <i18nlangtag/mslangid.hxx>
 #include <i18nutil/transliteration.hxx>
 #include <o3tl/cow_wrapper.hxx>
-#include <o3tl/enumrange.hxx>
+#include <o3tl/enumarray.hxx>
+#include <o3tl/optional.hxx>
 #include <o3tl/safeint.hxx>
 #include <o3tl/sorted_vector.hxx>
 #include <o3tl/strong_int.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <o3tl/underlyingenumvalue.hxx>
+#include <ooo/vba/word/WdSaveFormat.hpp>
 #include <oox/dllapi.h>
 #include <oox/drawingml/drawingmltypes.hxx>
 #include <oox/export/utils.hxx>
@@ -362,7 +357,6 @@
 #include <sax/saxdllapi.h>
 #include <sfx2/dllapi.h>
 #include <sfx2/docfile.hxx>
-#include <sfx2/shell.hxx>
 #include <sot/formats.hxx>
 #include <sot/object.hxx>
 #include <sot/sotdllapi.h>
@@ -376,11 +370,9 @@
 #include <svl/hint.hxx>
 #include <svl/intitem.hxx>
 #include <svl/itemiter.hxx>
-#include <svl/itemprop.hxx>
 #include <svl/itemset.hxx>
 #include <svl/languageoptions.hxx>
 #include <svl/lstner.hxx>
-#include <svl/macitem.hxx>
 #include <svl/metitem.hxx>
 #include <svl/poolitem.hxx>
 #include <svl/stritem.hxx>
@@ -396,7 +388,6 @@
 #include <svtools/svtdllapi.h>
 #include <svx/DiagramDataInterface.hxx>
 #include <svx/XPropertyEntry.hxx>
-#include <svx/fmglob.hxx>
 #include <svx/ipolypolygoneditorcontroller.hxx>
 #include <svx/itextprovider.hxx>
 #include <svx/msdffdef.hxx>
@@ -472,7 +463,6 @@
 #include <tools/stream.hxx>
 #include <tools/time.hxx>
 #include <tools/toolsdllapi.h>
-#include <tools/urlobj.hxx>
 #include <tools/weakbase.h>
 #include <tools/weakbase.hxx>
 #include <tools/wintypes.hxx>
@@ -491,7 +481,6 @@
 #include <unotools/nativenumberwrapper.hxx>
 #include <unotools/options.hxx>
 #include <unotools/readwritemutexguard.hxx>
-#include <unotools/streamwrap.hxx>
 #include <unotools/syslocale.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <unotools/ucbstreamhelper.hxx>
@@ -505,25 +494,21 @@
 #include <IDocumentSettingAccess.hxx>
 #include <IDocumentStylePoolAccess.hxx>
 #include <IMark.hxx>
-#include <IShellCursorSupplier.hxx>
+#include <SwRewriter.hxx>
 #include <bparr.hxx>
 #include <breakit.hxx>
 #include <calbck.hxx>
 #include <charfmt.hxx>
-#include <crstate.hxx>
-#include <cshtyp.hxx>
-#include <dcontact.hxx>
+#include <doc.hxx>
 #include <docary.hxx>
 #include <docsh.hxx>
 #include <docufld.hxx>
 #include <drawdoc.hxx>
 #include <fchrfmt.hxx>
 #include <fldbas.hxx>
-#include <flyenum.hxx>
 #include <fmtanchr.hxx>
-#include <fmtclbl.hxx>
+#include <fmtautofmt.hxx>
 #include <fmtclds.hxx>
-#include <fmtcnct.hxx>
 #include <fmtcntnt.hxx>
 #include <fmtcol.hxx>
 #include <fmtflcnt.hxx>
@@ -535,9 +520,11 @@
 #include <fmtline.hxx>
 #include <fmtornt.hxx>
 #include <fmtpdsc.hxx>
+#include <fmtrfmrk.hxx>
 #include <fmtrowsplt.hxx>
-#include <fmtsrnd.hxx>
+#include <fmtruby.hxx>
 #include <fmturl.hxx>
+#include <format.hxx>
 #include <frmatr.hxx>
 #include <frmfmt.hxx>
 #include <ftninfo.hxx>
@@ -546,8 +533,10 @@
 #include <index.hxx>
 #include <lineinfo.hxx>
 #include <mdiexp.hxx>
+#include <msfilter.hxx>
 #include <ndarr.hxx>
 #include <ndgrf.hxx>
+#include <ndhints.hxx>
 #include <ndole.hxx>
 #include <ndtxt.hxx>
 #include <ndtyp.hxx>
@@ -559,23 +548,22 @@
 #include <poolfmt.hxx>
 #include <redline.hxx>
 #include <reffld.hxx>
+#include <ring.hxx>
+#include <section.hxx>
 #include <shellio.hxx>
-#include <swcrsr.hxx>
 #include <swdllapi.h>
 #include <swerror.h>
 #include <swmodule.hxx>
 #include <swrect.hxx>
-#include <swregion.hxx>
 #include <swtable.hxx>
 #include <swtypes.hxx>
-#include <tblsel.hxx>
-#include <toxe.hxx>
+#include <swundo.hxx>
+#include <tox.hxx>
 #include <txatbase.hxx>
 #include <txtftn.hxx>
+#include <undobj.hxx>
 #include <unobaseclass.hxx>
-#include <viewopt.hxx>
 #include <viewsh.hxx>
-#include <viscrs.hxx>
 #endif // PCH_LEVEL >= 4
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/pch/precompiled_sw.hxx b/sw/inc/pch/precompiled_sw.hxx
index 3e2c13b5950f..3f378ab2236e 100644
--- a/sw/inc/pch/precompiled_sw.hxx
+++ b/sw/inc/pch/precompiled_sw.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 2020-01-14 11:50:23 using:
+ Generated on 2020-02-01 11:40:57 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:
@@ -22,9 +22,10 @@
 
 #if PCH_LEVEL >= 1
 #include <algorithm>
+#include <array>
+#include <assert.h>
 #include <cassert>
 #include <cstddef>
-#include <cstring>
 #include <deque>
 #include <functional>
 #include <initializer_list>
@@ -42,6 +43,7 @@
 #include <string_view>
 #include <type_traits>
 #include <unordered_map>
+#include <unordered_set>
 #include <utility>
 #include <vector>
 #include <boost/circular_buffer.hpp>
@@ -49,6 +51,7 @@
 #include <boost/property_tree/ptree_fwd.hpp>
 #endif // PCH_LEVEL >= 1
 #if PCH_LEVEL >= 2
+#include <osl/conditn.hxx>
 #include <osl/diagnose.h>
 #include <osl/doublecheckedlocking.h>
 #include <osl/endian.h>
@@ -65,9 +68,6 @@
 #include <rtl/math.hxx>
 #include <rtl/ref.hxx>
 #include <rtl/strbuf.hxx>
-#include <rtl/string.h>
-#include <rtl/stringconcat.hxx>
-#include <rtl/stringutils.hxx>
 #include <rtl/tencinfo.h>
 #include <rtl/textenc.h>
 #include <rtl/unload.h>
@@ -82,13 +82,17 @@
 #include <sal/types.h>
 #include <sal/typesizes.h>
 #include <vcl/EnumContext.hxx>
+#include <vcl/GraphicObject.hxx>
 #include <vcl/Scanline.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/bitmapex.hxx>
+#include <vcl/builderpage.hxx>
+#include <vcl/button.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/ctrl.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/dndhelp.hxx>
+#include <vcl/dockwin.hxx>
 #include <vcl/edit.hxx>
 #include <vcl/errcode.hxx>
 #include <vcl/errinf.hxx>
@@ -103,12 +107,15 @@
 #include <vcl/imap.hxx>
 #include <vcl/imapobj.hxx>
 #include <vcl/keycod.hxx>
+#include <vcl/lstbox.hxx>
 #include <vcl/menu.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/textfilter.hxx>
+#include <vcl/toolbox.hxx>
+#include <vcl/transfer.hxx>
 #include <vcl/vclenum.hxx>
 #include <vcl/vclevent.hxx>
 #include <vcl/vclptr.hxx>
@@ -131,9 +138,6 @@
 #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 <com/sun/star/accessibility/AccessibleEventId.hpp>
 #include <com/sun/star/accessibility/AccessibleRole.hpp>
 #include <com/sun/star/accessibility/AccessibleStateType.hpp>
@@ -141,11 +145,24 @@
 #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/container/XEnumeration.hpp>
+#include <com/sun/star/container/XNamed.hpp>
+#include <com/sun/star/datatransfer/XTransferable2.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp>
+#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp>
+#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp>
+#include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp>
+#include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp>
+#include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp>
+#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp>
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
+#include <com/sun/star/document/XFilter.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #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/XFrame.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/frame/XTerminateListener.hpp>
@@ -155,7 +172,7 @@
 #include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
@@ -246,8 +263,6 @@
 #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>
@@ -257,7 +272,6 @@
 #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>
@@ -277,10 +291,10 @@
 #include <salhelper/salhelperdllapi.h>
 #include <salhelper/simplereferenceobject.hxx>
 #include <salhelper/singletonref.hxx>
+#include <sax/fastattribs.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/bindings.hxx>
-#include <sfx2/chalign.hxx>
 #include <sfx2/childwin.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/dllapi.h>
@@ -297,8 +311,10 @@
 #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/stbitem.hxx>
+#include <sfx2/tabdlg.hxx>
 #include <sfx2/tbxctrl.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/viewsh.hxx>
@@ -339,6 +355,7 @@
 #include <svtools/htmlkywd.hxx>
 #include <svtools/htmlout.hxx>
 #include <svtools/htmltokn.h>
+#include <svtools/popupwindowcontroller.hxx>
 #include <svtools/svtdllapi.h>
 #include <svx/dataaccessdescriptor.hxx>
 #include <svx/drawitem.hxx>
@@ -389,6 +406,7 @@
 #include <uno/sequence2.h>
 #include <unotools/accessiblestatesethelper.hxx>
 #include <unotools/charclass.hxx>
+#include <unotools/configitem.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/lingucfg.hxx>
 #include <unotools/localedatawrapper.hxx>
@@ -410,7 +428,11 @@
 #endif // PCH_LEVEL >= 3
 #if PCH_LEVEL >= 4
 #include <AnnotationWin.hxx>
+#include <DocumentContentOperationsManager.hxx>
+#include <DocumentRedlineManager.hxx>
+#include <DocumentSettingManager.hxx>
 #include <EnhancedPDFExportHelper.hxx>
+#include <FrameControlsManager.hxx>
 #include <IDocumentChartDataProviderAccess.hxx>
 #include <IDocumentContentOperations.hxx>
 #include <IDocumentDeviceAccess.hxx>
@@ -427,39 +449,67 @@
 #include <IDocumentUndoRedo.hxx>
 #include <IMark.hxx>
 #include <PostItMgr.hxx>
+#include <SwGrammarMarkUp.hxx>
 #include <SwNodeNum.hxx>
+#include <SwPortionHandler.hxx>
 #include <SwRewriter.hxx>
 #include <SwSmartTagMgr.hxx>
 #include <SwStyleNameMapper.hxx>
 #include <TextCursorHelper.hxx>
+#include <UndoAttribute.hxx>
+#include <UndoCore.hxx>
+#include <UndoDelete.hxx>
+#include <UndoManager.hxx>
+#include <UndoRedline.hxx>
+#include <UndoTable.hxx>
 #include <accmap.hxx>
+#include <acorrect.hxx>
+#include <anchoredobject.hxx>
 #include <authfld.hxx>
+#include <basesh.hxx>
+#include <blink.hxx>
+#include <bodyfrm.hxx>
+#include <bookmrk.hxx>
 #include <breakit.hxx>
 #include <calbck.hxx>
 #include <calc.hxx>
 #include <cellatr.hxx>
+#include <cellfrm.hxx>
 #include <charatr.hxx>
 #include <charfmt.hxx>
 #include <chpfld.hxx>
 #include <cmdid.h>
+#include <cntfrm.hxx>
+#include <crossrefbookmark.hxx>
 #include <crsrsh.hxx>
 #include <crstate.hxx>
 #include <dbfld.hxx>
+#include <dbg_lay.hxx>
 #include <dbmgr.hxx>
 #include <dcontact.hxx>
 #include <ddefld.hxx>
+#include <dflyobj.hxx>
+#include <doc.hxx>
 #include <docary.hxx>
+#include <docfld.hxx>
 #include <docsh.hxx>
 #include <docstat.hxx>
 #include <docstyle.hxx>
+#include <doctxm.hxx>
 #include <docufld.hxx>
+#include <drawbase.hxx>
 #include <drawdoc.hxx>
+#include <dview.hxx>
 #include <editsh.hxx>
+#include <edtwin.hxx>
 #include <expfld.hxx>
 #include <fchrfmt.hxx>
 #include <fesh.hxx>
 #include <fldbas.hxx>
 #include <flddat.hxx>
+#include <fldmgr.hxx>
+#include <flyfrm.hxx>
+#include <flyfrms.hxx>
 #include <fmtanchr.hxx>
 #include <fmtautofmt.hxx>
 #include <fmtclbl.hxx>
@@ -487,46 +537,75 @@
 #include <fmtsrnd.hxx>
 #include <fmturl.hxx>
 #include <fmtwrapinfluenceonobjpos.hxx>
+#include <fntcache.hxx>
+#include <frame.hxx>
 #include <frmatr.hxx>
 #include <frmfmt.hxx>
+#include <frmmgr.hxx>
+#include <frmtool.hxx>
+#include <ftnfrm.hxx>
 #include <ftnidx.hxx>
 #include <ftninfo.hxx>
 #include <globdoc.hxx>
+#include <glosdoc.hxx>
+#include <gloshdl.hxx>
+#include <gloslst.hxx>
 #include <grfatr.hxx>
 #include <helpids.h>
 #include <hintids.hxx>
 #include <hints.hxx>
 #include <htmltbl.hxx>
+#include <initui.hxx>
 #include <iodetect.hxx>
 #include <istyleaccess.hxx>
+#include <layact.hxx>
+#include <layouter.hxx>
 #include <lineinfo.hxx>
+#include <list.hxx>
 #include <mdiexp.hxx>
 #include <modcfg.hxx>
+#include <mvsave.hxx>
 #include <ndgrf.hxx>
 #include <ndindex.hxx>
 #include <ndnotxt.hxx>
 #include <ndole.hxx>
 #include <ndtxt.hxx>
 #include <node.hxx>
+#include <node2lay.hxx>
+#include <notxtfrm.hxx>
 #include <numrule.hxx>
+#include <objectformatter.hxx>
 #include <pagedesc.hxx>
+#include <pagefrm.hxx>
 #include <pam.hxx>
+#include <pamtyp.hxx>
 #include <paratr.hxx>
 #include <poolfmt.hxx>
 #include <printdata.hxx>
 #include <prtopt.hxx>
+#include <pview.hxx>
 #include <redline.hxx>
 #include <reffld.hxx>
+#include <rolbck.hxx>
+#include <rootfrm.hxx>
+#include <rowfrm.hxx>
+#include <scriptinfo.hxx>
+#include <sectfrm.hxx>
+#include <section.hxx>
 #include <shellio.hxx>
 #include <shellres.hxx>
+#include <sortedobjs.hxx>
+#include <srcview.hxx>
 #include <swabstdlg.hxx>
 #include <swatrset.hxx>
+#include <swcache.hxx>
 #include <swcrsr.hxx>
 #include <swddetbl.hxx>
 #include <swdll.hxx>
 #include <swdllapi.h>
+#include <swdtflvr.hxx>
 #include <swerror.h>
-#include <swevent.hxx>
+#include <swfont.hxx>
 #include <swmodule.hxx>
 #include <swrect.hxx>
 #include <swserv.hxx>
@@ -537,27 +616,37 @@
 #include <swunohelper.hxx>
 #include <swwait.hxx>
 #include <tabcol.hxx>
+#include <tabfrm.hxx>
 #include <tblafmt.hxx>
 #include <tblsel.hxx>
 #include <textboxhelper.hxx>
+#include <textsh.hxx>
 #include <tgrditem.hxx>
+#include <tox.hxx>
 #include <txatbase.hxx>
 #include <txtatr.hxx>
 #include <txtflcnt.hxx>
 #include <txtfld.hxx>
+#include <txtfly.hxx>
+#include <txtfrm.hxx>
 #include <txtftn.hxx>
 #include <txtinet.hxx>
 #include <txttxmrk.hxx>
+#include <uiitems.hxx>
+#include <uitool.hxx>
 #include <undobj.hxx>
+#include <unobaseclass.hxx>
 #include <unochart.hxx>
 #include <unocoll.hxx>
 #include <unocrsr.hxx>
 #include <unocrsrhelper.hxx>
 #include <unodraw.hxx>
+#include <unofldmid.h>
 #include <unoframe.hxx>
 #include <unomap.hxx>
 #include <unomid.h>
 #include <unoparagraph.hxx>
+#include <unoport.hxx>
 #include <unoprnms.hxx>
 #include <unosett.hxx>
 #include <unotbl.hxx>
@@ -565,10 +654,16 @@
 #include <unotextrange.hxx>
 #include <unotxdoc.hxx>
 #include <usrfld.hxx>
+#include <usrpref.hxx>
+#include <view.hxx>
+#include <viewimp.hxx>
 #include <viewopt.hxx>
 #include <viewsh.hxx>
 #include <viscrs.hxx>
 #include <wdocsh.hxx>
+#include <wrong.hxx>
+#include <wrtsh.hxx>
+#include <wview.hxx>
 #endif // PCH_LEVEL >= 4
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/pch/precompiled_swui.hxx b/sw/inc/pch/precompiled_swui.hxx
index 4a7b9755c3d9..a7e5e6ac6385 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 2020-01-14 11:50:28 using:
+ Generated on 2020-02-01 10:58:54 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:
@@ -33,7 +33,6 @@
 #include <initializer_list>
 #include <iomanip>
 #include <iostream>
-#include <iterator>
 #include <limits.h>
 #include <limits>
 #include <list>
@@ -50,8 +49,15 @@
 #include <string_view>
 #include <type_traits>
 #include <typeinfo>
+#include <unordered_map>
 #include <utility>
 #include <vector>
+#include <boost/multi_index/composite_key.hpp>
+#include <boost/multi_index/identity.hpp>
+#include <boost/multi_index/mem_fun.hpp>
+#include <boost/multi_index/ordered_index.hpp>
+#include <boost/multi_index/random_access_index.hpp>
+#include <boost/multi_index_container.hpp>
 #include <boost/property_tree/ptree_fwd.hpp>
 #endif // PCH_LEVEL >= 1
 #if PCH_LEVEL >= 2
@@ -103,6 +109,7 @@
 #include <vcl/bitmap.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/builder.hxx>
+#include <vcl/builderpage.hxx>
 #include <vcl/button.hxx>
 #include <vcl/cairo.hxx>
 #include <vcl/checksum.hxx>
@@ -116,6 +123,7 @@
 #include <vcl/edit.hxx>
 #include <vcl/errcode.hxx>
 #include <vcl/event.hxx>
+#include <vcl/field.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/floatwin.hxx>
 #include <vcl/fntstyle.hxx>
@@ -124,7 +132,6 @@
 #include <vcl/glyphitem.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/headbar.hxx>
-#include <vcl/help.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/image.hxx>
 #include <vcl/keycod.hxx>
@@ -132,6 +139,7 @@
 #include <vcl/lstbox.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/menu.hxx>
+#include <vcl/menubtn.hxx>
 #include <vcl/metaactiontypes.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/outdev.hxx>
@@ -151,6 +159,7 @@
 #include <vcl/task.hxx>
 #include <vcl/textfilter.hxx>
 #include <vcl/timer.hxx>
+#include <vcl/toolbox.hxx>
 #include <vcl/transfer.hxx>
 #include <vcl/uitest/factory.hxx>
 #include <vcl/vclenum.hxx>
@@ -163,6 +172,7 @@
 #include <vcl/weld.hxx>
 #include <vcl/window.hxx>
 #include <vcl/windowstate.hxx>
+#include <vcl/wizardmachine.hxx>
 #endif // PCH_LEVEL >= 2
 #if PCH_LEVEL >= 3
 #include <basegfx/basegfxdllapi.h>
@@ -182,22 +192,22 @@
 #include <basegfx/vector/b2enums.hxx>
 #include <basegfx/vector/b2ivector.hxx>
 #include <basic/basicdllapi.h>
-#include <basic/sbdef.hxx>
-#include <basic/sbmod.hxx>
-#include <basic/sbx.hxx>
 #include <basic/sbxcore.hxx>
 #include <basic/sbxdef.hxx>
-#include <basic/sbxobj.hxx>
-#include <basic/sbxvar.hxx>
 #include <com/sun/star/awt/GradientStyle.hpp>
 #include <com/sun/star/awt/Key.hpp>
 #include <com/sun/star/awt/KeyGroup.hpp>
 #include <com/sun/star/awt/SystemPointer.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
 #include <com/sun/star/container/XIndexReplace.hpp>
+#include <com/sun/star/container/XNameAccess.hpp>
+#include <com/sun/star/container/XNameContainer.hpp>
+#include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/datatransfer/DataFlavor.hpp>
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <com/sun/star/datatransfer/XTransferable2.hpp>
@@ -223,8 +233,11 @@
 #include <com/sun/star/document/XStorageBasedDocument.hpp>
 #include <com/sun/star/document/XUndoManagerSupplier.hpp>
 #include <com/sun/star/document/XViewDataSupplier.hpp>
+#include <com/sun/star/drawing/DashStyle.hpp>
+#include <com/sun/star/drawing/HatchStyle.hpp>
 #include <com/sun/star/drawing/LineCap.hpp>
 #include <com/sun/star/embed/Aspects.hpp>
+#include <com/sun/star/embed/XStorage.hpp>
 #include <com/sun/star/embed/XVisualObject.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XLoadable.hpp>
@@ -237,10 +250,12 @@
 #include <com/sun/star/frame/XUntitledNumbers.hpp>
 #include <com/sun/star/graphic/XPrimitive2D.hpp>
 #include <com/sun/star/i18n/Calendar2.hpp>
-#include <com/sun/star/i18n/ForbiddenCharacters.hpp>
 #include <com/sun/star/i18n/NativeNumberXmlAttributes.hpp>
+#include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
 #include <com/sun/star/i18n/TransliterationModulesExtra.hpp>
+#include <com/sun/star/i18n/XBreakIterator.hpp>
+#include <com/sun/star/i18n/XExtendedIndexEntrySupplier.hpp>
 #include <com/sun/star/i18n/XForbiddenCharacters.hpp>
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
@@ -252,9 +267,14 @@
 #include <com/sun/star/lang/XTypeProvider.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/linguistic2/XSupportedLocales.hpp>
+#include <com/sun/star/mail/XAuthenticator.hpp>
+#include <com/sun/star/mail/XConnectionListener.hpp>
+#include <com/sun/star/mail/XMailMessage.hpp>
 #include <com/sun/star/rdf/XDocumentMetadataAccess.hpp>
+#include <com/sun/star/rdf/XMetadatable.hpp>
 #include <com/sun/star/script/XStarBasicAccess.hpp>
 #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>
+#include <com/sun/star/sdbc/XConnection.hpp>
 #include <com/sun/star/style/NumberingType.hpp>
 #include <com/sun/star/table/BorderLineStyle.hpp>
 #include <com/sun/star/text/HoriOrientation.hpp>
@@ -263,10 +283,10 @@
 #include <com/sun/star/text/RubyAdjust.hpp>
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
+#include <com/sun/star/text/XTextSection.hpp>
 #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
-#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
 #include <com/sun/star/uno/Any.h>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Exception.hpp>
@@ -279,6 +299,7 @@
 #include <com/sun/star/uno/Type.hxx>
 #include <com/sun/star/uno/TypeClass.hdl>
 #include <com/sun/star/uno/XAggregation.hpp>
+#include <com/sun/star/uno/XCurrentContext.hpp>
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/uno/XWeak.hpp>
 #include <com/sun/star/uno/genfunc.h>
@@ -324,38 +345,45 @@
 #include <editeng/editengdllapi.h>
 #include <editeng/editstat.hxx>
 #include <editeng/eedata.hxx>
-#include <editeng/flstitem.hxx>
 #include <editeng/fontitem.hxx>
+#include <editeng/formatbreakitem.hxx>
 #include <editeng/frmdiritem.hxx>
+#include <editeng/keepitem.hxx>
 #include <editeng/langitem.hxx>
 #include <editeng/lrspitem.hxx>
 #include <editeng/numdef.hxx>
 #include <editeng/numitem.hxx>
 #include <editeng/outliner.hxx>
+#include <editeng/paperinf.hxx>
 #include <editeng/paragraphdata.hxx>
-#include <editeng/scripttypeitem.hxx>
+#include <editeng/shaditem.hxx>
 #include <editeng/sizeitem.hxx>
 #include <editeng/svxenum.hxx>
 #include <editeng/svxfont.hxx>
 #include <editeng/ulspitem.hxx>
-#include <editeng/unolingu.hxx>
 #include <i18nlangtag/i18nlangtagdllapi.h>
 #include <i18nlangtag/lang.h>
 #include <i18nlangtag/languagetag.hxx>
 #include <i18nutil/i18nutildllapi.h>
+#include <i18nutil/paper.hxx>
 #include <i18nutil/transliteration.hxx>
 #include <o3tl/cow_wrapper.hxx>
 #include <o3tl/deleter.hxx>
 #include <o3tl/optional.hxx>
+#include <o3tl/safeint.hxx>
 #include <o3tl/sorted_vector.hxx>
 #include <o3tl/strong_int.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <o3tl/underlyingenumvalue.hxx>
 #include <officecfg/Office/Writer.hxx>
+#include <ooo/vba/word/WdSaveFormat.hpp>
 #include <salhelper/salhelperdllapi.h>
 #include <salhelper/simplereferenceobject.hxx>
-#include <sfx2/app.hxx>
+#include <sfx2/Metadatable.hxx>
+#include <sfx2/basedlgs.hxx>
 #include <sfx2/bindings.hxx>
+#include <sfx2/chalign.hxx>
+#include <sfx2/childwin.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/dllapi.h>
 #include <sfx2/docfile.hxx>
@@ -367,6 +395,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/request.hxx>
+#include <sfx2/sfxdlg.hxx>
 #include <sfx2/shell.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <sfx2/viewfrm.hxx>
@@ -389,7 +418,6 @@
 #include <svl/nfkeytab.hxx>
 #include <svl/ondemand.hxx>
 #include <svl/poolitem.hxx>
-#include <svl/slstitm.hxx>
 #include <svl/stritem.hxx>
 #include <svl/style.hxx>
 #include <svl/svldllapi.h>
@@ -399,6 +427,7 @@
 #include <svl/zforlist.hxx>
 #include <svl/zformat.hxx>
 #include <svtools/borderline.hxx>
+#include <svtools/ctrlbox.hxx>
 #include <svtools/htmlcfg.hxx>
 #include <svtools/svtdllapi.h>
 #include <svtools/toolbarmenu.hxx>
@@ -406,17 +435,27 @@
 #include <svtools/valueset.hxx>
 #include <svx/Palette.hxx>
 #include <svx/SvxColorValueSet.hxx>
+#include <svx/XPropertyEntry.hxx>
+#include <svx/autoformathelper.hxx>
+#include <svx/colorbox.hxx>
+#include <svx/colorwindow.hxx>
 #include <svx/ctredlin.hxx>
 #include <svx/dialmgr.hxx>
-#include <svx/dlgutil.hxx>
-#include <svx/drawitem.hxx>
 #include <svx/flagsdef.hxx>
+#include <svx/framelinkarray.hxx>
+#include <svx/langbox.hxx>
+#include <svx/pagectrl.hxx>
+#include <svx/rotmodit.hxx>
 #include <svx/sdr/attribute/sdrallfillattributeshelper.hxx>
+#include <svx/svddef.hxx>
 #include <svx/svxdlg.hxx>
 #include <svx/svxdllapi.h>
+#include <svx/swframetypes.hxx>
 #include <svx/unomod.hxx>
+#include <svx/xdash.hxx>
 #include <svx/xdef.hxx>
-#include <svx/xtable.hxx>
+#include <svx/xgrad.hxx>
+#include <svx/xhatch.hxx>
 #include <tools/color.hxx>
 #include <tools/date.hxx>
 #include <tools/datetime.hxx>
@@ -435,6 +474,7 @@
 #include <tools/solar.h>
 #include <tools/time.hxx>
 #include <tools/toolsdllapi.h>
+#include <tools/urlobj.hxx>
 #include <tools/wintypes.hxx>
 #include <typelib/typeclass.h>
 #include <typelib/typedescription.h>
@@ -445,7 +485,6 @@
 #include <unotools/calendarwrapper.hxx>
 #include <unotools/charclass.hxx>
 #include <unotools/configitem.hxx>
-#include <unotools/configmgr.hxx>
 #include <unotools/fontcvt.hxx>
 #include <unotools/fontdefs.hxx>
 #include <unotools/localedatawrapper.hxx>
@@ -453,74 +492,112 @@
 #include <unotools/options.hxx>
 #include <unotools/pathoptions.hxx>
 #include <unotools/resmgr.hxx>
+#include <unotools/sharedunocomponent.hxx>
 #include <unotools/syslocale.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <unotools/unotoolsdllapi.h>
 #endif // PCH_LEVEL >= 3
 #if PCH_LEVEL >= 4
 #include <IDocumentDeviceAccess.hxx>
+#include <IDocumentRedlineAccess.hxx>
 #include <IMark.hxx>
 #include <SwNumberTreeTypes.hxx>
+#include <SwRewriter.hxx>
 #include <SwStyleNameMapper.hxx>
+#include <autoformatpreview.hxx>
 #include <bparr.hxx>
 #include <calbck.hxx>
 #include <charfmt.hxx>
 #include <cmdid.h>
-#include <colwd.hxx>
-#include <cshtyp.hxx>
-#include <dbfld.hxx>
+#include <cnttab.hxx>
+#include <column.hxx>
 #include <dbmgr.hxx>
+#include <doc.hxx>
 #include <docary.hxx>
 #include <docsh.hxx>
 #include <docstyle.hxx>
 #include <docufld.hxx>
+#include <drpcps.hxx>
+#include <envlop.hxx>
 #include <expfld.hxx>
 #include <fchrfmt.hxx>
 #include <fldbas.hxx>
+#include <fldedt.hxx>
+#include <fldmgr.hxx>
+#include <fldtdlg.hxx>
 #include <fmtautofmt.hxx>
+#include <fmtclds.hxx>
 #include <fmtcol.hxx>
 #include <fmtflcnt.hxx>
 #include <fmtfld.hxx>
 #include <fmtfsize.hxx>
 #include <fmtftn.hxx>
 #include <fmtinfmt.hxx>
+#include <fmtornt.hxx>
+#include <fmtpdsc.hxx>
 #include <fmtrfmrk.hxx>
 #include <fmtruby.hxx>
-#include <frmatr.hxx>
+#include <format.hxx>
+#include <frmdlg.hxx>
 #include <frmfmt.hxx>
+#include <frmpage.hxx>
+#include <glossary.hxx>
 #include <hintids.hxx>
 #include <index.hxx>
+#include <label.hxx>
+#include <labimg.hxx>
+#include <macassgn.hxx>
 #include <modcfg.hxx>
 #include <ndarr.hxx>
 #include <ndhints.hxx>
 #include <ndindex.hxx>
-#include <ndtxt.hxx>
 #include <ndtyp.hxx>
 #include <node.hxx>
+#include <num.hxx>
+#include <numberingtypelistbox.hxx>
+#include <numfmtlb.hxx>
+#include <numpara.hxx>
 #include <numrule.hxx>
+#include <optload.hxx>
+#include <outline.hxx>
 #include <pagedesc.hxx>
 #include <pam.hxx>
-#include <paratr.hxx>
+#include <pardlg.hxx>
 #include <poolfmt.hxx>
+#include <ring.hxx>
+#include <section.hxx>
 #include <shellio.hxx>
 #include <shellres.hxx>
 #include <swabstdlg.hxx>
 #include <swatrset.hxx>
+#include <swdbdata.hxx>
 #include <swdllapi.h>
 #include <swmodule.hxx>
 #include <swrect.hxx>
-#include <swtable.hxx>
 #include <swtblfmt.hxx>
 #include <swtypes.hxx>
+#include <swuicnttab.hxx>
+#include <swuiexp.hxx>
+#include <swuipardlg.hxx>
 #include <swundo.hxx>
 #include <swwait.hxx>
+#include <tablemgr.hxx>
+#include <tblafmt.hxx>
 #include <tblenum.hxx>
-#include <tblsel.hxx>
-#include <txatbase.hxx>
-#include <unomid.h>
-#include <unoprnms.hxx>
+#include <tgrditem.hxx>
+#include <tox.hxx>
+#include <toxe.hxx>
+#include <uiitems.hxx>
+#include <uitool.hxx>
+#include <undobj.hxx>
+#include <unobaseclass.hxx>
+#include <unotools.hxx>
+#include <usrpref.hxx>
+#include <view.hxx>
 #include <viewopt.hxx>
 #include <wdocsh.hxx>
+#include <wrap.hxx>
+#include <wrtsh.hxx>
 #endif // PCH_LEVEL >= 4
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/pch/precompiled_vbaswobj.hxx b/sw/inc/pch/precompiled_vbaswobj.hxx
index d0a0f44cd1dc..3414f6daee68 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 2019-10-17 15:17:29 using:
+ Generated on 2020-02-01 10:59:00 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:
@@ -61,8 +61,7 @@
 #include <boost/multi_index/ordered_index.hpp>
 #include <boost/multi_index/random_access_index.hpp>
 #include <boost/multi_index_container.hpp>
-#include <o3tl/optional.hxx>
-#include <boost/property_tree/ptree.hpp>
+#include <boost/property_tree/ptree_fwd.hpp>
 #endif // PCH_LEVEL >= 1
 #if PCH_LEVEL >= 2
 #include <osl/diagnose.h>
@@ -90,7 +89,6 @@
 #include <rtl/stringutils.hxx>
 #include <rtl/textcvt.h>
 #include <rtl/textenc.h>
-#include <rtl/unload.h>
 #include <rtl/ustrbuf.h>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/ustring.h>
@@ -154,24 +152,27 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/range/b2drange.hxx>
+#include <basegfx/range/b2irange.hxx>
 #include <basegfx/range/basicrange.hxx>
 #include <basegfx/tuple/b2dtuple.hxx>
+#include <basegfx/tuple/b2i64tuple.hxx>
 #include <basegfx/tuple/b2ituple.hxx>
 #include <basegfx/tuple/b3dtuple.hxx>
 #include <basegfx/vector/b2dvector.hxx>
 #include <basegfx/vector/b2enums.hxx>
 #include <basegfx/vector/b2ivector.hxx>
-#include <basic/basicdllapi.h>
 #include <basic/sberrors.hxx>
-#include <basic/sbxdef.hxx>
+#include <com/sun/star/accessibility/XAccessible.hpp>
+#include <com/sun/star/accessibility/XAccessibleRelationSet.hpp>
 #include <com/sun/star/awt/Key.hpp>
 #include <com/sun/star/awt/KeyGroup.hpp>
 #include <com/sun/star/awt/SystemPointer.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/container/NoSuchElementException.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
-#include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/container/XIndexReplace.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
@@ -191,6 +192,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/rdf/XMetadatable.hpp>
 #include <com/sun/star/style/NumberingType.hpp>
 #include <com/sun/star/style/XStyle.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
@@ -198,12 +200,9 @@
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/text/PositionLayoutDir.hpp>
 #include <com/sun/star/text/XPageCursor.hpp>
-#include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/text/XTextRangeCompare.hpp>
-#include <com/sun/star/text/XTextTable.hpp>
-#include <com/sun/star/text/XTextViewCursor.hpp>
-#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
+#include <com/sun/star/text/XTextSection.hpp>
 #include <com/sun/star/uno/Any.h>
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/uno/Exception.hpp>
@@ -221,6 +220,9 @@
 #include <com/sun/star/uno/XWeak.hpp>
 #include <com/sun/star/uno/genfunc.h>
 #include <com/sun/star/uno/genfunc.hxx>
+#include <com/sun/star/util/Date.hpp>
+#include <com/sun/star/util/DateTime.hpp>
+#include <com/sun/star/util/Time.hpp>
 #include <com/sun/star/view/XSelectionSupplier.hpp>
 #include <comphelper/comphelperdllapi.h>
 #include <comphelper/processfactory.hxx>
@@ -243,12 +245,15 @@
 #include <editeng/svxenum.hxx>
 #include <i18nlangtag/lang.h>
 #include <o3tl/cow_wrapper.hxx>
+#include <o3tl/optional.hxx>
 #include <o3tl/sorted_vector.hxx>
 #include <o3tl/strong_int.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <o3tl/underlyingenumvalue.hxx>
 #include <ooo/vba/XCollection.hpp>
 #include <ooo/vba/XHelperInterface.hpp>
+#include <ooo/vba/word/WdSaveFormat.hpp>
+#include <sfx2/Metadatable.hxx>
 #include <sfx2/dllapi.h>
 #include <sfx2/shell.hxx>
 #include <sot/formats.hxx>
@@ -264,11 +269,13 @@
 #include <svl/stylesheetuser.hxx>
 #include <svl/svldllapi.h>
 #include <svl/typedwhich.hxx>
+#include <svl/undo.hxx>
 #include <svx/svxdllapi.h>
 #include <svx/xdef.hxx>
 #include <tools/color.hxx>
+#include <tools/date.hxx>
+#include <tools/datetime.hxx>
 #include <tools/debug.hxx>
-#include <tools/diagnose_ex.h>
 #include <tools/fldunit.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/gen.hxx>
@@ -277,6 +284,7 @@
 #include <tools/poly.hxx>
 #include <tools/ref.hxx>
 #include <tools/solar.h>
+#include <tools/time.hxx>
 #include <tools/toolsdllapi.h>
 #include <tools/urlobj.hxx>
 #include <tools/wintypes.hxx>
@@ -292,7 +300,6 @@
 #include <unotools/resmgr.hxx>
 #include <unotools/syslocale.hxx>
 #include <unotools/unotoolsdllapi.h>
-#include <vbahelper/helperdecl.hxx>
 #include <vbahelper/vbadllapi.h>
 #include <vbahelper/vbahelper.hxx>
 #include <vbahelper/vbahelperinterface.hxx>
@@ -302,6 +309,7 @@
 #include <IMark.hxx>
 #include <IShellCursorSupplier.hxx>
 #include <SwNumberTreeTypes.hxx>
+#include <SwRewriter.hxx>
 #include <bparr.hxx>
 #include <calbck.hxx>
 #include <charfmt.hxx>
@@ -312,6 +320,7 @@
 #include <fldbas.hxx>
 #include <fldupde.hxx>
 #include <fmtcol.hxx>
+#include <format.hxx>
 #include <frmfmt.hxx>
 #include <hintids.hxx>
 #include <index.hxx>
@@ -321,6 +330,8 @@
 #include <node.hxx>
 #include <numrule.hxx>
 #include <pam.hxx>
+#include <ring.hxx>
+#include <section.hxx>
 #include <swcrsr.hxx>
 #include <swdllapi.h>
 #include <swrect.hxx>
@@ -328,9 +339,12 @@
 #include <swtable.hxx>
 #include <swtblfmt.hxx>
 #include <swtypes.hxx>
+#include <swundo.hxx>
 #include <tblenum.hxx>
 #include <tblsel.hxx>
+#include <tox.hxx>
 #include <toxe.hxx>
+#include <undobj.hxx>
 #include <unobaseclass.hxx>
 #include <viewsh.hxx>
 #include <viscrs.hxx>
diff --git a/sw/source/uibase/inc/gloslst.hxx b/sw/source/uibase/inc/gloslst.hxx
index 21debbcfac5e..3da5d88617a5 100644
--- a/sw/source/uibase/inc/gloslst.hxx
+++ b/sw/source/uibase/inc/gloslst.hxx
@@ -27,7 +27,6 @@
 #include <vector>
 
 class SwGlossaries;
-class vector;
 
 struct AutoTextGroup
 {