sw/inc/ccoll.hxx | 7 -------
sw/inc/charatr.hxx | 5 +----
sw/inc/colwd.hxx | 2 --
sw/inc/crsrsh.hxx | 2 +-
sw/inc/crstate.hxx | 1 -
sw/inc/cshtyp.hxx | 1 -
sw/inc/dbmgr.hxx | 1 -
sw/inc/dcontact.hxx | 1 -
sw/inc/dlelstnr.hxx | 2 --
sw/inc/doc.hxx | 2 ++
sw/inc/docary.hxx | 10 ++++------
sw/inc/docfac.hxx | 3 +--
sw/source/core/inc/docfld.hxx | 1 +
sw/source/core/layout/pagedesc.cxx | 1 +
sw/source/core/unocore/unocoll.cxx | 1 +
sw/source/core/unocore/unostyle.cxx | 1 +
sw/source/filter/ascii/ascatr.cxx | 1 +
sw/source/filter/docx/swdocxreader.cxx | 1 +
sw/source/filter/ww8/rtfexport.cxx | 1 +
sw/source/filter/xml/xmlimp.cxx | 1 +
sw/source/uibase/inc/swuiccoll.hxx | 1 +
21 files changed, 18 insertions(+), 28 deletions(-)
New commits:
commit 152e022f1efacd49fefbd5367776c1e1fc044492
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Wed Feb 7 09:25:55 2018 +0100
Fix some IWYU warnings
Change-Id: Ie1639cc4017d696ea3fd9ffb96f1559aa3ac6397
Reviewed-on: https://gerrit.libreoffice.org/49340
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
Tested-by: Jenkins <c...@libreoffice.org>
diff --git a/sw/inc/ccoll.hxx b/sw/inc/ccoll.hxx
index b8115e1169b2..4ffbd9e77af9 100644
--- a/sw/inc/ccoll.hxx
+++ b/sw/inc/ccoll.hxx
@@ -19,16 +19,9 @@
#ifndef INCLUDED_SW_INC_CCOLL_HXX
#define INCLUDED_SW_INC_CCOLL_HXX
-#include <rtl/string.hxx>
#include <rtl/ustring.hxx>
#include <svl/poolitem.hxx>
-#include <sfx2/tabdlg.hxx>
-#include <svtools/svtabbx.hxx>
-#include <vcl/fixed.hxx>
-#include <vcl/button.hxx>
-#include <vcl/lstbox.hxx>
#include "swdllapi.h"
-#include "cmdid.h"
enum class Master_CollCondition;
diff --git a/sw/inc/charatr.hxx b/sw/inc/charatr.hxx
index 9d90f2dfc3c5..7161f45571ed 100644
--- a/sw/inc/charatr.hxx
+++ b/sw/inc/charatr.hxx
@@ -32,21 +32,18 @@
#include <editeng/crossedoutitem.hxx>
#include <editeng/fhgtitem.hxx>
#include <editeng/fontitem.hxx>
-#include <editeng/charsetcoloritem.hxx>
#include <editeng/escapementitem.hxx>
#include <editeng/cmapitem.hxx>
#include <editeng/nhypitem.hxx>
#include <editeng/blinkitem.hxx>
-#include <editeng/brushitem.hxx>
#include <editeng/emphasismarkitem.hxx>
#include <editeng/twolinesitem.hxx>
#include <editeng/charscaleitem.hxx>
#include <editeng/charrotateitem.hxx>
#include <editeng/charreliefitem.hxx>
#include <editeng/charhiddenitem.hxx>
-#include <editeng/boxitem.hxx>
-#include <editeng/shaditem.hxx>
#include <editeng/langitem.hxx>
+#include <editeng/colritem.hxx>
// implementation of the character attribute methods of SwAttrSet
diff --git a/sw/inc/colwd.hxx b/sw/inc/colwd.hxx
index 5f6c5380dc9e..c6d13e159130 100644
--- a/sw/inc/colwd.hxx
+++ b/sw/inc/colwd.hxx
@@ -20,9 +20,7 @@
#define INCLUDED_SW_INC_COLWD_HXX
#include <svx/stddlg.hxx>
-#include <vcl/fixed.hxx>
#include <vcl/field.hxx>
-#include <vcl/button.hxx>
class SwTableFUNC;
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 515ee873e9e2..ef89060b88f6 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -29,7 +29,6 @@
#include "IShellCursorSupplier.hxx"
#include "swdllapi.h"
#include "docary.hxx"
-#include "swtypes.hxx"
#include "viewsh.hxx"
#include "calbck.hxx"
#include "cshtyp.hxx"
@@ -38,6 +37,7 @@
#include "tblsel.hxx"
#include "viscrs.hxx"
#include "node.hxx"
+#include "fldbas.hxx"
#include "IDocumentMarkAccess.hxx"
class SfxItemSet;
diff --git a/sw/inc/crstate.hxx b/sw/inc/crstate.hxx
index 594757be3b76..29f959e196b8 100644
--- a/sw/inc/crstate.hxx
+++ b/sw/inc/crstate.hxx
@@ -21,7 +21,6 @@
#include <com/sun/star/text/HoriOrientation.hpp>
#include <tools/gen.hxx>
-#include "swtypes.hxx"
#include "swrect.hxx"
enum SwFillMode
diff --git a/sw/inc/cshtyp.hxx b/sw/inc/cshtyp.hxx
index 3546bb1ff256..1ecde9f6d1d7 100644
--- a/sw/inc/cshtyp.hxx
+++ b/sw/inc/cshtyp.hxx
@@ -19,7 +19,6 @@
#ifndef INCLUDED_SW_INC_CSHTYP_HXX
#define INCLUDED_SW_INC_CSHTYP_HXX
-#include <tools/solar.h>
#include "swdllapi.h"
#include <o3tl/typed_flags_set.hxx>
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index b4a6f9e8abfe..9bc2e3b90a0b 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -28,7 +28,6 @@
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/lang/Locale.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/embed/XStorage.hpp>
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index 451064a6010b..87c18ff8dfa0 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -21,7 +21,6 @@
#include <svx/svdobj.hxx>
#include <svx/svdovirt.hxx>
-#include "swtypes.hxx"
#include "fmtanchr.hxx"
#include "frmfmt.hxx"
#include <list>
diff --git a/sw/inc/dlelstnr.hxx b/sw/inc/dlelstnr.hxx
index 56562fda9f1e..7f58e9ba2db6 100644
--- a/sw/inc/dlelstnr.hxx
+++ b/sw/inc/dlelstnr.hxx
@@ -20,9 +20,7 @@
#ifndef INCLUDED_SW_INC_DLELSTNR_HXX
#define INCLUDED_SW_INC_DLELSTNR_HXX
-#include <cppuhelper/weak.hxx>
#include <com/sun/star/linguistic2/XLinguServiceEventListener.hpp>
-#include <com/sun/star/frame/XTerminateListener.hpp>
#include <com/sun/star/frame/XDesktop2.hpp>
#include <cppuhelper/implbase.hxx>
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 9389604c94aa..7eb5bf067c5a 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -42,6 +42,8 @@
#include "docary.hxx"
#include "pagedesc.hxx"
#include "tblenum.hxx"
+#include "ndarr.hxx"
+#include "ndtyp.hxx"
#include <memory>
#include <set>
#include <unordered_map>
diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index d616a0b839a7..068880d8c22e 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -19,10 +19,7 @@
#ifndef INCLUDED_SW_INC_DOCARY_HXX
#define INCLUDED_SW_INC_DOCARY_HXX
-#include <com/sun/star/i18n/ForbiddenCharacters.hpp>
#include <vector>
-#include <set>
-#include <algorithm>
#include <type_traits>
#include <o3tl/sorted_vector.hxx>
@@ -33,15 +30,13 @@
#include <boost/multi_index/ordered_index.hpp>
#include <boost/multi_index/random_access_index.hpp>
-#include "swtypes.hxx"
-#include "ndarr.hxx"
#include "charfmt.hxx"
#include "fmtcol.hxx"
#include "frmfmt.hxx"
#include "section.hxx"
-#include "fldbas.hxx"
#include "tox.hxx"
#include "numrule.hxx"
+#include "fldbas.hxx"
class SwRangeRedline;
class SwExtraRedline;
@@ -50,6 +45,9 @@ class SwOLENode;
class SwTable;
class SwTableLine;
class SwTableBox;
+struct SwPosition;
+class SwContentNode;
+class SwTextNode;
namespace com { namespace sun { namespace star { namespace i18n {
struct ForbiddenCharacters; ///< comes from the I18N UNO interface
diff --git a/sw/inc/docfac.hxx b/sw/inc/docfac.hxx
index df8f298bb969..4fa978e75963 100644
--- a/sw/inc/docfac.hxx
+++ b/sw/inc/docfac.hxx
@@ -19,9 +19,8 @@
#ifndef INCLUDED_SW_INC_DOCFAC_HXX
#define INCLUDED_SW_INC_DOCFAC_HXX
-#include <tools/solar.h>
#include <rtl/ref.hxx>
-
+#include "swdllapi.h"
#include "doc.hxx"
class SW_DLLPUBLIC SwDocFac
diff --git a/sw/source/core/inc/docfld.hxx b/sw/source/core/inc/docfld.hxx
index 9979d557a8ee..13402935dde4 100644
--- a/sw/source/core/inc/docfld.hxx
+++ b/sw/source/core/inc/docfld.hxx
@@ -39,6 +39,7 @@ class SwFlyFrameFormat;
class SwDoc;
class SwNode;
struct SwPosition;
+enum class SwFieldIds : sal_uInt16;
// Update expression fields
class SetGetExpField
diff --git a/sw/source/core/layout/pagedesc.cxx
b/sw/source/core/layout/pagedesc.cxx
index f55ccbd044f1..65ee423f6f64 100644
--- a/sw/source/core/layout/pagedesc.cxx
+++ b/sw/source/core/layout/pagedesc.cxx
@@ -36,6 +36,7 @@
#include <IDocumentStylePoolAccess.hxx>
#include <poolfmt.hxx>
#include <calbck.hxx>
+#include <hints.hxx>
SwPageDesc::SwPageDesc(const OUString& rName, SwFrameFormat *pFormat, SwDoc
*const pDoc)
: SwModify(nullptr)
diff --git a/sw/source/core/unocore/unocoll.cxx
b/sw/source/core/unocore/unocoll.cxx
index c1d8e417eb40..3138a9be4577 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -70,6 +70,7 @@
#include <unometa.hxx>
#include <docsh.hxx>
#include <calbck.hxx>
+#include <hints.hxx>
#include <com/sun/star/document/XCodeNameQuery.hpp>
#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
#include <com/sun/star/form/XFormsSupplier.hpp>
diff --git a/sw/source/core/unocore/unostyle.cxx
b/sw/source/core/unocore/unostyle.cxx
index 536663c0e5ca..1e99f8b68ba0 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -67,6 +67,7 @@
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/drawing/BitmapMode.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
#include <istyleaccess.hxx>
#include <GetMetricVal.hxx>
#include <fmtfsize.hxx>
diff --git a/sw/source/filter/ascii/ascatr.cxx
b/sw/source/filter/ascii/ascatr.cxx
index 4d7bcf246adc..175572133d79 100644
--- a/sw/source/filter/ascii/ascatr.cxx
+++ b/sw/source/filter/ascii/ascatr.cxx
@@ -34,6 +34,7 @@
#include <fmtfld.hxx>
#include <fldbas.hxx>
#include <ftninfo.hxx>
+#include <numrule.hxx>
#include <algorithm>
diff --git a/sw/source/filter/docx/swdocxreader.cxx
b/sw/source/filter/docx/swdocxreader.cxx
index 7a5a644ca8b4..20113ec459db 100644
--- a/sw/source/filter/docx/swdocxreader.cxx
+++ b/sw/source/filter/docx/swdocxreader.cxx
@@ -29,6 +29,7 @@
#include <comphelper/propertyvalue.hxx>
#include <comphelper/propertysequence.hxx>
#include <comphelper/sequenceashashmap.hxx>
+#include <doc.hxx>
#include <docsh.hxx>
#include <IDocumentStylePoolAccess.hxx>
#include <ndtxt.hxx>
diff --git a/sw/source/filter/ww8/rtfexport.cxx
b/sw/source/filter/ww8/rtfexport.cxx
index 4da44ceab223..717fc321edd5 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -52,6 +52,7 @@
#include <IDocumentSettingAccess.hxx>
#include <fmtfsize.hxx>
#include <ndtxt.hxx>
+#include <numrule.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 3e89ad5218fa..834d0467bcba 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -80,6 +80,7 @@
#include <vcl/svapp.hxx>
#include <unotxdoc.hxx>
+#include <numrule.hxx>
#include <xmloff/xmlmetai.hxx>
#include <xmloff/xformsimport.hxx>
diff --git a/sw/source/uibase/inc/swuiccoll.hxx
b/sw/source/uibase/inc/swuiccoll.hxx
index 4ae3c40495c3..2fd75bb89c36 100644
--- a/sw/source/uibase/inc/swuiccoll.hxx
+++ b/sw/source/uibase/inc/swuiccoll.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_SW_SOURCE_UIBASE_INC_SWUICCOLL_HXX
#include <sfx2/tabdlg.hxx>
+#include <svtools/svtabbx.hxx>
class SwWrtShell;
class SwFormat;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
