[Libreoffice-commits] core.git: sw/source
Gabor Kelemen (via logerrit)
logerrit at kemper.freedesktop.org
Mon Aug 5 08:57:23 UTC 2019
sw/source/ui/chrdlg/break.cxx | 1 +
sw/source/ui/chrdlg/drpcps.cxx | 1 +
sw/source/ui/chrdlg/pardlg.cxx | 1 +
sw/source/ui/config/optcomp.cxx | 2 ++
sw/source/ui/config/optpage.cxx | 1 +
sw/source/ui/dbui/dbinsdlg.cxx | 1 +
sw/source/ui/dialog/swdlgfact.cxx | 1 +
sw/source/ui/dialog/uiregionsw.cxx | 1 +
sw/source/ui/dialog/wordcountdialog.cxx | 1 +
sw/source/ui/envelp/envfmt.cxx | 1 +
sw/source/ui/envelp/swuilabimp.hxx | 4 ++++
sw/source/ui/fmtui/tmpdlg.cxx | 1 +
sw/source/ui/frmdlg/column.cxx | 1 +
sw/source/ui/index/cnttab.cxx | 1 +
sw/source/ui/index/swuiidxmrk.cxx | 1 +
sw/source/ui/misc/bookmark.cxx | 1 +
sw/source/ui/misc/glossary.cxx | 2 ++
sw/source/ui/misc/num.cxx | 1 +
sw/source/ui/misc/srtdlg.cxx | 2 ++
sw/source/ui/table/tabledlg.cxx | 2 ++
sw/source/ui/table/tautofmt.cxx | 1 +
sw/source/uibase/app/apphdl.cxx | 1 +
sw/source/uibase/docvw/AnnotationWin.cxx | 1 +
sw/source/uibase/envelp/labelcfg.cxx | 2 ++
sw/source/uibase/inc/DateFormFieldDialog.hxx | 1 -
sw/source/uibase/inc/FrameControl.hxx | 1 +
sw/source/uibase/inc/FrameControlsManager.hxx | 2 --
sw/source/uibase/inc/HeaderFooterWin.hxx | 1 -
sw/source/uibase/inc/PageBreakWin.hxx | 3 ++-
sw/source/uibase/inc/UnfloatTableButton.hxx | 2 +-
sw/source/uibase/inc/fldmgr.hxx | 1 +
sw/source/uibase/inc/labimp.hxx | 4 +---
sw/source/uibase/inc/labrec.hxx | 2 ++
sw/source/uibase/inc/macassgn.hxx | 1 +
sw/source/uibase/inc/mailconfigpage.hxx | 3 ---
sw/source/uibase/inc/mailmergehelper.hxx | 1 -
sw/source/uibase/inc/mailmrge.hxx | 2 ++
sw/source/uibase/inc/mediash.hxx | 6 +++++-
sw/source/uibase/inc/navmgr.hxx | 4 ----
sw/source/uibase/inc/navsh.hxx | 6 ++++--
sw/source/uibase/inc/numfmtlb.hxx | 1 +
sw/source/uibase/inc/olmenu.hxx | 3 ++-
sw/source/uibase/inc/optcomp.hxx | 3 ---
sw/source/uibase/inc/optload.hxx | 10 ++++------
sw/source/uibase/inc/optpage.hxx | 5 -----
sw/source/uibase/inc/pardlg.hxx | 2 --
sw/source/uibase/inc/pgfnote.hxx | 4 ----
sw/source/uibase/inc/prcntfld.hxx | 2 --
sw/source/uibase/inc/redlndlg.hxx | 6 +-----
sw/source/uibase/inc/regionsw.hxx | 7 -------
sw/source/uibase/inc/shdwcrsr.hxx | 4 ++--
sw/source/uibase/inc/swdtflvr.hxx | 3 +++
sw/source/uibase/inc/swmodalredlineacceptdlg.hxx | 2 +-
sw/source/uibase/inc/swrenamexnameddlg.hxx | 2 +-
sw/source/uibase/inc/swtablerep.hxx | 1 -
sw/source/uibase/inc/swuiccoll.hxx | 2 ++
sw/source/uibase/inc/swuicnttab.hxx | 1 +
sw/source/uibase/inc/swuipardlg.hxx | 5 ++++-
sw/source/uibase/inc/tabledlg.hxx | 3 ---
sw/source/uibase/inc/tablemgr.hxx | 2 ++
sw/source/uibase/inc/titlepage.hxx | 2 ++
sw/source/uibase/inc/tmpdlg.hxx | 1 +
sw/source/uibase/inc/uiborder.hxx | 1 +
sw/source/uibase/inc/uiitems.hxx | 1 -
sw/source/uibase/inc/uiobject.hxx | 5 ++---
sw/source/uibase/inc/uitool.hxx | 1 -
sw/source/uibase/inc/uivwimp.hxx | 2 --
sw/source/uibase/inc/unoatxt.hxx | 1 -
sw/source/uibase/inc/unodispatch.hxx | 1 -
sw/source/uibase/inc/unomailmerge.hxx | 1 -
sw/source/uibase/inc/unomod.hxx | 2 +-
sw/source/uibase/inc/unotools.hxx | 6 ------
sw/source/uibase/inc/workctrl.hxx | 1 -
sw/source/uibase/inc/wrap.hxx | 1 +
sw/source/uibase/inc/wrtsh.hxx | 2 +-
sw/source/uibase/lingu/hyp.cxx | 1 +
sw/source/uibase/shells/textsh1.cxx | 1 +
sw/source/uibase/uiview/pview.cxx | 1 +
sw/source/uibase/uiview/view1.cxx | 1 +
sw/source/uibase/uiview/view2.cxx | 1 +
sw/source/uibase/uiview/viewprt.cxx | 1 +
sw/source/uibase/uno/unomod.cxx | 1 +
sw/source/uibase/utlui/prcntfld.cxx | 1 +
sw/source/uibase/utlui/unotools.cxx | 1 +
sw/source/uibase/wrtsh/navmgr.cxx | 1 +
85 files changed, 95 insertions(+), 83 deletions(-)
New commits:
commit d5d994789fcbbe327828424cae8c840beaea856f
Author: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Sun Jul 28 13:42:18 2019 +0200
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Mon Aug 5 10:56:39 2019 +0200
tdf#42949 Fix IWYU warnings in sw/source/uibase/inc/[l-z]*
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: Ie1c889bb9bd74b0d2bd859dad4c85a209db750a3
Reviewed-on: https://gerrit.libreoffice.org/76503
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
diff --git a/sw/source/ui/chrdlg/break.cxx b/sw/source/ui/chrdlg/break.cxx
index bcbd51149187..31cba5287627 100644
--- a/sw/source/ui/chrdlg/break.cxx
+++ b/sw/source/ui/chrdlg/break.cxx
@@ -19,6 +19,7 @@
#include <sfx2/request.hxx>
#include <svl/stritem.hxx>
+#include <vcl/svapp.hxx>
#include <cmdid.h>
#include <uitool.hxx>
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 752d2825a33d..5cd01dd96867 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -38,6 +38,7 @@
#include <sfx2/printer.hxx>
#include <svtools/unitconv.hxx>
#include <vcl/print.hxx>
+#include <vcl/svapp.hxx>
#include <com/sun/star/i18n/BreakIterator.hpp>
#include <com/sun/star/i18n/ScriptType.hpp>
#include <editeng/scripttypeitem.hxx>
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index e089b4bed935..78c8a0cfb310 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -30,6 +30,7 @@
#include <globals.hrc>
#include <swuipardlg.hxx>
#include <pagedesc.hxx>
+#include <pardlg.hxx>
#include <paratr.hxx>
#include <drpcps.hxx>
#include <uitool.hxx>
diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx
index b527bf6a989f..e3953b4ad779 100644
--- a/sw/source/ui/config/optcomp.cxx
+++ b/sw/source/ui/config/optcomp.cxx
@@ -19,6 +19,7 @@
#include <optcomp.hxx>
+#include <cmdid.h>
#include <docsh.hxx>
#include <swmodule.hxx>
#include <swtypes.hxx>
@@ -28,6 +29,7 @@
#include <globals.hrc>
#include <unotools/configmgr.hxx>
+#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/docfilt.hxx>
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index e21ad734d6ed..45d811a45452 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -73,6 +73,7 @@
#include <svx/strarray.hxx>
#include <svx/svxids.hrc>
+#include <vcl/event.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
diff --git a/sw/source/ui/dbui/dbinsdlg.cxx b/sw/source/ui/dbui/dbinsdlg.cxx
index 07ce4b12186e..b994a4e8ed44 100644
--- a/sw/source/ui/dbui/dbinsdlg.cxx
+++ b/sw/source/ui/dbui/dbinsdlg.cxx
@@ -73,6 +73,7 @@
#include <tblafmt.hxx>
#include <cellatr.hxx>
#include <swtable.hxx>
+#include <swtablerep.hxx>
#include <dbfld.hxx>
#include <fmtcol.hxx>
#include <section.hxx>
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index 04a2c0f5e7f9..b4da2613af55 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -47,6 +47,7 @@
#include <drpcps.hxx>
#include <swuipardlg.hxx>
#include <pattern.hxx>
+#include <pardlg.hxx>
#include <rowht.hxx>
#include <selglos.hxx>
#include <splittbl.hxx>
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index ff02fca679af..edcb298983db 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -47,6 +47,7 @@
#include <wrtsh.hxx>
#include <swundo.hxx>
#include <column.hxx>
+#include <fmtclbl.hxx>
#include <fmtfsize.hxx>
#include <frmatr.hxx>
#include <shellio.hxx>
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx
index 1e0343ab3327..4d7f3b6e1d9d 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -30,6 +30,7 @@
#include <svl/cjkoptions.hxx>
#include <unotools/localedatawrapper.hxx>
#include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
SwWordCountFloatDlg::~SwWordCountFloatDlg()
{
diff --git a/sw/source/ui/envelp/envfmt.cxx b/sw/source/ui/envelp/envfmt.cxx
index 7659bf7d7997..528d202cf477 100644
--- a/sw/source/ui/envelp/envfmt.cxx
+++ b/sw/source/ui/envelp/envfmt.cxx
@@ -38,6 +38,7 @@
#include <fmtcol.hxx>
#include <swuipardlg.hxx>
#include <chrdlgmodes.hxx>
+#include <pardlg.hxx>
#include <pattern.hxx>
#include <poolfmt.hxx>
#include <uitool.hxx>
diff --git a/sw/source/ui/envelp/swuilabimp.hxx b/sw/source/ui/envelp/swuilabimp.hxx
index a26f1b9a50cd..ccdd6a476267 100644
--- a/sw/source/ui/envelp/swuilabimp.hxx
+++ b/sw/source/ui/envelp/swuilabimp.hxx
@@ -19,8 +19,12 @@
#ifndef INCLUDED_SW_SOURCE_UI_ENVELP_SWUILABIMP_HXX
#define INCLUDED_SW_SOURCE_UI_ENVELP_SWUILABIMP_HXX
+#include <label.hxx>
+#include <labimg.hxx>
#include <labimp.hxx>
+#include <labrec.hxx>
#include <com/sun/star/text/XAutoTextContainer2.hpp>
+#include <sfx2/tabdlg.hxx>
#include <vcl/layout.hxx>
class SwLabPage : public SfxTabPage
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx
index 276e6dc2848c..9794d9b76a7d 100644
--- a/sw/source/ui/fmtui/tmpdlg.cxx
+++ b/sw/source/ui/fmtui/tmpdlg.cxx
@@ -26,6 +26,7 @@
#include <sfx2/htmlmode.hxx>
#include <svtools/htmlcfg.hxx>
#include <svl/cjkoptions.hxx>
+#include <vcl/svapp.hxx>
#include <numpara.hxx>
#include <fmtclds.hxx>
#include <swtypes.hxx>
diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx
index 6e12124f9602..769bf2d9fcc9 100644
--- a/sw/source/ui/frmdlg/column.cxx
+++ b/sw/source/ui/frmdlg/column.cxx
@@ -41,6 +41,7 @@
#include <sfx2/viewfrm.hxx>
#include <vcl/event.hxx>
#include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
#include <swmodule.hxx>
#include <sal/macros.h>
diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx
index 3674207acebb..72ae0aab4399 100644
--- a/sw/source/ui/index/cnttab.cxx
+++ b/sw/source/ui/index/cnttab.cxx
@@ -22,6 +22,7 @@
#include <sal/log.hxx>
#include <svl/style.hxx>
#include <vcl/help.hxx>
+#include <vcl/layout.hxx>
#include <vcl/weld.hxx>
#include <svl/stritem.hxx>
#include <svl/urihelper.hxx>
diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx
index ab42f1e84d62..b1a0885e1eee 100644
--- a/sw/source/ui/index/swuiidxmrk.cxx
+++ b/sw/source/ui/index/swuiidxmrk.cxx
@@ -30,6 +30,7 @@
#include <com/sun/star/util/SearchFlags.hpp>
#include <i18nutil/searchopt.hxx>
#include <svl/stritem.hxx>
+#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/viewfrm.hxx>
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index e7de483ae76f..d7d891558abf 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -20,6 +20,7 @@
#include <sfx2/request.hxx>
#include <svl/stritem.hxx>
#include <svx/svxids.hrc>
+#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <com/sun/star/text/XBookmarksSupplier.hpp>
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index f0bf1d266638..8cc06b447e58 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -20,6 +20,8 @@
#include <hintids.hxx>
#include <o3tl/any.hxx>
+#include <vcl/event.hxx>
+#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <vcl/help.hxx>
#include <svl/stritem.hxx>
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 5599d7fc2b9b..20c74684f54b 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -23,6 +23,7 @@
#include <editeng/brushitem.hxx>
#include <editeng/lrspitem.hxx>
#include <editeng/numitem.hxx>
+#include <cmdid.h>
#include <swmodule.hxx>
#include <wrtsh.hxx>
#include <docsh.hxx>
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index 3d8cdb86e4e0..6e0519dbbea3 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -21,6 +21,7 @@
#include <srtdlg.hxx>
+#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <svl/intitem.hxx>
#include <svl/eitem.hxx>
@@ -38,6 +39,7 @@
#include <app.hrc>
#include <strings.hrc>
#include <swtable.hxx>
+#include <sortopt.hxx>
#include <node.hxx>
#include <tblsel.hxx>
#include <sfx2/request.hxx>
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index ba3ecf39fa23..adcd25af5d4c 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -18,6 +18,7 @@
*/
#include <hintids.hxx>
+#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <svl/stritem.hxx>
#include <svl/intitem.hxx>
@@ -51,6 +52,7 @@
#include <pagedesc.hxx>
#include <uiitems.hxx>
#include <poolfmt.hxx>
+#include <swtablerep.hxx>
#include <SwStyleNameMapper.hxx>
#include <app.hrc>
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index e2cfa38a688d..da6ffbe0455a 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -18,6 +18,7 @@
*/
#include <memory>
+#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <sal/log.hxx>
#include <strings.hrc>
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index a48505ac998d..683b6b049c92 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -41,6 +41,7 @@
#include <sfx2/docfile.hxx>
#include <sfx2/objface.hxx>
#include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
#include <view.hxx>
#include <pview.hxx>
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
index 3de3daf90eb9..fa4284ab393a 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -28,6 +28,7 @@
#include <vcl/edit.hxx>
#include <vcl/menu.hxx>
#include <vcl/scrbar.hxx>
+#include <vcl/svapp.hxx>
#include <svl/undo.hxx>
#include <unotools/localedatawrapper.hxx>
diff --git a/sw/source/uibase/envelp/labelcfg.cxx b/sw/source/uibase/envelp/labelcfg.cxx
index f562fba66d5b..7693009b43fc 100644
--- a/sw/source/uibase/envelp/labelcfg.cxx
+++ b/sw/source/uibase/envelp/labelcfg.cxx
@@ -29,6 +29,8 @@
#include <comphelper/sequence.hxx>
#include <osl/diagnose.h>
+#include <com/sun/star/beans/PropertyValue.hpp>
+
#include <unomid.h>
using namespace utl;
diff --git a/sw/source/uibase/inc/DateFormFieldDialog.hxx b/sw/source/uibase/inc/DateFormFieldDialog.hxx
index a09227c9af69..11ae445fe10a 100644
--- a/sw/source/uibase/inc/DateFormFieldDialog.hxx
+++ b/sw/source/uibase/inc/DateFormFieldDialog.hxx
@@ -11,7 +11,6 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_DATEFORMFIELDDIALOG_HXX
#include <vcl/weld.hxx>
-#include "actctrl.hxx"
#include "numfmtlb.hxx"
class SvNumberFormatter;
diff --git a/sw/source/uibase/inc/FrameControl.hxx b/sw/source/uibase/inc/FrameControl.hxx
index cae1e1eacb85..2ef085d3bde5 100644
--- a/sw/source/uibase/inc/FrameControl.hxx
+++ b/sw/source/uibase/inc/FrameControl.hxx
@@ -11,6 +11,7 @@
#include <vcl/menubtn.hxx>
+#include "edtwin.hxx"
class SwEditWin;
class SwPageFrame;
diff --git a/sw/source/uibase/inc/FrameControlsManager.hxx b/sw/source/uibase/inc/FrameControlsManager.hxx
index e8b5e33f3806..66685bd8b174 100644
--- a/sw/source/uibase/inc/FrameControlsManager.hxx
+++ b/sw/source/uibase/inc/FrameControlsManager.hxx
@@ -9,14 +9,12 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_FRAMECONTROLSMANAGER_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_FRAMECONTROLSMANAGER_HXX
-#include <viewsh.hxx>
#include "FrameControl.hxx"
#include <tools/gen.hxx>
#include <map>
#include <memory>
-#include <vector>
class SwPageFrame;
class SwEditWin;
diff --git a/sw/source/uibase/inc/HeaderFooterWin.hxx b/sw/source/uibase/inc/HeaderFooterWin.hxx
index d79ba707d7e7..ddca1de58034 100644
--- a/sw/source/uibase/inc/HeaderFooterWin.hxx
+++ b/sw/source/uibase/inc/HeaderFooterWin.hxx
@@ -12,7 +12,6 @@
#include "edtwin.hxx"
#include "FrameControl.hxx"
#include <vcl/builder.hxx>
-#include <vcl/menubtn.hxx>
#include <vcl/timer.hxx>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
diff --git a/sw/source/uibase/inc/PageBreakWin.hxx b/sw/source/uibase/inc/PageBreakWin.hxx
index 8e0ad200137e..9b07dd3ac133 100644
--- a/sw/source/uibase/inc/PageBreakWin.hxx
+++ b/sw/source/uibase/inc/PageBreakWin.hxx
@@ -9,9 +9,10 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_PAGEBREAKWIN_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_PAGEBREAKWIN_HXX
+#include "edtwin.hxx"
#include "FrameControl.hxx"
#include <vcl/builder.hxx>
-#include <vcl/menubtn.hxx>
+#include <vcl/timer.hxx>
#include <boost/optional.hpp>
class Menu;
diff --git a/sw/source/uibase/inc/UnfloatTableButton.hxx b/sw/source/uibase/inc/UnfloatTableButton.hxx
index cdf6eafb439d..701c824b814e 100644
--- a/sw/source/uibase/inc/UnfloatTableButton.hxx
+++ b/sw/source/uibase/inc/UnfloatTableButton.hxx
@@ -10,8 +10,8 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_DOCVW_UNFLOATTABLEBUTTON_HXX
#define INCLUDED_SW_SOURCE_UIBASE_DOCVW_UNFLOATTABLEBUTTON_HXX
+#include "edtwin.hxx"
#include "FrameControl.hxx"
-#include <vcl/menubtn.hxx>
/** Class for unfloat table button
*
diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx
index d37ab8eaf170..8f5a0a791508 100644
--- a/sw/source/uibase/inc/fldmgr.hxx
+++ b/sw/source/uibase/inc/fldmgr.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_FLDMGR_HXX
#include <fldbas.hxx>
+#include <pam.hxx>
#include <swdllapi.h>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Any.h>
diff --git a/sw/source/uibase/inc/labimp.hxx b/sw/source/uibase/inc/labimp.hxx
index 2b3f7b73f9d3..928ee86ec600 100644
--- a/sw/source/uibase/inc/labimp.hxx
+++ b/sw/source/uibase/inc/labimp.hxx
@@ -19,9 +19,7 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_LABIMP_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_LABIMP_HXX
-#include <sfx2/tabdlg.hxx>
-#include "label.hxx"
-#include "labimg.hxx"
+#include <vcl/weld.hxx>
#define GETFLDVAL(rField) (rField).Denormalize((rField).GetValue(FieldUnit::TWIP))
#define SETFLDVAL(rField, lValue) (rField).SetValue((rField).Normalize(lValue), FieldUnit::TWIP)
diff --git a/sw/source/uibase/inc/labrec.hxx b/sw/source/uibase/inc/labrec.hxx
index 4570226e5ab4..1810ff476dba 100644
--- a/sw/source/uibase/inc/labrec.hxx
+++ b/sw/source/uibase/inc/labrec.hxx
@@ -19,6 +19,8 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_LABREC_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_LABREC_HXX
+#include <rtl/ustring.hxx>
+
#include <memory>
#include <vector>
diff --git a/sw/source/uibase/inc/macassgn.hxx b/sw/source/uibase/inc/macassgn.hxx
index 059ea99900b1..6c1ce2c4dbdc 100644
--- a/sw/source/uibase/inc/macassgn.hxx
+++ b/sw/source/uibase/inc/macassgn.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_MACASSGN_HXX
#include <sfx2/evntconf.hxx>
+#include <vcl/weld.hxx>
class SwWrtShell;
class SvxMacroItem;
diff --git a/sw/source/uibase/inc/mailconfigpage.hxx b/sw/source/uibase/inc/mailconfigpage.hxx
index 136717c80193..f883b4100454 100644
--- a/sw/source/uibase/inc/mailconfigpage.hxx
+++ b/sw/source/uibase/inc/mailconfigpage.hxx
@@ -20,9 +20,6 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_MAILCONFIGPAGE_HXX
#include <sfx2/tabdlg.hxx>
-#include <vcl/button.hxx>
-#include <vcl/field.hxx>
-#include <vcl/fixed.hxx>
#include <sfx2/basedlgs.hxx>
class SwTestAccountSettingsDialog;
diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx
index ebf05e0c700c..f93161a7108c 100644
--- a/sw/source/uibase/inc/mailmergehelper.hxx
+++ b/sw/source/uibase/inc/mailmergehelper.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MAILMERGEHELPER_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_MAILMERGEHELPER_HXX
-#include <unotools/configitem.hxx>
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/mail/XAuthenticator.hpp>
#include <com/sun/star/mail/XConnectionListener.hpp>
diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx
index fb8773a3a602..0452a9af13e9 100644
--- a/sw/source/uibase/inc/mailmrge.hxx
+++ b/sw/source/uibase/inc/mailmrge.hxx
@@ -33,6 +33,8 @@
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/uno/Reference.h>
+#include <dbmgr.hxx>
+
class SwWrtShell;
class SwModuleOptions;
class SwXSelChgLstnr_Impl;
diff --git a/sw/source/uibase/inc/mediash.hxx b/sw/source/uibase/inc/mediash.hxx
index 68f13ca215fe..b67f903f01ee 100644
--- a/sw/source/uibase/inc/mediash.hxx
+++ b/sw/source/uibase/inc/mediash.hxx
@@ -19,7 +19,11 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_MEDIASH_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_MEDIASH_HXX
-#include "frmsh.hxx"
+#include <sfx2/module.hxx>
+#include <sfx2/shell.hxx>
+
+#include "basesh.hxx"
+#include <shellid.hxx>
class SwMediaShell: public SwBaseShell
{
diff --git a/sw/source/uibase/inc/navmgr.hxx b/sw/source/uibase/inc/navmgr.hxx
index d99e44433edd..858b990fd11d 100644
--- a/sw/source/uibase/inc/navmgr.hxx
+++ b/sw/source/uibase/inc/navmgr.hxx
@@ -10,12 +10,8 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_NAVMGR_HXX
#include <vector>
-#include <memory>
-#include <swtypes.hxx>
-#include <calbck.hxx>
#include <unocrsr.hxx>
-#include <vcl/svapp.hxx>
class SwWrtShell;
struct SwPosition;
diff --git a/sw/source/uibase/inc/navsh.hxx b/sw/source/uibase/inc/navsh.hxx
index 287c0acb2cad..4bc26ecb17de 100644
--- a/sw/source/uibase/inc/navsh.hxx
+++ b/sw/source/uibase/inc/navsh.hxx
@@ -9,9 +9,11 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_NAVSH_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_NAVSH_HXX
-#include "frmsh.hxx"
+#include <sfx2/module.hxx>
+#include <sfx2/shell.hxx>
-class SfxItemSet;
+#include "basesh.hxx"
+#include <shellid.hxx>
class SwNavigationShell: public SwBaseShell
{
diff --git a/sw/source/uibase/inc/numfmtlb.hxx b/sw/source/uibase/inc/numfmtlb.hxx
index 9a043d56cd9b..5349665ce317 100644
--- a/sw/source/uibase/inc/numfmtlb.hxx
+++ b/sw/source/uibase/inc/numfmtlb.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_NUMFMTLB_HXX
#include <vcl/lstbox.hxx>
+#include <vcl/weld.hxx>
#include <svl/zforlist.hxx>
#include <swdllapi.h>
diff --git a/sw/source/uibase/inc/olmenu.hxx b/sw/source/uibase/inc/olmenu.hxx
index bda8b7ddb3d4..db80e20e931a 100644
--- a/sw/source/uibase/inc/olmenu.hxx
+++ b/sw/source/uibase/inc/olmenu.hxx
@@ -26,12 +26,13 @@
#include <rtl/ustring.hxx>
#include <vcl/builder.hxx>
-#include <vcl/image.hxx>
#include <vcl/menu.hxx>
#include <map>
#include <vector>
+#include <swdllapi.h>
+
//! Don't change these values. You may break context menu modifying extensions!
#define MN_IGNORE_SELECTION 201
#define MN_SHORT_COMMENT 208
diff --git a/sw/source/uibase/inc/optcomp.hxx b/sw/source/uibase/inc/optcomp.hxx
index 2337893b5ed5..c153a4d9eed1 100644
--- a/sw/source/uibase/inc/optcomp.hxx
+++ b/sw/source/uibase/inc/optcomp.hxx
@@ -21,9 +21,6 @@
#include <memory>
#include <sfx2/tabdlg.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/layout.hxx>
-#include <vcl/lstbox.hxx>
#include <unotools/compatibility.hxx>
#include <unotools/compatibilityviewoptions.hxx>
#include <rtl/ustring.hxx>
diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx
index 7b0193acf652..d49924b961bf 100644
--- a/sw/source/uibase/inc/optload.hxx
+++ b/sw/source/uibase/inc/optload.hxx
@@ -19,17 +19,15 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_OPTLOAD_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_OPTLOAD_HXX
+#include <tools/globname.hxx>
#include <sfx2/tabdlg.hxx>
#include <vcl/customweld.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/layout.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/field.hxx>
+#include <vcl/edit.hxx>
#include <vcl/weld.hxx>
-#include <svx/strarray.hxx>
#include <sfx2/basedlgs.hxx>
-#include "caption.hxx"
+
+#include <SwCapObjType.hxx>
class SwFieldMgr;
class SvTreeListEntry;
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index 97af1974b1ea..f6ef68d9d769 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.hxx
@@ -20,11 +20,6 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_OPTPAGE_HXX
#include <sfx2/tabdlg.hxx>
-#include <vcl/button.hxx>
-#include <vcl/layout.hxx>
-#include <vcl/lstbox.hxx>
-#include <vcl/field.hxx>
-#include <vcl/fixed.hxx>
#include <vcl/weld.hxx>
#include <svtools/ctrlbox.hxx>
#include <svx/colorbox.hxx>
diff --git a/sw/source/uibase/inc/pardlg.hxx b/sw/source/uibase/inc/pardlg.hxx
index c73e029a5ea1..c417c7223906 100644
--- a/sw/source/uibase/inc/pardlg.hxx
+++ b/sw/source/uibase/inc/pardlg.hxx
@@ -19,8 +19,6 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_PARDLG_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_PARDLG_HXX
-#include <sfx2/tabdlg.hxx>
-
//DialogModes:
#define DLG_STD 0
#define DLG_ENVELOP 2
diff --git a/sw/source/uibase/inc/pgfnote.hxx b/sw/source/uibase/inc/pgfnote.hxx
index 4ebf0d14f812..1333672518f8 100644
--- a/sw/source/uibase/inc/pgfnote.hxx
+++ b/sw/source/uibase/inc/pgfnote.hxx
@@ -21,10 +21,6 @@
#include <sfx2/tabdlg.hxx>
-#include <vcl/field.hxx>
-
-#include <vcl/fixed.hxx>
-
#include <svtools/ctrlbox.hxx>
#include <svx/colorbox.hxx>
diff --git a/sw/source/uibase/inc/prcntfld.hxx b/sw/source/uibase/inc/prcntfld.hxx
index 4616a0cec216..f9e682c5194c 100644
--- a/sw/source/uibase/inc/prcntfld.hxx
+++ b/sw/source/uibase/inc/prcntfld.hxx
@@ -20,10 +20,8 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_PRCNTFLD_HXX
#include <svtools/unitconv.hxx>
-#include <vcl/field.hxx>
#include <vcl/weld.hxx>
#include <swdllapi.h>
-#include "uitool.hxx"
class SW_DLLPUBLIC SwPercentField
{
diff --git a/sw/source/uibase/inc/redlndlg.hxx b/sw/source/uibase/inc/redlndlg.hxx
index 615f69789cc4..447cd091becb 100644
--- a/sw/source/uibase/inc/redlndlg.hxx
+++ b/sw/source/uibase/inc/redlndlg.hxx
@@ -21,14 +21,10 @@
#include <swdllapi.h>
#include "chldwrap.hxx"
#include <redline.hxx>
-#include <tools/datetime.hxx>
-#include <svl/eitem.hxx>
#include <svx/sidebar/PanelLayout.hxx>
#include <sfx2/basedlgs.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/dispatch.hxx>
+#include <svl/lstner.hxx>
#include <svx/ctredlin.hxx>
-#include <svx/postattr.hxx>
#include <o3tl/sorted_vector.hxx>
#include <memory>
diff --git a/sw/source/uibase/inc/regionsw.hxx b/sw/source/uibase/inc/regionsw.hxx
index 5cb7257deb3e..52719c41e3b3 100644
--- a/sw/source/uibase/inc/regionsw.hxx
+++ b/sw/source/uibase/inc/regionsw.hxx
@@ -19,21 +19,14 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_REGIONSW_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_REGIONSW_HXX
-#include <hintids.hxx>
#include <sfx2/basedlgs.hxx>
#include <sfx2/tabdlg.hxx>
-#include <editeng/brushitem.hxx>
#include "condedit.hxx"
#include <section.hxx>
-#include <fmtclds.hxx>
#include <fmtftntx.hxx>
-#include <fmtclbl.hxx>
#include "numberingtypelistbox.hxx"
-#include <editeng/frmdiritem.hxx>
-#include <vcl/image.hxx>
#include <svx/paraprev.hxx>
-#include <editeng/lrspitem.hxx>
#include <memory>
#include <map>
diff --git a/sw/source/uibase/inc/shdwcrsr.hxx b/sw/source/uibase/inc/shdwcrsr.hxx
index 8f79f7722e63..4ae03f2fc422 100644
--- a/sw/source/uibase/inc/shdwcrsr.hxx
+++ b/sw/source/uibase/inc/shdwcrsr.hxx
@@ -21,10 +21,10 @@
#include <tools/gen.hxx>
#include <tools/color.hxx>
+#include <vcl/vclptr.hxx>
+#include <vcl/window.hxx>
#include <limits.h>
-namespace vcl { class Window; }
-
class SwShadowCursor
{
VclPtr<vcl::Window> pWin;
diff --git a/sw/source/uibase/inc/swdtflvr.hxx b/sw/source/uibase/inc/swdtflvr.hxx
index c19bc8efc075..0b6cccc381a2 100644
--- a/sw/source/uibase/inc/swdtflvr.hxx
+++ b/sw/source/uibase/inc/swdtflvr.hxx
@@ -23,6 +23,7 @@
#include <vcl/transfer.hxx>
#include <vcl/graph.hxx>
+#include <vcl/vclptr.hxx>
#include <sfx2/lnkbase.hxx>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <o3tl/deleter.hxx>
@@ -30,6 +31,8 @@
#include <svx/swframetypes.hxx>
#include <memory>
+#include <swdllapi.h>
+
class Graphic;
class ImageMap;
class INetBookmark;
diff --git a/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx b/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx
index 546f1c4a39dd..5c5450d5304f 100644
--- a/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx
+++ b/sw/source/uibase/inc/swmodalredlineacceptdlg.hxx
@@ -18,7 +18,7 @@
*/
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWMODALREDLINEACCEPTDLG_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_SWMODALREDLINEACCEPTDLG_HXX
-#include "chldwrap.hxx"
+
#include <sfx2/basedlgs.hxx>
class SwRedlineAcceptDlg;
diff --git a/sw/source/uibase/inc/swrenamexnameddlg.hxx b/sw/source/uibase/inc/swrenamexnameddlg.hxx
index 14bfcab89754..b847d54e7ac4 100644
--- a/sw/source/uibase/inc/swrenamexnameddlg.hxx
+++ b/sw/source/uibase/inc/swrenamexnameddlg.hxx
@@ -19,8 +19,8 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWRENAMEXNAMEDDLG_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_SWRENAMEXNAMEDDLG_HXX
+#include <vcl/edit.hxx>
#include <vcl/weld.hxx>
-#include "actctrl.hxx"
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/container/XNamed.hpp>
diff --git a/sw/source/uibase/inc/swtablerep.hxx b/sw/source/uibase/inc/swtablerep.hxx
index dd7bbbca7ceb..82f9fb92bffa 100644
--- a/sw/source/uibase/inc/swtablerep.hxx
+++ b/sw/source/uibase/inc/swtablerep.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_SWTABLEREP_HXX
#include <memory>
-#include <sfx2/tabdlg.hxx>
#include <swdllapi.h>
#include <swtypes.hxx>
diff --git a/sw/source/uibase/inc/swuiccoll.hxx b/sw/source/uibase/inc/swuiccoll.hxx
index 59a2b5a39edf..c3f10021a74a 100644
--- a/sw/source/uibase/inc/swuiccoll.hxx
+++ b/sw/source/uibase/inc/swuiccoll.hxx
@@ -21,6 +21,8 @@
#include <sfx2/tabdlg.hxx>
+#include <ccoll.hxx>
+
class SwWrtShell;
class SwFormat;
diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx
index a1e82d4851b6..84b90945e2ac 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -22,6 +22,7 @@
#include <sfx2/tabdlg.hxx>
#include <svx/langbox.hxx>
#include <vcl/weld.hxx>
+#include <vcl/customweld.hxx>
#include <tox.hxx>
#include "toxmgr.hxx"
diff --git a/sw/source/uibase/inc/swuipardlg.hxx b/sw/source/uibase/inc/swuipardlg.hxx
index 8783176f9ffe..ac50f0a520db 100644
--- a/sw/source/uibase/inc/swuipardlg.hxx
+++ b/sw/source/uibase/inc/swuipardlg.hxx
@@ -18,7 +18,10 @@
*/
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_SWUIPARDLG_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_SWUIPARDLG_HXX
-#include "pardlg.hxx"
+
+#include <view.hxx>
+
+#include <sfx2/tabdlg.hxx>
class SwParaDlg: public SfxTabDialogController
{
diff --git a/sw/source/uibase/inc/tabledlg.hxx b/sw/source/uibase/inc/tabledlg.hxx
index 4111a0485ff1..8db3671e34c0 100644
--- a/sw/source/uibase/inc/tabledlg.hxx
+++ b/sw/source/uibase/inc/tabledlg.hxx
@@ -21,9 +21,6 @@
#include <sfx2/tabdlg.hxx>
-#include <swtypes.hxx>
-#include "swtablerep.hxx"
-
class SwWrtShell;
struct TColumn;
diff --git a/sw/source/uibase/inc/tablemgr.hxx b/sw/source/uibase/inc/tablemgr.hxx
index baf1ee6746c7..a5c1bf953084 100644
--- a/sw/source/uibase/inc/tablemgr.hxx
+++ b/sw/source/uibase/inc/tablemgr.hxx
@@ -23,6 +23,8 @@
#include <swtypes.hxx>
#include <tabcol.hxx>
+#include <vcl/weld.hxx>
+
class SwFrameFormat;
class SwWrtShell;
namespace vcl { class Window; }
diff --git a/sw/source/uibase/inc/titlepage.hxx b/sw/source/uibase/inc/titlepage.hxx
index 062d500574f6..2679c00176ec 100644
--- a/sw/source/uibase/inc/titlepage.hxx
+++ b/sw/source/uibase/inc/titlepage.hxx
@@ -12,6 +12,8 @@
#include <sfx2/basedlgs.hxx>
+#include <fmtpdsc.hxx>
+
namespace vcl { class Window; }
class SwWrtShell;
class SwPageDesc;
diff --git a/sw/source/uibase/inc/tmpdlg.hxx b/sw/source/uibase/inc/tmpdlg.hxx
index 7b1358ba184a..514867c2bc9c 100644
--- a/sw/source/uibase/inc/tmpdlg.hxx
+++ b/sw/source/uibase/inc/tmpdlg.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_TMPDLG_HXX
#include <sfx2/styledlg.hxx>
+#include <svl/style.hxx>
class SfxItemSet;
class SwWrtShell;
diff --git a/sw/source/uibase/inc/uiborder.hxx b/sw/source/uibase/inc/uiborder.hxx
index 9f972373ff06..f3764ad9fb2e 100644
--- a/sw/source/uibase/inc/uiborder.hxx
+++ b/sw/source/uibase/inc/uiborder.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_UIBORDER_HXX
#include <sfx2/basedlgs.hxx>
+#include <svx/flagsdef.hxx>
class SwBorderDlg : public SfxSingleTabDialogController
{
diff --git a/sw/source/uibase/inc/uiitems.hxx b/sw/source/uibase/inc/uiitems.hxx
index 9be4523c00b7..e317006e1ba4 100644
--- a/sw/source/uibase/inc/uiitems.hxx
+++ b/sw/source/uibase/inc/uiitems.hxx
@@ -22,7 +22,6 @@
#include <memory>
#include <svl/poolitem.hxx>
#include <swdllapi.h>
-#include <cmdid.h>
#include <pagedesc.hxx>
class SwNumRule;
diff --git a/sw/source/uibase/inc/uiobject.hxx b/sw/source/uibase/inc/uiobject.hxx
index b3da542e1b4b..97362b51ae0f 100644
--- a/sw/source/uibase/inc/uiobject.hxx
+++ b/sw/source/uibase/inc/uiobject.hxx
@@ -13,7 +13,8 @@
#include <memory>
#include <vcl/uitest/uiobject.hxx>
-class SwEditWin;
+#include "edtwin.hxx"
+#include "navipi.hxx"
class SwEditWinUIObject : public WindowUIObject
{
@@ -38,8 +39,6 @@ private:
};
-class SwNavigationPI;
-
class SwNavigationPIUIObject : public WindowUIObject
{
VclPtr<SwNavigationPI> mxSwNavigationPI;
diff --git a/sw/source/uibase/inc/uitool.hxx b/sw/source/uibase/inc/uitool.hxx
index 8b4a9ea738be..d7370fa0dc09 100644
--- a/sw/source/uibase/inc/uitool.hxx
+++ b/sw/source/uibase/inc/uitool.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_UITOOL_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_UITOOL_HXX
-#include <tools/wintypes.hxx>
#include <vcl/field.hxx>
#include <vcl/weld.hxx>
#include <swtypes.hxx>
diff --git a/sw/source/uibase/inc/uivwimp.hxx b/sw/source/uibase/inc/uivwimp.hxx
index 006be555cc81..fe01807ef2a0 100644
--- a/sw/source/uibase/inc/uivwimp.hxx
+++ b/sw/source/uibase/inc/uivwimp.hxx
@@ -19,8 +19,6 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_UIVWIMP_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_UIVWIMP_HXX
-#include <config_features.h>
-
#include <view.hxx>
#include <sfx2/objsh.hxx>
diff --git a/sw/source/uibase/inc/unoatxt.hxx b/sw/source/uibase/inc/unoatxt.hxx
index d1c80753a423..6e7e27359579 100644
--- a/sw/source/uibase/inc/unoatxt.hxx
+++ b/sw/source/uibase/inc/unoatxt.hxx
@@ -24,7 +24,6 @@
#include <com/sun/star/document/XEventsSupplier.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/text/XAutoTextGroup.hpp>
#include <com/sun/star/text/XAutoTextEntry.hpp>
#include <com/sun/star/text/XAutoTextContainer2.hpp>
diff --git a/sw/source/uibase/inc/unodispatch.hxx b/sw/source/uibase/inc/unodispatch.hxx
index 547e90b108dd..ec9a722ed12a 100644
--- a/sw/source/uibase/inc/unodispatch.hxx
+++ b/sw/source/uibase/inc/unodispatch.hxx
@@ -28,7 +28,6 @@
#include <cppuhelper/implbase.hxx>
#include <vector>
#include <vcl/svapp.hxx>
-#include <osl/mutex.hxx>
class SwView;
diff --git a/sw/source/uibase/inc/unomailmerge.hxx b/sw/source/uibase/inc/unomailmerge.hxx
index 243d226105b3..b8d6c1866ed1 100644
--- a/sw/source/uibase/inc/unomailmerge.hxx
+++ b/sw/source/uibase/inc/unomailmerge.hxx
@@ -23,7 +23,6 @@
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/interfacecontainer.hxx>
#include <comphelper/interfacecontainer2.hxx>
-#include <unotools/configitem.hxx>
#include <com/sun/star/task/XJob.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sw/source/uibase/inc/unomod.hxx b/sw/source/uibase/inc/unomod.hxx
index 016e7c576443..ef53b761b544 100644
--- a/sw/source/uibase/inc/unomod.hxx
+++ b/sw/source/uibase/inc/unomod.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <cppuhelper/implbase.hxx>
#include <comphelper/ChainablePropertySet.hxx>
-#include "usrpref.hxx"
+#include <tools/fldunit.hxx>
class SwView;
class SwViewOption;
diff --git a/sw/source/uibase/inc/unotools.hxx b/sw/source/uibase/inc/unotools.hxx
index 51931ec1ce5f..429f6a0e96c4 100644
--- a/sw/source/uibase/inc/unotools.hxx
+++ b/sw/source/uibase/inc/unotools.hxx
@@ -19,17 +19,11 @@
#ifndef INCLUDED_SW_SOURCE_UIBASE_INC_UNOTOOLS_HXX
#define INCLUDED_SW_SOURCE_UIBASE_INC_UNOTOOLS_HXX
-#include <vcl/button.hxx>
-#include <vcl/edit.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/layout.hxx>
#include <vcl/idle.hxx>
#include <vcl/weld.hxx>
#include <vcl/customweld.hxx>
-#include "actctrl.hxx"
#include <com/sun/star/frame/XController.hpp>
#include <com/sun/star/text/XTextCursor.hpp>
-#include <com/sun/star/awt/XControl.hpp>
#include <swdllapi.h>
#define EX_SHOW_ONLINE_LAYOUT 0x001
diff --git a/sw/source/uibase/inc/workctrl.hxx b/sw/source/uibase/inc/workctrl.hxx
index 9d3caeb4c26a..b276d9c1ac5c 100644
--- a/sw/source/uibase/inc/workctrl.hxx
+++ b/sw/source/uibase/inc/workctrl.hxx
@@ -21,7 +21,6 @@
#include <sfx2/tbxctrl.hxx>
#include <vcl/toolbox.hxx>
-#include <vcl/button.hxx>
class PopupMenu;
class SwView;
diff --git a/sw/source/uibase/inc/wrap.hxx b/sw/source/uibase/inc/wrap.hxx
index c0d73b256e8b..acb9bc3c2791 100644
--- a/sw/source/uibase/inc/wrap.hxx
+++ b/sw/source/uibase/inc/wrap.hxx
@@ -21,6 +21,7 @@
#include <sfx2/tabdlg.hxx>
#include <sfx2/basedlgs.hxx>
+#include <svx/swframetypes.hxx>
namespace vcl { class Window; }
class SfxItemSet;
diff --git a/sw/source/uibase/inc/wrtsh.hxx b/sw/source/uibase/inc/wrtsh.hxx
index 041be40fe4b6..850f0f03ad48 100644
--- a/sw/source/uibase/inc/wrtsh.hxx
+++ b/sw/source/uibase/inc/wrtsh.hxx
@@ -21,13 +21,13 @@
#include <swdllapi.h>
#include <fesh.hxx>
-#include <sortopt.hxx>
#include <swurl.hxx>
#include <IMark.hxx>
#include "navmgr.hxx"
#include <boost/optional.hpp>
#include <o3tl/typed_flags_set.hxx>
#include <svx/swframetypes.hxx>
+#include <vcl/weld.hxx>
namespace vcl { class Window; }
class SbxArray;
diff --git a/sw/source/uibase/lingu/hyp.cxx b/sw/source/uibase/lingu/hyp.cxx
index b343ae05c6d1..fe99a1a2e8b2 100644
--- a/sw/source/uibase/lingu/hyp.cxx
+++ b/sw/source/uibase/lingu/hyp.cxx
@@ -22,6 +22,7 @@
#include <edtwin.hxx>
#include <wrtsh.hxx>
#include <globals.hrc>
+#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <vcl/wrkwin.hxx>
#include <linguistic/lngprops.hxx>
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index 2e85fb6bf9db..85ea8091aee5 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -39,6 +39,7 @@
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/objitem.hxx>
+#include <sfx2/viewfrm.hxx>
#include <vcl/unohelp2.hxx>
#include <vcl/weld.hxx>
#include <sfx2/request.hxx>
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index d3f97155548a..7eb6569aa2e0 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -22,6 +22,7 @@
#include <vcl/help.hxx>
#include <vcl/commandevent.hxx>
#include <vcl/settings.hxx>
+#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <svl/whiter.hxx>
diff --git a/sw/source/uibase/uiview/view1.cxx b/sw/source/uibase/uiview/view1.cxx
index 556899c1e416..b82c9d49c140 100644
--- a/sw/source/uibase/uiview/view1.cxx
+++ b/sw/source/uibase/uiview/view1.cxx
@@ -35,6 +35,7 @@
#include <edtwin.hxx>
#include <formatclipboard.hxx>
#include <cmdid.h>
+#include <sfx2/dispatch.hxx>
#include <sfx2/request.hxx>
#include <sfx2/viewfrm.hxx>
#include <wordcountdialog.hxx>
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index 874c940e0fe1..fb43ba7a3cf8 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -70,6 +70,7 @@
#include <svl/whiter.hxx>
#include <svl/ptitem.hxx>
#include <sfx2/linkmgr.hxx>
+#include <sfx2/viewfrm.hxx>
#include <vcl/errinf.hxx>
#include <tools/urlobj.hxx>
#include <svx/svdview.hxx>
diff --git a/sw/source/uibase/uiview/viewprt.cxx b/sw/source/uibase/uiview/viewprt.cxx
index 3a3bf94abef3..799f7351e361 100644
--- a/sw/source/uibase/uiview/viewprt.cxx
+++ b/sw/source/uibase/uiview/viewprt.cxx
@@ -24,6 +24,7 @@
#include <sfx2/progress.hxx>
#include <sfx2/app.hxx>
#include <sfx2/viewfrm.hxx>
+#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <vcl/button.hxx>
#include <vcl/oldprintadaptor.hxx>
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index baac09794a6e..d1123e1199f0 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -24,6 +24,7 @@
#include <unomid.h>
#include <unoprnms.hxx>
#include <unomap.hxx>
+#include <usrpref.hxx>
#include <prtopt.hxx>
#include <swmodule.hxx>
#include <view.hxx>
diff --git a/sw/source/uibase/utlui/prcntfld.cxx b/sw/source/uibase/utlui/prcntfld.cxx
index 0bd5199ee596..d3b039613a8a 100644
--- a/sw/source/uibase/utlui/prcntfld.cxx
+++ b/sw/source/uibase/utlui/prcntfld.cxx
@@ -18,6 +18,7 @@
*/
#include <prcntfld.hxx>
+#include <vcl/field.hxx>
SwPercentField::SwPercentField(std::unique_ptr<weld::MetricSpinButton> pControl)
: m_pField(std::move(pControl))
diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx
index 0a050a6f56fb..0e529d0b8bb1 100644
--- a/sw/source/uibase/utlui/unotools.cxx
+++ b/sw/source/uibase/utlui/unotools.cxx
@@ -25,6 +25,7 @@
#include <unoprnms.hxx>
#include <i18nutil/unicode.hxx>
#include <svtools/colorcfg.hxx>
+#include <vcl/commandevent.hxx>
#include <vcl/jobset.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
diff --git a/sw/source/uibase/wrtsh/navmgr.cxx b/sw/source/uibase/wrtsh/navmgr.cxx
index dd107ed6886a..5222c6cc1841 100644
--- a/sw/source/uibase/wrtsh/navmgr.cxx
+++ b/sw/source/uibase/wrtsh/navmgr.cxx
@@ -11,6 +11,7 @@
#include <wrtsh.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/viewfrm.hxx>
+#include <vcl/svapp.hxx>
#include <cmdid.h>
#include <view.hxx>
#include <doc.hxx>
More information about the Libreoffice-commits
mailing list