[Libreoffice-commits] core.git: sd/IwyuFilter_sd.yaml sd/source

Gabor Kelemen kelemeng at ubuntu.com
Mon Jun 4 12:05:13 UTC 2018 

 sd/IwyuFilter_sd.yaml                     |    6 +++
 sd/source/filter/eppt/eppt.cxx            |    2 +
 sd/source/filter/eppt/eppt.hxx            |   54 +++++-------------------------
 sd/source/filter/eppt/epptbase.hxx        |   22 ++++++++----
 sd/source/filter/eppt/epptooxml.hxx       |    1 
 sd/source/filter/eppt/epptso.cxx          |    7 +++
 sd/source/filter/eppt/pptexanimations.cxx |    3 +
 sd/source/filter/eppt/pptexanimations.hxx |   20 ++++++-----
 sd/source/filter/eppt/pptx-epptbase.cxx   |    6 +++
 sd/source/filter/eppt/pptx-epptooxml.cxx  |    5 ++
 sd/source/filter/eppt/pptx-stylesheet.cxx |    1 
 sd/source/filter/eppt/pptx-text.cxx       |    2 +
 sd/source/filter/eppt/text.hxx            |    2 -
 sd/source/filter/html/htmlex.cxx          |    1 
 sd/source/filter/html/htmlex.hxx          |   23 ++++++------
 sd/source/filter/ppt/ppt97animations.hxx  |    1 
 sd/source/filter/ppt/pptanimations.hxx    |    2 -
 sd/source/filter/ppt/pptatom.hxx          |    5 --
 sd/source/filter/ppt/pptin.cxx            |    3 +
 sd/source/filter/ppt/pptin.hxx            |    2 -
 sd/source/filter/ppt/pptinanimations.cxx  |    4 ++
 sd/source/filter/ppt/pptinanimations.hxx  |   10 ++---
 22 files changed, 94 insertions(+), 88 deletions(-)

New commits:
commit c35916de11632685571aaf9728f083fe3287c4c0
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date:   Fri Jun 1 23:58:05 2018 +0200

    tdf#42949 Fix IWYU warnings in sd/source/filter
    
    Found with bin/find-unneeded-includes
    Removal proposals are dealt with, and necessary fallout management
    
    Change-Id: Ibf30bb929d2530572bbfee7ebeaad8a7fea7b3c2
    Reviewed-on: https://gerrit.libreoffice.org/55208
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml
index 09bb304b60c9..67eb50eb2851 100644
--- a/sd/IwyuFilter_sd.yaml
+++ b/sd/IwyuFilter_sd.yaml
@@ -77,3 +77,9 @@ blacklist:
     sd/inc/undo/undoobjects.hxx:
     # base class has to be a complete type
     - tools/weakbase.hxx
+    sd/source/filter/eppt/eppt.hxx:
+    # base class has to be a complete type
+    - escherex.hxx
+    sd/source/filter/eppt/pptexanimations.hxx:
+    # base class has to be a complete type
+    - memory
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index f906b99af1f8..2e5818701dda 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -19,6 +19,7 @@
 
 #include "eppt.hxx"
 #include "epptdef.hxx"
+#include "pptexanimations.hxx"
 #include <o3tl/any.hxx>
 #include <tools/globname.hxx>
 #include <tools/poly.hxx>
@@ -36,6 +37,7 @@
 #include <svx/svdpage.hxx>
 #include <com/sun/star/view/PaperOrientation.hpp>
 #include <com/sun/star/view/PaperFormat.hpp>
+#include <com/sun/star/container/XIndexContainer.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/office/XAnnotation.hpp>
 #include <com/sun/star/office/XAnnotationAccess.hpp>
diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx
index 749b74123900..04f11675a6fd 100644
--- a/sd/source/filter/eppt/eppt.hxx
+++ b/sd/source/filter/eppt/eppt.hxx
@@ -23,59 +23,25 @@
 #include <vector>
 #include "escherex.hxx"
 #include <sal/types.h>
-#include <sot/storage.hxx>
-#include <vcl/graph.hxx>
-#include <unotools/fontcvt.hxx>
-#include "pptexanimations.hxx"
 #include "pptexsoundcollection.hxx"
 
 #include "text.hxx"
 
