Recheck include/ with IWYU

See tdf#42949 for motivation

Change-Id: Ifc253bf800bb1468b5774663a93f4fb30bec81d3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113657
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

80 files changed, 82 insertions, 0 deletions

diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 924a8f18e839..7a90c00db4e6 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -55,6 +55,7 @@
 #include <svl/zforlist.hxx>
 #include <svl/zformat.hxx>
 #include <svl/sharedstringpool.hxx>
+#include <osl/diagnose.h>
 
 #include <cstdio>
 #include <refdata.hxx>
diff --git a/sc/source/core/data/dociter.cxx b/sc/source/core/data/dociter.cxx
index 27301007e433..deb9a8eaa6a1 100644
--- a/sc/source/core/data/dociter.cxx
+++ b/sc/source/core/data/dociter.cxx
@@ -44,6 +44,7 @@
 #include <editeng/editobj.hxx>
 #include <svl/sharedstring.hxx>
 #include <unotools/collatorwrapper.hxx>
+#include <osl/diagnose.h>
 
 #include <algorithm>
 #include <vector>
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 7ad53e33394f..ce47333cd14c 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -35,6 +35,7 @@
 #include <basic/basmgr.hxx>
 #include <comphelper/threadpool.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <scmod.hxx>
 #include <document.hxx>
diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx
index e3da76da859c..b47c03c0e6fe 100644
--- a/sc/source/core/data/documen3.cxx
+++ b/sc/source/core/data/documen3.cxx
@@ -28,6 +28,7 @@
 #include <sfx2/viewsh.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/thread.hxx>
+#include <osl/diagnose.h>
 #include <document.hxx>
 #include <attrib.hxx>
 #include <table.hxx>
diff --git a/sc/source/core/data/documen4.cxx b/sc/source/core/data/documen4.cxx
index 9190ed109e44..aee431660d0a 100644
--- a/sc/source/core/data/documen4.cxx
+++ b/sc/source/core/data/documen4.cxx
@@ -22,6 +22,7 @@
 #include <formula/token.hxx>
 #include <sal/log.hxx>
 #include <unotools/configmgr.hxx>
+#include <osl/diagnose.h>
 
 #include <document.hxx>
 #include <table.hxx>
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index 137aec6947ea..eaaaf285c4b8 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <document.hxx>
 #include <brdcst.hxx>
diff --git a/sc/source/core/data/documen8.cxx b/sc/source/core/data/documen8.cxx
index 1008cdff14f5..98ba25af1811 100644
--- a/sc/source/core/data/documen8.cxx
+++ b/sc/source/core/data/documen8.cxx
@@ -37,6 +37,7 @@
 #include <svl/zformat.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx
index ff5eb488f858..5c6defa59f40 100644
--- a/sc/source/core/data/documen9.cxx
+++ b/sc/source/core/data/documen9.cxx
@@ -25,6 +25,7 @@
 #include <editeng/langitem.hxx>
 #include <o3tl/unit_conversion.hxx>
 #include <osl/thread.h>
+#include <osl/diagnose.h>
 #include <svl/asiancfg.hxx>
 #include <svx/svditer.hxx>
 #include <svx/svdograf.hxx>
diff --git a/sc/source/core/data/document.cxx b/sc/source/core/data/document.cxx
index ba9cee894875..9755bd74c90e 100644
--- a/sc/source/core/data/document.cxx
+++ b/sc/source/core/data/document.cxx
@@ -32,6 +32,7 @@
 #include <unotools/transliterationwrapper.hxx>
 #include <tools/urlobj.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/script/vba/XVBACompatibility.hpp>
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index 8e74fb8d1686..551b3c7db899 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -53,6 +53,7 @@
 #include <vcl/settings.hxx>
 #include <tools/globname.hxx>
 #include <tools/UnitConversion.hxx>
+#include <osl/diagnose.h>
 
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
diff --git a/sc/source/core/data/fillinfo.cxx b/sc/source/core/data/fillinfo.cxx
index 0a2d84f7727b..0405a55a1cd9 100644
--- a/sc/source/core/data/fillinfo.cxx
+++ b/sc/source/core/data/fillinfo.cxx
@@ -24,6 +24,7 @@
 #include <editeng/shaditem.hxx>
 #include <editeng/brushitem.hxx>
 #include <svx/framelink.hxx>
+#include <osl/diagnose.h>
 
 #include <fillinfo.hxx>
 #include <document.hxx>
diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx
index bafd2e9e901b..84633a640de8 100644
--- a/sc/source/core/data/postit.cxx
+++ b/sc/source/core/data/postit.cxx
@@ -28,6 +28,7 @@
 #include <editeng/outlobj.hxx>
 #include <editeng/editobj.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
