include/oox/ppt/animationspersist.hxx | 8 ++----
include/oox/ppt/backgroundproperties.hxx | 6 +++-
include/oox/ppt/comments.hxx | 3 ++
include/oox/ppt/customshowlistcontext.hxx | 8 +++++-
include/oox/ppt/dgmimport.hxx | 23 +++++++++++++-----
include/oox/ppt/dgmlayout.hxx | 24 ++++++++++++++-----
include/oox/ppt/headerfooter.hxx | 2 -
include/oox/ppt/layoutfragmenthandler.hxx | 7 ++++-
include/oox/ppt/pptfilterhelpers.hxx | 5 +++
include/oox/ppt/pptgraphicshapecontext.hxx | 7 +++++
include/oox/ppt/pptimport.hxx | 29 +++++++++++++++++++----
include/oox/ppt/pptshape.hxx | 19 +++++++++++++++
include/oox/ppt/pptshapecontext.hxx | 6 ++++
include/oox/ppt/pptshapegroupcontext.hxx | 10 +++++++
include/oox/ppt/pptshapepropertiescontext.hxx | 8 ++++++
include/oox/ppt/presentationfragmenthandler.hxx | 14 +++++++----
include/oox/ppt/slidefragmenthandler.hxx | 13 ++++++----
include/oox/ppt/slidemastertextstylescontext.hxx | 4 ++-
include/oox/ppt/slidepersist.hxx | 24 ++++++++++++-------
include/oox/ppt/slidetimingcontext.hxx | 8 +++---
include/oox/ppt/slidetransition.hxx | 6 +++-
include/oox/ppt/slidetransitioncontext.hxx | 7 ++++-
include/oox/ppt/soundactioncontext.hxx | 8 +++++-
include/oox/ppt/timenode.hxx | 19 +++++++++------
include/oox/ppt/timenodelistcontext.hxx | 9 ++++++-
oox/source/drawingml/shape.cxx | 1
oox/source/drawingml/textparagraphproperties.cxx | 1
oox/source/ppt/dgmimport.cxx | 1
oox/source/ppt/dgmlayout.cxx | 1
oox/source/ppt/pptimport.cxx | 1
oox/source/ppt/pptshape.cxx | 2 +
oox/source/ppt/slidepersist.cxx | 1
oox/source/ppt/slidetimingcontext.cxx | 2 -
oox/source/ppt/slidetransition.cxx | 1
oox/source/ppt/timenode.cxx | 1
35 files changed, 225 insertions(+), 64 deletions(-)
New commits:
commit 5c05f1b201be8c1b978dc8d409f3c4dbf0b4beb6
Author: Jorenz Paragas <j.paragas....@gmail.com>
Date: Sun May 15 11:41:45 2016 -0700
tdf#42949: clean up includes in include/oox/ppt with iwyu
Change-Id: Ib2cf76418e8406b925113ae7a9e3c5b07ffd2de2
Reviewed-on: https://gerrit.libreoffice.org/25011
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Michael Stahl <mst...@redhat.com>
diff --git a/include/oox/ppt/animationspersist.hxx
b/include/oox/ppt/animationspersist.hxx
index 7a49964..a10c9c6 100644
--- a/include/oox/ppt/animationspersist.hxx
+++ b/include/oox/ppt/animationspersist.hxx
@@ -21,17 +21,15 @@
#ifndef INCLUDED_OOX_PPT_ANIMATIONSPERSIST_HXX
#define INCLUDED_OOX_PPT_ANIMATIONSPERSIST_HXX
+#include <array>
#include <list>
#include <memory>
-#include <array>
-
-#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Any.hxx>
-#include <com/sun/star/drawing/XShape.hpp>
-
#include <oox/drawingml/drawingmltypes.hxx>
#include <oox/ppt/slidepersist.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
namespace oox { namespace ppt {
diff --git a/include/oox/ppt/backgroundproperties.hxx
b/include/oox/ppt/backgroundproperties.hxx
index 4df7a30..ce8925d 100644
--- a/include/oox/ppt/backgroundproperties.hxx
+++ b/include/oox/ppt/backgroundproperties.hxx
@@ -20,8 +20,12 @@
#ifndef INCLUDED_OOX_PPT_BACKGROUNDPROPERTIES_HXX
#define INCLUDED_OOX_PPT_BACKGROUNDPROPERTIES_HXX
+#include <oox/core/contexthandler.hxx>
#include <oox/core/fragmenthandler2.hxx>
-#include <oox/drawingml/fillproperties.hxx>
+#include <sal/types.h>
+
+namespace oox { class AttributeList; }
+namespace oox { namespace drawingml { struct FillProperties; } }
namespace oox { namespace ppt {
diff --git a/include/oox/ppt/comments.hxx b/include/oox/ppt/comments.hxx
index a722ff3..db8a547 100644
--- a/include/oox/ppt/comments.hxx
+++ b/include/oox/ppt/comments.hxx
@@ -12,7 +12,10 @@
#define INCLUDED_OOX_PPT_COMMENTS_HXX
#include <vector>
+
#include <com/sun/star/util/DateTime.hpp>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
namespace oox { namespace ppt {
diff --git a/include/oox/ppt/customshowlistcontext.hxx
b/include/oox/ppt/customshowlistcontext.hxx
index 136d6e5..5baea22 100644
--- a/include/oox/ppt/customshowlistcontext.hxx
+++ b/include/oox/ppt/customshowlistcontext.hxx
@@ -20,9 +20,15 @@
#ifndef INCLUDED_OOX_PPT_CUSTOMSHOWLISTCONTEXT_HXX
#define INCLUDED_OOX_PPT_CUSTOMSHOWLISTCONTEXT_HXX
-#include <oox/core/fragmenthandler2.hxx>
#include <vector>
+#include <oox/core/contexthandler.hxx>
+#include <oox/core/fragmenthandler2.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace oox { class AttributeList; }
+
namespace oox { namespace ppt {
diff --git a/include/oox/ppt/dgmimport.hxx b/include/oox/ppt/dgmimport.hxx
index 7272eeeb..cac00b1 100644
--- a/include/oox/ppt/dgmimport.hxx
+++ b/include/oox/ppt/dgmimport.hxx
@@ -20,14 +20,25 @@
#ifndef INCLUDED_OOX_PPT_DGMIMPORT_HXX
#define INCLUDED_OOX_PPT_DGMIMPORT_HXX
-#include <oox/core/xmlfilterbase.hxx>
+#include <exception>
-#include <com/sun/star/animations/XAnimationNode.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <oox/core/filterbase.hxx>
+#include <oox/core/xmlfilterbase.hxx>
#include <oox/drawingml/theme.hxx>
-#include <oox/ppt/presentationfragmenthandler.hxx>
-#include <oox/ppt/slidepersist.hxx>
-#include <vector>
-#include <map>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+ namespace uno { class XComponentContext; }
+} } }
+
+namespace oox {
+ namespace drawingml { namespace chart { class ChartConverter; } }
+ namespace ole { class VbaProject; }
+ namespace vml { class Drawing; }
+}
namespace oox { namespace ppt {
diff --git a/include/oox/ppt/dgmlayout.hxx b/include/oox/ppt/dgmlayout.hxx
index 0ba4d53..a0735ea 100644
--- a/include/oox/ppt/dgmlayout.hxx
+++ b/include/oox/ppt/dgmlayout.hxx
@@ -20,14 +20,26 @@
#ifndef INCLUDED_OOX_PPT_DGMLAYOUT_HXX
#define INCLUDED_OOX_PPT_DGMLAYOUT_HXX
-#include <oox/core/xmlfilterbase.hxx>
+#include <exception>
-#include <com/sun/star/animations/XAnimationNode.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <oox/core/filterbase.hxx>
+#include <oox/core/xmlfilterbase.hxx>
+#include <oox/drawingml/drawingmltypes.hxx>
#include <oox/drawingml/theme.hxx>
-#include <oox/ppt/presentationfragmenthandler.hxx>
-#include <oox/ppt/slidepersist.hxx>
-#include <vector>
-#include <map>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+ namespace uno { class XComponentContext; }
+} } }
+
+namespace oox {
+ namespace drawingml { namespace chart { class ChartConverter; } }
+ namespace ole { class VbaProject; }
+ namespace vml { class Drawing; }
+}
namespace oox { namespace ppt {
diff --git a/include/oox/ppt/headerfooter.hxx b/include/oox/ppt/headerfooter.hxx
index 30a0719..55203a7 100644
--- a/include/oox/ppt/headerfooter.hxx
+++ b/include/oox/ppt/headerfooter.hxx
@@ -20,8 +20,6 @@
#ifndef INCLUDED_OOX_PPT_HEADERFOOTER_HXX
#define INCLUDED_OOX_PPT_HEADERFOOTER_HXX
-#include <sal/types.h>
-
namespace oox { namespace ppt {
struct HeaderFooter
diff --git a/include/oox/ppt/layoutfragmenthandler.hxx
b/include/oox/ppt/layoutfragmenthandler.hxx
index d385bc5..5ec9351 100644
--- a/include/oox/ppt/layoutfragmenthandler.hxx
+++ b/include/oox/ppt/layoutfragmenthandler.hxx
@@ -20,9 +20,14 @@
#ifndef INCLUDED_OOX_PPT_LAYOUTFRAGMENTHANDLER_HXX
#define INCLUDED_OOX_PPT_LAYOUTFRAGMENTHANDLER_HXX
+#include <oox/core/contexthandler.hxx>
#include <oox/ppt/slidefragmenthandler.hxx>
+#include <oox/ppt/slidepersist.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
-#include <vector>
+namespace oox { class AttributeList; }
+namespace oox { namespace core { class XmlFilterBase; } }
namespace oox { namespace ppt {
diff --git a/include/oox/ppt/pptfilterhelpers.hxx
b/include/oox/ppt/pptfilterhelpers.hxx
index a832c3b..b100799 100644
--- a/include/oox/ppt/pptfilterhelpers.hxx
+++ b/include/oox/ppt/pptfilterhelpers.hxx
@@ -21,11 +21,14 @@
#define INCLUDED_OOX_PPT_PPTFILTERHELPERS_HXX
#include <com/sun/star/uno/Reference.hxx>
-#include <com/sun/star/animations/XAnimationNode.hpp>
#include <oox/dllapi.h>
#include <sal/types.h>
#include <rtl/ustring.hxx>
+namespace com { namespace sun { namespace star {
+ namespace animations { class XAnimationNode; }
+} } }
+
namespace oox { namespace ppt {
// conversion of MS to OOo attributes.
diff --git a/include/oox/ppt/pptgraphicshapecontext.hxx
b/include/oox/ppt/pptgraphicshapecontext.hxx
index 5e6d422..44b0438 100644
--- a/include/oox/ppt/pptgraphicshapecontext.hxx
+++ b/include/oox/ppt/pptgraphicshapecontext.hxx
@@ -20,7 +20,14 @@
#ifndef INCLUDED_OOX_PPT_PPTGRAPHICSHAPECONTEXT_HXX
#define INCLUDED_OOX_PPT_PPTGRAPHICSHAPECONTEXT_HXX
+#include <oox/core/contexthandler.hxx>
+#include <oox/drawingml/drawingmltypes.hxx>
#include <oox/drawingml/graphicshapecontext.hxx>
+#include <oox/ppt/slidepersist.hxx>
+#include <sal/types.h>
+
+namespace oox { class AttributeList; }
+namespace oox { namespace core { class ContextHandler2Helper; } }
namespace oox { namespace ppt {
diff --git a/include/oox/ppt/pptimport.hxx b/include/oox/ppt/pptimport.hxx
index 35bfb91..2a28607 100644
--- a/include/oox/ppt/pptimport.hxx
+++ b/include/oox/ppt/pptimport.hxx
@@ -20,14 +20,33 @@
#ifndef INCLUDED_OOX_PPT_PPTIMPORT_HXX
#define INCLUDED_OOX_PPT_PPTIMPORT_HXX
-#include <oox/core/xmlfilterbase.hxx>
+#include <exception>
+#include <map>
+#include <memory>
+#include <vector>
-#include <com/sun/star/animations/XAnimationNode.hpp>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
+#include <oox/core/filterbase.hxx>
+#include <oox/core/xmlfilterbase.hxx>
+#include <oox/drawingml/drawingmltypes.hxx>
#include <oox/drawingml/theme.hxx>
-#include <oox/ppt/presentationfragmenthandler.hxx>
#include <oox/ppt/slidepersist.hxx>
-#include <vector>
-#include <map>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+ namespace beans { struct PropertyValue; }
+ namespace uno { class XComponentContext; }
+} } }
+
+namespace oox {
+ class GraphicHelper;
+ namespace drawingml { namespace chart { class ChartConverter; } }
+ namespace ole { class VbaProject; }
+ namespace vml { class Drawing; }
+}
namespace oox { namespace ppt {
diff --git a/include/oox/ppt/pptshape.hxx b/include/oox/ppt/pptshape.hxx
index af26854..e31eeab 100644
--- a/include/oox/ppt/pptshape.hxx
+++ b/include/oox/ppt/pptshape.hxx
@@ -20,8 +20,27 @@
#ifndef INCLUDED_OOX_PPT_PPTSHAPE_HXX
#define INCLUDED_OOX_PPT_PPTSHAPE_HXX
+#include <vector>
+
+#include <com/sun/star/uno/Reference.hxx>
#include <oox/drawingml/shape.hxx>
+#include <oox/drawingml/drawingmltypes.hxx>
#include <oox/ppt/slidepersist.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 XShapes; }
+} } }
+
+namespace oox {
+ namespace core { class XmlFilterBase; }
+ namespace drawingml { class Theme; }
+ template <typename Type> class OptValue;
+}
namespace oox { namespace ppt {
diff --git a/include/oox/ppt/pptshapecontext.hxx
b/include/oox/ppt/pptshapecontext.hxx
index 2ff237f..f3a643f 100644
--- a/include/oox/ppt/pptshapecontext.hxx
+++ b/include/oox/ppt/pptshapecontext.hxx
@@ -20,8 +20,14 @@
#ifndef INCLUDED_OOX_PPT_PPTSHAPECONTEXT_HXX
#define INCLUDED_OOX_PPT_PPTSHAPECONTEXT_HXX
+#include <oox/core/contexthandler.hxx>
+#include <oox/drawingml/drawingmltypes.hxx>
#include <oox/drawingml/shapecontext.hxx>
#include <oox/ppt/slidepersist.hxx>
+#include <sal/types.h>
+
+namespace oox { class AttributeList; }
+namespace oox { namespace core { class ContextHandler2Helper; } }
namespace oox { namespace ppt {
diff --git a/include/oox/ppt/pptshapegroupcontext.hxx
b/include/oox/ppt/pptshapegroupcontext.hxx
index 20b2d7c..91d78e9 100644
--- a/include/oox/ppt/pptshapegroupcontext.hxx
+++ b/include/oox/ppt/pptshapegroupcontext.hxx
@@ -20,9 +20,17 @@
#ifndef INCLUDED_OOX_PPT_PPTSHAPEGROUPCONTEXT_HXX
#define INCLUDED_OOX_PPT_PPTSHAPEGROUPCONTEXT_HXX
+#include <oox/core/contexthandler.hxx>
+#include <oox/drawingml/drawingmltypes.hxx>
#include <oox/drawingml/shapegroupcontext.hxx>
-#include <oox/drawingml/color.hxx>
#include <oox/ppt/slidepersist.hxx>
+#include <sal/types.h>
+
+namespace oox {
+ class AttributeList;
+ namespace core { class ContextHandler2Helper; }
+ namespace drawingml { class Color; }
+}
namespace oox { namespace ppt {
diff --git a/include/oox/ppt/pptshapepropertiescontext.hxx
b/include/oox/ppt/pptshapepropertiescontext.hxx
index b41a186..dffa479 100644
--- a/include/oox/ppt/pptshapepropertiescontext.hxx
+++ b/include/oox/ppt/pptshapepropertiescontext.hxx
@@ -21,6 +21,14 @@
#define INCLUDED_OOX_PPT_PPTSHAPEPROPERTIESCONTEXT_HXX
#include <drawingml/shapepropertiescontext.hxx>
+#include <oox/core/contexthandler.hxx>
+#include <sal/types.h>
+
+namespace oox {
+ class AttributeList;
+ namespace core { class ContextHandler2Helper; }
+ namespace drawingml { class Shape; }
+}
namespace oox { namespace ppt {
diff --git a/include/oox/ppt/presentationfragmenthandler.hxx
b/include/oox/ppt/presentationfragmenthandler.hxx
index 912c181..0457235 100644
--- a/include/oox/ppt/presentationfragmenthandler.hxx
+++ b/include/oox/ppt/presentationfragmenthandler.hxx
@@ -20,17 +20,21 @@
#ifndef INCLUDED_OOX_PPT_PRESENTATIONFRAGMENTHANDLER_HXX
#define INCLUDED_OOX_PPT_PRESENTATIONFRAGMENTHANDLER_HXX
-#include <com/sun/star/drawing/XDrawPage.hpp>
+#include <vector>
+
#include <com/sun/star/awt/Size.hpp>
-#include <oox/ppt/slidepersist.hxx>
#include <oox/core/contexthandler.hxx>
#include <oox/core/fragmenthandler.hxx>
#include <oox/core/fragmenthandler2.hxx>
-#include <oox/core/relations.hxx>
+#include <oox/drawingml/drawingmltypes.hxx>
#include <oox/ppt/customshowlistcontext.hxx>
#include <oox/ppt/comments.hxx>
-#include <stack>
-#include <vector>
+#include <oox/ppt/slidepersist.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace oox { class AttributeList; }
+namespace oox { namespace core { class XmlFilterBase; } }
namespace oox { namespace ppt {
diff --git a/include/oox/ppt/slidefragmenthandler.hxx
b/include/oox/ppt/slidefragmenthandler.hxx
index a0d1394..fb6b6f9 100644
--- a/include/oox/ppt/slidefragmenthandler.hxx
+++ b/include/oox/ppt/slidefragmenthandler.hxx
@@ -20,14 +20,17 @@
#ifndef INCLUDED_OOX_PPT_SLIDEFRAGMENTHANDLER_HXX
#define INCLUDED_OOX_PPT_SLIDEFRAGMENTHANDLER_HXX
-#include <com/sun/star/drawing/XDrawPage.hpp>
-#include <oox/helper/propertymap.hxx>
+#include <vector>
+
+#include <oox/core/contexthandler.hxx>
#include <oox/core/fragmenthandler2.hxx>
+#include <oox/helper/propertymap.hxx>
#include <oox/ppt/slidepersist.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
-#include <stack>
-#include <vector>
-#include <map>
+namespace oox { class AttributeList; }
+namespace oox { namespace core { class XmlFilterBase; } }
namespace oox { namespace ppt {
diff --git a/include/oox/ppt/slidemastertextstylescontext.hxx
b/include/oox/ppt/slidemastertextstylescontext.hxx
index d719e46..d00f3fc 100644
--- a/include/oox/ppt/slidemastertextstylescontext.hxx
+++ b/include/oox/ppt/slidemastertextstylescontext.hxx
@@ -20,10 +20,12 @@
#ifndef INCLUDED_OOX_PPT_SLIDEMASTERTEXTSTYLESCONTEXT_HXX
#define INCLUDED_OOX_PPT_SLIDEMASTERTEXTSTYLESCONTEXT_HXX
-#include <oox/drawingml/theme.hxx>
#include <oox/core/contexthandler.hxx>
#include <oox/core/fragmenthandler2.hxx>
#include <oox/ppt/slidepersist.hxx>
+#include <sal/types.h>
+
+namespace oox { class AttributeList; }
namespace oox { namespace ppt {
diff --git a/include/oox/ppt/slidepersist.hxx b/include/oox/ppt/slidepersist.hxx
index 1e75c2c..09344a7 100644
--- a/include/oox/ppt/slidepersist.hxx
+++ b/include/oox/ppt/slidepersist.hxx
@@ -20,19 +20,27 @@
#ifndef INCLUDED_OOX_PPT_SLIDEPERSIST_HXX
#define INCLUDED_OOX_PPT_SLIDEPERSIST_HXX
+#include <list>
+#include <map>
#include <memory>
-#include <oox/drawingml/shape.hxx>
-#include <oox/drawingml/theme.hxx>
+
+#include <cppuhelper/weakref.hxx>
+#include <com/sun/star/uno/Reference.hxx>
#include <oox/drawingml/clrscheme.hxx>
-#include <oox/ppt/headerfooter.hxx>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/drawing/XDrawPage.hpp>
-#include <com/sun/star/animations/XAnimationNode.hpp>
-#include <oox/core/fragmenthandler.hxx>
+#include <oox/drawingml/color.hxx>
+#include <oox/drawingml/drawingmltypes.hxx>
+#include <oox/drawingml/shape.hxx>
#include <oox/ppt/comments.hxx>
+#include <oox/ppt/headerfooter.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
-#include <list>
+namespace com { namespace sun { namespace star {
+ namespace animations { class XAnimationNode; }
+ namespace drawing { class XDrawPage; }
+} } }
+namespace oox { namespace core { class XmlFilterBase; } }
namespace oox { namespace vml { class Drawing; } }
namespace oox { namespace ppt {
diff --git a/include/oox/ppt/slidetimingcontext.hxx
b/include/oox/ppt/slidetimingcontext.hxx
index 3598045..b13b8ad 100644
--- a/include/oox/ppt/slidetimingcontext.hxx
+++ b/include/oox/ppt/slidetimingcontext.hxx
@@ -20,12 +20,12 @@
#ifndef INCLUDED_OOX_PPT_SLIDETIMINGCONTEXT_HXX
#define INCLUDED_OOX_PPT_SLIDETIMINGCONTEXT_HXX
-#include <com/sun/star/animations/XTimeContainer.hpp>
-#include <oox/ppt/timenode.hxx>
+#include <oox/core/contexthandler.hxx>
#include <oox/core/fragmenthandler2.hxx>
+#include <oox/ppt/timenode.hxx>
+#include <sal/types.h>
-#include <stack>
-#include <vector>
+namespace oox { class AttributeList; }
namespace oox { namespace ppt {
diff --git a/include/oox/ppt/slidetransition.hxx
b/include/oox/ppt/slidetransition.hxx
index 1e322e0..41df7b2 100644
--- a/include/oox/ppt/slidetransition.hxx
+++ b/include/oox/ppt/slidetransition.hxx
@@ -21,9 +21,13 @@
#ifndef INCLUDED_OOX_PPT_SLIDETRANSITION_HXX
#define INCLUDED_OOX_PPT_SLIDETRANSITION_HXX
+#include <com/sun/star/uno/Reference.hxx>
#include <rtl/ustring.hxx>
+#include <sal/types.h>
-#include <com/sun/star/animations/XTransitionFilter.hpp>
+namespace com { namespace sun { namespace star {
+ namespace animations { class XTransitionFilter; }
+} } }
namespace oox { class PropertyMap; }
diff --git a/include/oox/ppt/slidetransitioncontext.hxx
b/include/oox/ppt/slidetransitioncontext.hxx
index 8cb53e7..1588cba 100644
--- a/include/oox/ppt/slidetransitioncontext.hxx
+++ b/include/oox/ppt/slidetransitioncontext.hxx
@@ -20,10 +20,15 @@
#ifndef INCLUDED_OOX_PPT_SLIDETRANSITIONCONTEXT_HXX
#define INCLUDED_OOX_PPT_SLIDETRANSITIONCONTEXT_HXX
+#include <oox/core/contexthandler.hxx>
#include <oox/core/fragmenthandler2.hxx>
#include <oox/ppt/slidetransition.hxx>
+#include <sal/types.h>
-namespace oox { class PropertyMap; }
+namespace oox {
+ class AttributeList;
+ class PropertyMap;
+}
namespace oox { namespace ppt {
diff --git a/include/oox/ppt/soundactioncontext.hxx
b/include/oox/ppt/soundactioncontext.hxx
index 51e0e0d..7d7f714 100644
--- a/include/oox/ppt/soundactioncontext.hxx
+++ b/include/oox/ppt/soundactioncontext.hxx
@@ -21,9 +21,15 @@
#ifndef INCLUDED_OOX_PPT_SOUNDACTIONCONTEXT_HXX
#define INCLUDED_OOX_PPT_SOUNDACTIONCONTEXT_HXX
+#include <oox/core/contexthandler.hxx>
#include <oox/core/fragmenthandler2.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
-namespace oox { class PropertyMap; }
+namespace oox {
+ class AttributeList;
+ class PropertyMap;
+}
namespace oox { namespace ppt {
diff --git a/include/oox/ppt/timenode.hxx b/include/oox/ppt/timenode.hxx
index c04d4f5..546f73a 100644
--- a/include/oox/ppt/timenode.hxx
+++ b/include/oox/ppt/timenode.hxx
@@ -21,22 +21,27 @@
#ifndef INCLUDED_OOX_PPT_TIMENODE_HXX
#define INCLUDED_OOX_PPT_TIMENODE_HXX
-#include <memory>
-#include <vector>
#include <list>
-#include <rtl/ustring.hxx>
+#include <map>
+#include <memory>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/animations/XAnimationNode.hpp>
-#include <oox/helper/propertymap.hxx>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Reference.hxx>
#include <oox/ppt/slidetransition.hxx>
#include <oox/ppt/slidepersist.hxx>
#include <oox/ppt/animationspersist.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+ namespace animations { class XAnimationNode; }
+} } }
+
+namespace oox { namespace core { class XmlFilterBase; } }
namespace oox { namespace ppt {
class TimeNode;
- class SlideTransition;
typedef std::shared_ptr< TimeNode > TimeNodePtr;
typedef std::list< TimeNodePtr > TimeNodePtrList;
diff --git a/include/oox/ppt/timenodelistcontext.hxx
b/include/oox/ppt/timenodelistcontext.hxx
index 5406771..fe27bba 100644
--- a/include/oox/ppt/timenodelistcontext.hxx
+++ b/include/oox/ppt/timenodelistcontext.hxx
@@ -20,10 +20,17 @@
#ifndef INCLUDED_OOX_PPT_TIMENODELISTCONTEXT_HXX
#define INCLUDED_OOX_PPT_TIMENODELISTCONTEXT_HXX
+#include <com/sun/star/uno/Reference.hxx>
+#include <oox/core/contexthandler.hxx>
#include <oox/core/fragmenthandler2.hxx>
#include <oox/ppt/timenode.hxx>
+#include <sal/types.h>
-#include <com/sun/star/animations/XTimeContainer.hpp>
+namespace com { namespace sun { namespace star {
+ namespace xml { namespace sax { class XFastAttributeList; } }
+} } }
+
+namespace oox { class AttributeList; }
namespace oox { namespace ppt {
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index a3ab467..fe96550 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -61,6 +61,7 @@
#include <com/sun/star/drawing/HomogenMatrix3.hpp>
#include <com/sun/star/drawing/TextVerticalAdjust.hpp>
#include <com/sun/star/drawing/GraphicExportFilter.hpp>
+#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/text/XText.hpp>
#include <com/sun/star/table/BorderLine2.hpp>
diff --git a/oox/source/drawingml/textparagraphproperties.cxx
b/oox/source/drawingml/textparagraphproperties.cxx
index 4abee8f..d9b3636 100644
--- a/oox/source/drawingml/textparagraphproperties.cxx
+++ b/oox/source/drawingml/textparagraphproperties.cxx
@@ -29,6 +29,7 @@
#include <com/sun/star/style/TabStop.hpp>
#include <com/sun/star/text/PositionAndSpaceMode.hpp>
#include <com/sun/star/style/ParagraphAdjust.hpp>
+#include <com/sun/star/drawing/XDrawPage.hpp>
#include <osl/diagnose.h>
diff --git a/oox/source/ppt/dgmimport.cxx b/oox/source/ppt/dgmimport.cxx
index 5f6625d..5727129 100644
--- a/oox/source/ppt/dgmimport.cxx
+++ b/oox/source/ppt/dgmimport.cxx
@@ -24,6 +24,7 @@
#include "oox/dump/pptxdumper.hxx"
#include <com/sun/star/drawing/XShape.hpp>
+#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <services.hxx>
diff --git a/oox/source/ppt/dgmlayout.cxx b/oox/source/ppt/dgmlayout.cxx
index 24e3451..9e35c8c 100644
--- a/oox/source/ppt/dgmlayout.cxx
+++ b/oox/source/ppt/dgmlayout.cxx
@@ -24,6 +24,7 @@
#include "drawingml/diagram/diagram.hxx"
#include "oox/dump/pptxdumper.hxx"
+#include <com/sun/star/awt/Rectangle.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/drawing/XMasterPageTarget.hpp>
diff --git a/oox/source/ppt/pptimport.cxx b/oox/source/ppt/pptimport.cxx
index 9a606e6..d2764b8 100644
--- a/oox/source/ppt/pptimport.cxx
+++ b/oox/source/ppt/pptimport.cxx
@@ -28,6 +28,7 @@
#include "drawingml/table/tablestylelistfragmenthandler.hxx"
#include "oox/helper/graphichelper.hxx"
#include "oox/ole/vbaproject.hxx"
+#include <oox/ppt/presentationfragmenthandler.hxx>
#include <oox/token/tokens.hxx>
#include <services.hxx>
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 06a173b..a1600c2 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -21,10 +21,12 @@
#include "oox/core/xmlfilterbase.hxx"
#include "drawingml/textbody.hxx"
+#include <com/sun/star/awt/Rectangle.hpp>
#include <com/sun/star/container/XNamed.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/drawing/HomogenMatrix3.hpp>
+#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/text/XText.hpp>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include "oox/ppt/slidepersist.hxx"
diff --git a/oox/source/ppt/slidepersist.cxx b/oox/source/ppt/slidepersist.cxx
index fec1d6c..2e920c1 100644
--- a/oox/source/ppt/slidepersist.cxx
+++ b/oox/source/ppt/slidepersist.cxx
@@ -18,6 +18,7 @@
*/
#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <com/sun/star/drawing/XShapes.hpp>
#include "oox/ppt/timenode.hxx"
#include "oox/ppt/pptshape.hxx"
#include "oox/ppt/slidepersist.hxx"
diff --git a/oox/source/ppt/slidetimingcontext.cxx
b/oox/source/ppt/slidetimingcontext.cxx
index e074451..d2ed428 100644
--- a/oox/source/ppt/slidetimingcontext.cxx
+++ b/oox/source/ppt/slidetimingcontext.cxx
@@ -22,6 +22,7 @@
#include "comphelper/anytostring.hxx"
#include "cppuhelper/exc_hlp.hxx"
+#include <com/sun/star/drawing/XShapes.hpp>
#include "oox/ppt/backgroundproperties.hxx"
#include "oox/ppt/slidefragmenthandler.hxx"
#include "oox/drawingml/shapegroupcontext.hxx"
@@ -38,7 +39,6 @@ using namespace ::oox::drawingml;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::xml::sax;
-using namespace ::com::sun::star::container;
namespace oox { namespace ppt {
diff --git a/oox/source/ppt/slidetransition.cxx
b/oox/source/ppt/slidetransition.cxx
index e21ecdd..9ae715f 100644
--- a/oox/source/ppt/slidetransition.cxx
+++ b/oox/source/ppt/slidetransition.cxx
@@ -23,6 +23,7 @@
#include <com/sun/star/presentation/AnimationSpeed.hpp>
#include <com/sun/star/animations/TransitionType.hpp>
#include <com/sun/star/animations/TransitionSubType.hpp>
+#include <com/sun/star/animations/XTransitionFilter.hpp>
#include <osl/diagnose.h>
diff --git a/oox/source/ppt/timenode.cxx b/oox/source/ppt/timenode.cxx
index eebaee7..2e5a02e 100644
--- a/oox/source/ppt/timenode.cxx
+++ b/oox/source/ppt/timenode.cxx
@@ -31,6 +31,7 @@
#include <com/sun/star/animations/XIterateContainer.hpp>
#include <com/sun/star/animations/XAnimationNodeSupplier.hpp>
#include <com/sun/star/animations/XTimeContainer.hpp>
+#include <com/sun/star/animations/XTransitionFilter.hpp>
#include <com/sun/star/animations/AnimationNodeType.hpp>
#include <com/sun/star/animations/Event.hpp>
#include <com/sun/star/animations/EventTrigger.hpp>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
