entirity of writer rebuilding when vcl widget headers change

which seems a bit excessive

Change-Id: If0ab5a33bfbbd399e270f3e140c9d44d843985aa
Reviewed-on: https://gerrit.libreoffice.org/63422
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

25 files changed, 27 insertions, 2 deletions

diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx
index 6bb50990660f..e5432b543a10 100644
--- a/sw/inc/fmtclds.hxx
+++ b/sw/inc/fmtclds.hxx
@@ -21,6 +21,7 @@
 
 #include <editeng/borderline.hxx>
 #include <tools/color.hxx>
+#include <tools/solar.h>
 #include <svl/poolitem.hxx>
 #include "swdllapi.h"
 #include "hintids.hxx"
diff --git a/sw/source/core/crsr/annotationmark.cxx b/sw/source/core/crsr/annotationmark.cxx
index 24e413d34839..4ab997dc48a3 100644
--- a/sw/source/core/crsr/annotationmark.cxx
+++ b/sw/source/core/crsr/annotationmark.cxx
@@ -31,6 +31,7 @@
 #include <UndoBookmark.hxx>
 #include <ndtxt.hxx>
 #include <txtfld.hxx>
+#include <o3tl/make_unique.hxx>
 
 namespace sw { namespace mark
 {
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx
index 65d70390df0c..ae1d7fcab7f5 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -54,6 +54,7 @@
 #include <ndindex.hxx>
 #include <pam.hxx>
 #include <o3tl/deleter.hxx>
+#include <o3tl/make_unique.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <com/sun/star/uno/Any.hxx>
 
diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx b/sw/source/core/doc/DocumentLayoutManager.cxx
index cf4333877032..867bb5d62555 100644
--- a/sw/source/core/doc/DocumentLayoutManager.cxx
+++ b/sw/source/core/doc/DocumentLayoutManager.cxx
@@ -30,7 +30,6 @@
 #include <fmtcntnt.hxx>
 #include <fmtcnct.hxx>
 #include <ndole.hxx>
-#include <com/sun/star/embed/EmbedStates.hpp>
 #include <fmtanchr.hxx>
 #include <txtflcnt.hxx>
 #include <fmtflcnt.hxx>
@@ -41,6 +40,8 @@
 #include <textboxhelper.hxx>
 #include <ndindex.hxx>
 #include <pam.hxx>
+#include <o3tl/make_unique.hxx>
+#include <com/sun/star/embed/EmbedStates.hpp>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index 452112cc7073..1d8048619ca0 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -62,6 +62,7 @@
 #include <undoflystrattr.hxx>
 #include <calbck.hxx>
 #include <memory>
+#include <o3tl/make_unique.hxx>
 #include <svx/xbtmpit.hxx>
 #include <svx/xflftrit.hxx>
 #include <svx/xlndsit.hxx>
diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx
index 2b911947ab53..3b8948ceb6ef 100644
--- a/sw/source/core/doc/docftn.cxx
+++ b/sw/source/core/doc/docftn.cxx
@@ -36,6 +36,7 @@
 #include <ndtxt.hxx>
 #include <poolfmt.hxx>
 #include <ftninfo.hxx>
+#include <o3tl/make_unique.hxx>
 
 SwEndNoteInfo& SwEndNoteInfo::operator=(const SwEndNoteInfo& rInfo)
 {
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 58491be5e587..508ff29ecd91 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -57,6 +57,7 @@
 #include <comphelper/string.hxx>
 #include <comphelper/random.hxx>
 #include <tools/datetimeutils.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <cstdlib>
 #include <map>
diff --git a/sw/source/core/doc/gctable.cxx b/sw/source/core/doc/gctable.cxx
index 660324549c21..e6daaaebf136 100644
--- a/sw/source/core/doc/gctable.cxx
+++ b/sw/source/core/doc/gctable.cxx
@@ -18,10 +18,11 @@
  */
 
 #include <hintids.hxx>
-#include <editeng/boxitem.hxx>
 #include <tblrwcl.hxx>
 #include <swtblfmt.hxx>
 #include <algorithm>
+#include <editeng/boxitem.hxx>
+#include <osl/diagnose.h>
 
 using namespace ::editeng;
 
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index e14ffc63506c..aaefcce05412 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -58,6 +58,7 @@
 #include <hints.hxx>
 #include <memory>
 #include "ndsect.hxx"
+#include <o3tl/make_unique.hxx>
 #include <tools/datetimeutils.hxx>
 
 // #i21457# - new implementation of local method <lcl_IsInSameTableBox(..)>.
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index bc4535be0d23..af3d4313a03d 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -93,6 +93,7 @@
 #include <fldupde.hxx>
 #include <calbck.hxx>
 #include <fntcache.hxx>
+#include <o3tl/make_unique.hxx>
 #include <o3tl/numeric.hxx>
 #include <tools/datetimeutils.hxx>
 #include <sal/log.hxx>
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index a95bde0b4144..0fa554afb4be 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -60,6 +60,7 @@
 #include <sortedobjs.hxx>
 #include <flyfrms.hxx>
 #include <UndoManager.hxx>
+#include <o3tl/make_unique.hxx>
 
 using namespace com::sun::star;
 
diff --git a/sw/source/core/edit/edglbldc.cxx b/sw/source/core/edit/edglbldc.cxx
index fc7d8b241b89..ec14ef48661d 100644
--- a/sw/source/core/edit/edglbldc.cxx
+++ b/sw/source/core/edit/edglbldc.cxx
@@ -30,6 +30,7 @@
 #include <section.hxx>
 #include <doctxm.hxx>
 #include <edglbldc.hxx>
+#include <o3tl/make_unique.hxx>
 
 bool SwEditShell::IsGlobalDoc() const
 {
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 268e74e6d379..1d3defae80da 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -31,6 +31,7 @@
 #include <IDocumentDrawModelAccess.hxx>
 #include <com/sun/star/style/TabStop.hpp>
 #include <basegfx/matrix/b2dhommatrix.hxx>
+#include <vcl/outdev.hxx>
 
 #include <memory>
 
diff --git a/sw/source/core/undo/undraw.cxx b/sw/source/core/undo/undraw.cxx
index 5b1195ff9846..8151736c7184 100644
--- a/sw/source/core/undo/undraw.cxx
+++ b/sw/source/core/undo/undraw.cxx
@@ -45,6 +45,7 @@
 #include <dview.hxx>
 #include <rootfrm.hxx>
 #include <viewsh.hxx>
+#include <o3tl/make_unique.hxx>
 
 struct SwUndoGroupObjImpl
 {
diff --git a/sw/source/core/undo/unsect.cxx b/sw/source/core/undo/unsect.cxx
index 8f59781ae009..1a40d6c5b424 100644
--- a/sw/source/core/undo/unsect.cxx
+++ b/sw/source/core/undo/unsect.cxx
@@ -40,6 +40,7 @@
 /// OD 04.10.2002 #102894#
 /// class Calc needed for calculation of the hidden condition of a section.
 #include <calc.hxx>
+#include <o3tl/make_unique.hxx>
 
 static SfxItemSet* lcl_GetAttrSet( const SwSection& rSect )
 {
diff --git a/sw/source/filter/basflt/shellio.cxx b/sw/source/filter/basflt/shellio.cxx
index cf8c34db8972..e0a675911ef3 100644
--- a/sw/source/filter/basflt/shellio.cxx
+++ b/sw/source/filter/basflt/shellio.cxx
@@ -59,6 +59,7 @@
 #include <swerror.h>
 #include <paratr.hxx>
 #include <pausethreadstarting.hxx>
+#include <o3tl/make_unique.hxx>
 
 using namespace ::com::sun::star;
 
diff --git a/sw/source/filter/html/htmlflywriter.cxx b/sw/source/filter/html/htmlflywriter.cxx
index 290289dc8281..3d74a9e7976e 100644
--- a/sw/source/filter/html/htmlflywriter.cxx
+++ b/sw/source/filter/html/htmlflywriter.cxx
@@ -66,6 +66,7 @@
 #include "htmlatr.hxx"
 #include "htmlfly.hxx"
 #include "htmlreqifreader.hxx"
+#include <o3tl/make_unique.hxx>
 
 using namespace css;
 
diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx
index 251d871acebf..f0d42826a9df 100644
--- a/sw/source/filter/writer/wrtswtbl.cxx
+++ b/sw/source/filter/writer/wrtswtbl.cxx
@@ -30,6 +30,7 @@
 #include <fmtornt.hxx>
 #include <frmatr.hxx>
 #include <htmltbl.hxx>
+#include <osl/diagnose.h>
 
 using ::editeng::SvxBorderLine;
 using namespace ::com::sun::star;
diff --git a/sw/source/filter/ww8/ww8struc.hxx b/sw/source/filter/ww8/ww8struc.hxx
index f14ee98e868e..6627b352a9c8 100644
--- a/sw/source/filter/ww8/ww8struc.hxx
+++ b/sw/source/filter/ww8/ww8struc.hxx
@@ -27,6 +27,7 @@
 
 #include <editeng/borderline.hxx>
 #include <filter/msfilter/util.hxx>
+#include <i18nlangtag/lang.h>
 #include <tools/color.hxx>
 
 #ifdef _WIN32
diff --git a/sw/source/filter/xml/xmlexpit.cxx b/sw/source/filter/xml/xmlexpit.cxx
index 577936ae59f2..6daec44d8e37 100644
--- a/sw/source/filter/xml/xmlexpit.cxx
+++ b/sw/source/filter/xml/xmlexpit.cxx
@@ -53,6 +53,7 @@
 #include "xmlithlp.hxx"
 
 #include <fmtrowsplt.hxx>
+#include <osl/diagnose.h>
 
 using ::editeng::SvxBorderLine;
 using namespace ::com::sun::star;
diff --git a/sw/source/filter/xml/xmlfmte.cxx b/sw/source/filter/xml/xmlfmte.cxx
index bbc59643506b..c8aa5a172691 100644
--- a/sw/source/filter/xml/xmlfmte.cxx
+++ b/sw/source/filter/xml/xmlfmte.cxx
@@ -37,6 +37,7 @@
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include "xmlexp.hxx"
 #include <SwStyleNameMapper.hxx>
+#include <osl/diagnose.h>
 
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::uno;
diff --git a/sw/source/filter/xml/xmlimpit.cxx b/sw/source/filter/xml/xmlimpit.cxx
index afc3cd64d3d3..578d07d0face 100644
--- a/sw/source/filter/xml/xmlimpit.cxx
+++ b/sw/source/filter/xml/xmlimpit.cxx
@@ -51,6 +51,7 @@
 #include <xmloff/xmlprhdl.hxx>
 #include "xmlithlp.hxx"
 #include <com/sun/star/uno/Any.hxx>
+#include <osl/diagnose.h>
 
 using ::editeng::SvxBorderLine;
 using namespace ::com::sun::star;
diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx
index 56cd728628ae..6dc8f3830e77 100644
--- a/sw/source/filter/xml/xmlithlp.cxx
+++ b/sw/source/filter/xml/xmlithlp.cxx
@@ -35,6 +35,7 @@
 
 #include <fmtlsplt.hxx>
 #include <xmloff/xmluconv.hxx>
+#include <osl/diagnose.h>
 
 using ::editeng::SvxBorderLine;
 using namespace ::xmloff::token;
diff --git a/sw/source/uibase/frmdlg/colmgr.cxx b/sw/source/uibase/frmdlg/colmgr.cxx
index 0a38bc2e44bd..c2ff97fe7145 100644
--- a/sw/source/uibase/frmdlg/colmgr.cxx
+++ b/sw/source/uibase/frmdlg/colmgr.cxx
@@ -19,6 +19,7 @@
 
 #include <hintids.hxx>
 #include <editeng/lrspitem.hxx>
+#include <osl/diagnose.h>
 
 #include <frmmgr.hxx>
 #include <frmfmt.hxx>
diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx
index 8c7c515796af..585d48820b88 100644
--- a/sw/source/uibase/utlui/uiitems.cxx
+++ b/sw/source/uibase/utlui/uiitems.cxx
@@ -29,6 +29,7 @@
 #include <numrule.hxx>
 
 #include <editeng/eerdll.hxx>
+#include <osl/diagnose.h>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;