include/oox/drawingml/chart/chartconverter.hxx | 1
include/oox/drawingml/chart/datasourcemodel.hxx | 4 +
include/oox/drawingml/chart/modelbase.hxx | 5 +-
include/oox/drawingml/clrscheme.hxx | 5 +-
include/oox/drawingml/color.hxx | 9 +---
include/oox/drawingml/connectorshapecontext.hxx | 9 +++-
include/oox/drawingml/drawingmltypes.hxx | 20 +++++----
include/oox/drawingml/fillproperties.hxx | 12 +++++
include/oox/drawingml/graphicshapecontext.hxx | 13 ++++--
include/oox/drawingml/lineproperties.hxx | 10 ++++
include/oox/drawingml/shape.hxx | 42 +++++++++++++++-----
include/oox/drawingml/shapecontext.hxx | 8 ++-
include/oox/drawingml/shapegroupcontext.hxx | 8 ++-
include/oox/drawingml/shapepropertymap.hxx | 10 +++-
include/oox/drawingml/theme.hxx | 17 +++++++-
include/oox/drawingml/themefragmenthandler.hxx | 6 ++
oox/source/drawingml/chart/axiscontext.cxx | 1
oox/source/drawingml/chart/chartdrawingfragment.cxx | 2
oox/source/drawingml/chart/chartspacefragment.cxx | 1
oox/source/drawingml/chart/plotareacontext.cxx | 1
oox/source/drawingml/chart/plotareaconverter.cxx | 1
oox/source/drawingml/chart/seriescontext.cxx | 1
oox/source/drawingml/chart/seriesconverter.cxx | 1
oox/source/drawingml/chart/titlecontext.cxx | 1
oox/source/drawingml/chart/typegroupcontext.cxx | 1
oox/source/drawingml/chart/typegroupconverter.cxx | 1
oox/source/drawingml/clrscheme.cxx | 2
oox/source/drawingml/drawingmltypes.cxx | 2
oox/source/ppt/dgmimport.cxx | 1
oox/source/ppt/dgmlayout.cxx | 1
oox/source/ppt/pptshapegroupcontext.cxx | 1
oox/source/ppt/slidepersist.cxx | 1
oox/source/shape/LockedCanvasContext.cxx | 1
oox/source/shape/ShapeContextHandler.cxx | 2
oox/source/shape/WpsContext.cxx | 1
sc/source/filter/oox/condformatbuffer.cxx | 1
sc/source/filter/oox/drawingfragment.cxx | 2
sc/source/filter/oox/workbookfragment.cxx | 1
38 files changed, 165 insertions(+), 41 deletions(-)
New commits:
commit af1174b2dea72359e8eb0e15297c61cf82571250
Author: Jorenz Paragas <j.paragas....@gmail.com>
Date: Sat Apr 30 00:06:53 2016 -0700
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 <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/include/oox/drawingml/chart/chartconverter.hxx
b/include/oox/drawingml/chart/chartconverter.hxx
index f8ee8d0..d4371c6 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 b09558f..097bfd1 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 5dc25fb..d27d139 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 00bf149..ccb1517 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 9f94c4d..cde7bf1 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 6d18439..9f6a1a6 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 a6114ac..fef050f 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 0fa28ad..3015424 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 2cf6c62..fed6d89 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 bc1793d..f546425 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 63c0bbb..520bc51 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 8ec0e69..9d73a21 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 877e3d7..c702bfb 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 4aaedd7..c75beb0 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 134167f..9593b77e 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 24ea7ab..d097e02 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 {
diff --git a/oox/source/drawingml/chart/axiscontext.cxx
b/oox/source/drawingml/chart/axiscontext.cxx
index 7cb89b1..9fad190 100644
--- a/oox/source/drawingml/chart/axiscontext.cxx
+++ b/oox/source/drawingml/chart/axiscontext.cxx
@@ -23,6 +23,7 @@
#include "drawingml/textbodycontext.hxx"
#include "drawingml/chart/axismodel.hxx"
#include "drawingml/chart/titlecontext.hxx"
+#include <oox/core/xmlfilterbase.hxx>
#include <oox/helper/attributelist.hxx>
namespace oox {
diff --git a/oox/source/drawingml/chart/chartdrawingfragment.cxx
b/oox/source/drawingml/chart/chartdrawingfragment.cxx
index 693432f..de8d3f2 100644
--- a/oox/source/drawingml/chart/chartdrawingfragment.cxx
+++ b/oox/source/drawingml/chart/chartdrawingfragment.cxx
@@ -21,6 +21,8 @@
#include <osl/diagnose.h>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <com/sun/star/awt/Rectangle.hpp>
#include "oox/core/xmlfilterbase.hxx"
#include "oox/drawingml/connectorshapecontext.hxx"
#include "oox/drawingml/graphicshapecontext.hxx"
diff --git a/oox/source/drawingml/chart/chartspacefragment.cxx
b/oox/source/drawingml/chart/chartspacefragment.cxx
index 3fe2310..8bb1a4c 100644
--- a/oox/source/drawingml/chart/chartspacefragment.cxx
+++ b/oox/source/drawingml/chart/chartspacefragment.cxx
@@ -24,6 +24,7 @@
#include "drawingml/chart/chartspacemodel.hxx"
#include "drawingml/chart/plotareacontext.hxx"
#include "drawingml/chart/titlecontext.hxx"
+#include <oox/core/xmlfilterbase.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/token/namespaces.hxx>
diff --git a/oox/source/drawingml/chart/plotareacontext.cxx
b/oox/source/drawingml/chart/plotareacontext.cxx
index 05c8430..f941729 100644
--- a/oox/source/drawingml/chart/plotareacontext.cxx
+++ b/oox/source/drawingml/chart/plotareacontext.cxx
@@ -25,6 +25,7 @@
#include "drawingml/chart/seriescontext.hxx"
#include "drawingml/chart/titlecontext.hxx"
#include "drawingml/chart/typegroupcontext.hxx"
+#include <oox/core/xmlfilterbase.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
diff --git a/oox/source/drawingml/chart/plotareaconverter.cxx
b/oox/source/drawingml/chart/plotareaconverter.cxx
index 5c449ad..f55ef9b 100644
--- a/oox/source/drawingml/chart/plotareaconverter.cxx
+++ b/oox/source/drawingml/chart/plotareaconverter.cxx
@@ -31,6 +31,7 @@
#include "drawingml/chart/axisconverter.hxx"
#include "drawingml/chart/plotareamodel.hxx"
#include "drawingml/chart/typegroupconverter.hxx"
+#include <oox/core/xmlfilterbase.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
diff --git a/oox/source/drawingml/chart/seriescontext.cxx
b/oox/source/drawingml/chart/seriescontext.cxx
index 5e309a5..56efbe26 100644
--- a/oox/source/drawingml/chart/seriescontext.cxx
+++ b/oox/source/drawingml/chart/seriescontext.cxx
@@ -24,6 +24,7 @@
#include "drawingml/chart/datasourcecontext.hxx"
#include "drawingml/chart/seriesmodel.hxx"
#include "drawingml/chart/titlecontext.hxx"
+#include <oox/core/xmlfilterbase.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx
b/oox/source/drawingml/chart/seriesconverter.cxx
index a36e68d..4682f5d 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -34,6 +34,7 @@
#include "drawingml/chart/titleconverter.hxx"
#include "drawingml/chart/typegroupconverter.hxx"
#include "drawingml/chart/typegroupmodel.hxx"
+#include <oox/core/xmlfilterbase.hxx>
#include "oox/helper/containerhelper.hxx"
#include <oox/helper/attributelist.hxx>
#include <oox/token/namespaces.hxx>
diff --git a/oox/source/drawingml/chart/titlecontext.cxx
b/oox/source/drawingml/chart/titlecontext.cxx
index e4f22a9..6064178 100644
--- a/oox/source/drawingml/chart/titlecontext.cxx
+++ b/oox/source/drawingml/chart/titlecontext.cxx
@@ -23,6 +23,7 @@
#include "drawingml/textbodycontext.hxx"
#include "drawingml/chart/datasourcecontext.hxx"
#include "drawingml/chart/titlemodel.hxx"
+#include <oox/core/xmlfilterbase.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
diff --git a/oox/source/drawingml/chart/typegroupcontext.cxx
b/oox/source/drawingml/chart/typegroupcontext.cxx
index 77f5c85..20c84f6 100644
--- a/oox/source/drawingml/chart/typegroupcontext.cxx
+++ b/oox/source/drawingml/chart/typegroupcontext.cxx
@@ -21,6 +21,7 @@
#include "drawingml/chart/seriescontext.hxx"
#include "drawingml/chart/typegroupmodel.hxx"
+#include <oox/core/xmlfilterbase.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/token/namespaces.hxx>
diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx
b/oox/source/drawingml/chart/typegroupconverter.cxx
index 78079e9..b9f95d1 100644
--- a/oox/source/drawingml/chart/typegroupconverter.cxx
+++ b/oox/source/drawingml/chart/typegroupconverter.cxx
@@ -37,6 +37,7 @@
#include "oox/drawingml/lineproperties.hxx"
#include "drawingml/chart/seriesconverter.hxx"
#include "drawingml/chart/typegroupmodel.hxx"
+#include <oox/core/xmlfilterbase.hxx>
#include "oox/helper/containerhelper.hxx"
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
diff --git a/oox/source/drawingml/clrscheme.cxx
b/oox/source/drawingml/clrscheme.cxx
index 176fd82..2f8e937 100644
--- a/oox/source/drawingml/clrscheme.cxx
+++ b/oox/source/drawingml/clrscheme.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <algorithm>
+
#include <osl/diagnose.h>
#include "oox/drawingml/clrscheme.hxx"
#include "oox/token/tokens.hxx"
diff --git a/oox/source/drawingml/drawingmltypes.cxx
b/oox/source/drawingml/drawingmltypes.cxx
index b25b94f..288749b 100644
--- a/oox/source/drawingml/drawingmltypes.cxx
+++ b/oox/source/drawingml/drawingmltypes.cxx
@@ -20,8 +20,10 @@
#include "oox/drawingml/drawingmltypes.hxx"
#include <com/sun/star/awt/FontUnderline.hpp>
#include <com/sun/star/awt/FontStrikeout.hpp>
+#include <com/sun/star/drawing/Hatch.hpp>
#include <com/sun/star/style/CaseMap.hpp>
#include <com/sun/star/style/ParagraphAdjust.hpp>
+#include <com/sun/star/xml/sax/XFastAttributeList.hpp>
#include <osl/diagnose.h>
#include <sax/tools/converter.hxx>
#include "oox/token/tokens.hxx"
diff --git a/oox/source/ppt/dgmimport.cxx b/oox/source/ppt/dgmimport.cxx
index e841d3c..5f6625d 100644
--- a/oox/source/ppt/dgmimport.cxx
+++ b/oox/source/ppt/dgmimport.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <basegfx/matrix/b2dhommatrix.hxx>
#include "oox/ppt/dgmimport.hxx"
#include "oox/drawingml/theme.hxx"
#include "drawingml/diagram/diagram.hxx"
diff --git a/oox/source/ppt/dgmlayout.cxx b/oox/source/ppt/dgmlayout.cxx
index acf7979..24e3451 100644
--- a/oox/source/ppt/dgmlayout.cxx
+++ b/oox/source/ppt/dgmlayout.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <basegfx/matrix/b2dhommatrix.hxx>
#include "oox/ppt/dgmlayout.hxx"
#include "oox/drawingml/theme.hxx"
#include "oox/drawingml/themefragmenthandler.hxx"
diff --git a/oox/source/ppt/pptshapegroupcontext.cxx
b/oox/source/ppt/pptshapegroupcontext.cxx
index b2acee7..0c2beb1 100644
--- a/oox/source/ppt/pptshapegroupcontext.cxx
+++ b/oox/source/ppt/pptshapegroupcontext.cxx
@@ -22,6 +22,7 @@
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/container/XNamed.hpp>
+#include <oox/core/xmlfilterbase.hxx>
#include "oox/helper/attributelist.hxx"
#include "oox/ppt/pptshape.hxx"
#include "oox/ppt/pptgraphicshapecontext.hxx"
diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx
index 574892a..eaee10d 100644
--- a/oox/source/ppt/slidepersist.cxx
+++ b/oox/source/ppt/slidepersist.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <basegfx/matrix/b2dhommatrix.hxx>
#include "oox/ppt/timenode.hxx"
#include "oox/ppt/pptshape.hxx"
#include "oox/ppt/slidepersist.hxx"
diff --git a/oox/source/shape/LockedCanvasContext.cxx
b/oox/source/shape/LockedCanvasContext.cxx
index 93e5716..e6f128f 100644
--- a/oox/source/shape/LockedCanvasContext.cxx
+++ b/oox/source/shape/LockedCanvasContext.cxx
@@ -8,6 +8,7 @@
*/
#include "LockedCanvasContext.hxx"
+#include <oox/drawingml/shapecontext.hxx>
#include <oox/drawingml/shapegroupcontext.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
diff --git a/oox/source/shape/ShapeContextHandler.cxx
b/oox/source/shape/ShapeContextHandler.cxx
index 3613baf3..7638071 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <com/sun/star/xml/dom/XDocument.hpp>
#include <com/sun/star/xml/sax/XFastSAXSerializable.hpp>
#include "ShapeContextHandler.hxx"
@@ -25,6 +26,7 @@
#include "WpsContext.hxx"
#include "WpgContext.hxx"
#include "services.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
#include "oox/vml/vmldrawingfragment.hxx"
#include "oox/vml/vmlshape.hxx"
#include <oox/token/namespaces.hxx>
diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx
index 738f2e1..15a1022 100644
--- a/oox/source/shape/WpsContext.cxx
+++ b/oox/source/shape/WpsContext.cxx
@@ -8,6 +8,7 @@
*/
#include "WpsContext.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <drawingml/customshapeproperties.hxx>
#include <drawingml/shapepropertiescontext.hxx>
diff --git a/sc/source/filter/oox/condformatbuffer.cxx
b/sc/source/filter/oox/condformatbuffer.cxx
index 1c6b5ba..ecd4a9d 100644
--- a/sc/source/filter/oox/condformatbuffer.cxx
+++ b/sc/source/filter/oox/condformatbuffer.cxx
@@ -26,6 +26,7 @@
#include <osl/diagnose.h>
#include <svl/intitem.hxx>
#include <svl/sharedstringpool.hxx>
+#include <oox/core/filterbase.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/containerhelper.hxx>
#include <oox/helper/propertyset.hxx>
diff --git a/sc/source/filter/oox/drawingfragment.cxx
b/sc/source/filter/oox/drawingfragment.cxx
index c3f41c8..5c872c7 100644
--- a/sc/source/filter/oox/drawingfragment.cxx
+++ b/sc/source/filter/oox/drawingfragment.cxx
@@ -19,6 +19,7 @@
#include "drawingfragment.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/container/XNameReplace.hpp>
#include <com/sun/star/document/XEventsSupplier.hpp>
@@ -29,6 +30,7 @@
#include <svx/svdobj.hxx>
#include "drwlayer.hxx"
#include "userdat.hxx"
+#include <oox/core/filterbase.hxx>
#include <oox/drawingml/connectorshapecontext.hxx>
#include <oox/drawingml/graphicshapecontext.hxx>
#include <oox/helper/attributelist.hxx>
diff --git a/sc/source/filter/oox/workbookfragment.cxx
b/sc/source/filter/oox/workbookfragment.cxx
index 82980ab..9b824f1 100644
--- a/sc/source/filter/oox/workbookfragment.cxx
+++ b/sc/source/filter/oox/workbookfragment.cxx
@@ -21,6 +21,7 @@
#include <com/sun/star/table/CellAddress.hpp>
#include <oox/core/filterbase.hxx>
+#include <oox/core/xmlfilterbase.hxx>
#include <oox/drawingml/themefragmenthandler.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/helper/progressbar.hxx>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
