tdf#42949 Fix IWYU warnings in oox/*/*hxx
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I3d34eb4933ad574321c0de6a650fc89dd0aa353f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90144
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
diff --git a/oox/IwyuFilter_oox.yaml b/oox/IwyuFilter_oox.yaml
new file mode 100644
index 0000000..8b39313
--- /dev/null
+++ b/oox/IwyuFilter_oox.yaml
@@ -0,0 +1,6 @@
---
assumeFilename: oox/source/export/drawingml.cxx
blacklist:
oox/source/docprop/docprophandler.hxx:
# Needed for macro defines
- oox/token/namespaces.hxx
diff --git a/oox/inc/drawingml/chart/axismodel.hxx b/oox/inc/drawingml/chart/axismodel.hxx
index 11cf8df..8f1f904 100644
--- a/oox/inc/drawingml/chart/axismodel.hxx
+++ b/oox/inc/drawingml/chart/axismodel.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_OOX_DRAWINGML_CHART_AXISMODEL_HXX
#include <oox/drawingml/shape.hxx>
#include <oox/token/tokens.hxx>
#include <drawingml/chart/titlemodel.hxx>
namespace oox {
diff --git a/oox/inc/drawingml/chart/converterbase.hxx b/oox/inc/drawingml/chart/converterbase.hxx
index 183bb16..9a29783 100644
--- a/oox/inc/drawingml/chart/converterbase.hxx
+++ b/oox/inc/drawingml/chart/converterbase.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_OOX_DRAWINGML_CHART_CONVERTERBASE_HXX
#define INCLUDED_OOX_DRAWINGML_CHART_CONVERTERBASE_HXX
#include <drawingml/chart/chartcontextbase.hxx>
#include <drawingml/chart/objectformatter.hxx>
namespace com { namespace sun { namespace star {
diff --git a/oox/inc/drawingml/customshapegeometry.hxx b/oox/inc/drawingml/customshapegeometry.hxx
index 88d387c..ff95b8b 100644
--- a/oox/inc/drawingml/customshapegeometry.hxx
+++ b/oox/inc/drawingml/customshapegeometry.hxx
@@ -20,8 +20,6 @@
#ifndef INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEGEOMETRY_HXX
#define INCLUDED_OOX_DRAWINGML_CUSTOMSHAPEGEOMETRY_HXX
#include <com/sun/star/beans/XPropertySet.hpp>
#include <oox/helper/propertymap.hxx>
#include <oox/core/contexthandler2.hxx>
#include <oox/drawingml/shape.hxx>
diff --git a/oox/inc/drawingml/embeddedwavaudiofile.hxx b/oox/inc/drawingml/embeddedwavaudiofile.hxx
index d467654..ebf20da 100644
--- a/oox/inc/drawingml/embeddedwavaudiofile.hxx
+++ b/oox/inc/drawingml/embeddedwavaudiofile.hxx
@@ -22,7 +22,7 @@
#include <rtl/ustring.hxx>
#include <oox/core/fragmenthandler.hxx>
#include <oox/core/relations.hxx>
#include <oox/helper/attributelist.hxx>
namespace oox { namespace drawingml {
diff --git a/oox/inc/drawingml/fillproperties.hxx b/oox/inc/drawingml/fillproperties.hxx
index f189a91..be791ac 100644
--- a/oox/inc/drawingml/fillproperties.hxx
+++ b/oox/inc/drawingml/fillproperties.hxx
@@ -26,7 +26,6 @@
#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>
diff --git a/oox/inc/drawingml/graphicproperties.hxx b/oox/inc/drawingml/graphicproperties.hxx
index 7a227f8..ee87ce0 100644
--- a/oox/inc/drawingml/graphicproperties.hxx
+++ b/oox/inc/drawingml/graphicproperties.hxx
@@ -24,8 +24,6 @@
#include <com/sun/star/io/XInputStream.hpp>
#include <oox/helper/helper.hxx>
#include <drawingml/fillproperties.hxx>
namespace oox {
diff --git a/oox/inc/drawingml/lineproperties.hxx b/oox/inc/drawingml/lineproperties.hxx
index 46be7b9..f9e731f 100644
--- a/oox/inc/drawingml/lineproperties.hxx
+++ b/oox/inc/drawingml/lineproperties.hxx
@@ -26,7 +26,6 @@
#include <com/sun/star/drawing/LineCap.hpp>
#include <com/sun/star/drawing/LineJoint.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
#include <oox/dllapi.h>
#include <oox/helper/helper.hxx>
#include <sal/types.h>
diff --git a/oox/inc/drawingml/presetgeometrynames.hxx b/oox/inc/drawingml/presetgeometrynames.hxx
index f3ab92c..1dc46b8 100644
--- a/oox/inc/drawingml/presetgeometrynames.hxx
+++ b/oox/inc/drawingml/presetgeometrynames.hxx
@@ -11,7 +11,6 @@
#define INCLUDED_OOX_DRAWINGML_PRESETGEOMETRYNAMES_HXX
#include <rtl/ustring.hxx>
#include <oox/dllapi.h>
namespace PresetGeometryTypeNames
{
diff --git a/oox/inc/drawingml/shape3dproperties.hxx b/oox/inc/drawingml/shape3dproperties.hxx
index e44d046..2fb3dad 100644
--- a/oox/inc/drawingml/shape3dproperties.hxx
+++ b/oox/inc/drawingml/shape3dproperties.hxx
@@ -20,10 +20,6 @@
#ifndef INCLUDED_OOX_DRAWINGML_SHAPE3DPROPERTIES_HXX
#define INCLUDED_OOX_DRAWINGML_SHAPE3DPROPERTIES_HXX
#include <map>
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/geometry/IntegerRectangle2D.hpp>
#include <oox/core/xmlfilterbase.hxx>
#include <oox/drawingml/color.hxx>
#include <oox/helper/helper.hxx>
diff --git a/oox/inc/drawingml/table/tablecell.hxx b/oox/inc/drawingml/table/tablecell.hxx
index 9c1bda2..e5b39ea 100644
--- a/oox/inc/drawingml/table/tablecell.hxx
+++ b/oox/inc/drawingml/table/tablecell.hxx
@@ -20,18 +20,13 @@
#ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLECELL_HXX
#define INCLUDED_OOX_DRAWINGML_TABLE_TABLECELL_HXX
#include <oox/helper/propertymap.hxx>
#include <oox/drawingml/color.hxx>
#include <oox/drawingml/drawingmltypes.hxx>
#include <drawingml/textliststyle.hxx>
#include <drawingml/textfont.hxx>
#include <com/sun/star/table/XCell.hpp>
#include <drawingml/fillproperties.hxx>
#include <drawingml/lineproperties.hxx>
#include <vector>
#include <map>
namespace oox { namespace drawingml { namespace table {
class TableCellContext;
diff --git a/oox/inc/drawingml/table/tablecellcontext.hxx b/oox/inc/drawingml/table/tablecellcontext.hxx
index f0bd393..a4f0332 100644
--- a/oox/inc/drawingml/table/tablecellcontext.hxx
+++ b/oox/inc/drawingml/table/tablecellcontext.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLECELLCONTEXT_HXX
#define INCLUDED_OOX_DRAWINGML_TABLE_TABLECELLCONTEXT_HXX
#include <oox/drawingml/shapecontext.hxx>
#include <oox/core/contexthandler2.hxx>
#include <drawingml/table/tablecell.hxx>
namespace oox { namespace drawingml { namespace table {
diff --git a/oox/inc/drawingml/table/tableproperties.hxx b/oox/inc/drawingml/table/tableproperties.hxx
index 010fc67..6269ee9 100644
--- a/oox/inc/drawingml/table/tableproperties.hxx
+++ b/oox/inc/drawingml/table/tableproperties.hxx
@@ -22,10 +22,8 @@
#include <drawingml/table/tablerow.hxx>
#include <drawingml/table/tablestyle.hxx>
#include <oox/helper/propertymap.hxx>
#include <oox/drawingml/color.hxx>
#include <map>
#include <memory>
#include <vector>
diff --git a/oox/inc/drawingml/table/tablestylepart.hxx b/oox/inc/drawingml/table/tablestylepart.hxx
index f79591f..8f281f7 100644
--- a/oox/inc/drawingml/table/tablestylepart.hxx
+++ b/oox/inc/drawingml/table/tablestylepart.hxx
@@ -20,15 +20,11 @@
#ifndef INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLEPART_HXX
#define INCLUDED_OOX_DRAWINGML_TABLE_TABLESTYLEPART_HXX
#include <rtl/ustring.hxx>
#include <optional>
#include <oox/drawingml/color.hxx>
#include <drawingml/textfont.hxx>
#include <oox/drawingml/shape.hxx>
#include <drawingml/fillproperties.hxx>
#include <drawingml/lineproperties.hxx>
#include <map>
namespace oox { namespace drawingml { namespace table {
diff --git a/oox/inc/drawingml/textbodycontext.hxx b/oox/inc/drawingml/textbodycontext.hxx
index 5773162..cd7e50fa 100644
--- a/oox/inc/drawingml/textbodycontext.hxx
+++ b/oox/inc/drawingml/textbodycontext.hxx
@@ -20,8 +20,6 @@
#ifndef INCLUDED_OOX_DRAWINGML_TEXTBODYCONTEXT_HXX
#define INCLUDED_OOX_DRAWINGML_TEXTBODYCONTEXT_HXX
#include <com/sun/star/text/XText.hpp>
#include <drawingml/textbody.hxx>
#include <drawingml/textrun.hxx>
#include <oox/core/contexthandler2.hxx>
diff --git a/oox/inc/drawingml/textfield.hxx b/oox/inc/drawingml/textfield.hxx
index 4b972e4..03bb540d 100644
--- a/oox/inc/drawingml/textfield.hxx
+++ b/oox/inc/drawingml/textfield.hxx
@@ -22,7 +22,6 @@
#include <drawingml/textrun.hxx>
#include <drawingml/textparagraphproperties.hxx>
#include <memory>
namespace oox { namespace drawingml {
diff --git a/oox/inc/drawingml/textparagraphproperties.hxx b/oox/inc/drawingml/textparagraphproperties.hxx
index ccca29a..59b8b1d 100644
--- a/oox/inc/drawingml/textparagraphproperties.hxx
+++ b/oox/inc/drawingml/textparagraphproperties.hxx
@@ -21,9 +21,7 @@
#define INCLUDED_OOX_DRAWINGML_TEXTPARAGRAPHPROPERTIES_HXX
#include <com/sun/star/beans/XPropertySet.hpp>
#include <drawingml/misccontexts.hxx>
#include <drawingml/textcharacterproperties.hxx>
#include <com/sun/star/style/NumberingType.hpp>
#include <com/sun/star/style/ParagraphAdjust.hpp>
#include <drawingml/textfont.hxx>
#include <drawingml/textspacing.hxx>
diff --git a/oox/inc/drawingml/textparagraphpropertiescontext.hxx b/oox/inc/drawingml/textparagraphpropertiescontext.hxx
index 3cd2d0d..bde6f6d 100644
--- a/oox/inc/drawingml/textparagraphpropertiescontext.hxx
+++ b/oox/inc/drawingml/textparagraphpropertiescontext.hxx
@@ -23,9 +23,7 @@
#include <vector>
#include <com/sun/star/style/TabStop.hpp>
#include <oox/drawingml/drawingmltypes.hxx>
#include <drawingml/textparagraphproperties.hxx>
#include <drawingml/textspacing.hxx>
#include <oox/core/contexthandler2.hxx>
namespace oox { namespace drawingml {
diff --git a/oox/inc/drawingml/textspacing.hxx b/oox/inc/drawingml/textspacing.hxx
index ed5f9b3..cfe4da2 100644
--- a/oox/inc/drawingml/textspacing.hxx
+++ b/oox/inc/drawingml/textspacing.hxx
@@ -20,8 +20,6 @@
#ifndef INCLUDED_OOX_DRAWINGML_TEXTSPACING_HXX
#define INCLUDED_OOX_DRAWINGML_TEXTSPACING_HXX
#include <rtl/ustring.hxx>
#include <com/sun/star/style/LineSpacing.hpp>
#include <com/sun/star/style/LineSpacingMode.hpp>
#include <oox/drawingml/drawingmltypes.hxx>
diff --git a/oox/inc/ooxresid.hxx b/oox/inc/ooxresid.hxx
index 8fbcd48..6af3b7f 100644
--- a/oox/inc/ooxresid.hxx
+++ b/oox/inc/ooxresid.hxx
@@ -11,9 +11,8 @@
#define INCLUDED_OOX_INC_RESID_HXX
#include <rtl/ustring.hxx>
#include <oox/dllapi.h>
OUString OoxResId(const char* pId);
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
\ No newline at end of file
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/oox/source/docprop/docprophandler.hxx b/oox/source/docprop/docprophandler.hxx
index 29cdd67..d3baa3f 100644
--- a/oox/source/docprop/docprophandler.hxx
+++ b/oox/source/docprop/docprophandler.hxx
@@ -27,7 +27,6 @@
#include <cppuhelper/implbase.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
namespace oox {
namespace docprop {
diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx
index 6a222b4..0d64fc6 100644
--- a/oox/source/docprop/ooxmldocpropimport.cxx
+++ b/oox/source/docprop/ooxmldocpropimport.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/embed/XStorage.hpp>
#include <com/sun/star/io/IOException.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <com/sun/star/xml/sax/InputSource.hpp>
#include <oox/core/fastparser.hxx>
#include <oox/core/relations.hxx>
#include <oox/helper/containerhelper.hxx>
diff --git a/oox/source/docprop/ooxmldocpropimport.hxx b/oox/source/docprop/ooxmldocpropimport.hxx
index 61a58eb..cc4301d 100644
--- a/oox/source/docprop/ooxmldocpropimport.hxx
+++ b/oox/source/docprop/ooxmldocpropimport.hxx
@@ -23,7 +23,6 @@
#include <com/sun/star/document/XOOXMLDocumentPropertiesImporter.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/xml/sax/InputSource.hpp>
#include <cppuhelper/implbase.hxx>
namespace oox {
diff --git a/oox/source/drawingml/chart/axismodel.cxx b/oox/source/drawingml/chart/axismodel.cxx
index a5b2d55..d84c707 100644
--- a/oox/source/drawingml/chart/axismodel.cxx
+++ b/oox/source/drawingml/chart/axismodel.cxx
@@ -18,6 +18,7 @@
*/
#include <drawingml/chart/axismodel.hxx>
#include <oox/token/tokens.hxx>
namespace oox::drawingml::chart {
diff --git a/oox/source/drawingml/chart/objectformatter.cxx b/oox/source/drawingml/chart/objectformatter.cxx
index 2d264c4..a72652f 100644
--- a/oox/source/drawingml/chart/objectformatter.cxx
+++ b/oox/source/drawingml/chart/objectformatter.cxx
@@ -36,6 +36,7 @@
#include <oox/helper/modelobjecthelper.hxx>
#include <oox/helper/graphichelper.hxx>
#include <oox/token/properties.hxx>
#include <oox/token/tokens.hxx>
namespace oox::drawingml::chart {
diff --git a/oox/source/drawingml/diagram/constraintlistcontext.hxx b/oox/source/drawingml/diagram/constraintlistcontext.hxx
index 619235a..dd2132a 100644
--- a/oox/source/drawingml/diagram/constraintlistcontext.hxx
+++ b/oox/source/drawingml/diagram/constraintlistcontext.hxx
@@ -22,7 +22,6 @@
#include <oox/core/contexthandler2.hxx>
#include "diagramlayoutatoms.hxx"
#include "diagram.hxx"
namespace oox { namespace drawingml {
diff --git a/oox/source/drawingml/diagram/datamodel.cxx b/oox/source/drawingml/diagram/datamodel.cxx
index c6f20ae..3a090c1 100644
--- a/oox/source/drawingml/diagram/datamodel.cxx
+++ b/oox/source/drawingml/diagram/datamodel.cxx
@@ -25,6 +25,7 @@
#include <drawingml/textbody.hxx>
#include <drawingml/textparagraph.hxx>
#include <drawingml/textrun.hxx>
#include <oox/drawingml/shape.hxx>
#include <oox/token/namespaces.hxx>
#include <svx/DiagramDataInterface.hxx>
#include <comphelper/xmltools.hxx>
diff --git a/oox/source/drawingml/diagram/datamodel.hxx b/oox/source/drawingml/diagram/datamodel.hxx
index afaabd9..4f90f67 100644
--- a/oox/source/drawingml/diagram/datamodel.hxx
+++ b/oox/source/drawingml/diagram/datamodel.hxx
@@ -26,8 +26,7 @@
#include <rtl/ustring.hxx>
#include <oox/drawingml/shape.hxx>
#include <drawingml/fillproperties.hxx>
#include <oox/drawingml/drawingmltypes.hxx>
#include <oox/token/tokens.hxx>
#include <svx/DiagramDataInterface.hxx>
diff --git a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
index e0f0f3d..73a72f4 100644
--- a/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
+++ b/oox/source/drawingml/diagram/diagramfragmenthandler.hxx
@@ -21,7 +21,8 @@
#define INCLUDED_OOX_SOURCE_DRAWINGML_DIAGRAM_DIAGRAMFRAGMENTHANDLER_HXX
#include <oox/core/fragmenthandler2.hxx>
#include <oox/drawingml/diagram/diagram.hxx>
#include "diagram.hxx"
namespace oox { namespace drawingml {
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index 9102897..859b3bc 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -25,7 +25,6 @@
#include <com/sun/star/xml/sax/XFastAttributeList.hpp>
#include <oox/drawingml/shape.hxx>
#include "diagram.hxx"
namespace oox { namespace drawingml {
diff --git a/oox/source/drawingml/diagram/layoutatomvisitorbase.hxx b/oox/source/drawingml/diagram/layoutatomvisitorbase.hxx
index ff12f82..4a08c99 100644
--- a/oox/source/drawingml/diagram/layoutatomvisitorbase.hxx
+++ b/oox/source/drawingml/diagram/layoutatomvisitorbase.hxx
@@ -20,9 +20,6 @@
#ifndef INCLUDED_OOX_SOURCE_DRAWINGML_DIAGRAM_LAYOUTATOMVISITORBASE_HXX
#define INCLUDED_OOX_SOURCE_DRAWINGML_DIAGRAM_LAYOUTATOMVISITORBASE_HXX
#include <memory>
#include <oox/drawingml/shape.hxx>
#include "diagram.hxx"
#include "diagramlayoutatoms.hxx"
diff --git a/oox/source/drawingml/diagram/layoutatomvisitors.hxx b/oox/source/drawingml/diagram/layoutatomvisitors.hxx
index 656f61d..67a097d 100644
--- a/oox/source/drawingml/diagram/layoutatomvisitors.hxx
+++ b/oox/source/drawingml/diagram/layoutatomvisitors.hxx
@@ -20,9 +20,7 @@
#ifndef INCLUDED_OOX_SOURCE_DRAWINGML_DIAGRAM_LAYOUTATOMVISITORS_HXX
#define INCLUDED_OOX_SOURCE_DRAWINGML_DIAGRAM_LAYOUTATOMVISITORS_HXX
#include <memory>
#include <oox/drawingml/shape.hxx>
#include <oox/drawingml/drawingmltypes.hxx>
#include "diagram.hxx"
#include "diagramlayoutatoms.hxx"
#include "layoutatomvisitorbase.hxx"
diff --git a/oox/source/drawingml/diagram/layoutnodecontext.hxx b/oox/source/drawingml/diagram/layoutnodecontext.hxx
index 587c8bb..90cbb71 100644
--- a/oox/source/drawingml/diagram/layoutnodecontext.hxx
+++ b/oox/source/drawingml/diagram/layoutnodecontext.hxx
@@ -22,7 +22,6 @@
#include <oox/core/contexthandler2.hxx>
#include "diagramlayoutatoms.hxx"
#include "diagram.hxx"
namespace oox { namespace drawingml {
diff --git a/oox/source/drawingml/hyperlinkcontext.hxx b/oox/source/drawingml/hyperlinkcontext.hxx
index 027147b..6bd444f 100644
--- a/oox/source/drawingml/hyperlinkcontext.hxx
+++ b/oox/source/drawingml/hyperlinkcontext.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_OOX_SOURCE_DRAWINGML_HYPERLINKCONTEXT_HXX
#define INCLUDED_OOX_SOURCE_DRAWINGML_HYPERLINKCONTEXT_HXX
#include <com/sun/star/xml/sax/XFastAttributeList.hpp>
#include <oox/core/contexthandler2.hxx>
namespace oox { class PropertyMap; }
diff --git a/oox/source/drawingml/table/tablecontext.cxx b/oox/source/drawingml/table/tablecontext.cxx
index 7f5c7db..f84bad8 100644
--- a/oox/source/drawingml/table/tablecontext.cxx
+++ b/oox/source/drawingml/table/tablecontext.cxx
@@ -19,6 +19,7 @@
#include <oox/helper/attributelist.hxx>
#include <drawingml/guidcontext.hxx>
#include <drawingml/misccontexts.hxx>
#include <drawingml/table/tablecontext.hxx>
#include <drawingml/table/tableproperties.hxx>
#include <drawingml/table/tablestylecontext.hxx>
diff --git a/oox/source/drawingml/table/tablestylecellstylecontext.cxx b/oox/source/drawingml/table/tablestylecellstylecontext.cxx
index 608177f..a3c86b2 100644
--- a/oox/source/drawingml/table/tablestylecellstylecontext.cxx
+++ b/oox/source/drawingml/table/tablestylecellstylecontext.cxx
@@ -20,6 +20,7 @@
#include <drawingml/table/tablestylecellstylecontext.hxx>
#include <drawingml/misccontexts.hxx>
#include <drawingml/lineproperties.hxx>
#include <drawingml/linepropertiescontext.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/token/namespaces.hxx>
diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx b/oox/source/drawingml/textcharacterpropertiescontext.cxx
index 9c0157c..2fe7a26 100644
--- a/oox/source/drawingml/textcharacterpropertiescontext.cxx
+++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx
@@ -22,6 +22,7 @@
#include <oox/helper/attributelist.hxx>
#include <oox/drawingml/drawingmltypes.hxx>
#include <drawingml/colorchoicecontext.hxx>
#include <drawingml/misccontexts.hxx>
#include <drawingml/texteffectscontext.hxx>
#include <drawingml/lineproperties.hxx>
#include <drawingml/textparagraphproperties.hxx>
diff --git a/oox/source/drawingml/textparagraphproperties.cxx b/oox/source/drawingml/textparagraphproperties.cxx
index bb708b0..37cf339 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/awt/XBitmap.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/style/NumberingType.hpp>
#include <com/sun/star/style/TabStop.hpp>
#include <com/sun/star/text/PositionAndSpaceMode.hpp>
#include <com/sun/star/style/ParagraphAdjust.hpp>
diff --git a/oox/source/drawingml/textparagraphpropertiescontext.cxx b/oox/source/drawingml/textparagraphpropertiescontext.cxx
index f4b8ec5..8f7f206 100644
--- a/oox/source/drawingml/textparagraphpropertiescontext.cxx
+++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx
@@ -27,6 +27,7 @@
#include <sal/log.hxx>
#include <drawingml/colorchoicecontext.hxx>
#include <drawingml/misccontexts.hxx>
#include <drawingml/textcharacterpropertiescontext.hxx>
#include <drawingml/fillproperties.hxx>
#include <oox/helper/attributelist.hxx>
diff --git a/oox/source/ppt/animationtypes.hxx b/oox/source/ppt/animationtypes.hxx
index 0a4f461..195141e 100644
--- a/oox/source/ppt/animationtypes.hxx
+++ b/oox/source/ppt/animationtypes.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_OOX_SOURCE_PPT_ANIMATIONTYPES_HXX
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/xml/sax/XFastAttributeList.hpp>
namespace oox { namespace ppt {
diff --git a/oox/source/ppt/commonbehaviorcontext.cxx b/oox/source/ppt/commonbehaviorcontext.cxx
index ae3c125..b136052 100644
--- a/oox/source/ppt/commonbehaviorcontext.cxx
+++ b/oox/source/ppt/commonbehaviorcontext.cxx
@@ -27,6 +27,7 @@
#include <oox/token/tokens.hxx>
#include <oox/ppt/pptfilterhelpers.hxx>
#include "conditioncontext.hxx"
#include "commonbehaviorcontext.hxx"
#include "commontimenodecontext.hxx"
#include "timetargetelementcontext.hxx"
diff --git a/oox/source/ppt/commonbehaviorcontext.hxx b/oox/source/ppt/commonbehaviorcontext.hxx
index f1fef41..389f9ce 100644
--- a/oox/source/ppt/commonbehaviorcontext.hxx
+++ b/oox/source/ppt/commonbehaviorcontext.hxx
@@ -21,10 +21,10 @@
#define INCLUDED_OOX_SOURCE_PPT_COMMONBEHAVIORCONTEXT_HXX
#include <rtl/ustring.hxx>
#include <oox/ppt/timenodelistcontext.hxx>
#include <oox/ppt/animationspersist.hxx>
#include <oox/core/contexthandler.hxx>
#include <oox/core/fragmenthandler2.hxx>
#include <oox/ppt/pptfilterhelpers.hxx>
#include "conditioncontext.hxx"
#include <oox/ppt/timenode.hxx>
namespace oox { namespace ppt {
diff --git a/oox/source/ppt/commontimenodecontext.cxx b/oox/source/ppt/commontimenodecontext.cxx
index faf4b2d..4af1a97 100644
--- a/oox/source/ppt/commontimenodecontext.cxx
+++ b/oox/source/ppt/commontimenodecontext.cxx
@@ -18,6 +18,7 @@
*/
#include "commontimenodecontext.hxx"
#include "conditioncontext.hxx"
#include <algorithm>
diff --git a/oox/source/ppt/commontimenodecontext.hxx b/oox/source/ppt/commontimenodecontext.hxx
index a3317fe..e2f609a 100644
--- a/oox/source/ppt/commontimenodecontext.hxx
+++ b/oox/source/ppt/commontimenodecontext.hxx
@@ -22,7 +22,6 @@
#include <oox/ppt/timenode.hxx>
#include <oox/ppt/timenodelistcontext.hxx>
#include "conditioncontext.hxx"
namespace oox { namespace ppt {
diff --git a/oox/source/ppt/conditioncontext.hxx b/oox/source/ppt/conditioncontext.hxx
index 39096aa..75aaf64 100644
--- a/oox/source/ppt/conditioncontext.hxx
+++ b/oox/source/ppt/conditioncontext.hxx
@@ -22,7 +22,6 @@
#include <com/sun/star/animations/Event.hpp>
#include <oox/core/fragmenthandler.hxx>
#include <oox/ppt/timenode.hxx>
#include <oox/ppt/timenodelistcontext.hxx>
#include <oox/ppt/animationspersist.hxx>
diff --git a/oox/source/ppt/extdrawingfragmenthandler.cxx b/oox/source/ppt/extdrawingfragmenthandler.cxx
index 86d65c6..74eca3d 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.cxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.cxx
@@ -9,6 +9,7 @@
#include "extdrawingfragmenthandler.hxx"
#include <oox/ppt/pptshapegroupcontext.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
#include <oox/core/xmlfilterbase.hxx>
diff --git a/oox/source/ppt/extdrawingfragmenthandler.hxx b/oox/source/ppt/extdrawingfragmenthandler.hxx
index cdde037..2ea704f 100644
--- a/oox/source/ppt/extdrawingfragmenthandler.hxx
+++ b/oox/source/ppt/extdrawingfragmenthandler.hxx
@@ -11,10 +11,7 @@
#define INCLUDED_OOX_SOURCE_PPT_EXTDRAWINGFRAGMENTHANDLER_HXX
#include <oox/core/fragmenthandler2.hxx>
#include <oox/drawingml/shapegroupcontext.hxx>
#include <oox/ppt/slidepersist.hxx>
#include <oox/ppt/pptshapegroupcontext.hxx>
#include <oox/ppt/pptshape.hxx>
namespace oox { namespace ppt {
diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx
index e9a5432..2108f9e 100644
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -30,8 +30,10 @@
#include <oox/vml/vmldrawingfragment.hxx>
#include <oox/vml/vmlshape.hxx>
#include <oox/vml/vmlshapecontainer.hxx>
#include <oox/shape/ShapeFilterBase.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
#include <oox/drawingml/theme.hxx>
#include <oox/drawingml/themefragmenthandler.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <memory>
diff --git a/oox/source/shape/ShapeContextHandler.hxx b/oox/source/shape/ShapeContextHandler.hxx
index 2de45f5..c97714c 100644
--- a/oox/source/shape/ShapeContextHandler.hxx
+++ b/oox/source/shape/ShapeContextHandler.hxx
@@ -24,11 +24,8 @@
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/xml/sax/XFastShapeContextHandler.hpp>
#include <oox/drawingml/graphicshapecontext.hxx>
#include <oox/drawingml/shape.hxx>
#include <oox/drawingml/theme.hxx>
#include <oox/core/fragmenthandler2.hxx>
#include <oox/core/xmlfilterbase.hxx>
#include <oox/shape/ShapeFilterBase.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.cxx b/oox/source/shape/ShapeDrawingFragmentHandler.cxx
index 895e26e..2c9552d 100644
--- a/oox/source/shape/ShapeDrawingFragmentHandler.cxx
+++ b/oox/source/shape/ShapeDrawingFragmentHandler.cxx
@@ -9,6 +9,7 @@
#include "ShapeDrawingFragmentHandler.hxx"
#include <oox/drawingml/shapegroupcontext.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
diff --git a/oox/source/shape/ShapeDrawingFragmentHandler.hxx b/oox/source/shape/ShapeDrawingFragmentHandler.hxx
index 7484a4e..abf4800 100644
--- a/oox/source/shape/ShapeDrawingFragmentHandler.hxx
+++ b/oox/source/shape/ShapeDrawingFragmentHandler.hxx
@@ -11,7 +11,7 @@
#define INCLUDED_OOX_SOURCE_SHAPE_SHAPEDRAWINGFRAGMENTHANDLER_HXX
#include <oox/core/fragmenthandler2.hxx>
#include <oox/drawingml/shapegroupcontext.hxx>
#include <oox/drawingml/drawingmltypes.hxx>
namespace oox { namespace shape {
