From baf3ad4dc9ef4e18306b492a70eadc285f6dbe51 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Tue, 30 Jan 2018 21:20:50 +0100
Subject: Fix some IWYU warnings

Change-Id: I85a096505b0de98fd1de6179b9239318622fc34a
Reviewed-on: https://gerrit.libreoffice.org/48933
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
---
 sw/inc/PostItMgr.hxx                      | 4 +---
 sw/inc/SwAppletImpl.hxx                   | 3 ---
 sw/inc/SwDocIdle.hxx                      | 3 ++-
 sw/inc/ToxTabStopTokenHandler.hxx         | 1 -
 sw/inc/ToxTextGenerator.hxx               | 1 -
 sw/inc/ToxWhitespaceStripper.hxx          | 1 -
 sw/inc/UndoParagraphSignature.hxx         | 8 ++++----
 sw/inc/accessibilityoptions.hxx           | 2 --
 sw/inc/accmap.hxx                         | 5 ++---
 sw/inc/authratr.hxx                       | 3 +--
 sw/inc/breakit.hxx                        | 1 -
 sw/inc/calbck.hxx                         | 7 +++----
 sw/inc/swevent.hxx                        | 1 +
 sw/source/core/access/accfrmobj.cxx       | 2 ++
 sw/source/core/access/accfrmobj.hxx       | 1 +
 sw/source/core/doc/SwDocIdle.cxx          | 1 +
 sw/source/filter/html/SwAppletImpl.cxx    | 1 +
 sw/source/filter/xml/xmltexti.cxx         | 1 +
 sw/source/uibase/docvw/AnnotationWin.cxx  | 1 +
 sw/source/uibase/docvw/AnnotationWin2.cxx | 1 +
 sw/source/uibase/docvw/PostItMgr.cxx      | 1 +
 21 files changed, 23 insertions(+), 26 deletions(-)

(limited to 'sw')

diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 7f01f6ff09d6..dade2cd0026b 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -27,18 +27,15 @@
 #include <list>
 #include <memory>
 #include <vector>
-#include <editeng/outlobj.hxx>
 #include <rtl/ustring.hxx>
 #include <sal/log.hxx>
 #include <tools/link.hxx>
 #include "swrect.hxx"
 #include <unotools/configitem.hxx>
-#include <unotools/options.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include "SidebarWindowsTypes.hxx"
 #include <svl/lstner.hxx>
 #include <vcl/vclptr.hxx>
-#include <LibreOfficeKit/LibreOfficeKitTypes.h>
 
 class OutputDevice;
 class SwWrtShell;
@@ -66,6 +63,7 @@ class SwFrame;
 namespace vcl { class Window; }
 struct ImplSVEvent;
 class OutlinerSearchable;
+class OutlinerParaObject;
 namespace i18nutil { struct SearchOptions2; }
 
 #define COL_NOTES_SIDEPANE_ARROW_ENABLED    RGB_COLORDATA(0,0,0)
diff --git a/sw/inc/SwAppletImpl.hxx b/sw/inc/SwAppletImpl.hxx
index aaa600b2453e..046893f70803 100644
--- a/sw/inc/SwAppletImpl.hxx
+++ b/sw/inc/SwAppletImpl.hxx
@@ -23,9 +23,6 @@
 #include <config_features.h>
 
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
-#include <sfx2/frmhtmlw.hxx>
-#include <vcl/wrkwin.hxx>
-#include <sot/storage.hxx>
 #include <svl/itemset.hxx>
 #include <svl/ownlist.hxx>
 
diff --git a/sw/inc/SwDocIdle.hxx b/sw/inc/SwDocIdle.hxx
index def54cdcc287..38072f8f3cdf 100644
--- a/sw/inc/SwDocIdle.hxx
+++ b/sw/inc/SwDocIdle.hxx
@@ -19,9 +19,10 @@
 #ifndef INCLUDED_SW_INC_SWDOCIDLE_HXX
 #define INCLUDED_SW_INC_SWDOCIDLE_HXX
 
-#include "doc.hxx"
 #include <vcl/idle.hxx>
 
