Kaydet (Commit) 5b156b37 authored tarafından Jorenz Paragas's avatar Jorenz Paragas Kaydeden (comit) Noel Grandin

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

Change-Id: I753880ce146fef6523561290b8e13310d9f7219c
Reviewed-on: https://gerrit.libreoffice.org/26142Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 4c8d656b
...@@ -23,14 +23,15 @@ ...@@ -23,14 +23,15 @@
#include <map> #include <map>
#include <memory> #include <memory>
#include <vector> #include <vector>
#include <oox/ole/axcontrol.hxx>
#include <oox/ole/oleobjecthelper.hxx> #include <com/sun/star/uno/Reference.hxx>
#include <oox/vml/vmlshapecontainer.hxx>
#include <oox/dllapi.h> #include <oox/dllapi.h>
#include <oox/ole/oleobjecthelper.hxx>
#include <rtl/ustring.hxx>
#include <sal/types.h>
namespace com { namespace sun { namespace star { namespace com { namespace sun { namespace star {
namespace awt { struct Rectangle; } namespace awt { struct Rectangle; }
namespace awt { class XControlModel; }
namespace drawing { class XDrawPage; } namespace drawing { class XDrawPage; }
namespace drawing { class XShape; } namespace drawing { class XShape; }
namespace drawing { class XShapes; } namespace drawing { class XShapes; }
...@@ -39,13 +40,14 @@ namespace com { namespace sun { namespace star { ...@@ -39,13 +40,14 @@ namespace com { namespace sun { namespace star {
namespace oox { namespace oox {
namespace core { class XmlFilterBase; } namespace core { class XmlFilterBase; }
namespace ole { class EmbeddedControl; } namespace ole { class EmbeddedControl; }
namespace ole { class EmbeddedForm; }
namespace vml { class ShapeContainer; }
} }
namespace oox { namespace oox {
namespace vml { namespace vml {
class ShapeBase; class ShapeBase;
struct ClientData;
/** Enumerates different types of VML drawings. */ /** Enumerates different types of VML drawings. */
......
...@@ -20,8 +20,19 @@ ...@@ -20,8 +20,19 @@
#ifndef INCLUDED_OOX_VML_VMLDRAWINGFRAGMENT_HXX #ifndef INCLUDED_OOX_VML_VMLDRAWINGFRAGMENT_HXX
#define 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/core/fragmenthandler2.hxx>
#include <oox/dllapi.h> #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 oox {
namespace vml { namespace vml {
......
...@@ -20,13 +20,20 @@ ...@@ -20,13 +20,20 @@
#ifndef INCLUDED_OOX_VML_VMLFORMATTING_HXX #ifndef INCLUDED_OOX_VML_VMLFORMATTING_HXX
#define INCLUDED_OOX_VML_VMLFORMATTING_HXX #define INCLUDED_OOX_VML_VMLFORMATTING_HXX
#include <oox/helper/helper.hxx> #include <utility>
#include <vector>
#include <com/sun/star/drawing/PolygonFlags.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <oox/dllapi.h> #include <oox/dllapi.h>
#include <com/sun/star/awt/Point.hpp> #include <oox/helper/helper.hxx>
#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp> #include <rtl/ustring.hxx>
#include <com/sun/star/drawing/XShape.hpp> #include <sal/types.h>
#include <vector> namespace com { namespace sun { namespace star {
namespace awt { struct Point; }
namespace drawing { class XShape; }
} } }
namespace oox { namespace oox {
class GraphicHelper; class GraphicHelper;
......
...@@ -20,9 +20,19 @@ ...@@ -20,9 +20,19 @@
#ifndef INCLUDED_OOX_VML_VMLINPUTSTREAM_HXX #ifndef INCLUDED_OOX_VML_VMLINPUTSTREAM_HXX
#define 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/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 <cppuhelper/implbase.hxx>
#include <rtl/string.hxx> #include <rtl/string.hxx>
#include <sal/types.h>
namespace com { namespace sun { namespace star { namespace com { namespace sun { namespace star {
namespace io { class XTextInputStream2; } namespace io { class XTextInputStream2; }
......
...@@ -22,10 +22,14 @@ ...@@ -22,10 +22,14 @@
#include <memory> #include <memory>
#include <vector> #include <vector>
#include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Point.hpp>
#include <oox/vml/vmlformatting.hxx> #include <com/sun/star/uno/Reference.hxx>
#include <oox/vml/vmltextbox.hxx>
#include <oox/dllapi.h> #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 com { namespace sun { namespace star {
namespace awt { struct Rectangle; } namespace awt { struct Rectangle; }
...@@ -39,7 +43,7 @@ namespace vml { ...@@ -39,7 +43,7 @@ namespace vml {
class Drawing; class Drawing;
struct ShapeParentAnchor; struct ShapeParentAnchor;
class ShapeContainer; class ShapeContainer;
class TextBox;
const sal_Int32 VML_CLIENTDATA_UNCHECKED = 0; const sal_Int32 VML_CLIENTDATA_UNCHECKED = 0;
const sal_Int32 VML_CLIENTDATA_CHECKED = 1; const sal_Int32 VML_CLIENTDATA_CHECKED = 1;
......
...@@ -20,10 +20,16 @@ ...@@ -20,10 +20,16 @@
#ifndef INCLUDED_OOX_VML_VMLSHAPECONTAINER_HXX #ifndef INCLUDED_OOX_VML_VMLSHAPECONTAINER_HXX
#define 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/awt/Rectangle.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <oox/helper/refmap.hxx> #include <oox/helper/refmap.hxx>
#include <oox/helper/refvector.hxx> #include <oox/helper/refvector.hxx>
#include <stack> #include <rtl/ustring.hxx>
namespace com { namespace sun { namespace star { namespace com { namespace sun { namespace star {
namespace drawing { class XShapes; } namespace drawing { class XShapes; }
......
...@@ -20,8 +20,13 @@ ...@@ -20,8 +20,13 @@
#ifndef INCLUDED_OOX_VML_VMLSHAPECONTEXT_HXX #ifndef INCLUDED_OOX_VML_VMLSHAPECONTEXT_HXX
#define INCLUDED_OOX_VML_VMLSHAPECONTEXT_HXX #define INCLUDED_OOX_VML_VMLSHAPECONTEXT_HXX
#include <oox/core/contexthandler.hxx>
#include <oox/core/contexthandler2.hxx> #include <oox/core/contexthandler2.hxx>
#include <oox/helper/helper.hxx> #include <oox/helper/helper.hxx>
#include <rtl/ustring.hxx>
#include <sal/types.h>
namespace oox { class AttributeList; }
namespace oox { namespace oox {
namespace vml { namespace vml {
......
...@@ -20,11 +20,14 @@ ...@@ -20,11 +20,14 @@
#ifndef INCLUDED_OOX_VML_VMLTEXTBOX_HXX #ifndef INCLUDED_OOX_VML_VMLTEXTBOX_HXX
#define INCLUDED_OOX_VML_VMLTEXTBOX_HXX #define INCLUDED_OOX_VML_VMLTEXTBOX_HXX
#include <cstddef>
#include <vector> #include <vector>
#include <rtl/ustring.hxx>
#include <oox/helper/helper.hxx> #include <com/sun/star/uno/Reference.hxx>
#include <oox/dllapi.h> #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 com { namespace sun { namespace star {
namespace drawing { class XShape; } namespace drawing { class XShape; }
......
...@@ -20,11 +20,16 @@ ...@@ -20,11 +20,16 @@
#ifndef INCLUDED_OOX_VML_VMLTEXTBOXCONTEXT_HXX #ifndef INCLUDED_OOX_VML_VMLTEXTBOXCONTEXT_HXX
#define 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/core/contexthandler2.hxx>
#include <oox/helper/attributelist.hxx>
#include <oox/vml/vmltextbox.hxx> #include <oox/vml/vmltextbox.hxx>
#include <rtl/ustring.hxx>
#include <sal/types.h>
namespace oox { namespace oox {
class AttributeList;
class GraphicHelper; class GraphicHelper;
namespace vml { namespace vml {
......
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
#include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrix.hxx>
#include "oox/vml/vmldrawingfragment.hxx" #include "oox/vml/vmldrawingfragment.hxx"
#include "oox/vml/vmlshape.hxx" #include "oox/vml/vmlshape.hxx"
#include <oox/vml/vmlshapecontainer.hxx>
#include <oox/token/namespaces.hxx> #include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx> #include <oox/token/tokens.hxx>
#include "oox/drawingml/themefragmenthandler.hxx" #include "oox/drawingml/themefragmenthandler.hxx"
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#include "ShapeFilterBase.hxx" #include "ShapeFilterBase.hxx"
#include "oox/drawingml/chart/chartconverter.hxx" #include "oox/drawingml/chart/chartconverter.hxx"
#include <oox/helper/graphichelper.hxx>
#include "oox/ole/vbaproject.hxx" #include "oox/ole/vbaproject.hxx"
#include "oox/drawingml/theme.hxx" #include "oox/drawingml/theme.hxx"
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 . * the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/ */
#include <oox/helper/attributelist.hxx>
#include "oox/vml/vmlformatting.hxx" #include "oox/vml/vmlformatting.hxx"
#include "oox/vml/vmltextboxcontext.hxx" #include "oox/vml/vmltextboxcontext.hxx"
#include "oox/vml/vmlshape.hxx" #include "oox/vml/vmlshape.hxx"
......
...@@ -36,6 +36,7 @@ ...@@ -36,6 +36,7 @@
#include <oox/export/vmlexport.hxx> #include <oox/export/vmlexport.hxx>
#include <oox/export/chartexport.hxx> #include <oox/export/chartexport.hxx>
#include <oox/export/shapes.hxx> #include <oox/export/shapes.hxx>
#include <oox/helper/propertyset.hxx>
#include <map> #include <map>
#include <algorithm> #include <algorithm>
......
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <editeng/unoprnms.hxx> #include <editeng/unoprnms.hxx>
#include <editeng/charrotateitem.hxx> #include <editeng/charrotateitem.hxx>
#include <svx/svdogrp.hxx> #include <svx/svdogrp.hxx>
#include <oox/helper/propertyset.hxx>
#include <oox/token/properties.hxx> #include <oox/token/properties.hxx>
#include <textboxhelper.hxx> #include <textboxhelper.hxx>
#include <fmtanchr.hxx> #include <fmtanchr.hxx>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment