mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
...and fix the usual compiler errors that occurred as a result.

Change-Id: I54781d3f01e9f5a87fd008870c825b2d8154fd59
Reviewed-on: https://gerrit.libreoffice.org/24686
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
This commit is contained in:
Jorenz Paragas 2016-05-05 18:05:57 -07:00 committed by Noel Grandin
parent f3d9aab841
commit 1aeca4b64a
7 changed files with 106 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
include/oox/export/chartexport.hxx
View File

@ -20,48 +20,52 @@
#ifndef INCLUDED_OOX_EXPORT_CHARTEXPORT_HXX #ifndef INCLUDED_OOX_EXPORT_CHARTEXPORT_HXX
#define INCLUDED_OOX_EXPORT_CHARTEXPORT_HXX #define INCLUDED_OOX_EXPORT_CHARTEXPORT_HXX
#include <oox/dllapi.h>
#include <com/sun/star/uno/XReference.hpp>
#include <oox/export/drawingml.hxx>
#include <oox/token/tokens.hxx>
#include <sax/fshelper.hxx>
#include <vcl/mapmod.hxx>
#include <com/sun/star/chart2/RelativePosition.hpp>
#include <com/sun/star/chart2/RelativeSize.hpp>
#include <set> #include <set>
#include <vector>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <oox/dllapi.h>
#include <oox/export/drawingml.hxx>
#include <oox/export/utils.hxx>
#include <oox/token/tokens.hxx>
#include <rtl/ustring.hxx>
#include <sal/types.h>
#include <sax/fshelper.hxx>
namespace com { namespace sun { namespace star { namespace com { namespace sun { namespace star {
namespace beans {
class XPropertySet;
}
namespace chart { namespace chart {
class XDiagram; class XDiagram;
class XChartDocument; class XChartDocument;
class XChartDataArray;
struct ChartSeriesAddress;
} }
namespace chart2 { namespace chart2 {
struct RelativePosition;
struct RelativeSize;
class XDiagram; class XDiagram;
class XChartDocument; class XChartDocument;
class XDataSeries; class XDataSeries;
class XChartType; class XChartType;
namespace data namespace data
{ {
class XDataProvider;
class XDataSequence; class XDataSequence;
} }
} }
namespace drawing { namespace drawing {
class XShape; class XShape;
class XShapes;
}
namespace task {
class XStatusIndicator;
} }
namespace frame { namespace frame {
class XModel; class XModel;
} }
}}} }}}
namespace oox {
namespace core {
class XmlFilterBase;
}}
namespace oox { namespace drawingml { namespace oox { namespace drawingml {
enum AxesType enum AxesType

30
include/oox/export/drawingml.hxx
View File

@ -20,16 +20,22 @@
#ifndef INCLUDED_OOX_EXPORT_DRAWINGML_HXX #ifndef INCLUDED_OOX_EXPORT_DRAWINGML_HXX
#define INCLUDED_OOX_EXPORT_DRAWINGML_HXX #define INCLUDED_OOX_EXPORT_DRAWINGML_HXX
#include <map>
#include <com/sun/star/beans/PropertyState.hpp>
#include <com/sun/star/uno/Any.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <oox/dllapi.h> #include <oox/dllapi.h>
#include <sax/fshelper.hxx> #include <oox/drawingml/drawingmltypes.hxx>
#include <rtl/strbuf.hxx>
#include <com/sun/star/awt/FontDescriptor.hpp>
#include <com/sun/star/awt/Gradient.hpp>
#include <com/sun/star/uno/XReference.hpp>
#include <filter/msfilter/escherex.hxx>
#include "oox/drawingml/drawingmltypes.hxx"
#include <oox/token/tokens.hxx> #include <oox/token/tokens.hxx>
#include <oox/export/utils.hxx> #include <oox/export/utils.hxx>
#include <rtl/string.hxx>
#include <rtl/ustring.hxx>
#include <sal/types.h>
#include <sax/fshelper.hxx>
#include <svx/msdffdef.hxx>
#include <vcl/checksum.hxx>
#ifndef OOX_DRAWINGML_EXPORT_ROTATE_CLOCKWISIFY #ifndef OOX_DRAWINGML_EXPORT_ROTATE_CLOCKWISIFY
// Our rotation is counter-clockwise and is in 100ths of a degree. // Our rotation is counter-clockwise and is in 100ths of a degree.
@ -40,7 +46,12 @@
class Graphic; class Graphic;
namespace com { namespace sun { namespace star { namespace com { namespace sun { namespace star {
namespace awt {
struct FontDescriptor;
struct Gradient;
}
namespace beans { namespace beans {
struct PropertyValue;
class XPropertySet; class XPropertySet;
class XPropertyState; class XPropertyState;
} }
@ -57,9 +68,14 @@ namespace text {
namespace io { namespace io {
class XOutputStream; class XOutputStream;
} }
namespace uno {
class XInterface;
}
}}} }}}
struct EscherConnectorListEntry;
class OutlinerParaObject; class OutlinerParaObject;
class Rectangle;
namespace tools { namespace tools {
class PolyPolygon; class PolyPolygon;

35
include/oox/export/shapes.hxx
View File

@ -20,27 +20,48 @@
#ifndef INCLUDED_OOX_EXPORT_SHAPES_HXX #ifndef INCLUDED_OOX_EXPORT_SHAPES_HXX
#define INCLUDED_OOX_EXPORT_SHAPES_HXX #define INCLUDED_OOX_EXPORT_SHAPES_HXX
#include <oox/dllapi.h> #include <cstddef>
#include <com/sun/star/uno/XReference.hpp> #include <memory>
#include <oox/export/drawingml.hxx>
#include <sax/fshelper.hxx>
#include <vcl/mapmod.hxx>
#include <tools/fract.hxx>
#include <unordered_map> #include <unordered_map>
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <oox/dllapi.h>
#include <oox/export/drawingml.hxx>
#include <oox/export/utils.hxx>
#include <rtl/ustring.hxx>
#include <sal/types.h>
#include <sax/fshelper.hxx>
#include <tools/fract.hxx>
#include <vcl/mapmod.hxx>
namespace com { namespace sun { namespace star { namespace com { namespace sun { namespace star {
namespace beans { namespace beans {
class XPropertySet; class XPropertySet;
} }
namespace drawing { namespace drawing {
class XShape; class XShape;
class XShapes;
} }
namespace embed { namespace embed {
class XEmbeddedObject; class XEmbeddedObject;
} }
namespace io {
class XInputStream;
}
namespace uno {
class XComponentContext;
class XInterface;
}
}}} }}}
namespace oox {
namespace core {
class XmlFilterBase;
}}
class Graphic;
namespace oox { namespace oox {
OOX_DLLPUBLIC css::uno::Reference<css::io::XInputStream> GetOLEObjectStream( OOX_DLLPUBLIC css::uno::Reference<css::io::XInputStream> GetOLEObjectStream(

4
include/oox/export/utils.hxx
View File

@ -20,7 +20,9 @@
#ifndef INCLUDED_OOX_EXPORT_UTILS_HXX #ifndef INCLUDED_OOX_EXPORT_UTILS_HXX
#define INCLUDED_OOX_EXPORT_UTILS_HXX #define INCLUDED_OOX_EXPORT_UTILS_HXX
#include <rtl/ustring.hxx> #include <rtl/string.hxx>
#include <rtl/textenc.h>
#include <sal/types.h>
#define I32S(x) OString::number( (sal_Int32) x ).getStr() #define I32S(x) OString::number( (sal_Int32) x ).getStr()
#define I64S(x) OString::number( (sal_Int64) x ).getStr() #define I64S(x) OString::number( (sal_Int64) x ).getStr()

32
include/oox/export/vmlexport.hxx
View File

@ -20,12 +20,36 @@
#ifndef INCLUDED_OOX_EXPORT_VMLEXPORT_HXX #ifndef INCLUDED_OOX_EXPORT_VMLEXPORT_HXX
#define INCLUDED_OOX_EXPORT_VMLEXPORT_HXX #define INCLUDED_OOX_EXPORT_VMLEXPORT_HXX
#include <oox/dllapi.h> #include <com/sun/star/uno/Reference.hxx>
#include <oox/export/drawingml.hxx>
#include <sax/fshelper.hxx>
#include <filter/msfilter/escherex.hxx>
#include <editeng/outlobj.hxx> #include <editeng/outlobj.hxx>
#include <filter/msfilter/escherex.hxx>
#include <oox/dllapi.h>
#include <rtl/strbuf.hxx>
#include <rtl/string.hxx>
#include <rtl/ustring.hxx>
#include <sal/types.h>
#include <sax/fshelper.hxx>
#include <vcl/checksum.hxx>
namespace com { namespace sun { namespace star {
namespace drawing {
class XShape;
}
}}}
namespace oox {
namespace drawingml {
class DrawingML;
}
}
namespace sax_fastparser {
class FastAttributeList;
}
class Point;
class Rectangle;
class SdrObject;
namespace oox { namespace oox {

2
oox/source/export/chartexport.cxx
View File

@ -47,6 +47,8 @@
#include <com/sun/star/chart/ErrorBarStyle.hpp> #include <com/sun/star/chart/ErrorBarStyle.hpp>
#include <com/sun/star/chart/MissingValueTreatment.hpp> #include <com/sun/star/chart/MissingValueTreatment.hpp>
#include <com/sun/star/chart2/RelativePosition.hpp>
#include <com/sun/star/chart2/RelativeSize.hpp>
#include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/XChartDocument.hpp>
#include <com/sun/star/chart2/XDiagram.hpp> #include <com/sun/star/chart2/XDiagram.hpp>
#include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp>

1
oox/source/export/vmlexport.cxx
View File

@ -19,6 +19,7 @@
#include <config_folders.h> #include <config_folders.h>
#include "rtl/bootstrap.hxx" #include "rtl/bootstrap.hxx"
#include <oox/export/drawingml.hxx>
#include <oox/export/vmlexport.hxx> #include <oox/export/vmlexport.hxx>
#include <oox/token/tokens.hxx> #include <oox/token/tokens.hxx>