-#include <vcl/mapmod.hxx>
-#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/drawing/FillStyle.hpp>
-#include <com/sun/star/drawing/LineStyle.hpp>
-#include <com/sun/star/drawing/DashStyle.hpp>
-#include <com/sun/star/drawing/HatchStyle.hpp>
-#include <com/sun/star/drawing/LineEndType.hpp>
-#include <com/sun/star/drawing/Alignment.hpp>
-#include <com/sun/star/drawing/TextAdjust.hpp>
-#include <com/sun/star/drawing/CircleKind.hpp>
-#include <com/sun/star/drawing/PolygonKind.hpp>
-#include <com/sun/star/drawing/PolygonFlags.hpp>
-#include <com/sun/star/drawing/XUniversalShapeDescriptor.hpp>
-#include <com/sun/star/drawing/XShapeGrouper.hpp>
-#include <com/sun/star/text/XSimpleText.hpp>
-#include <com/sun/star/drawing/XConnectorShape.hpp>
-#include <com/sun/star/drawing/BezierPoint.hpp>
-#include <com/sun/star/drawing/Hatch.hpp>
-#include <com/sun/star/drawing/LineDash.hpp>
-#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
-#include <com/sun/star/drawing/XMasterPageTarget.hpp>
-#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
-#include <com/sun/star/drawing/XMasterPagesSupplier.hpp>
-#include <com/sun/star/awt/XGraphics.hpp>
-#include <com/sun/star/task/XStatusIndicatorSupplier.hpp>
 #include <com/sun/star/presentation/AnimationEffect.hpp>
 #include <com/sun/star/presentation/ClickAction.hpp>
-#include <com/sun/star/text/XTextFieldsSupplier.hpp>
-#include <com/sun/star/text/XTextField.hpp>
-#include <com/sun/star/container/XNamed.hpp>
-#include <com/sun/star/awt/FontDescriptor.hpp>
-#include <com/sun/star/container/XIndexContainer.hpp>
-#include <com/sun/star/awt/XControlModel.hpp>
-#include <com/sun/star/style/TabStop.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/XPropertyState.hpp>
-#include <com/sun/star/beans/XPropertySetInfo.hpp>
-#include <com/sun/star/awt/FontFamily.hpp>
-#include <com/sun/star/awt/FontPitch.hpp>
-#include <com/sun/star/awt/CharSet.hpp>
-#include <com/sun/star/text/WritingMode.hpp>
-#include <com/sun/star/lang/Locale.hpp>
 
 #include "epptbase.hxx"
 
+namespace com { namespace sun { namespace star { namespace awt { class XControlModel; } } } }
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com { namespace sun { namespace star { namespace task { class XStatusIndicator; } } } }
+namespace com { namespace sun { namespace star { namespace text { class XSimpleText; } } } }
+
+class SotStorage;
+
 #define EPP_MAINMASTER_PERSIST_KEY      0x80010000
 #define EPP_MAINNOTESMASTER_PERSIST_KEY 0x80020000
 #define EPP_MAINSLIDE_PERSIST_KEY       0x80030000
diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx
index cf61a2d3ac6f..6e627f3aa9ca 100644
--- a/sd/source/filter/eppt/epptbase.hxx
+++ b/sd/source/filter/eppt/epptbase.hxx
@@ -27,19 +27,27 @@
 #include <tools/stream.hxx>
 #include <tools/fract.hxx>
 #include <tools/gen.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
-#include <com/sun/star/drawing/XMasterPagesSupplier.hpp>
-#include <com/sun/star/frame/XModel.hpp>
+#include <com/sun/star/awt/Size.hpp>
+#include <com/sun/star/awt/Point.hpp>
 #include <com/sun/star/presentation/FadeEffect.hpp>
-#include <com/sun/star/task/XStatusIndicator.hpp>
-#include <com/sun/star/graphic/XGraphic.hpp>
 #include <vcl/vclptr.hxx>
-#include <vcl/virdev.hxx>
 #include <vcl/graph.hxx>
 
 #include "grouptable.hxx"
 