+class SwDoc;
+
 namespace sw {
 
 /**
diff --git a/sw/inc/ToxTabStopTokenHandler.hxx b/sw/inc/ToxTabStopTokenHandler.hxx
index 0f16033bfe6e..7da924599b5e 100644
--- a/sw/inc/ToxTabStopTokenHandler.hxx
+++ b/sw/inc/ToxTabStopTokenHandler.hxx
@@ -11,7 +11,6 @@
 #ifndef TOXTABSTOPTOKENHANDLER_HXX_
 #define TOXTABSTOPTOKENHANDLER_HXX_
 
-#include "swdllapi.h"
 #include <rtl/ustring.hxx>
 
 #include <editeng/tstpitem.hxx>
diff --git a/sw/inc/ToxTextGenerator.hxx b/sw/inc/ToxTextGenerator.hxx
index 78de181df56d..4f996c44e150 100644
--- a/sw/inc/ToxTextGenerator.hxx
+++ b/sw/inc/ToxTextGenerator.hxx
@@ -22,7 +22,6 @@
 
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
-#include "swdllapi.h"
 
 #include <memory>
 #include <vector>
diff --git a/sw/inc/ToxWhitespaceStripper.hxx b/sw/inc/ToxWhitespaceStripper.hxx
index bbe261312301..9185fa5a4ee9 100644
--- a/sw/inc/ToxWhitespaceStripper.hxx
+++ b/sw/inc/ToxWhitespaceStripper.hxx
@@ -12,7 +12,6 @@
 #define TOXWHITESPACESTRIPPER_HXX_
 
 #include <rtl/ustring.hxx>
-#include "swdllapi.h"
 #include <vector>
 
 namespace sw {
diff --git a/sw/inc/UndoParagraphSignature.hxx b/sw/inc/UndoParagraphSignature.hxx
index 39b6dbf5d770..30b6ddbf4555 100644
--- a/sw/inc/UndoParagraphSignature.hxx
+++ b/sw/inc/UndoParagraphSignature.hxx
@@ -34,8 +34,8 @@ class SwUndoParagraphSigning : public SwUndo
 {
 private:
     SwDoc* m_pDoc;
-    uno::Reference<text::XTextField> m_xField;
-    uno::Reference<text::XTextContent> m_xParent;
+    css::uno::Reference<css::text::XTextField> m_xField;
+    css::uno::Reference<css::text::XTextContent> m_xParent;
     OUString m_signature;
     OUString m_usage;
     OUString m_display;
@@ -43,8 +43,8 @@ private:
 
 public:
     SwUndoParagraphSigning(SwDoc* pDoc,
-                           const uno::Reference<text::XTextField>& xField,
-                           const uno::Reference<text::XTextContent>& xParent,
+                           const css::uno::Reference<css::text::XTextField>& xField,
+                           const css::uno::Reference<css::text::XTextContent>& xParent,
                            const bool bRemove);
 
     virtual void UndoImpl(::sw::UndoRedoContext&) override;
diff --git a/sw/inc/accessibilityoptions.hxx b/sw/inc/accessibilityoptions.hxx
index 9e54e7449f73..05ce3665b1ce 100644
--- a/sw/inc/accessibilityoptions.hxx
+++ b/sw/inc/accessibilityoptions.hxx
@@ -19,8 +19,6 @@
 #ifndef INCLUDED_SW_INC_ACCESSIBILITYOPTIONS_HXX
 #define INCLUDED_SW_INC_ACCESSIBILITYOPTIONS_HXX
 
-#include <tools/solar.h>
-
 struct SwAccessibilityOptions
 {
     bool bIsAlwaysAutoColor         :1;
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 2739b1a78a01..975c01f559b9 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -25,11 +25,8 @@
 #include <osl/mutex.hxx>
 #include <svx/IAccessibleViewForwarder.hxx>
 #include <svx/IAccessibleParent.hxx>
-#include <tools/fract.hxx>
 
 #include <svx/AccessibleControlShape.hxx>
-#include <svx/AccessibleShape.hxx>
-#include "fesh.hxx"
 #include <o3tl/typed_flags_set.hxx>
 
 #include <list>
@@ -55,6 +52,8 @@ class SwAccessibleSelectedParas_Impl;
 class SwRect;
 class MapMode;
 class SwAccPreviewData;
+class SwFEShell;
+class Fraction;
 struct PreviewPage;
 namespace vcl { class Window; }
 
diff --git a/sw/inc/authratr.hxx b/sw/inc/authratr.hxx
index 1507e088addf..cb932d88bddc 100644
--- a/sw/inc/authratr.hxx
+++ b/sw/inc/authratr.hxx
@@ -20,8 +20,7 @@
 #ifndef INCLUDED_SW_INC_AUTHRATR_HXX
 #define INCLUDED_SW_INC_AUTHRATR_HXX
 
-#include <tools/solar.h>
-#include <tools/color.hxx>
+#include <tools/colordata.hxx>
 #include "swdllapi.h"
 
 class SW_DLLPUBLIC AuthorCharAttr
diff --git a/sw/inc/breakit.hxx b/sw/inc/breakit.hxx
index 2dc5af732927..525c896ddb35 100644
--- a/sw/inc/breakit.hxx
+++ b/sw/inc/breakit.hxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/i18n/XBreakIterator.hpp>
-#include <com/sun/star/i18n/XScriptTypeDetector.hpp>
 #include <com/sun/star/i18n/ForbiddenCharacters.hpp>
 #include <i18nlangtag/languagetag.hxx>
 #include "swdllapi.h"
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index ea4181a190ea..d42f1e95dbd0 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -20,17 +20,16 @@
 #ifndef INCLUDED_SW_INC_CALBCK_HXX
 #define INCLUDED_SW_INC_CALBCK_HXX
 
+#include <svl/hint.hxx>
+#include <svl/poolitem.hxx>
 #include "swdllapi.h"
 #include "ring.hxx"
 #include "hintids.hxx"
-#include "hints.hxx"
-#include <typeinfo>
 #include <type_traits>
 
 
 class SwModify;
-class SfxPoolItem;
-class SfxHint;
+class SwPtrMsgPoolItem;
 
 /*
     SwModify and SwClient cooperate in propagating attribute changes.
diff --git a/sw/inc/swevent.hxx b/sw/inc/swevent.hxx
index 9b6b4b3b84f1..a618d8ca7f74 100644
--- a/sw/inc/swevent.hxx
+++ b/sw/inc/swevent.hxx
@@ -24,6 +24,7 @@
 #include <tools/solar.h>
 #include "calbck.hxx"
 #include "frmfmt.hxx"
+#include "hints.hxx"
 
 #define     STR_SW_EVENT_PAGE_COUNT           0
 #define     STR_SW_EVENT_MAIL_MERGE           1
diff --git a/sw/source/core/access/accfrmobj.cxx b/sw/source/core/access/accfrmobj.cxx
index 041698987d52..c617a62a4e22 100644
--- a/sw/source/core/access/accfrmobj.cxx
+++ b/sw/source/core/access/accfrmobj.cxx
@@ -95,6 +95,8 @@ SwAccessibleChild::SwAccessibleChild( const SwFrame* pFrame,
 
 }
 
+SwAccessibleChild::~SwAccessibleChild() = default;
+
 void SwAccessibleChild::Init( const SdrObject* pDrawObj )
 {
     mpDrawObj = pDrawObj;
diff --git a/sw/source/core/access/accfrmobj.hxx b/sw/source/core/access/accfrmobj.hxx
index 4e1c90f6ce37..5806f4abd179 100644
--- a/sw/source/core/access/accfrmobj.hxx
+++ b/sw/source/core/access/accfrmobj.hxx
@@ -34,6 +34,7 @@ class SwAccessibleChild
 {
     public:
         SwAccessibleChild();
+        ~SwAccessibleChild();
         explicit SwAccessibleChild( const SdrObject* pDrawObj );
         explicit SwAccessibleChild( const SwFrame* pFrame );
         explicit SwAccessibleChild( vcl::Window* pWindow );
diff --git a/sw/source/core/doc/SwDocIdle.cxx b/sw/source/core/doc/SwDocIdle.cxx
index f81c7a5de53d..d2bf04f408dc 100644
--- a/sw/source/core/doc/SwDocIdle.cxx
+++ b/sw/source/core/doc/SwDocIdle.cxx
@@ -19,6 +19,7 @@
 
 #include <view.hxx>
 #include <wrtsh.hxx>
+#include <doc.hxx>
 #include <docsh.hxx>
 #include <viewopt.hxx>
 #include <vcl/scheduler.hxx>
diff --git a/sw/source/filter/html/SwAppletImpl.cxx b/sw/source/filter/html/SwAppletImpl.cxx
index 8d3a8858c9da..ce4bfc54e460 100644
--- a/sw/source/filter/html/SwAppletImpl.cxx
+++ b/sw/source/filter/html/SwAppletImpl.cxx
@@ -26,6 +26,7 @@
 #include <comphelper/classids.hxx>
 #include <com/sun/star/uno/Any.hxx>
 #include <svtools/embedhlp.hxx>
+#include <tools/globname.hxx>
 #include <hintids.hxx>
 
 using namespace com::sun::star;
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 78cab08507f0..0986e089a6ae 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -58,6 +58,7 @@
 #include <toolkit/helper/vclunohelper.hxx>
 #include <svtools/embedhlp.hxx>
 #include <svl/urihelper.hxx>
+#include <sfx2/frmdescr.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
index 4a5cf6da9d6f..7fef02cdf522 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -39,6 +39,7 @@
 #include <editeng/outliner.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/editobj.hxx>
+#include <editeng/outlobj.hxx>
 
 #include <comphelper/lok.hxx>
 #include <docufld.hxx>
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx
index 6199d7c3cc34..a3ab401c4ac6 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -46,6 +46,7 @@
 #include <editeng/outliner.hxx>
 #include <editeng/editeng.hxx>
 #include <editeng/eeitem.hxx>
+#include <editeng/outlobj.hxx>
 
 #include <svl/zforlist.hxx>
 #include <svl/undo.hxx>
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index c19ec007369d..479770bf6d70 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -73,6 +73,7 @@
 #include <editeng/langitem.hxx>
 #include <editeng/kernitem.hxx>
 #include <editeng/outliner.hxx>
+#include <editeng/outlobj.hxx>
 
 #include <i18nlangtag/mslangid.hxx>
 #include <i18nlangtag/lang.h>
-- 
cgit