tdf#42949 Fix some Include What You Use warnings

Change-Id: I30121764303579a7cb4ded0f0f48cc1f8fff6c33
Reviewed-on: https://gerrit.libreoffice.org/46946Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>

cppcanvas/qa/extras/emfplus/emfplus.cxx

@@ -7,17 +7,13 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/graphic/XGraphic.hpp>
 
 #include <comphelper/processfactory.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/objsh.hxx>
 #include <sfx2/sfxbasemodel.hxx>
 #include <test/unoapi_test.hxx>
-#include <unotest/macros_test.hxx>
 #include <vcl/bitmapaccess.hxx>
 #include <vcl/pngwrite.hxx>
 

drawinglayer/qa/unit/border.cxx

@@ -12,11 +12,8 @@
 #include <cppunit/extensions/HelperMacros.h>
 #include <cppunit/plugin/TestPlugIn.h>
 
-#include <com/sun/star/table/BorderLineStyle.hpp>
-
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <drawinglayer/primitive2d/borderlineprimitive2d.hxx>
-#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
 #include <drawinglayer/primitive2d/polygonprimitive2d.hxx>
 #include <drawinglayer/processor2d/baseprocessor2d.hxx>
 #include <drawinglayer/processor2d/processorfromoutputdevice.hxx>

oox/source/drawingml/customshapepresetdata.cxx

@@ -16,7 +16,7 @@
 #include <oox/token/properties.hxx>
 #include <oox/token/tokenmap.hxx>
 #include <com/sun/star/awt/Rectangle.hpp>
-#include <com/sun/star/beans/PropertyValues.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp>
 #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp>
 

oox/source/shape/LockedCanvasContext.cxx

@@ -8,6 +8,7 @@
  */
 
 #include "LockedCanvasContext.hxx"
+#include <oox/drawingml/shape.hxx>
 #include <oox/drawingml/shapecontext.hxx>
 #include <oox/drawingml/shapegroupcontext.hxx>
 #include <oox/token/namespaces.hxx>

oox/source/shape/LockedCanvasContext.hxx

@@ -11,7 +11,7 @@
 #define INCLUDED_OOX_SOURCE_SHAPE_LOCKEDCANVASCONTEXT_HXX
 
 #include <oox/core/contexthandler2.hxx>