+namespace com { namespace sun { namespace star { namespace task { class XStatusIndicator; } } } }
+namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
+namespace com { namespace sun { namespace star { namespace awt { struct Rectangle; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XMasterPagesSupplier; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XDrawPages; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XDrawPagesSupplier; } } } }
+namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XShapes; } } } }
+
+class VirtualDevice;
+
 // PLACEMENT_ID
 enum class EppLayout
 {
diff --git a/sd/source/filter/eppt/epptooxml.hxx b/sd/source/filter/eppt/epptooxml.hxx
index 7fff989cc23d..ee5520f590b5 100644
--- a/sd/source/filter/eppt/epptooxml.hxx
+++ b/sd/source/filter/eppt/epptooxml.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SD_SOURCE_FILTER_EPPT_EPPTOOXML_HXX
 
 #include <oox/core/xmlfilterbase.hxx>
-#include <oox/helper/zipstorage.hxx>
 #include <oox/vml/vmldrawing.hxx>
 #include <oox/export/shapes.hxx>
 #include "epptbase.hxx"
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index d3a017236c72..4ebeafe3c48e 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -48,15 +48,21 @@
 #include <com/sun/star/awt/XFont.hpp>
 #include <com/sun/star/awt/FontWeight.hpp>
 #include <com/sun/star/awt/FontUnderline.hpp>
+#include <com/sun/star/awt/FontFamily.hpp>
+#include <com/sun/star/awt/FontPitch.hpp>
 #include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <com/sun/star/style/LineSpacing.hpp>
 #include <com/sun/star/style/LineSpacingMode.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/style/XStyle.hpp>
+#include <com/sun/star/style/TabStop.hpp>
+#include <com/sun/star/drawing/CircleKind.hpp>
 #include <com/sun/star/drawing/PointSequence.hpp>
 #include <com/sun/star/drawing/FlagSequence.hpp>
 #include <com/sun/star/drawing/PolygonFlags.hpp>
+#include <com/sun/star/drawing/XMasterPagesSupplier.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/drawing/XControlShape.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/i18n/XBreakIterator.hpp>
@@ -69,6 +75,7 @@
 #include <rtl/crc.h>
 #include <comphelper/classids.hxx>
 #include <com/sun/star/text/FontRelief.hpp>
+#include <com/sun/star/text/XSimpleText.hpp>
 #include <editeng/frmdiritem.hxx>
 #include <vcl/fltcall.hxx>
 #include <com/sun/star/table/XTable.hpp>
diff --git a/sd/source/filter/eppt/pptexanimations.cxx b/sd/source/filter/eppt/pptexanimations.cxx
index 6e7affc21242..a861b162f32c 100644
--- a/sd/source/filter/eppt/pptexanimations.cxx
+++ b/sd/source/filter/eppt/pptexanimations.cxx
@@ -57,6 +57,9 @@
 #include <editeng/outlobj.hxx>
 #include <editeng/editobj.hxx>
 #include "pptexanimations.hxx"
+#include "pptexsoundcollection.hxx"
+#include "../ppt/pptanimations.hxx"
+#include <filter/msfilter/escherex.hxx>
 #include <osl/endian.h>
 
 #include <algorithm>
diff --git a/sd/source/filter/eppt/pptexanimations.hxx b/sd/source/filter/eppt/pptexanimations.hxx
index acd7df5da99a..2b6da5830816 100644
--- a/sd/source/filter/eppt/pptexanimations.hxx
+++ b/sd/source/filter/eppt/pptexanimations.hxx
@@ -20,22 +20,26 @@
 #ifndef INCLUDED_SD_SOURCE_FILTER_EPPT_PPTEXANIMATIONS_HXX
 #define INCLUDED_SD_SOURCE_FILTER_EPPT_PPTEXANIMATIONS_HXX
 
-#include <com/sun/star/drawing/XDrawPage.hpp>
-#include <com/sun/star/animations/XAnimate.hpp>
-#include <com/sun/star/beans/NamedValue.hpp>
-#include "../ppt/pptanimations.hxx"
-#include "pptexsoundcollection.hxx"
-#include <filter/msfilter/escherex.hxx>
-
 #ifdef DBG_ANIM_LOG
 #include <stdio.h>
 #endif
 
-#include <memory>
+#include <rtl/ustring.hxx>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Reference.h>
 
+#include <memory>
 #include <vector>
 
+namespace com { namespace sun { namespace star { namespace animations { class XAnimate; } } } }
+namespace com { namespace sun { namespace star { namespace animations { class XAnimationNode; } } } }
+namespace com { namespace sun { namespace star { namespace beans { struct NamedValue; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } }
+namespace ppt { class ExSoundCollection; }
+
 class SvStream;
+class EscherSolverContainer;
 
 namespace ppt
 {
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index 22c6d0fa143d..e5aea155e711 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -19,6 +19,8 @@
 
 #include "eppt.hxx"
 #include "epptdef.hxx"
+#include "pptexanimations.hxx"
+#include "../ppt/pptanimations.hxx"
 
 #include <o3tl/any.hxx>
 #include <tools/globname.hxx>
@@ -43,6 +45,10 @@
 #include <com/sun/star/view/PaperOrientation.hpp>
 #include <com/sun/star/view/PaperFormat.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
+#include <com/sun/star/drawing/XMasterPageTarget.hpp>
+#include <com/sun/star/drawing/XMasterPagesSupplier.hpp>
+#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
+#include <com/sun/star/drawing/XDrawPages.hpp>
 #include <com/sun/star/office/XAnnotation.hpp>
 #include <com/sun/star/office/XAnnotationAccess.hpp>
 #include <com/sun/star/office/XAnnotationEnumeration.hpp>
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 13dd072460f0..59da0d6932c4 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -62,6 +62,8 @@
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
 #include <com/sun/star/drawing/RectanglePoint.hpp>
+#include <com/sun/star/drawing/XDrawPages.hpp>
+#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
 #include <com/sun/star/embed/ElementModes.hpp>
 #include <com/sun/star/geometry/RealPoint2D.hpp>
 #include <com/sun/star/office/XAnnotationEnumeration.hpp>
@@ -72,10 +74,13 @@
 #include <com/sun/star/presentation/EffectPresetClass.hpp>
 #include <com/sun/star/presentation/ParagraphTarget.hpp>
 #include <com/sun/star/util/DateTime.hpp>
+#include <com/sun/star/task/XStatusIndicator.hpp>
+#include <com/sun/star/frame/XModel.hpp>
 
 #include <oox/export/utils.hxx>
 
 #include "pptexanimations.hxx"
+#include "../ppt/pptanimations.hxx"
 
 #include <com/sun/star/document/XDocumentProperties.hpp>
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx b/sd/source/filter/eppt/pptx-stylesheet.cxx
index 9fcc3c1f5a45..0fb26bfe74f2 100644
--- a/sd/source/filter/eppt/pptx-stylesheet.cxx
+++ b/sd/source/filter/eppt/pptx-stylesheet.cxx
@@ -22,6 +22,7 @@
 #include "text.hxx"
 #include <tools/color.hxx>
 #include <editeng/svxenum.hxx>
+#include <com/sun/star/beans/XPropertySet.hpp>
 
 using namespace ::com::sun::star;
 
diff --git a/sd/source/filter/eppt/pptx-text.cxx b/sd/source/filter/eppt/pptx-text.cxx
index 285c5e14a5fd..90011a09be3d 100644
--- a/sd/source/filter/eppt/pptx-text.cxx
+++ b/sd/source/filter/eppt/pptx-text.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/awt/FontUnderline.hpp>
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/container/XIndexReplace.hpp>
 #include <com/sun/star/i18n/BreakIterator.hpp>
@@ -37,6 +38,7 @@
 #include <com/sun/star/style/LineSpacingMode.hpp>
 #include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <com/sun/star/style/TabStop.hpp>
+#include <com/sun/star/graphic/XGraphic.hpp>
 
 #include <comphelper/processfactory.hxx>
 #include <editeng/svxenum.hxx>
diff --git a/sd/source/filter/eppt/text.hxx b/sd/source/filter/eppt/text.hxx
index 7357e93b0f1c..d9e40f2ac91d 100644
--- a/sd/source/filter/eppt/text.hxx
+++ b/sd/source/filter/eppt/text.hxx
@@ -21,9 +21,7 @@
 #define INCLUDED_SD_SOURCE_FILTER_EPPT_TEXT_HXX
 
 #include "epptbase.hxx"
-#include "epptdef.hxx"
 
-#include <rtl/textenc.h>
 #include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/lang/Locale.hpp>
 #include <editeng/svxenum.hxx>
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 7dd92d1d7558..36c326a7157c 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -75,6 +75,7 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 
 #include <drawdoc.hxx>
+#include <DrawDocShell.hxx>
 #include "htmlpublishmode.hxx"
 #include <Outliner.hxx>
 #include <sdpage.hxx>
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index dddea6336d2b..33066490bf6b 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -20,24 +20,21 @@
 #ifndef INCLUDED_SD_SOURCE_FILTER_HTML_HTMLEX_HXX
 #define INCLUDED_SD_SOURCE_FILTER_HTML_HTMLEX_HXX
 
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/ucb/XSimpleFileAccess3.hpp>
-#include <vcl/gdimtf.hxx>
-#include <svl/itemset.hxx>
 #include <resltn.hxx>
-#include <svtools/colrdlg.hxx>
-#include <svtools/ehdl.hxx>
-
-#include <DrawDocShell.hxx>
-#include <Window.hxx>
-#include <ViewShell.hxx>
-#include <assclass.hxx>
+#include <tools/color.hxx>
+#include <vcl/errinf.hxx>
 
 #include "htmlpublishmode.hxx"
 
 #include <memory>
 #include <vector>
 
+namespace basegfx { class B2DPolyPolygon; }
+namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
+namespace com { namespace sun { namespace star { namespace ucb { class XSimpleFileAccess3; } } } }
+namespace sd { class DrawDocShell; }
+namespace tools { class Rectangle; }
+
 #define PUB_LOWRES_WIDTH    640
 #define PUB_MEDRES_WIDTH    800
 #define PUB_HIGHRES_WIDTH   1024
@@ -45,6 +42,10 @@
 #define PUB_THUMBNAIL_WIDTH  256
 #define PUB_THUMBNAIL_HEIGHT 192
 
+class ErrCode;
+class OutlinerParaObject;
+class SfxItemSet;
+class Size;
 class SfxProgress;
 class SdrOutliner;
 class SdPage;
diff --git a/sd/source/filter/ppt/ppt97animations.hxx b/sd/source/filter/ppt/ppt97animations.hxx
index d2c1c6eb25f6..0baef8965ecb 100644
--- a/sd/source/filter/ppt/ppt97animations.hxx
+++ b/sd/source/filter/ppt/ppt97animations.hxx
@@ -25,7 +25,6 @@
 #include <tools/color.hxx>
 
 class SdrObject;
-class Ppt97Animation;
 class SvStream;
 
 /// helper class for reading PPT AnimationInfoAtom
diff --git a/sd/source/filter/ppt/pptanimations.hxx b/sd/source/filter/ppt/pptanimations.hxx
index 34d750c42e29..8de13b56d090 100644
--- a/sd/source/filter/ppt/pptanimations.hxx
+++ b/sd/source/filter/ppt/pptanimations.hxx
@@ -22,8 +22,6 @@
 
 #include <com/sun/star/uno/Any.h>
 
-#include <oox/ppt/pptfilterhelpers.hxx>
-
 #include <map>
 #include <sal/types.h>
 
diff --git a/sd/source/filter/ppt/pptatom.hxx b/sd/source/filter/ppt/pptatom.hxx
index 72b1238ac583..a177c443da3c 100644
--- a/sd/source/filter/ppt/pptatom.hxx
+++ b/sd/source/filter/ppt/pptatom.hxx
@@ -20,10 +20,7 @@
 #ifndef INCLUDED_SD_SOURCE_FILTER_PPT_PPTATOM_HXX
 #define INCLUDED_SD_SOURCE_FILTER_PPT_PPTATOM_HXX
 
-#include <svx/msdffdef.hxx>
-#include <filter/msfilter/msdffimp.hxx>
-
-class SvStream;
+#include <filter/msfilter/dffrecordheader.hxx>
 
 namespace ppt
 {
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index cda8adb45b0e..ab97f71ce73d 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -83,6 +83,8 @@
 #include <sfx2/docfac.hxx>
 #define MAX_USER_MOVE       2
 
+#include <animations.hxx>
+#include "pptanimations.hxx"
 #include "pptinanimations.hxx"
 #include "ppt97animations.hxx"
 
@@ -94,6 +96,7 @@
 
 #include <comphelper/string.hxx>
 #include <oox/ole/olehelper.hxx>
+#include <oox/ppt/pptfilterhelpers.hxx>
 
 #include <boost/optional.hpp>
 
diff --git a/sd/source/filter/ppt/pptin.hxx b/sd/source/filter/ppt/pptin.hxx
index f4b6de81d752..b620836b8791 100644
--- a/sd/source/filter/ppt/pptin.hxx
+++ b/sd/source/filter/ppt/pptin.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_SD_SOURCE_FILTER_PPT_PPTIN_HXX
 
 #include <filter/msfilter/svdfppt.hxx>
-#include <svx/msdffdef.hxx>
 #include <diadef.h>
 #include <svx/svdtypes.hxx>
 #include <memory>
@@ -37,7 +36,6 @@ class SfxMedium;
 
 class SdPage;
 class SdAnimationInfo;
-struct PptInteractiveInfoAtom;
 class Ppt97Animation;
 
 typedef std::shared_ptr< Ppt97Animation > Ppt97AnimationPtr;
diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx
index d1e00b043f7a..1c0c51da2411 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -32,6 +32,7 @@
 #include <com/sun/star/animations/AnimationAdditiveMode.hpp>
 #include <com/sun/star/animations/XIterateContainer.hpp>
 #include <com/sun/star/animations/XAnimateSet.hpp>
+#include <com/sun/star/animations/XAnimationNode.hpp>
 #include <com/sun/star/animations/XAudio.hpp>
 #include <com/sun/star/animations/XCommand.hpp>
 #include <com/sun/star/animations/XTransitionFilter.hpp>
@@ -55,6 +56,7 @@
 #include <com/sun/star/presentation/TextAnimationType.hpp>
 #include <comphelper/processfactory.hxx>
 #include <oox/helper/addtosequence.hxx>
+#include <oox/ppt/pptfilterhelpers.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <rtl/math.hxx>
 
@@ -62,6 +64,8 @@
 #include <svx/svdotext.hxx>
 #include <editeng/outlobj.hxx>
 #include <editeng/editobj.hxx>
+#include <animations.hxx>
+#include "pptanimations.hxx"
 #include "pptinanimations.hxx"
 #include "pptatom.hxx"
 #include "pptin.hxx"
diff --git a/sd/source/filter/ppt/pptinanimations.hxx b/sd/source/filter/ppt/pptinanimations.hxx
index 7a237fc14cee..c83807bd80ed 100644
--- a/sd/source/filter/ppt/pptinanimations.hxx
+++ b/sd/source/filter/ppt/pptinanimations.hxx
@@ -20,17 +20,15 @@
 #ifndef INCLUDED_SD_SOURCE_FILTER_PPT_PPTINANIMATIONS_HXX
 #define INCLUDED_SD_SOURCE_FILTER_PPT_PPTINANIMATIONS_HXX
 
-#include <com/sun/star/drawing/XDrawPage.hpp>
-
-#include "pptanimations.hxx"
-#include <animations.hxx>
+#include <oox/ppt/pptfilterhelpers.hxx>
 
 #ifdef DBG_ANIM_LOG
 #include <stdio.h>
 #endif
-#include <filter/msfilter/svdfppt.hxx>
 
-#include <list>
+namespace com { namespace sun { namespace star { namespace animations { class XAnimationNode; } } } }
+namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } }
+namespace ppt { struct AnimationNode; }
 
 class DffRecordHeader;
 class SvStream;

More information about the Libreoffice-commits mailing list