tdf#42949: clean up includes in include/oox/drawingml with iwyu

Add includes in other files to fix compiler errors.

Change-Id: I566e2e081094cb074d20afbe7ceee49f759c725b
Reviewed-on: https://gerrit.libreoffice.org/24510
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Stahl <mstahl@redhat.com>

16 files changed, 138 insertions, 41 deletions

diff --git a/include/oox/drawingml/chart/chartconverter.hxx b/include/oox/drawingml/chart/chartconverter.hxx
index f8ee8d043d27..d4371c6f9c7b 100644
--- a/include/oox/drawingml/chart/chartconverter.hxx
+++ b/include/oox/drawingml/chart/chartconverter.hxx
@@ -22,6 +22,7 @@
 
 #include <com/sun/star/uno/Reference.hxx>
 #include <oox/dllapi.h>
+#include <rtl/ustring.hxx>
 
 namespace com { namespace sun { namespace star {
     namespace awt { struct Point; }
diff --git a/include/oox/drawingml/chart/datasourcemodel.hxx b/include/oox/drawingml/chart/datasourcemodel.hxx
index b09558f4b5ba..097bfd188720 100644
--- a/include/oox/drawingml/chart/datasourcemodel.hxx
+++ b/include/oox/drawingml/chart/datasourcemodel.hxx
@@ -20,8 +20,12 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_DATASOURCEMODEL_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_DATASOURCEMODEL_HXX
 
+#include <map>
+
 #include <com/sun/star/uno/Any.hxx>
 #include <oox/drawingml/chart/modelbase.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 
 namespace oox {
 namespace drawingml {
diff --git a/include/oox/drawingml/chart/modelbase.hxx b/include/oox/drawingml/chart/modelbase.hxx
index 5dc25fb8c1d1..d27d13937bad 100644
--- a/include/oox/drawingml/chart/modelbase.hxx
+++ b/include/oox/drawingml/chart/modelbase.hxx
@@ -20,9 +20,12 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CHART_MODELBASE_HXX
 #define INCLUDED_OOX_DRAWINGML_CHART_MODELBASE_HXX
 
-#include <oox/helper/helper.hxx>
+#include <memory>
+
 #include <oox/helper/refmap.hxx>
 #include <oox/helper/refvector.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 
 namespace oox { class AttributeList; }
 
diff --git a/include/oox/drawingml/clrscheme.hxx b/include/oox/drawingml/clrscheme.hxx
index 00bf1499e660..ccb1517e44eb 100644
--- a/include/oox/drawingml/clrscheme.hxx
+++ b/include/oox/drawingml/clrscheme.hxx
@@ -20,11 +20,14 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CLRSCHEME_HXX
 #define INCLUDED_OOX_DRAWINGML_CLRSCHEME_HXX
 
+#include <cstddef>
 #include <map>
 #include <memory>
+#include <utility>
 #include <vector>
-#include <oox/drawingml/color.hxx>
+
 #include <oox/dllapi.h>
+#include <sal/types.h>
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/color.hxx b/include/oox/drawingml/color.hxx
index 9f94c4d91489..cde7bf1fa82e 100644
--- a/include/oox/drawingml/color.hxx
+++ b/include/oox/drawingml/color.hxx
@@ -20,15 +20,14 @@
 #ifndef INCLUDED_OOX_DRAWINGML_COLOR_HXX
 #define INCLUDED_OOX_DRAWINGML_COLOR_HXX
 
+#include <vector>
+
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <sal/types.h>
-#include <rtl/instance.hxx>
-#include <rtl/ustring.hxx>
 #include <oox/helper/helper.hxx>
 #include <oox/dllapi.h>
-#include <memory>
-#include <vector>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 
 namespace oox { class GraphicHelper; }
 
diff --git a/include/oox/drawingml/connectorshapecontext.hxx b/include/oox/drawingml/connectorshapecontext.hxx
index 6d184399de82..9f6a1a655b52 100644
--- a/include/oox/drawingml/connectorshapecontext.hxx
+++ b/include/oox/drawingml/connectorshapecontext.hxx
@@ -20,9 +20,14 @@
 #ifndef INCLUDED_OOX_DRAWINGML_CONNECTORSHAPECONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_CONNECTORSHAPECONTEXT_HXX
 
-#include <oox/drawingml/shape.hxx>
-#include <oox/drawingml/shapecontext.hxx>
+#include <oox/core/contexthandler.hxx>
 #include <oox/dllapi.h>
+#include <oox/drawingml/drawingmltypes.hxx>
+#include <oox/drawingml/shapecontext.hxx>
+#include <sal/types.h>
+
+namespace oox { class AttributeList; }
+namespace oox { namespace core { class ContextHandler2Helper; } }
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/drawingmltypes.hxx b/include/oox/drawingml/drawingmltypes.hxx
index a6114ac7e279..fef050ff189d 100644
--- a/include/oox/drawingml/drawingmltypes.hxx
+++ b/include/oox/drawingml/drawingmltypes.hxx
@@ -21,16 +21,22 @@
 #define INCLUDED_OOX_DRAWINGML_DRAWINGMLTYPES_HXX
 
 #include <memory>
-#include <com/sun/star/style/TabAlign.hpp>
-#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
-#include <com/sun/star/drawing/Hatch.hpp>
-#include <com/sun/star/geometry/IntegerRectangle2D.hpp>
+
 #include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/awt/Size.hpp>
-#include <com/sun/star/xml/sax/XFastAttributeList.hpp>
-
+#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
+#include <com/sun/star/geometry/IntegerRectangle2D.hpp>
+#include <com/sun/star/style/TabAlign.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 #include <oox/dllapi.h>
 #include <oox/helper/helper.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+    namespace drawing { struct Hatch; }
+    namespace xml { namespace sax { class XFastAttributeList; } }
+} } }
 
 namespace oox {
 namespace drawingml {
@@ -58,8 +64,6 @@ typedef std::shared_ptr< Shape3DProperties > Shape3DPropertiesPtr;
 struct TextCharacterProperties;
 typedef std::shared_ptr< TextCharacterProperties > TextCharacterPropertiesPtr;
 
-struct TextBodyProperties;
-
 struct EffectProperties;
 typedef std::shared_ptr< EffectProperties > EffectPropertiesPtr;
 
diff --git a/include/oox/drawingml/fillproperties.hxx b/include/oox/drawingml/fillproperties.hxx
index 0fa28adeaaea..3015424c1898 100644
--- a/include/oox/drawingml/fillproperties.hxx
+++ b/include/oox/drawingml/fillproperties.hxx
@@ -21,11 +21,21 @@
 #define INCLUDED_OOX_DRAWINGML_FILLPROPERTIES_HXX
 
 #include <map>
-#include <com/sun/star/graphic/XGraphic.hpp>
+
+#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/geometry/IntegerRectangle2D.hpp>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+#include <oox/dllapi.h>
 #include <oox/drawingml/color.hxx>
 #include <oox/helper/helper.hxx>
 #include <oox/ole/oleobjecthelper.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+    namespace graphic { class XGraphic; }
+} } }
 
 namespace oox {
     class GraphicHelper;
diff --git a/include/oox/drawingml/graphicshapecontext.hxx b/include/oox/drawingml/graphicshapecontext.hxx
index 2cf6c6285a33..fed6d893007f 100644
--- a/include/oox/drawingml/graphicshapecontext.hxx
+++ b/include/oox/drawingml/graphicshapecontext.hxx
@@ -20,10 +20,15 @@
 #ifndef INCLUDED_OOX_DRAWINGML_GRAPHICSHAPECONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_GRAPHICSHAPECONTEXT_HXX
 
-#include <oox/drawingml/shape.hxx>
-#include <oox/drawingml/shapecontext.hxx>
+#include <oox/core/contexthandler.hxx>
 #include <oox/dllapi.h>
+#include <oox/drawingml/drawingmltypes.hxx>
+#include <oox/drawingml/shapecontext.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
 
+namespace oox { class AttributeList; }
+namespace oox { namespace core { class ContextHandler2Helper; } }
 namespace oox { namespace vml { struct OleObjectInfo; } }
 
 namespace oox { namespace drawingml {
@@ -63,8 +68,6 @@ private:
 };
 
 
-class Diagram;
-
 class DiagramGraphicDataContext
     : public ShapeContext
 {
@@ -81,6 +84,8 @@ private:
 };
 
 
+struct ChartShapeInfo;
+
 class ChartGraphicDataContext : public ShapeContext
 {
 public:
diff --git a/include/oox/drawingml/lineproperties.hxx b/include/oox/drawingml/lineproperties.hxx
index bc1793dcdcd5..f54642583715 100644
--- a/include/oox/drawingml/lineproperties.hxx
+++ b/include/oox/drawingml/lineproperties.hxx
@@ -20,13 +20,23 @@
 #ifndef INCLUDED_OOX_DRAWINGML_LINEPROPERTIES_HXX
 #define INCLUDED_OOX_DRAWINGML_LINEPROPERTIES_HXX
 
+#include <utility>
+#include <vector>
+
 #include <com/sun/star/drawing/LineJoint.hpp>
 #include <com/sun/star/drawing/LineStyle.hpp>
+#include <oox/dllapi.h>
+#include <oox/helper/helper.hxx>
 #include <oox/drawingml/fillproperties.hxx>
+#include <sal/types.h>
+
+namespace oox { class GraphicHelper; }
 
 namespace oox {
 namespace drawingml {
 
+class ShapePropertyMap;
+
 struct LineArrowProperties
 {
     OptValue< sal_Int32 > moArrowType;
diff --git a/include/oox/drawingml/shape.hxx b/include/oox/drawingml/shape.hxx
index 63c0bbb4507c..520bc51bc1f9 100644
--- a/include/oox/drawingml/shape.hxx
+++ b/include/oox/drawingml/shape.hxx
@@ -20,18 +20,35 @@
 #ifndef INCLUDED_OOX_DRAWINGML_SHAPE_HXX
 #define INCLUDED_OOX_DRAWINGML_SHAPE_HXX
 
-#include <oox/helper/propertymap.hxx>
-#include <oox/core/xmlfilterbase.hxx>
-#include <oox/drawingml/color.hxx>
-#include <oox/drawingml/drawingmltypes.hxx>
-
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/drawing/XDrawPage.hpp>
+#include <map>
 #include <memory>
-#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <vector>
-#include <map>
+
+#include <com/sun/star/awt/Point.hpp>
+#include <com/sun/star/awt/Size.hpp>
+#include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/Sequence.hxx>
 #include <oox/dllapi.h>
+#include <oox/drawingml/color.hxx>
+#include <oox/drawingml/drawingmltypes.hxx>
+#include <oox/helper/helper.hxx>
+#include <oox/helper/propertymap.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace basegfx { class B2DHomMatrix; }
+
+namespace com { namespace sun { namespace star {
+    namespace awt { struct Rectangle; }
+    namespace drawing { class XShape; }
+    namespace drawing { class XShapes; }
+    namespace uno { class Any; }
+} } }
+
+namespace oox { namespace core {
+    class XmlFilterBase;
+} }
 
 namespace oox { namespace vml {
     struct OleObjectInfo;
@@ -39,6 +56,13 @@ namespace oox { namespace vml {
 
 namespace oox { namespace drawingml {
 
+class Theme;
+struct EffectProperties;
+struct FillProperties;
+struct GraphicProperties;
+struct LineProperties;
+struct Shape3DProperties;
+
 class CustomShapeProperties;
 typedef std::shared_ptr< CustomShapeProperties > CustomShapePropertiesPtr;
 
diff --git a/include/oox/drawingml/shapecontext.hxx b/include/oox/drawingml/shapecontext.hxx
index 8ec0e691d869..9d73a2105609 100644
--- a/include/oox/drawingml/shapecontext.hxx
+++ b/include/oox/drawingml/shapecontext.hxx
@@ -20,11 +20,13 @@
 #ifndef INCLUDED_OOX_DRAWINGML_SHAPECONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_SHAPECONTEXT_HXX
 
-#include <com/sun/star/drawing/XShapes.hpp>
-
+#include <oox/core/contexthandler.hxx>
 #include <oox/core/contexthandler2.hxx>
-#include <oox/drawingml/shape.hxx>
 #include <oox/dllapi.h>
+#include <oox/drawingml/drawingmltypes.hxx>
+#include <sal/types.h>
+
+namespace oox { class AttributeList; }
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/shapegroupcontext.hxx b/include/oox/drawingml/shapegroupcontext.hxx
index 877e3d7856aa..c702bfbfd5c0 100644
--- a/include/oox/drawingml/shapegroupcontext.hxx
+++ b/include/oox/drawingml/shapegroupcontext.hxx
@@ -20,9 +20,13 @@
 #ifndef INCLUDED_OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX
 #define INCLUDED_OOX_DRAWINGML_SHAPEGROUPCONTEXT_HXX
 
-#include <oox/drawingml/shape.hxx>
-#include <oox/drawingml/shapecontext.hxx>
+#include <oox/core/contexthandler.hxx>
+#include <oox/core/contexthandler2.hxx>
 #include <oox/dllapi.h>
+#include <oox/drawingml/drawingmltypes.hxx>
+#include <sal/types.h>
+
+namespace oox { class AttributeList; }
 
 namespace oox { namespace drawingml {
 
diff --git a/include/oox/drawingml/shapepropertymap.hxx b/include/oox/drawingml/shapepropertymap.hxx
index 4aaedd7c1d81..c75beb050fcb 100644
--- a/include/oox/drawingml/shapepropertymap.hxx
+++ b/include/oox/drawingml/shapepropertymap.hxx
@@ -20,11 +20,15 @@
 #ifndef INCLUDED_OOX_DRAWINGML_SHAPEPROPERTYMAP_HXX
 #define INCLUDED_OOX_DRAWINGML_SHAPEPROPERTYMAP_HXX
 
-#include <oox/helper/propertymap.hxx>
-#include <oox/dllapi.h>
-
+#include <cstddef>
 #include <vector>
 
+#include <com/sun/star/uno/Any.hxx>
+#include <oox/dllapi.h>
+#include <oox/helper/propertymap.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
 namespace oox { class ModelObjectHelper; }
 
 namespace oox {
diff --git a/include/oox/drawingml/theme.hxx b/include/oox/drawingml/theme.hxx
index 134167f3fdad..9593b77eb5f9 100644
--- a/include/oox/drawingml/theme.hxx
+++ b/include/oox/drawingml/theme.hxx
@@ -20,15 +20,28 @@
 #ifndef INCLUDED_OOX_DRAWINGML_THEME_HXX
 #define INCLUDED_OOX_DRAWINGML_THEME_HXX
 
+#include <functional>
+
+#include <com/sun/star/uno/Reference.hxx>
 #include <oox/drawingml/clrscheme.hxx>
 #include <oox/drawingml/shape.hxx>
-#include <oox/helper/refvector.hxx>
-#include <com/sun/star/xml/dom/XDocument.hpp>
 #include <oox/dllapi.h>
+#include <oox/helper/refmap.hxx>
+#include <oox/helper/refvector.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+    namespace xml { namespace dom { class XDocument; } }
+} } }
 
 namespace oox {
 namespace drawingml {
 
+struct EffectProperties;
+struct FillProperties;
+struct LineProperties;
+struct TextCharacterProperties;
 
 const sal_Int32 THEMED_STYLE_SUBTLE     = 1;
 const sal_Int32 THEMED_STYLE_MODERATE   = 2;
diff --git a/include/oox/drawingml/themefragmenthandler.hxx b/include/oox/drawingml/themefragmenthandler.hxx
index 24ea7abb2d21..d097e022a7ec 100644
--- a/include/oox/drawingml/themefragmenthandler.hxx
+++ b/include/oox/drawingml/themefragmenthandler.hxx
@@ -20,8 +20,14 @@
 #ifndef INCLUDED_OOX_DRAWINGML_THEMEFRAGMENTHANDLER_HXX
 #define INCLUDED_OOX_DRAWINGML_THEMEFRAGMENTHANDLER_HXX
 
+#include <oox/core/contexthandler.hxx>
 #include <oox/core/fragmenthandler2.hxx>
 #include <oox/dllapi.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace oox { class AttributeList; }
+namespace oox { namespace core { class XmlFilterBase; } }
 
 namespace oox {
 namespace drawingml {