-#include <oox/drawingml/shape.hxx>
+#include <oox/drawingml/drawingmltypes.hxx>
 
 namespace oox
 {

oox/source/shape/WpgContext.hxx

@@ -11,7 +11,7 @@
 #define INCLUDED_OOX_SOURCE_SHAPE_WPGCONTEXT_HXX
 
 #include <oox/core/contexthandler2.hxx>
-#include <oox/drawingml/shape.hxx>
+#include <oox/drawingml/drawingmltypes.hxx>
 
 namespace oox
 {

oox/source/shape/WpsContext.cxx

@@ -23,6 +23,7 @@
 #include <oox/helper/attributelist.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
+#include <oox/drawingml/shape.hxx>
 
 #include <boost/optional.hpp>
 

oox/source/shape/WpsContext.hxx

@@ -10,8 +10,9 @@
 #ifndef INCLUDED_OOX_SOURCE_SHAPE_WPSCONTEXT_HXX
 #define INCLUDED_OOX_SOURCE_SHAPE_WPSCONTEXT_HXX
 
+#include <com/sun/star/drawing/XShape.hpp>
 #include <oox/core/contexthandler2.hxx>
-#include <oox/drawingml/shape.hxx>
+#include <oox/drawingml/drawingmltypes.hxx>
 
 namespace oox
 {

starmath/source/ooxmlexport.cxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-
 #include "ooxmlexport.hxx"
+#include <node.hxx>
 
 #include <oox/token/tokens.hxx>
 #include <rtl/ustring.hxx>

starmath/source/rtfexport.cxx

@@ -8,6 +8,7 @@
  */
 
 #include "rtfexport.hxx"
+#include <node.hxx>
 
 #include <svtools/rtfkeywd.hxx>
 #include <filter/msfilter/rtfutil.hxx>

starmath/source/wordexportbase.cxx

@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-
 #include "wordexportbase.hxx"
+#include <node.hxx>
 
 SmWordExportBase::SmWordExportBase(const SmNode* pIn)
     : m_pTree(pIn)

starmath/source/wordexportbase.hxx

@@ -10,7 +10,16 @@
 #ifndef INCLUDED_STARMATH_SOURCE_WORDEXPORTBASE_HXX
 #define INCLUDED_STARMATH_SOURCE_WORDEXPORTBASE_HXX
 
-#include <node.hxx>
+class SmAttributNode;
+class SmBinHorNode;
+class SmBraceNode;
+class SmMatrixNode;
+class SmNode;
+class SmOperNode;
+class SmRootNode;
+class SmSubSupNode;
+class SmUnHorNode;
+class SmVerticalBraceNode;
 
 /**
  Base class implementing writing of formulas to Word.

svx/qa/unit/xoutdev.cxx

@@ -12,7 +12,6 @@
 #include <cppunit/TestAssert.h>
 #include <cppunit/TestFixture.h>
 #include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/plugin/TestPlugIn.h>
 
 #include <sal/types.h>
 #include <sfx2/app.hxx>

sw/inc/textboxhelper.hxx

@@ -17,7 +17,6 @@
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/uno/Any.h>
 #include <com/sun/star/uno/Type.h>
-#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 
 #include "swdllapi.h"
 

sw/source/core/doc/textboxhelper.cxx

@@ -23,10 +23,7 @@
 #include <unotextrange.hxx>
 #include <cmdid.h>
 #include <unoprnms.hxx>
-#include <dflyobj.hxx>
 #include <mvsave.hxx>
-#include <sortedobjs.hxx>
-#include <cntfrm.hxx>
 #include <fmtsrnd.hxx>
 #include <frmfmt.hxx>
 
@@ -39,6 +36,7 @@
 #include <comphelper/sequenceashashmap.hxx>
 
 #include <com/sun/star/document/XActionLockable.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <com/sun/star/text/SizeType.hpp>
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <com/sun/star/text/WrapTextMode.hpp>

sw/source/core/unocore/unodraw.cxx

@@ -67,6 +67,7 @@
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <com/sun/star/drawing/PointSequence.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <calbck.hxx>
 
 using namespace ::com::sun::star;

sw/source/core/unocore/unoobj2.cxx

@@ -94,6 +94,7 @@
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
+#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
 #include <unoframe.hxx>
 #include <fmthdft.hxx>
 #include <vcl/svapp.hxx>

sw/source/filter/ww8/docxsdrexport.cxx

@@ -8,10 +8,10 @@
  */
 
 #include "docxsdrexport.hxx"
-#include <com/sun/star/drawing/LineStyle.hpp>
 #include <com/sun/star/drawing/PointSequenceSequence.hpp>
 #include <com/sun/star/xml/sax/XSAXSerializable.hpp>
 #include <com/sun/star/xml/sax/Writer.hpp>
+#include <com/sun/star/xml/dom/XNodeList.hpp>
 #include <editeng/unoprnms.hxx>
 #include <editeng/charrotateitem.hxx>
 #include <svx/svdogrp.hxx>
@@ -32,6 +32,7 @@
 #include <comphelper/seqstream.hxx>
 #include <comphelper/sequence.hxx>
 #include <comphelper/sequenceashashmap.hxx>
+#include <o3tl/make_unique.hxx>
 
 #include <IDocumentDrawModelAccess.hxx>
 

sw/source/filter/ww8/docxsdrexport.hxx

@@ -11,9 +11,7 @@
 #define INCLUDED_SW_SOURCE_FILTER_WW8_DOCXSDREXPORT_HXX
 
 #include <memory>
-#include <o3tl/make_unique.hxx>
 
-#include <com/sun/star/xml/dom/XDocument.hpp>
 #include <rtl/strbuf.hxx>
 #include <rtl/ref.hxx>
 #include <sax/fshelper.hxx>

sw/source/uibase/docvw/SidebarScrollBar.cxx

@@ -9,8 +9,6 @@
 
 #include "SidebarScrollBar.hxx"
 
-#include <LibreOfficeKit/LibreOfficeKitEnums.h>
-#include <comphelper/lok.hxx>
 #include <sfx2/lokhelper.hxx>
 
 #include <view.hxx>

vcl/inc/pdfread.hxx

@@ -11,7 +11,10 @@
 #define INCLUDED_VCL_SOURCE_FILTER_IPDF_PDFREAD_HXX
 
 #include <tools/stream.hxx>
-#include <vcl/graph.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
+
+class Bitmap;
+class Graphic;
 
 namespace vcl
 {

vcl/source/filter/ipdf/pdfdocument.cxx

@@ -15,22 +15,16 @@
 
 #include <com/sun/star/uno/Sequence.hxx>
 
-#include <comphelper/processfactory.hxx>
 #include <comphelper/scopeguard.hxx>
 #include <comphelper/string.hxx>
-#include <filter/msfilter/mscodec.hxx>
 #include <rtl/character.hxx>
 #include <rtl/strbuf.hxx>
 #include <rtl/string.hxx>
 #include <sal/log.hxx>
 #include <sal/types.h>
-#include <sax/tools/converter.hxx>
 #include <svl/cryptosign.hxx>
 #include <tools/zcodec.hxx>
-#include <unotools/calendarwrapper.hxx>
-#include <unotools/datetime.hxx>
 #include <vcl/pdfwriter.hxx>
-#include <xmloff/xmluconv.hxx>
 #include <o3tl/make_unique.hxx>
 
 using namespace com::sun::star;

vcl/source/filter/ipdf/pdfread.cxx

@@ -18,6 +18,7 @@
 #endif
 
 #include <vcl/bitmapaccess.hxx>
+#include <vcl/graph.hxx>
 
 using namespace com::sun::star;
 

writerfilter/source/dmapper/DomainMapper.cxx

@@ -63,6 +63,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/text/FontEmphasis.hpp>
 #include <com/sun/star/awt/CharSet.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <comphelper/types.hxx>
 #include <comphelper/storagehelper.hxx>
 #include <comphelper/sequence.hxx>

writerfilter/source/dmapper/DomainMapper_Impl.cxx

@@ -68,6 +68,7 @@
 #include <com/sun/star/text/ControlCharacter.hpp>
 #include <com/sun/star/text/XTextColumns.hpp>
 #include <com/sun/star/awt/CharSet.hpp>
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <oox/mathml/import.hxx>
 #include <rtl/uri.hxx>

writerfilter/source/dmapper/LatentStyleHandler.hxx

@@ -10,7 +10,6 @@
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_LATENTSTYLEHANDLER_HXX
 
 #include "LoggedResources.hxx"
-#include <memory>
 #include <vector>
 #include <com/sun/star/beans/PropertyValue.hpp>
 

writerfilter/source/dmapper/SdtHelper.cxx

@@ -8,6 +8,7 @@
  */
 
 #include "SdtHelper.hxx"
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/drawing/XControlShape.hpp>
 #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
 #include <com/sun/star/text/VertOrientation.hpp>
@@ -17,6 +18,9 @@
 #include <unotools/datetime.hxx>
 #include <comphelper/sequence.hxx>
 
+#include "DomainMapper_Impl.hxx"
+#include "StyleSheetTable.hxx"
+
 namespace writerfilter
 {
 namespace dmapper

writerfilter/source/dmapper/SdtHelper.hxx

@@ -12,13 +12,10 @@
 
 #include <vector>
 
-#include <boost/optional.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <rtl/ustrbuf.hxx>
 
-#include "DomainMapper_Impl.hxx"
-
 namespace com
 {
 namespace sun
@@ -38,6 +35,7 @@ namespace writerfilter
 {
 namespace dmapper
 {
+class DomainMapper_Impl;
 
 /**
  * Helper to create form controls from w:sdt tokens.

writerfilter/source/dmapper/TableManager.hxx

@@ -20,15 +20,9 @@
 #ifndef INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TABLEMANAGER_HXX
 #define INCLUDED_WRITERFILTER_SOURCE_DMAPPER_TABLEMANAGER_HXX
 
-#include <dmapper/resourcemodel.hxx>
-
-#include <ooxml/resourceids.hxx>
-
 #include <memory>
 #include <stack>
-#include "TagLogger.hxx"
 
-#include <rtl/strbuf.hxx>
 #include "PropertyMap.hxx"
 #include "TableData.hxx"