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

Change-Id: I753880ce146fef6523561290b8e13310d9f7219c Reviewed-on: https://gerrit.libreoffice.org/26142 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
2016-06-08 21:43:35 -07:00
parent 4c8d656b89
commit 5b156b37d4
14 changed files with 77 additions and 19 deletions
--- a/include/oox/vml/vmldrawing.hxx
+++ b/include/oox/vml/vmldrawing.hxx
@@ -23,14 +23,15 @@
 #include <map>
 #include <memory>
 #include <vector>
-#include <oox/ole/axcontrol.hxx>
-#include <oox/ole/oleobjecthelper.hxx>
-#include <oox/vml/vmlshapecontainer.hxx>
+
+#include <com/sun/star/uno/Reference.hxx>
 #include <oox/dllapi.h>
+#include <oox/ole/oleobjecthelper.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>

 namespace com { namespace sun { namespace star {
    namespace awt { struct Rectangle; }
-    namespace awt { class XControlModel; }
    namespace drawing { class XDrawPage; }
    namespace drawing { class XShape; }
    namespace drawing { class XShapes; }
@@ -39,13 +40,14 @@ namespace com { namespace sun { namespace star {
 namespace oox {
    namespace core { class XmlFilterBase; }
    namespace ole { class EmbeddedControl; }
+    namespace ole { class EmbeddedForm; }
+    namespace vml { class ShapeContainer; }
 }

 namespace oox {
 namespace vml {

 class ShapeBase;
-struct ClientData;


 /** Enumerates different types of VML drawings. */
--- a/include/oox/vml/vmldrawingfragment.hxx
+++ b/include/oox/vml/vmldrawingfragment.hxx
@@ -20,8 +20,19 @@
 #ifndef INCLUDED_OOX_VML_VMLDRAWINGFRAGMENT_HXX
 #define INCLUDED_OOX_VML_VMLDRAWINGFRAGMENT_HXX

+#include <com/sun/star/uno/Reference.hxx>
+#include <oox/core/contexthandler.hxx>
 #include <oox/core/fragmenthandler2.hxx>
 #include <oox/dllapi.h>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace com { namespace sun { namespace star {
+    namespace io { class XInputStream; }
+} } }
+
+namespace oox { class AttributeList; }
+namespace oox { namespace core { class XmlFilterBase; } }

 namespace oox {
 namespace vml {
--- a/include/oox/vml/vmlformatting.hxx
+++ b/include/oox/vml/vmlformatting.hxx
@@ -20,14 +20,21 @@
 #ifndef INCLUDED_OOX_VML_VMLFORMATTING_HXX
 #define INCLUDED_OOX_VML_VMLFORMATTING_HXX

-#include <oox/helper/helper.hxx>
-#include <oox/dllapi.h>
-#include <com/sun/star/awt/Point.hpp>
-#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
-#include <com/sun/star/drawing/XShape.hpp>
-
+#include <utility>
 #include <vector>

+#include <com/sun/star/drawing/PolygonFlags.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 awt { struct Point; }
+    namespace drawing { class XShape; }
+} } }
+
 namespace oox {
    class GraphicHelper;
    namespace drawingml { class Color; }
--- a/include/oox/vml/vmlinputstream.hxx
+++ b/include/oox/vml/vmlinputstream.hxx
@@ -20,9 +20,19 @@
 #ifndef INCLUDED_OOX_VML_VMLINPUTSTREAM_HXX
 #define INCLUDED_OOX_VML_VMLINPUTSTREAM_HXX

+#include <exception>
+
+#include <com/sun/star/io/BufferSizeExceededException.hpp>
+#include <com/sun/star/io/IOException.hpp>
+#include <com/sun/star/io/NotConnectedException.hpp>
 #include <com/sun/star/io/XInputStream.hpp>
+#include <com/sun/star/uno/Any.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+#include <com/sun/star/uno/RuntimeException.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <rtl/string.hxx>
+#include <sal/types.h>

 namespace com { namespace sun { namespace star {
    namespace io { class XTextInputStream2; }
--- a/include/oox/vml/vmlshape.hxx
+++ b/include/oox/vml/vmlshape.hxx
@@ -22,10 +22,14 @@

 #include <memory>
 #include <vector>
+
 #include <com/sun/star/awt/Point.hpp>
-#include <oox/vml/vmlformatting.hxx>
-#include <oox/vml/vmltextbox.hxx>
+#include <com/sun/star/uno/Reference.hxx>
 #include <oox/dllapi.h>
+#include <oox/helper/helper.hxx>
+#include <oox/vml/vmlformatting.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>

 namespace com { namespace sun { namespace star {
    namespace awt { struct Rectangle; }
@@ -39,7 +43,7 @@ namespace vml {
 class Drawing;
 struct ShapeParentAnchor;
 class ShapeContainer;
-
+class TextBox;

 const sal_Int32 VML_CLIENTDATA_UNCHECKED        = 0;
 const sal_Int32 VML_CLIENTDATA_CHECKED          = 1;
--- a/include/oox/vml/vmlshapecontainer.hxx
+++ b/include/oox/vml/vmlshapecontainer.hxx
@@ -20,10 +20,16 @@
 #ifndef INCLUDED_OOX_VML_VMLSHAPECONTAINER_HXX
 #define INCLUDED_OOX_VML_VMLSHAPECONTAINER_HXX

+#include <cstddef>
+#include <functional>
+#include <memory>
+#include <stack>
+
 #include <com/sun/star/awt/Rectangle.hpp>
+#include <com/sun/star/uno/Reference.hxx>
 #include <oox/helper/refmap.hxx>
 #include <oox/helper/refvector.hxx>
-#include <stack>
+#include <rtl/ustring.hxx>

 namespace com { namespace sun { namespace star {
    namespace drawing { class XShapes; }
--- a/include/oox/vml/vmlshapecontext.hxx
+++ b/include/oox/vml/vmlshapecontext.hxx
@@ -20,8 +20,13 @@
 #ifndef INCLUDED_OOX_VML_VMLSHAPECONTEXT_HXX
 #define INCLUDED_OOX_VML_VMLSHAPECONTEXT_HXX

+#include <oox/core/contexthandler.hxx>
 #include <oox/core/contexthandler2.hxx>
 #include <oox/helper/helper.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>
+
+namespace oox { class AttributeList; }

 namespace oox {
 namespace vml {
--- a/include/oox/vml/vmltextbox.hxx
+++ b/include/oox/vml/vmltextbox.hxx
@@ -20,11 +20,14 @@
 #ifndef INCLUDED_OOX_VML_VMLTEXTBOX_HXX
 #define INCLUDED_OOX_VML_VMLTEXTBOX_HXX

+#include <cstddef>
 #include <vector>
-#include <rtl/ustring.hxx>
-#include <oox/helper/helper.hxx>
+
+#include <com/sun/star/uno/Reference.hxx>
 #include <oox/dllapi.h>
-#include <com/sun/star/uno/Reference.h>
+#include <oox/helper/helper.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>

 namespace com { namespace sun { namespace star {
    namespace drawing { class XShape; }
--- a/include/oox/vml/vmltextboxcontext.hxx
+++ b/include/oox/vml/vmltextboxcontext.hxx
@@ -20,11 +20,16 @@
 #ifndef INCLUDED_OOX_VML_VMLTEXTBOXCONTEXT_HXX
 #define INCLUDED_OOX_VML_VMLTEXTBOXCONTEXT_HXX

+#include <cstddef>
+
+#include <oox/core/contexthandler.hxx>
 #include <oox/core/contexthandler2.hxx>
-#include <oox/helper/attributelist.hxx>
 #include <oox/vml/vmltextbox.hxx>
+#include <rtl/ustring.hxx>
+#include <sal/types.h>

 namespace oox {
+    class AttributeList;
    class GraphicHelper;

 namespace vml {
--- a/oox/source/shape/ShapeContextHandler.cxx
+++ b/oox/source/shape/ShapeContextHandler.cxx
@@ -30,6 +30,7 @@
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include "oox/vml/vmldrawingfragment.hxx"
 #include "oox/vml/vmlshape.hxx"
+#include <oox/vml/vmlshapecontainer.hxx>
 #include <oox/token/namespaces.hxx>
 #include <oox/token/tokens.hxx>
 #include "oox/drawingml/themefragmenthandler.hxx"
--- a/oox/source/shape/ShapeFilterBase.cxx
+++ b/oox/source/shape/ShapeFilterBase.cxx
@@ -19,6 +19,7 @@

 #include "ShapeFilterBase.hxx"
 #include "oox/drawingml/chart/chartconverter.hxx"
+#include <oox/helper/graphichelper.hxx>
 #include "oox/ole/vbaproject.hxx"
 #include "oox/drawingml/theme.hxx"

--- a/oox/source/vml/vmltextboxcontext.cxx
+++ b/oox/source/vml/vmltextboxcontext.cxx
@@ -17,6 +17,7 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

+#include <oox/helper/attributelist.hxx>
 #include "oox/vml/vmlformatting.hxx"
 #include "oox/vml/vmltextboxcontext.hxx"
 #include "oox/vml/vmlshape.hxx"
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -36,6 +36,7 @@
 #include <oox/export/vmlexport.hxx>
 #include <oox/export/chartexport.hxx>
 #include <oox/export/shapes.hxx>
+#include <oox/helper/propertyset.hxx>

 #include <map>
 #include <algorithm>
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -15,6 +15,7 @@
 #include <editeng/unoprnms.hxx>
 #include <editeng/charrotateitem.hxx>
 #include <svx/svdogrp.hxx>
+#include <oox/helper/propertyset.hxx>
 #include <oox/token/properties.hxx>
 #include <textboxhelper.hxx>
 #include <fmtanchr.hxx>