+#include <osl/diagnose.h>
 
 #include <scitems.hxx>
 #include <svx/xfillit0.hxx>
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index f018bfc03d4d..79a33320358c 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -23,6 +23,7 @@
 #include <o3tl/unit_conversion.hxx>
 #include <unotools/textsearch.hxx>
 #include <unotools/charclass.hxx>
+#include <osl/diagnose.h>
 
 #include <patattr.hxx>
 #include <table.hxx>
diff --git a/sc/source/core/data/table2.cxx b/sc/source/core/data/table2.cxx
index 833b4edd13f7..a94d07bf5032 100644
--- a/sc/source/core/data/table2.cxx
+++ b/sc/source/core/data/table2.cxx
@@ -59,6 +59,7 @@
 #include <editeng/editobj.hxx>
 #include <o3tl/safeint.hxx>
 #include <o3tl/unit_conversion.hxx>
+#include <osl/diagnose.h>
 #include <svl/poolcach.hxx>
 #include <unotools/charclass.hxx>
 #include <math.h>
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 58a0594f63b8..e1df9cae6332 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -29,6 +29,7 @@
 #include <com/sun/star/i18n/KParseTokens.hpp>
 #include <com/sun/star/i18n/KParseType.hpp>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <refdata.hxx>
 #include <table.hxx>
diff --git a/sc/source/core/data/table4.cxx b/sc/source/core/data/table4.cxx
index e6c29a5a00e7..e3407715152f 100644
--- a/sc/source/core/data/table4.cxx
+++ b/sc/source/core/data/table4.cxx
@@ -27,6 +27,7 @@
 #include <vcl/keycodes.hxx>
 #include <rtl/math.hxx>
 #include <unotools/charclass.hxx>
+#include <osl/diagnose.h>
 
 #include <attrib.hxx>
 #include <patattr.hxx>
diff --git a/sc/source/core/data/table5.cxx b/sc/source/core/data/table5.cxx
index 21d2b11d8c6e..7af84bcd58dc 100644
--- a/sc/source/core/data/table5.cxx
+++ b/sc/source/core/data/table5.cxx
@@ -40,6 +40,8 @@
 
 #include <com/sun/star/sheet/TablePageBreakData.hpp>
 
+#include <osl/diagnose.h>
+
 #include <algorithm>
 #include <limits>
 
diff --git a/sc/source/core/data/table7.cxx b/sc/source/core/data/table7.cxx
index fc821133ef65..6ec79a90fd98 100644
--- a/sc/source/core/data/table7.cxx
+++ b/sc/source/core/data/table7.cxx
@@ -20,6 +20,7 @@
 #include <drwlayer.hxx>
 #include <compressedarray.hxx>
 
+#include <osl/diagnose.h>
 #include <sal/log.hxx>
 #include <tools/stream.hxx>
 
diff --git a/sc/source/core/tool/detfunc.cxx b/sc/source/core/tool/detfunc.cxx
index 2b525e8c0891..fc5014440645 100644
--- a/sc/source/core/tool/detfunc.cxx
+++ b/sc/source/core/tool/detfunc.cxx
@@ -45,6 +45,7 @@
 #include <svx/sdtagitm.hxx>
 #include <svx/sxcecitm.hxx>
 #include <svl/whiter.hxx>
+#include <osl/diagnose.h>
 
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
diff --git a/sc/source/filter/oox/drawingfragment.cxx b/sc/source/filter/oox/drawingfragment.cxx
index 1f1f38b25c28..eb9b6627a120 100644
--- a/sc/source/filter/oox/drawingfragment.cxx
+++ b/sc/source/filter/oox/drawingfragment.cxx
@@ -44,6 +44,7 @@
 #include <oox/token/tokens.hxx>
 #include <oox/vml/vmlshape.hxx>
 #include <oox/vml/vmlshapecontainer.hxx>
+#include <osl/diagnose.h>
 #include <formulaparser.hxx>
 #include <stylesbuffer.hxx>
 #include <themebuffer.hxx>
diff --git a/sc/source/filter/rtf/eeimpars.cxx b/sc/source/filter/rtf/eeimpars.cxx
index db15c1560e10..14cdf76d7349 100644
--- a/sc/source/filter/rtf/eeimpars.cxx
+++ b/sc/source/filter/rtf/eeimpars.cxx
@@ -34,6 +34,7 @@
 #include <vcl/svapp.hxx>
 #include <unotools/charclass.hxx>
 #include <comphelper/string.hxx>
+#include <osl/diagnose.h>
 
 #include <eeimport.hxx>
 #include <global.hxx>
diff --git a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
index 572b696f2528..21774de12bb0 100644
--- a/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
+++ b/sc/source/filter/xml/XMLCellRangeSourceContext.cxx
@@ -23,6 +23,7 @@
 
 #include "xmlimprt.hxx"
 #include <xmloff/xmlnamespace.hxx>
