summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGabor Kelemen <kelemen.gabor2@nisz.hu>2019-06-13 18:43:27 +0200
committerMiklos Vajna <vmiklos@collabora.com>2019-06-18 09:08:59 +0200
commite080acf2211af3f2b55cf59f04272a9a43188abe (patch)
treef347e9c079181671e3965369bb645b5a45266a6e /include
parent4079282731cdf276715af6571786ab75845efc15 (diff)
tdf#42949 Fix IWYU warnings in include/svx/[t-v]*
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I345b8c54890b5bc27f51addd2e6e73ba68b6b327 Reviewed-on: https://gerrit.libreoffice.org/73977 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'include')
-rw-r--r--include/IwyuFilter_include.yaml49
-rw-r--r--include/svx/TextCharacterSpacingPopup.hxx2
-rw-r--r--include/svx/TextUnderlinePopup.hxx4
-rw-r--r--include/svx/svddef.hxx3
-rw-r--r--include/svx/tabline.hxx6
-rw-r--r--include/svx/tbcontrl.hxx3
-rw-r--r--include/svx/ucsubset.hxx1
-rw-r--r--include/svx/unoapi.hxx3
-rw-r--r--include/svx/unomaster.hxx4
-rw-r--r--include/svx/unopage.hxx8
-rw-r--r--include/svx/unoprov.hxx1
-rw-r--r--include/svx/unoshape.hxx10
-rw-r--r--include/svx/unoshprp.hxx7
-rw-r--r--include/svx/view3d.hxx1
14 files changed, 59 insertions, 43 deletions
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 850067c0d93a..c69220e197ec 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -989,3 +989,52 @@ blacklist:
include/svx/svxids.hrc:
# Used in macro definition
- svl/typedwhich.hxx
+ include/svx/unopage.hxx:
+ # Don't propose hxx -> h change in URE libs
+ - cppuhelper/interfacecontainer.hxx
+ include/svx/unoshprp.hxx:
+ # Needed for macro defines
+ - com/sun/star/drawing/PointSequence.hpp
+ - com/sun/star/drawing/PointSequenceSequence.hpp
+ - com/sun/star/uno/Sequence.hxx
+ - com/sun/star/drawing/RectanglePoint.hpp
+ - com/sun/star/awt/XBitmap.hpp
+ - com/sun/star/awt/Gradient.hpp
+ - com/sun/star/drawing/Hatch.hpp
+ - com/sun/star/drawing/FillStyle.hpp
+ - com/sun/star/drawing/LineCap.hpp
+ - com/sun/star/drawing/LineDash.hpp
+ - com/sun/star/drawing/LineJoint.hpp
+ - com/sun/star/drawing/LineStyle.hpp
+ - com/sun/star/beans/PropertyAttribute.hpp
+ - com/sun/star/awt/Rectangle.hpp
+ - com/sun/star/drawing/TextAnimationDirection.hpp
+ - com/sun/star/drawing/TextAnimationKind.hpp
+ - com/sun/star/drawing/TextFitToSizeType.hpp
+ - com/sun/star/drawing/TextVerticalAdjust.hpp
+ - com/sun/star/drawing/TextHorizontalAdjust.hpp
+ - com/sun/star/drawing/ConnectorType.hpp
+ - com/sun/star/drawing/XShape.hpp
+ - com/sun/star/drawing/MeasureKind.hpp
+ - com/sun/star/drawing/MeasureTextHorzPos.hpp
+ - com/sun/star/drawing/MeasureTextVertPos.hpp
+ - com/sun/star/drawing/HomogenMatrix3.hpp
+ - com/sun/star/drawing/CircleKind.hpp
+ - com/sun/star/drawing/PolygonKind.hpp
+ - com/sun/star/drawing/PolyPolygonBezierCoords.hpp
+ - com/sun/star/drawing/ColorMode.hpp
+ - com/sun/star/drawing/HomogenMatrix.hpp
+ - com/sun/star/drawing/Direction3D.hpp
+ - com/sun/star/drawing/ProjectionMode.hpp
+ - com/sun/star/drawing/ShadeMode.hpp
+ - com/sun/star/drawing/Position3D.hpp
+ - com/sun/star/drawing/NormalsKind.hpp
+ - com/sun/star/drawing/TextureKind.hpp
+ - com/sun/star/drawing/TextureMode.hpp
+ - com/sun/star/drawing/TextureProjectionMode.hpp
+ - com/sun/star/drawing/PolyPolygonShape3D.hpp
+ - com/sun/star/text/GraphicCrop.hpp
+ - com/sun/star/drawing/BitmapMode.hpp
+ - com/sun/star/drawing/CameraGeometry.hpp
+ - com/sun/star/text/WritingMode.hpp
+ - com/sun/star/graphic/XGraphic.hpp
diff --git a/include/svx/TextCharacterSpacingPopup.hxx b/include/svx/TextCharacterSpacingPopup.hxx
index 8bfbfce058da..82c18986cd06 100644
--- a/include/svx/TextCharacterSpacingPopup.hxx
+++ b/include/svx/TextCharacterSpacingPopup.hxx
@@ -22,8 +22,6 @@
#include <sfx2/tbxctrl.hxx>
#include <svx/svxdllapi.h>
-#include <functional>
-
namespace svx {
class SVX_DLLPUBLIC TextCharacterSpacingPopup : public SfxToolBoxControl
diff --git a/include/svx/TextUnderlinePopup.hxx b/include/svx/TextUnderlinePopup.hxx
index 4db840376a80..7a2a12fdd927 100644
--- a/include/svx/TextUnderlinePopup.hxx
+++ b/include/svx/TextUnderlinePopup.hxx
@@ -22,10 +22,6 @@
#include <sfx2/tbxctrl.hxx>
#include <svx/svxdllapi.h>
-#include <vcl/vclenum.hxx>
-
-#include <functional>
-
namespace svx {
class SVX_DLLPUBLIC TextUnderlinePopup : public SfxToolBoxControl
diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx
index 34ed1c9dda3c..a8696559c4fd 100644
--- a/include/svx/svddef.hxx
+++ b/include/svx/svddef.hxx
@@ -161,6 +161,9 @@ class SvxLineItem;
class SvxTextRotateItem;
class SvxWritingModeItem;
class XColorItem;
+class SdrTextAniDirectionItem;
+class SdrTextAniKindItem;
+class SdrTextHorzAdjustItem;
#define SDRATTR_START XATTR_START /* 1000 */
/* Pool V4*/ /* Pool V3*/ /* Pool V2*/
diff --git a/include/svx/tabline.hxx b/include/svx/tabline.hxx
index dda8a85bccd5..398845146102 100644
--- a/include/svx/tabline.hxx
+++ b/include/svx/tabline.hxx
@@ -19,12 +19,6 @@
#ifndef INCLUDED_SVX_TABLINE_HXX
#define INCLUDED_SVX_TABLINE_HXX
-#include <vcl/button.hxx>
-#include <svx/svdpage.hxx>
-#include <svx/xlineit0.hxx>
-#include <svx/dlgctrl.hxx>
-#include <vcl/menubtn.hxx>
-
class SvxBrushItem;
class SdrModel;
class SdrObject;
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index afa61b9b38b1..034bf20c1c6c 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -131,11 +131,8 @@
// ITEMID_... defines in the *.cxx
#include <svl/style.hxx>
-#include <svl/lstner.hxx>
#include <sfx2/tbxctrl.hxx>
-#include <svx/strarray.hxx>
#include <svx/svxdllapi.h>
-#include <com/sun/star/awt/FontDescriptor.hpp>
#include <com/sun/star/frame/XSubToolbarController.hpp>
#include <svtools/popupwindowcontroller.hxx>
#include <svx/colorwindow.hxx>
diff --git a/include/svx/ucsubset.hxx b/include/svx/ucsubset.hxx
index 9fda3d3ddb40..106a0d9d444c 100644
--- a/include/svx/ucsubset.hxx
+++ b/include/svx/ucsubset.hxx
@@ -24,7 +24,6 @@
#include <vcl/metric.hxx>
-#include <list>
#include <vector>
class FontCharMap;
diff --git a/include/svx/unoapi.hxx b/include/svx/unoapi.hxx
index 71d699ad0a65..e2b0f5ae830f 100644
--- a/include/svx/unoapi.hxx
+++ b/include/svx/unoapi.hxx
@@ -23,10 +23,9 @@
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/drawing/XDrawPage.hpp>
#include <sal/types.h>
-#include <vcl/GraphicObject.hxx>
-#include <svl/poolitem.hxx>
#include <svx/svxdllapi.h>
#include <tools/fldunit.hxx>
+#include <tools/mapunit.hxx>
class SvxShape;
class SdrObject;
diff --git a/include/svx/unomaster.hxx b/include/svx/unomaster.hxx
index dad729df9ce3..f544d2f8b06a 100644
--- a/include/svx/unomaster.hxx
+++ b/include/svx/unomaster.hxx
@@ -22,8 +22,8 @@
#include <com/sun/star/uno/Type.h>
#include <com/sun/star/uno/Any.h>
-#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/beans/PropertyState.hpp>
/** this abstract class is the interface for an instance that likes to enhance
the functionality of components implemented with derivations from SvxShape
diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx
index 1ca099d797eb..50b54a62c754 100644
--- a/include/svx/unopage.hxx
+++ b/include/svx/unopage.hxx
@@ -21,25 +21,17 @@
#include <com/sun/star/lang/XComponent.hpp>
#include <cppuhelper/interfacecontainer.hxx>
-#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/drawing/XShapes2.hpp>
#include <com/sun/star/drawing/XShapeGrouper.hpp>
-#include <com/sun/star/drawing/XShapeCombiner.hpp>
-#include <com/sun/star/drawing/XShapeBinder.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <cppuhelper/weak.hxx>
-#include <cppuhelper/weakagg.hxx>
-#include <svl/lstner.hxx>
#include <editeng/mutxhelp.hxx>
#include <svx/svxdllapi.h>
#include <cppuhelper/implbase6.hxx>
#include <comphelper/servicehelper.hxx>
-#include <svx/unoprov.hxx>
#include <memory>
class SdrPage;
diff --git a/include/svx/unoprov.hxx b/include/svx/unoprov.hxx
index 0fa155c252e8..90e830ee3ed5 100644
--- a/include/svx/unoprov.hxx
+++ b/include/svx/unoprov.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SVX_UNOPROV_HXX
#define INCLUDED_SVX_UNOPROV_HXX
-#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include <svl/itemprop.hxx>
#include <svx/svxdllapi.h>
diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx
index 60917bf7d893..7c8b3cdc6f4d 100644
--- a/include/svx/unoshape.hxx
+++ b/include/svx/unoshape.hxx
@@ -29,15 +29,12 @@
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/uno/XAggregation.hpp>
-#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/awt/Point.hpp>
#include <com/sun/star/drawing/PolygonKind.hpp>
#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/drawing/XShapes2.hpp>
#include <com/sun/star/drawing/XShapeGroup.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/container/XNamed.hpp>
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/beans/XMultiPropertySet.hpp>
@@ -49,24 +46,19 @@
#include <tools/weakbase.hxx>
#include <svl/lstner.hxx>
#include <editeng/unoipset.hxx>
-#include <cppuhelper/weak.hxx>
-#include <cppuhelper/weakagg.hxx>
-#include <cppuhelper/interfacecontainer.h>
#include <osl/mutex.hxx>
#include <svx/svxdllapi.h>
#include <rtl/ref.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <editeng/unotext.hxx>
-#include <svx/svdouno.hxx>
+#include <svx/svdobj.hxx>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase12.hxx>
-#include <svx/unoprov.hxx>
-
class SfxItemSet;
class SdrModel;
class SvxDrawPage;
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index 1ea5683a9731..a54b51ae7a52 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SVX_UNOSHPRP_HXX
#define INCLUDED_SVX_UNOSHPRP_HXX
-#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/drawing/PointSequence.hpp>
#include <com/sun/star/drawing/PointSequenceSequence.hpp>
#include <com/sun/star/uno/Sequence.hxx>
@@ -66,13 +65,13 @@
#include <com/sun/star/text/WritingMode.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
-#include <svx/unoprov.hxx>
#include <editeng/unoprnms.hxx>
+#include <svx/svddef.hxx>
#include <svx/unomid.hxx>
#include <editeng/unotext.hxx>
-#include <svl/itemprop.hxx>
-#include <svx/svxids.hrc>
+#include <editeng/memberids.h>
+#include <svl/solar.hrc>
#define OWN_ATTR_VALUE_START_TEXT (OWN_ATTR_VALUE_START+0) // the next 10 entries are reserved for text
#define OWN_ATTR_VALUE_POLYGONKIND (OWN_ATTR_VALUE_START+10)
diff --git a/include/svx/view3d.hxx b/include/svx/view3d.hxx
index 64c13412152f..4a0c9ddaeb15 100644
--- a/include/svx/view3d.hxx
+++ b/include/svx/view3d.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SVX_VIEW3D_HXX
#include <svx/svdview.hxx>
-#include <svx/def3d.hxx>
#include <svx/deflt3d.hxx>
#include <basegfx/point/b2dpoint.hxx>
#include <svx/svxdllapi.h>