diff options
author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-03-02 22:49:18 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2019-03-20 12:22:45 +0100 |
commit | a26524e348fe06b93c26b1b1fa3dae3a5b26d6fa (patch) | |
tree | eb3ab567c4ab77bc58b95bd158d51e7d89b44e61 /include/drawinglayer | |
parent | rhbz#1690645 null deref of pEntry when GetCurEntry return null (diff) | |
download | core-a26524e348fe06b93c26b1b1fa3dae3a5b26d6fa.tar.gz core-a26524e348fe06b93c26b1b1fa3dae3a5b26d6fa.zip |
tdf#42949 Fix IWYU warnings in include/drawinglayer/
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I8daf57df5b8f9c609d4f3ca44bae7366addceb6c
Reviewed-on: https://gerrit.libreoffice.org/69151
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'include/drawinglayer')
30 files changed, 35 insertions, 95 deletions
diff --git a/include/drawinglayer/XShapeDumper.hxx b/include/drawinglayer/XShapeDumper.hxx index 0e4650be5663..24603e0db60a 100644 --- a/include/drawinglayer/XShapeDumper.hxx +++ b/include/drawinglayer/XShapeDumper.hxx @@ -11,35 +11,11 @@ #define INCLUDED_DRAWINGLAYER_XSHAPEDUMPER_HXX #include <drawinglayer/drawinglayerdllapi.h> +#include <rtl/ustring.hxx> -#include <com/sun/star/drawing/XShapes.hpp> -#include <com/sun/star/drawing/XShape.hpp> -#include <com/sun/star/drawing/FillStyle.hpp> -#include <com/sun/star/awt/Gradient.hpp> -#include <com/sun/star/drawing/Hatch.hpp> -#include <com/sun/star/awt/XBitmap.hpp> -#include <com/sun/star/drawing/RectanglePoint.hpp> -#include <com/sun/star/drawing/BitmapMode.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> - -#include <com/sun/star/drawing/LineStyle.hpp> -#include <com/sun/star/drawing/LineDash.hpp> -#include <com/sun/star/drawing/LineJoint.hpp> -#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp> - -#include <com/sun/star/drawing/PolygonKind.hpp> - -#include <com/sun/star/drawing/TextFitToSizeType.hpp> -#include <com/sun/star/drawing/TextHorizontalAdjust.hpp> -#include <com/sun/star/drawing/TextVerticalAdjust.hpp> -#include <com/sun/star/drawing/TextAnimationDirection.hpp> -#include <com/sun/star/drawing/TextAnimationKind.hpp> -#include <com/sun/star/text/WritingMode.hpp> - -#include <com/sun/star/drawing/HomogenMatrixLine3.hpp> -#include <com/sun/star/drawing/HomogenMatrix3.hpp> - -#include <com/sun/star/beans/PropertyValue.hpp> +namespace com::sun::star::drawing { class XShape; } +namespace com::sun::star::drawing { class XShapes; } +namespace com::sun::star::uno { template <typename > class Reference; } class DRAWINGLAYER_DLLPUBLIC XShapeDumper { diff --git a/include/drawinglayer/geometry/viewinformation2d.hxx b/include/drawinglayer/geometry/viewinformation2d.hxx index 8769a260f3ef..40a4d82e1e4a 100644 --- a/include/drawinglayer/geometry/viewinformation2d.hxx +++ b/include/drawinglayer/geometry/viewinformation2d.hxx @@ -23,9 +23,6 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <sal/config.h> -#include <com/sun/star/uno/Sequence.h> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/drawing/XDrawPage.hpp> #include <o3tl/cow_wrapper.hxx> @@ -40,6 +37,10 @@ namespace basegfx { class B2DRange; } +namespace com::sun::star::beans { struct PropertyValue; } +namespace com::sun::star::drawing { class XDrawPage; } +namespace com::sun::star::uno { template <class interface_type> class Reference; } +namespace com::sun::star::uno { template <typename > class Sequence; } namespace drawinglayer { diff --git a/include/drawinglayer/geometry/viewinformation3d.hxx b/include/drawinglayer/geometry/viewinformation3d.hxx index dc3889d87351..d8800a1ea46a 100644 --- a/include/drawinglayer/geometry/viewinformation3d.hxx +++ b/include/drawinglayer/geometry/viewinformation3d.hxx @@ -23,8 +23,6 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <sal/config.h> -#include <com/sun/star/uno/Sequence.h> -#include <com/sun/star/beans/PropertyValue.hpp> #include <o3tl/cow_wrapper.hxx> @@ -38,6 +36,8 @@ namespace basegfx { class B3DHomMatrix; } +namespace com::sun::star::beans { struct PropertyValue; } +namespace com::sun::star::uno { template <typename > class Sequence; } namespace drawinglayer { diff --git a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx index 6ccb2acd64aa..21e7d9d5ba69 100644 --- a/include/drawinglayer/primitive2d/animatedprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/animatedprimitive2d.hxx @@ -23,7 +23,6 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> -#include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <memory> @@ -32,6 +31,8 @@ namespace drawinglayer { namespace animation { class AnimationEntry; }} +namespace basegfx { class B2DHomMatrix; } + namespace drawinglayer { diff --git a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx index a3f41985061e..c801f36dc1a0 100644 --- a/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/borderlineprimitive2d.hxx @@ -23,9 +23,6 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> -#include <basegfx/color/bcolor.hxx> -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/polygon/b2dpolypolygon.hxx> #include <drawinglayer/attribute/lineattribute.hxx> #include <drawinglayer/attribute/strokeattribute.hxx> diff --git a/include/drawinglayer/primitive2d/controlprimitive2d.hxx b/include/drawinglayer/primitive2d/controlprimitive2d.hxx index 9bd3783e07a9..c568ada2eb64 100644 --- a/include/drawinglayer/primitive2d/controlprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/controlprimitive2d.hxx @@ -24,8 +24,9 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <com/sun/star/awt/XControlModel.hpp> -#include <com/sun/star/awt/XControl.hpp> + +namespace com::sun::star::awt { class XControl; } +namespace com::sun::star::awt { class XControlModel; } namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx index 65353312b71c..12c48a7ad6b8 100644 --- a/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/fillgradientprimitive2d.hxx @@ -24,12 +24,12 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/attribute/fillgradientattribute.hxx> -#include <drawinglayer/texture/texture.hxx> // predefines namespace basegfx { class B2DPolygon; } +namespace drawinglayer { namespace texture { struct B2DHomMatrixAndBColor; } } // FillGradientPrimitive2D class diff --git a/include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx b/include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx index 8eb3c43918e1..4f323504d32e 100644 --- a/include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx +++ b/include/drawinglayer/primitive2d/graphicprimitivehelper2d.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GRAPHICPRIMITIVEHELPER2D_HXX #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_GRAPHICPRIMITIVEHELPER2D_HXX -#include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <vcl/GraphicObject.hxx> diff --git a/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx b/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx index 2dd43e2ff262..e98dbcf4c3ad 100644 --- a/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/markerarrayprimitive2d.hxx @@ -23,7 +23,6 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> -#include <basegfx/color/bcolor.hxx> #include <vcl/bitmapex.hxx> diff --git a/include/drawinglayer/primitive2d/pagehierarchyprimitive2d.hxx b/include/drawinglayer/primitive2d/pagehierarchyprimitive2d.hxx index e2c9b1d603ab..cc77043f8af1 100644 --- a/include/drawinglayer/primitive2d/pagehierarchyprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/pagehierarchyprimitive2d.hxx @@ -23,7 +23,6 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/groupprimitive2d.hxx> -#include <rtl/ustring.hxx> namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx index c6639998f34d..6abe873e6f22 100644 --- a/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/pagepreviewprimitive2d.hxx @@ -23,9 +23,10 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> -#include <com/sun/star/drawing/XDrawPage.hpp> #include <basegfx/matrix/b2dhommatrix.hxx> +namespace com::sun::star::drawing { class XDrawPage; } + namespace drawinglayer { diff --git a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx index c4a53dbf5d7b..150eeba92fdf 100644 --- a/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/patternfillprimitive2d.hxx @@ -22,7 +22,6 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> -#include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> diff --git a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx index e659a2184324..8cc503903ad9 100644 --- a/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/polypolygonprimitive2d.hxx @@ -27,7 +27,6 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <drawinglayer/attribute/lineattribute.hxx> #include <drawinglayer/attribute/strokeattribute.hxx> -#include <drawinglayer/attribute/linestartendattribute.hxx> #include <drawinglayer/attribute/fillgradientattribute.hxx> #include <drawinglayer/attribute/fillhatchattribute.hxx> #include <drawinglayer/primitive2d/primitivetools2d.hxx> diff --git a/include/drawinglayer/primitive2d/sceneprimitive2d.hxx b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx index 8adafda0e137..faac60ca50d9 100644 --- a/include/drawinglayer/primitive2d/sceneprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/sceneprimitive2d.hxx @@ -29,7 +29,6 @@ #include <vcl/bitmapex.hxx> #include <drawinglayer/attribute/sdrsceneattribute3d.hxx> #include <drawinglayer/attribute/sdrlightingattribute3d.hxx> -#include <drawinglayer/attribute/sdrlightattribute3d.hxx> namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/textbreakuphelper.hxx b/include/drawinglayer/primitive2d/textbreakuphelper.hxx index 1afe12eea5de..a2b0ef0324ee 100644 --- a/include/drawinglayer/primitive2d/textbreakuphelper.hxx +++ b/include/drawinglayer/primitive2d/textbreakuphelper.hxx @@ -21,10 +21,12 @@ #define INCLUDED_DRAWINGLAYER_PRIMITIVE2D_TEXTBREAKUPHELPER_HXX #include <drawinglayer/drawinglayerdllapi.h> -#include <drawinglayer/primitive2d/textprimitive2d.hxx> +#include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/primitive2d/textlayoutdevice.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> +namespace drawinglayer { namespace primitive2d { class TextSimplePortionPrimitive2D; } } + namespace drawinglayer { diff --git a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx index 37643195bfdc..8980322b5c93 100644 --- a/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textdecoratedprimitive2d.hxx @@ -29,10 +29,6 @@ namespace basegfx { namespace utils { class B2DHomMatrixBufferedOnDemandDecompose; }} -namespace com { namespace sun { namespace star { namespace i18n { - struct Boundary; -}}}} - namespace drawinglayer { namespace primitive2d diff --git a/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx b/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx index 3547185e2126..ee1193b46a95 100644 --- a/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textenumsprimitive2d.hxx @@ -22,8 +22,6 @@ #include <drawinglayer/drawinglayerdllapi.h> -#include <drawinglayer/primitive2d/baseprimitive2d.hxx> -#include <vcl/vclenum.hxx> #include <tools/fontenum.hxx> diff --git a/include/drawinglayer/primitive2d/textlayoutdevice.hxx b/include/drawinglayer/primitive2d/textlayoutdevice.hxx index e95c00410249..61607232d92c 100644 --- a/include/drawinglayer/primitive2d/textlayoutdevice.hxx +++ b/include/drawinglayer/primitive2d/textlayoutdevice.hxx @@ -24,17 +24,12 @@ #include <basegfx/range/b2drange.hxx> #include <vector> -#include <com/sun/star/lang/Locale.hpp> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <vcl/svapp.hxx> // predefines class VirtualDevice; namespace vcl { class Font; } -namespace rtl { - class OUString; -}; -class OutputDevice; class GDIMetaFile; namespace tools { class Rectangle; } enum class DrawTextFlags; @@ -42,6 +37,8 @@ namespace drawinglayer { namespace attribute { class FontAttribute; }} +namespace com::sun::star::lang { struct Locale; } + // access to one global impTimedRefDev incarnation in namespace drawinglayer::primitive namespace drawinglayer diff --git a/include/drawinglayer/primitive2d/textprimitive2d.hxx b/include/drawinglayer/primitive2d/textprimitive2d.hxx index 2eb208f271ce..2c6e9b4476e6 100644 --- a/include/drawinglayer/primitive2d/textprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textprimitive2d.hxx @@ -25,7 +25,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <rtl/ustring.hxx> -#include <vcl/font.hxx> +#include <tools/color.hxx> #include <basegfx/color/bcolor.hxx> #include <vector> #include <com/sun/star/lang/Locale.hpp> @@ -33,11 +33,6 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> -// predefines - -class OutputDevice; - - namespace drawinglayer { namespace primitive2d diff --git a/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx b/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx index 8d1e0b365477..4a019ebb3d41 100644 --- a/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/polygontubeprimitive3d.hxx @@ -25,14 +25,6 @@ #include <drawinglayer/primitive3d/polygonprimitive3d.hxx> -// predefines - -namespace basegfx { - class B3DPolyPolygon; - class B3DHomMatrix; -} - - namespace drawinglayer { namespace primitive3d diff --git a/include/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx b/include/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx index 081f453af3d9..ac158615a19e 100644 --- a/include/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx +++ b/include/drawinglayer/primitive3d/sdrdecompositiontools3d.hxx @@ -30,7 +30,6 @@ // predefines namespace basegfx { - class B3DPolygon; class B3DPolyPolygon; class B3DHomMatrix; class B2DVector; diff --git a/include/drawinglayer/primitive3d/textureprimitive3d.hxx b/include/drawinglayer/primitive3d/textureprimitive3d.hxx index 5fa89d2e76bf..13ee158c8d8c 100644 --- a/include/drawinglayer/primitive3d/textureprimitive3d.hxx +++ b/include/drawinglayer/primitive3d/textureprimitive3d.hxx @@ -24,7 +24,6 @@ #include <drawinglayer/primitive3d/groupprimitive3d.hxx> #include <drawinglayer/attribute/fillgraphicattribute.hxx> -#include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/vector/b2dvector.hxx> #include <drawinglayer/attribute/fillgradientattribute.hxx> diff --git a/include/drawinglayer/processor2d/contourextractor2d.hxx b/include/drawinglayer/processor2d/contourextractor2d.hxx index 6520c2c378fe..fb8e9fe67624 100644 --- a/include/drawinglayer/processor2d/contourextractor2d.hxx +++ b/include/drawinglayer/processor2d/contourextractor2d.hxx @@ -23,7 +23,6 @@ #include <drawinglayer/drawinglayerdllapi.h> #include <drawinglayer/processor2d/baseprocessor2d.hxx> -#include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> diff --git a/include/drawinglayer/processor2d/processor2dtools.hxx b/include/drawinglayer/processor2d/processor2dtools.hxx index e4f4684b0b76..18ba6b216dc7 100644 --- a/include/drawinglayer/processor2d/processor2dtools.hxx +++ b/include/drawinglayer/processor2d/processor2dtools.hxx @@ -20,10 +20,11 @@ #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_PROCESSOR2DTOOLS_HXX #include <drawinglayer/drawinglayerdllapi.h> -#include <drawinglayer/processor2d/baseprocessor2d.hxx> -#include <drawinglayer/geometry/viewinformation2d.hxx> #include <memory> +namespace drawinglayer { namespace geometry { class ViewInformation2D; } } +namespace drawinglayer { namespace processor2d { class BaseProcessor2D; } } + class OutputDevice; namespace drawinglayer diff --git a/include/drawinglayer/processor2d/processorfromoutputdevice.hxx b/include/drawinglayer/processor2d/processorfromoutputdevice.hxx index 549b170f293d..25ea79ff477a 100644 --- a/include/drawinglayer/processor2d/processorfromoutputdevice.hxx +++ b/include/drawinglayer/processor2d/processorfromoutputdevice.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR2D_PROCESSORFROMOUTPUTDEVICE_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR2D_PROCESSORFROMOUTPUTDEVICE_HXX -#include <drawinglayer/geometry/viewinformation2d.hxx> #include <drawinglayer/drawinglayerdllapi.h> #include <memory> @@ -30,6 +29,8 @@ namespace drawinglayer { namespace processor2d { class BaseProcessor2D; }} +namespace drawinglayer { namespace geometry { class ViewInformation2D; } } + namespace drawinglayer { namespace processor2d diff --git a/include/drawinglayer/processor3d/cutfindprocessor3d.hxx b/include/drawinglayer/processor3d/cutfindprocessor3d.hxx index eb5d946608d4..a22afc122e0c 100644 --- a/include/drawinglayer/processor3d/cutfindprocessor3d.hxx +++ b/include/drawinglayer/processor3d/cutfindprocessor3d.hxx @@ -21,9 +21,9 @@ #define INCLUDED_DRAWINGLAYER_PROCESSOR3D_CUTFINDPROCESSOR3D_HXX #include <drawinglayer/drawinglayerdllapi.h> +#include <drawinglayer/processor3d/baseprocessor3d.hxx> -#include <drawinglayer/processor3d/defaultprocessor3d.hxx> - +#include <basegfx/matrix/b3dhommatrix.hxx> namespace drawinglayer { diff --git a/include/drawinglayer/processor3d/defaultprocessor3d.hxx b/include/drawinglayer/processor3d/defaultprocessor3d.hxx index a400343ac4f6..1de9bb89cf81 100644 --- a/include/drawinglayer/processor3d/defaultprocessor3d.hxx +++ b/include/drawinglayer/processor3d/defaultprocessor3d.hxx @@ -20,10 +20,7 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_DEFAULTPROCESSOR3D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR3D_DEFAULTPROCESSOR3D_HXX -#include <drawinglayer/drawinglayerdllapi.h> - #include <drawinglayer/processor3d/baseprocessor3d.hxx> -#include <basegfx/matrix/b3dhommatrix.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/color/bcolormodifier.hxx> #include <svtools/optionsdrawinglayer.hxx> @@ -31,7 +28,6 @@ // predefines namespace basegfx { - class BZPixelRaster; class B3DPolygon; class B3DPolyPolygon; } diff --git a/include/drawinglayer/processor3d/geometry2dextractor.hxx b/include/drawinglayer/processor3d/geometry2dextractor.hxx index ba828e040e78..98233dd009b7 100644 --- a/include/drawinglayer/processor3d/geometry2dextractor.hxx +++ b/include/drawinglayer/processor3d/geometry2dextractor.hxx @@ -25,7 +25,6 @@ #include <drawinglayer/processor3d/baseprocessor3d.hxx> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/matrix/b3dhommatrix.hxx> #include <basegfx/color/bcolormodifier.hxx> diff --git a/include/drawinglayer/processor3d/shadow3dextractor.hxx b/include/drawinglayer/processor3d/shadow3dextractor.hxx index 6606eae3a14e..8d92f84c503d 100644 --- a/include/drawinglayer/processor3d/shadow3dextractor.hxx +++ b/include/drawinglayer/processor3d/shadow3dextractor.hxx @@ -25,13 +25,13 @@ #include <drawinglayer/processor3d/baseprocessor3d.hxx> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> -#include <basegfx/color/bcolor.hxx> #include <basegfx/polygon/b2dpolygon.hxx> -#include <basegfx/polygon/b3dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> -#include <basegfx/polygon/b3dpolypolygon.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> +namespace basegfx { class B3DPolyPolygon; } +namespace basegfx { class B3DPolygon; } + namespace drawinglayer { diff --git a/include/drawinglayer/processor3d/zbufferprocessor3d.hxx b/include/drawinglayer/processor3d/zbufferprocessor3d.hxx index 90db04b2a546..eb537537cf11 100644 --- a/include/drawinglayer/processor3d/zbufferprocessor3d.hxx +++ b/include/drawinglayer/processor3d/zbufferprocessor3d.hxx @@ -20,10 +20,8 @@ #ifndef INCLUDED_DRAWINGLAYER_PROCESSOR3D_ZBUFFERPROCESSOR3D_HXX #define INCLUDED_DRAWINGLAYER_PROCESSOR3D_ZBUFFERPROCESSOR3D_HXX -#include <drawinglayer/drawinglayerdllapi.h> - #include <drawinglayer/processor3d/defaultprocessor3d.hxx> -#include <vcl/bitmapex.hxx> +#include <basegfx/matrix/b3dhommatrix.hxx> #include <memory> namespace basegfx { @@ -36,9 +34,6 @@ namespace drawinglayer { class SdrLightingAttribute; class MaterialAttribute3D; } - namespace geometry { - class ViewInformation2D; - } } class ZBufferRasterConverter3D; |