+#include <xmloff/xmltkmap.hxx>
 
 using namespace ::com::sun::star;
 using namespace xmloff::token;
diff --git a/sc/source/filter/xml/celltextparacontext.cxx b/sc/source/filter/xml/celltextparacontext.cxx
index 54981ed41bca..e2668dea28a5 100644
--- a/sc/source/filter/xml/celltextparacontext.cxx
+++ b/sc/source/filter/xml/celltextparacontext.cxx
@@ -13,6 +13,7 @@
 
 #include <comphelper/string.hxx>
 #include <xmloff/xmlnamespace.hxx>
+#include <xmloff/xmltkmap.hxx>
 
 using namespace com::sun::star;
 using namespace xmloff::token;
diff --git a/sc/source/filter/xml/xmlcelli.cxx b/sc/source/filter/xml/xmlcelli.cxx
index 26d85c4768f4..638c2c5cba67 100644
--- a/sc/source/filter/xml/xmlcelli.cxx
+++ b/sc/source/filter/xml/xmlcelli.cxx
@@ -91,6 +91,7 @@
 #include <com/sun/star/sheet/ValidationAlertStyle.hpp>
 
 #include <rtl/ustrbuf.hxx>
+#include <osl/diagnose.h>
 #include <sal/log.hxx>
 #include <i18nlangtag/lang.h>
 
diff --git a/sc/source/filter/xml/xmlcondformat.cxx b/sc/source/filter/xml/xmlcondformat.cxx
index a1b54c036c30..996032f03498 100644
--- a/sc/source/filter/xml/xmlcondformat.cxx
+++ b/sc/source/filter/xml/xmlcondformat.cxx
@@ -11,6 +11,7 @@
 #include "xmlcondformat.hxx"
 #include "xmlimprt.hxx"
 #include <xmloff/xmlnamespace.hxx>
+#include <xmloff/xmltkmap.hxx>
 #include <xmloff/xmlictxt.hxx>
 #include <sal/log.hxx>
 
diff --git a/sc/source/filter/xml/xmlnexpi.cxx b/sc/source/filter/xml/xmlnexpi.cxx
index 00a72cfd9df5..3d4286985d61 100644
--- a/sc/source/filter/xml/xmlnexpi.cxx
+++ b/sc/source/filter/xml/xmlnexpi.cxx
@@ -22,6 +22,7 @@
 #include <document.hxx>
 
 #include <xmloff/xmlnamespace.hxx>
+#include <xmloff/xmltkmap.hxx>
 
 using namespace com::sun::star;
 using namespace xmloff::token;
diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index e575a837ec87..19081a32e067 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -44,6 +44,7 @@
 #include <svl/itempool.hxx>
 #include <svl/urlbmk.hxx>
 #include <tools/urlobj.hxx>
+#include <osl/diagnose.h>
 
 #include <drwtrans.hxx>
 #include <docsh.hxx>
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index c9b13dc709ae..64621cc72a0d 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -58,6 +58,7 @@
 #include <formula/funcvarargs.h>
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <comphelper/lok.hxx>
+#include <osl/diagnose.h>
 
 #include <attrib.hxx>
 #include <inputwin.hxx>
diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx
index ce3624b27c85..7c50c1cf1b6f 100644
--- a/sc/source/ui/app/seltrans.cxx
+++ b/sc/source/ui/app/seltrans.cxx
@@ -25,6 +25,7 @@
 #include <sfx2/docfile.hxx>
 #include <svx/svdograf.hxx>
 #include <svx/svdouno.hxx>
+#include <osl/diagnose.h>
 
 #include <seltrans.hxx>
 #include <transobj.hxx>
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index 53492205dbd2..9ed3e0f41ff1 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <unotools/charclass.hxx>
 #include <comphelper/lok.hxx>
+#include <osl/diagnose.h>
 
 #include <dbdocfun.hxx>
 #include <dbdata.hxx>
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index e1498dd4424a..3a26bffadfa6 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -32,6 +32,7 @@
 #include <svx/svdocapt.hxx>
 #include <sal/log.hxx>
 #include <unotools/charclass.hxx>
+#include <osl/diagnose.h>
 
 #include <com/sun/star/container/XNameContainer.hpp>
 #include <com/sun/star/script/ModuleType.hpp>
diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx
index 37e1bc773859..8cb71adc0ac0 100644
--- a/sc/source/ui/docshell/docsh3.cxx
+++ b/sc/source/ui/docshell/docsh3.cxx
@@ -39,6 +39,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/weld.hxx>
+#include <osl/diagnose.h>
 
 #include <docsh.hxx>
 #include "docshimp.hxx"
