diff options
author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-05-02 23:43:11 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-04 09:18:20 +0200 |
commit | dd2a4069e50ec0a114173ffb811e736155614f9a (patch) | |
tree | ca52f84f24308c3665c20415b12909591606355e /oox | |
parent | 44752e2627378c55efeac88f537314bbd3078b6a (diff) |
cleanup includes
Change-Id: I9615a1da8224b0112acf5b811f7de566945c02c9
Reviewed-on: https://gerrit.libreoffice.org/37185
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'oox')
-rw-r--r-- | oox/inc/drawingml/customshapeproperties.hxx | 12 | ||||
-rw-r--r-- | oox/source/drawingml/customshapegeometry.cxx | 3 | ||||
-rw-r--r-- | oox/source/drawingml/customshapepresetdata.cxx | 3 | ||||
-rw-r--r-- | oox/source/drawingml/customshapeproperties.cxx | 13 | ||||
-rw-r--r-- | oox/source/shape/WpsContext.cxx | 1 |
5 files changed, 10 insertions, 22 deletions
diff --git a/oox/inc/drawingml/customshapeproperties.hxx b/oox/inc/drawingml/customshapeproperties.hxx index 0a4a338e8db6..2e47b64bb013 100644 --- a/oox/inc/drawingml/customshapeproperties.hxx +++ b/oox/inc/drawingml/customshapeproperties.hxx @@ -23,21 +23,9 @@ #include <memory> #include <unordered_map> #include <vector> -#include <map> #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeGluePointType.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp> -#include <com/sun/star/drawing/EnhancedCustomShapeTextPathMode.hpp> -#include <com/sun/star/beans/PropertyValues.hpp> -#include <com/sun/star/drawing/ProjectionMode.hpp> #include <com/sun/star/drawing/XShape.hpp> -#include <com/sun/star/graphic/XGraphic.hpp> -#include <oox/core/xmlfilterbase.hxx> -#include <oox/drawingml/color.hxx> #include <oox/helper/helper.hxx> #include <oox/helper/propertymap.hxx> #include <oox/token/tokens.hxx> diff --git a/oox/source/drawingml/customshapegeometry.cxx b/oox/source/drawingml/customshapegeometry.cxx index d15337dd7cbd..43de3ddebc19 100644 --- a/oox/source/drawingml/customshapegeometry.cxx +++ b/oox/source/drawingml/customshapegeometry.cxx @@ -20,6 +20,8 @@ #include "drawingml/customshapegeometry.hxx" #include <drawingml/customshapeproperties.hxx> +#include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp> +#include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp> #include <com/sun/star/xml/sax/FastToken.hpp> #include <osl/diagnose.h> #include "oox/helper/helper.hxx" @@ -31,7 +33,6 @@ using namespace ::oox::core; using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::beans; using namespace ::com::sun::star::drawing; using namespace ::com::sun::star::xml::sax; diff --git a/oox/source/drawingml/customshapepresetdata.cxx b/oox/source/drawingml/customshapepresetdata.cxx index ca931eb199b4..e2b0a5816236 100644 --- a/oox/source/drawingml/customshapepresetdata.cxx +++ b/oox/source/drawingml/customshapepresetdata.cxx @@ -16,6 +16,9 @@ #include <oox/token/properties.hxx> #include "oox/token/tokenmap.hxx" #include <com/sun/star/awt/Rectangle.hpp> +#include <com/sun/star/beans/PropertyValues.hpp> +#include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp> +#include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp> using namespace ::com::sun::star; diff --git a/oox/source/drawingml/customshapeproperties.cxx b/oox/source/drawingml/customshapeproperties.cxx index a043dabb359a..5cf9cd235b93 100644 --- a/oox/source/drawingml/customshapeproperties.cxx +++ b/oox/source/drawingml/customshapeproperties.cxx @@ -18,28 +18,23 @@ */ #include "drawingml/customshapeproperties.hxx" -#include "oox/helper/helper.hxx" #include "oox/helper/propertymap.hxx" #include "oox/helper/propertyset.hxx" #include <oox/token/properties.hxx> #include "oox/token/tokenmap.hxx" #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/awt/Size.hpp> -#include <com/sun/star/beans/XMultiPropertySet.hpp> +#include <com/sun/star/beans/PropertyValues.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/graphic/XGraphicTransformer.hpp> -#include <com/sun/star/drawing/XShape.hpp> -#include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp> +#include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeTextFrame.hpp> -#include <osl/diagnose.h> +#include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp> +#include <com/sun/star/drawing/XShape.hpp> #include <comphelper/sequence.hxx> -using namespace ::oox::core; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::graphic; using namespace ::com::sun::star::drawing; namespace oox { namespace drawingml { diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx index 0ed5f9024ccc..b26ce06562b0 100644 --- a/oox/source/shape/WpsContext.cxx +++ b/oox/source/shape/WpsContext.cxx @@ -16,6 +16,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/drawing/HomogenMatrix3.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/text/XText.hpp> #include <com/sun/star/text/XTextCursor.hpp> #include <svx/svdtrans.hxx> |