diff --git a/sc/source/ui/docshell/documentlinkmgr.cxx b/sc/source/ui/docshell/documentlinkmgr.cxx
index 842c1052bb45..3652df5cca0a 100644
--- a/sc/source/ui/docshell/documentlinkmgr.cxx
+++ b/sc/source/ui/docshell/documentlinkmgr.cxx
@@ -24,6 +24,8 @@
 #include <webservicelink.hxx>
 #include <strings.hrc>
 #include <scresid.hxx>
+#include <sfx2/linkmgr.hxx>
+#include <sfx2/linksrc.hxx>
 #include <o3tl/deleter.hxx>
 #include <svx/svdoole2.hxx>
 #include <vcl/svapp.hxx>
diff --git a/sc/source/ui/drawfunc/drawsh5.cxx b/sc/source/ui/drawfunc/drawsh5.cxx
index bec44bcab4d3..94e87dd29d27 100644
--- a/sc/source/ui/drawfunc/drawsh5.cxx
+++ b/sc/source/ui/drawfunc/drawsh5.cxx
@@ -31,6 +31,7 @@
 #include <svx/extrusionbar.hxx>
 #include <svx/fontworkbar.hxx>
 #include <sfx2/docfile.hxx>
+#include <osl/diagnose.h>
 
 #include <com/sun/star/form/FormButtonType.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sc/source/ui/drawfunc/fuconarc.cxx b/sc/source/ui/drawfunc/fuconarc.cxx
index 5d85181eb300..95e5785868d0 100644
--- a/sc/source/ui/drawfunc/fuconarc.cxx
+++ b/sc/source/ui/drawfunc/fuconarc.cxx
@@ -25,6 +25,7 @@
 #include <svx/svdocirc.hxx>
 #include <svx/svxids.hrc>
 #include <svx/sxciaitm.hxx>
+#include <osl/diagnose.h>
 
 FuConstArc::FuConstArc(ScTabViewShell& rViewSh, vcl::Window* pWin, ScDrawView* pViewP,
                        SdrModel* pDoc, const SfxRequest& rReq)
diff --git a/sc/source/ui/drawfunc/fuconpol.cxx b/sc/source/ui/drawfunc/fuconpol.cxx
index bdb6807dcd56..712b12a2bddf 100644
--- a/sc/source/ui/drawfunc/fuconpol.cxx
+++ b/sc/source/ui/drawfunc/fuconpol.cxx
@@ -24,6 +24,7 @@
 // Create default drawing objects via keyboard
 #include <svx/svdopath.hxx>
 #include <svx/svxids.hrc>
+#include <osl/diagnose.h>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/point/b2dpoint.hxx>
 
diff --git a/sc/source/ui/drawfunc/fuconrec.cxx b/sc/source/ui/drawfunc/fuconrec.cxx
index 3ef1a03752cb..2a927f999164 100644
--- a/sc/source/ui/drawfunc/fuconrec.cxx
+++ b/sc/source/ui/drawfunc/fuconrec.cxx
@@ -34,6 +34,7 @@
 #include <svx/xlnstit.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/svdomeas.hxx>
+#include <osl/diagnose.h>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 
 #include <basegfx/polygon/b2dpolygon.hxx>
diff --git a/sc/source/ui/drawfunc/futext.cxx b/sc/source/ui/drawfunc/futext.cxx
index 30ab23371d2f..8174506255a7 100644
--- a/sc/source/ui/drawfunc/futext.cxx
+++ b/sc/source/ui/drawfunc/futext.cxx
@@ -31,6 +31,7 @@
 #include <svx/svxids.hrc>
 #include <editeng/eeitem.hxx>
 #include <svl/itemset.hxx>
+#include <osl/diagnose.h>
 
 #include <futext.hxx>
 #include <drwlayer.hxx>
diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx
index 8411f75f62ed..df601ea0d35c 100644
--- a/sc/source/ui/drawfunc/futext3.cxx
+++ b/sc/source/ui/drawfunc/futext3.cxx
@@ -20,6 +20,7 @@
 #include <svx/svdocapt.hxx>
 #include <svx/svdundo.hxx>
 #include <vcl/cursor.hxx>
+#include <osl/diagnose.h>
 
 #include <global.hxx>
 #include <drwlayer.hxx>
diff --git a/sc/source/ui/inc/ChildWindowWrapper.hxx b/sc/source/ui/inc/ChildWindowWrapper.hxx
index 572a76c32bb4..7db2b99c53a4 100644
--- a/sc/source/ui/inc/ChildWindowWrapper.hxx
+++ b/sc/source/ui/inc/ChildWindowWrapper.hxx
@@ -13,6 +13,7 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/childwin.hxx>
+#include <osl/diagnose.h>
 
 #include "tabvwsh.hxx"
 
diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx
index a30218118bcc..6738eb79bd06 100644
--- a/sc/source/ui/miscdlgs/anyrefdg.cxx
+++ b/sc/source/ui/miscdlgs/anyrefdg.cxx
@@ -24,6 +24,7 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/viewfrm.hxx>
+#include <osl/diagnose.h>
 
 #include <anyrefdg.hxx>
 #include <sc.hrc>
diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx
index 577706782e98..d1be90274f5f 100644
--- a/sc/source/ui/miscdlgs/conflictsdlg.cxx
+++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <comphelper/string.hxx>
+#include <osl/diagnose.h>
 
 #include <conflictsdlg.hxx>
 #include <strings.hrc>
diff --git a/sc/source/ui/miscdlgs/datafdlg.cxx b/sc/source/ui/miscdlgs/datafdlg.cxx
index c357718c2a53..0ed421cba831 100644
--- a/sc/source/ui/miscdlgs/datafdlg.cxx
+++ b/sc/source/ui/miscdlgs/datafdlg.cxx
@@ -15,6 +15,7 @@
 #include <tabvwsh.hxx>
 
 #include <vcl/svapp.hxx>
+#include <osl/diagnose.h>
 
 ScDataFormDlg::ScDataFormDlg(weld::Window* pParent, ScTabViewShell* pTabViewShellOri)
     : GenericDialogController(pParent, "modules/scalc/ui/dataform.ui", "DataFormDialog")
diff --git a/sc/source/ui/navipi/content.cxx b/sc/source/ui/navipi/content.cxx
index 6a08e44b2186..2ede5b43cd36 100644
--- a/sc/source/ui/navipi/content.cxx
+++ b/sc/source/ui/navipi/content.cxx
@@ -29,6 +29,7 @@
 #include <sfx2/viewfrm.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/svapp.hxx>
+#include <osl/diagnose.h>
 #include <tools/urlobj.hxx>
 #include <sal/log.hxx>
 #include <unotools/charclass.hxx>
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 33f5bad417a7..0dc4692645d9 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -23,6 +23,7 @@
 #include <tools/lineend.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
+#include <osl/diagnose.h>
 
 #include <global.hxx>
 #include <document.hxx>
diff --git a/sc/source/ui/undo/undoblk.cxx b/sc/source/ui/undo/undoblk.cxx
index 919d2b467582..6706b19adc0b 100644
--- a/sc/source/ui/undo/undoblk.cxx
+++ b/sc/source/ui/undo/undoblk.cxx
@@ -22,6 +22,7 @@
 #include <editeng/boxitem.hxx>
 #include <sfx2/app.hxx>
 #include <comphelper/lok.hxx>
+#include <osl/diagnose.h>
 
 #include <undoblk.hxx>
 #include <undoutil.hxx>
diff --git a/sc/source/ui/undo/undoblk3.cxx b/sc/source/ui/undo/undoblk3.cxx
index 917fc67e3511..40f57412f960 100644
--- a/sc/source/ui/undo/undoblk3.cxx
+++ b/sc/source/ui/undo/undoblk3.cxx
@@ -29,6 +29,7 @@
 #include <vcl/virdev.hxx>
 #include <sfx2/app.hxx>
 #include <svx/svdundo.hxx>
+#include <osl/diagnose.h>
 
 #include <undoblk.hxx>
 #include <globstr.hrc>
diff --git a/sc/source/ui/undo/undocell.cxx b/sc/source/ui/undo/undocell.cxx
index 2e82399c879e..ce503934fe70 100644
--- a/sc/source/ui/undo/undocell.cxx
+++ b/sc/source/ui/undo/undocell.cxx
@@ -23,6 +23,7 @@
 #include <editeng/editobj.hxx>
 #include <sfx2/app.hxx>
 #include <comphelper/lok.hxx>
+#include <osl/diagnose.h>
 
 #include <document.hxx>
 #include <docpool.hxx>
diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx
index c3a9476d7804..cd92934d1b6c 100644
--- a/sc/source/ui/undo/undodat.cxx
+++ b/sc/source/ui/undo/undodat.cxx
@@ -20,6 +20,7 @@
 #include <sfx2/app.hxx>
 #include <svx/svdundo.hxx>
 #include <unotools/charclass.hxx>
+#include <osl/diagnose.h>
 
 #include <undodat.hxx>
 #include <undoutil.hxx>
diff --git a/sc/source/ui/undo/undotab.cxx b/sc/source/ui/undo/undotab.cxx
index 0002fefa1ccb..51596baf9d42 100644
--- a/sc/source/ui/undo/undotab.cxx
+++ b/sc/source/ui/undo/undotab.cxx
@@ -21,6 +21,7 @@
 #include <sfx2/bindings.hxx>
 #include <sfx2/dispatch.hxx>
 #include <svl/hint.hxx>
+#include <osl/diagnose.h>
 
 #include <undotab.hxx>
 #include <document.hxx>
diff --git a/sc/source/ui/undo/undoutil.cxx b/sc/source/ui/undo/undoutil.cxx
index 76789b8b7857..fc0e71b69db5 100644
--- a/sc/source/ui/undo/undoutil.cxx
+++ b/sc/source/ui/undo/undoutil.cxx
@@ -26,6 +26,7 @@
 #include <globalnames.hxx>
 #include <global.hxx>
 #include <markdata.hxx>
+#include <osl/diagnose.h>
 
 void ScUndoUtil::MarkSimpleBlock( const ScDocShell* pDocShell,
                                 SCCOL nStartX, SCROW nStartY, SCTAB nStartZ,
diff --git a/sc/source/ui/view/auditsh.cxx b/sc/source/ui/view/auditsh.cxx
index 3c366490de59..42f01761bd25 100644
--- a/sc/source/ui/view/auditsh.cxx
+++ b/sc/source/ui/view/auditsh.cxx
@@ -22,6 +22,7 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/request.hxx>
 #include <vcl/EnumContext.hxx>
+#include <osl/diagnose.h>
 
 #include <auditsh.hxx>
 #include <tabvwsh.hxx>
diff --git a/sc/source/ui/view/cellsh4.cxx b/sc/source/ui/view/cellsh4.cxx
index fb4b303e0833..13d6993634dd 100644
--- a/sc/source/ui/view/cellsh4.cxx
+++ b/sc/source/ui/view/cellsh4.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <sfx2/request.hxx>
+#include <osl/diagnose.h>
 
 #include <cellsh.hxx>
 #include <tabvwsh.hxx>
diff --git a/sc/source/ui/view/dbfunc.cxx b/sc/source/ui/view/dbfunc.cxx
index 8f9f8e3a52a2..82fb4f7f64a2 100644
--- a/sc/source/ui/view/dbfunc.cxx
+++ b/sc/source/ui/view/dbfunc.cxx
@@ -22,6 +22,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <unotools/charclass.hxx>
+#include <osl/diagnose.h>
 
 #include <dbfunc.hxx>
 #include <docsh.hxx>
diff --git a/sc/source/ui/view/dbfunc3.cxx b/sc/source/ui/view/dbfunc3.cxx
index 8bb263b71530..3ca2bb5e7fe5 100644
--- a/sc/source/ui/view/dbfunc3.cxx
+++ b/sc/source/ui/view/dbfunc3.cxx
@@ -62,6 +62,7 @@
 #include <sortparam.hxx>
 
 #include <comphelper/lok.hxx>
+#include <osl/diagnose.h>
 
 #include <memory>
 #include <string_view>
diff --git a/sc/source/ui/view/dbfunc4.cxx b/sc/source/ui/view/dbfunc4.cxx
index c8a6f48d0452..9f6719f9c01b 100644
--- a/sc/source/ui/view/dbfunc4.cxx
+++ b/sc/source/ui/view/dbfunc4.cxx
@@ -20,6 +20,7 @@
 #include <svx/svditer.hxx>
 #include <svx/svdoole2.hxx>
 #include <svx/svdpage.hxx>
+#include <osl/diagnose.h>
 
 #include <dbfunc.hxx>
 #include <drwlayer.hxx>
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index b7d7af5fcc48..cd1851d81082 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -26,6 +26,7 @@
 #include <tools/urlobj.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <drawview.hxx>
 #include <global.hxx>
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index a1efca1748e4..9d23c064664f 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -42,6 +42,7 @@
 #include <svx/sdr/contact/viewcontact.hxx>
 #include <svx/sdrpagewindow.hxx>
 #include <tools/UnitConversion.hxx>
+#include <osl/diagnose.h>
 
 #include <drawview.hxx>
 #include <global.hxx>
diff --git a/sc/source/ui/view/gridwin3.cxx b/sc/source/ui/view/gridwin3.cxx
index 948f388ca866..cb8bc5393dc3 100644
--- a/sc/source/ui/view/gridwin3.cxx
+++ b/sc/source/ui/view/gridwin3.cxx
@@ -22,6 +22,7 @@
 #include <editeng/sizeitem.hxx>
 #include <sfx2/bindings.hxx>
 #include <svl/ptitem.hxx>
+#include <osl/diagnose.h>
 
 #include <tabvwsh.hxx>
 #include <gridwin.hxx>
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index 7dde48a0e4dc..d12ccee4f779 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -30,6 +30,7 @@
 #include <vcl/cursor.hxx>
 #include <vcl/settings.hxx>
 #include <o3tl/unit_conversion.hxx>
+#include <osl/diagnose.h>
 
 #include <LibreOfficeKit/LibreOfficeKitEnums.h>
 #include <comphelper/lok.hxx>
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index 50199cf790dd..34ebc328eb82 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -22,6 +22,7 @@
 #include <vcl/help.hxx>
 #include <vcl/settings.hxx>
 #include <svtools/colorcfg.hxx>
+#include <osl/diagnose.h>
 
 #include <tabvwsh.hxx>
 #include <hdrcont.hxx>
diff --git a/sc/source/ui/view/olinewin.cxx b/sc/source/ui/view/olinewin.cxx
index 60cac1a63773..97b7682d8fad 100644
--- a/sc/source/ui/view/olinewin.cxx
+++ b/sc/source/ui/view/olinewin.cxx
@@ -24,6 +24,7 @@
 #include <vcl/image.hxx>
 #include <vcl/taskpanelist.hxx>
 #include <vcl/settings.hxx>
+#include <osl/diagnose.h>
 
 #include <olinewin.hxx>
 #include <olinetab.hxx>
diff --git a/sc/source/ui/view/output3.cxx b/sc/source/ui/view/output3.cxx
index 47730c9b3cd2..eec75c39664d 100644
--- a/sc/source/ui/view/output3.cxx
+++ b/sc/source/ui/view/output3.cxx
@@ -25,6 +25,7 @@
 #include <svx/svdview.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
+#include <osl/diagnose.h>
 
 #include <output.hxx>
 #include <drwlayer.hxx>
diff --git a/sc/source/ui/view/printfun.cxx b/sc/source/ui/view/printfun.cxx
index 467ec9f43b73..3828c031cc3c 100644
--- a/sc/source/ui/view/printfun.cxx
+++ b/sc/source/ui/view/printfun.cxx
@@ -41,6 +41,7 @@
 #include <tools/multisel.hxx>
 #include <sfx2/docfile.hxx>
 #include <tools/urlobj.hxx>
+#include <osl/diagnose.h>
 
 #include <editutil.hxx>
 #include <docsh.hxx>
diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx
index 89baed62a9f5..c2433e57c277 100644
--- a/sc/source/ui/view/select.cxx
+++ b/sc/source/ui/view/select.cxx
@@ -19,6 +19,7 @@
 
 #include <tools/urlobj.hxx>
 #include <sfx2/docfile.hxx>
+#include <osl/diagnose.h>
 
 #include <select.hxx>
 #include <tabvwsh.hxx>
diff --git a/sc/source/ui/view/spelldialog.cxx b/sc/source/ui/view/spelldialog.cxx
index 894157e578e1..aa535aca0aa2 100644
--- a/sc/source/ui/view/spelldialog.cxx
+++ b/sc/source/ui/view/spelldialog.cxx
@@ -25,6 +25,7 @@
 #include <editeng/editview.hxx>
 #include <editeng/unolingu.hxx>
 #include <selectionstate.hxx>
+#include <osl/diagnose.h>
 
 #include <spelleng.hxx>
 #include <tabvwsh.hxx>
diff --git a/sc/source/ui/view/spelleng.cxx b/sc/source/ui/view/spelleng.cxx
index 23b09806c98b..c9285866485a 100644
--- a/sc/source/ui/view/spelleng.cxx
+++ b/sc/source/ui/view/spelleng.cxx
@@ -29,6 +29,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
+#include <osl/diagnose.h>
 
 #include <spelldialog.hxx>
 #include <tabvwsh.hxx>
diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx
index 7e7368548f9a..f4581d394dd0 100644
--- a/sc/source/ui/view/tabview.cxx
+++ b/sc/source/ui/view/tabview.cxx
@@ -50,6 +50,7 @@
 #include <spellcheckcontext.hxx>
 #include <comphelper/lok.hxx>
 #include <sfx2/lokhelper.hxx>
+#include <osl/diagnose.h>
 
 #include <boost/property_tree/ptree.hpp>
 #include <boost/property_tree/json_parser.hpp>
diff --git a/sc/source/ui/view/tabview2.cxx b/sc/source/ui/view/tabview2.cxx
index 787aa64fea71..0ec66ee6eb3c 100644
--- a/sc/source/ui/view/tabview2.cxx
+++ b/sc/source/ui/view/tabview2.cxx
@@ -21,6 +21,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <sfx2/bindings.hxx>
+#include <osl/diagnose.h>
 
 #include <attrib.hxx>
 #include <pagedata.hxx>
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index 46dea5fb338d..94ac00f7187b 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -31,6 +31,7 @@
 #include <vcl/uitest/logger.hxx>
 #include <vcl/uitest/eventdescription.hxx>
 #include <sal/log.hxx>
+#include <osl/diagnose.h>
 
 #include <IAnyRefDialog.hxx>
 #include <tabview.hxx>
diff --git a/sc/source/ui/view/tabview5.cxx b/sc/source/ui/view/tabview5.cxx
index 8f5963b9a189..d2158ebe6529 100644
--- a/sc/source/ui/view/tabview5.cxx
+++ b/sc/source/ui/view/tabview5.cxx
@@ -26,6 +26,7 @@
 #include <sfx2/lokhelper.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewfrm.hxx>
+#include <osl/diagnose.h>
 
 #include <tabview.hxx>
 #include <tabvwsh.hxx>
diff --git a/sc/source/ui/view/tabvwsh5.cxx b/sc/source/ui/view/tabvwsh5.cxx
index 948cfd5d5328..668e10aae8f3 100644
--- a/sc/source/ui/view/tabvwsh5.cxx
+++ b/sc/source/ui/view/tabvwsh5.cxx
@@ -26,6 +26,7 @@
 #include <sfx2/dispatch.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/viewfrm.hxx>
+#include <osl/diagnose.h>
 
 #include <tabvwsh.hxx>
 #include <global.hxx>
diff --git a/sc/source/ui/view/tabvwshe.cxx b/sc/source/ui/view/tabvwshe.cxx
index 51489544ade8..84b883a25924 100644
--- a/sc/source/ui/view/tabvwshe.cxx
+++ b/sc/source/ui/view/tabvwshe.cxx
@@ -20,6 +20,7 @@
 #include <comphelper/string.hxx>
 #include <comphelper/lok.hxx>
 #include <editeng/eeitem.hxx>
+#include <osl/diagnose.h>
 
 #include <editeng/editview.hxx>
 #include <editeng/flditem.hxx>
diff --git a/sc/source/ui/view/tabvwshg.cxx b/sc/source/ui/view/tabvwshg.cxx
index fa939bb6317c..26d67585301b 100644
--- a/sc/source/ui/view/tabvwshg.cxx
+++ b/sc/source/ui/view/tabvwshg.cxx
@@ -24,6 +24,7 @@
 #include <svx/svdouno.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/docfile.hxx>
+#include <osl/diagnose.h>
 
 #include <com/sun/star/form/FormButtonType.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sc/source/ui/view/tabvwshh.cxx b/sc/source/ui/view/tabvwshh.cxx
index f178175046fd..8eb262187b0e 100644
--- a/sc/source/ui/view/tabvwshh.cxx
+++ b/sc/source/ui/view/tabvwshh.cxx
@@ -29,6 +29,7 @@
 #include <svl/stritem.hxx>
 #include <svl/whiter.hxx>
 #include <vcl/svapp.hxx>
+#include <osl/diagnose.h>
 
 #include <tabvwsh.hxx>
 #include <document.hxx>
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 112226405232..43021d09c02d 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -39,6 +39,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <vcl/waitobj.hxx>
+#include <osl/diagnose.h>
 
 #include <viewfunc.hxx>
 #include <vcl/uitest/logger.hxx>
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index e6439ffc04b9..db5987e8b2a8 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -32,6 +32,7 @@
 #include <vcl/uitest/logger.hxx>
 #include <vcl/uitest/eventdescription.hxx>
 #include <vcl/TypeSerializer.hxx>
+#include <osl/diagnose.h>
 
 #include <attrib.hxx>
 #include <patattr.hxx>
diff --git a/sc/source/ui/view/viewfun4.cxx b/sc/source/ui/view/viewfun4.cxx
index 8b09321620c4..c151099b098f 100644
--- a/sc/source/ui/view/viewfun4.cxx
+++ b/sc/source/ui/view/viewfun4.cxx
@@ -44,6 +44,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <avmedia/mediawindow.hxx>
+#include <osl/diagnose.h>
 
 #include <comphelper/storagehelper.hxx>
 
diff --git a/sc/source/ui/view/viewfun7.cxx b/sc/source/ui/view/viewfun7.cxx
index d58c4300a684..9dafd25a64a1 100644
--- a/sc/source/ui/view/viewfun7.cxx
+++ b/sc/source/ui/view/viewfun7.cxx
@@ -32,6 +32,7 @@
 #include <sfx2/ipclient.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
 #include <com/sun/star/embed/Aspects.hpp>
+#include <osl/diagnose.h>
 
 #include <document.hxx>
 #include <viewfunc.hxx>
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 8e20a8348678..bef26c640673 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -39,6 +39,7 @@
 #include <unotools/charclass.hxx>
 #include <vcl/uitest/logger.hxx>
 #include <vcl/uitest/eventdescription.hxx>
+#include <osl/diagnose.h>
 
 #include <viewfunc.hxx>
 #include <tabvwsh.hxx>