summaryrefslogtreecommitdiff
path: root/svx/source/engine3d
diff options
context:
space:
mode:
authorGabor Kelemen <kelemen.gabor2@nisz.hu>2020-01-12 01:40:03 +0100
committerMiklos Vajna <vmiklos@collabora.com>2020-01-17 10:01:04 +0100
commita0d8600bbcc2fd108b1f44ca735a921bc8b4b577 (patch)
tree05aa6933aba37defe11990d1d4e27997ead60b9d /svx/source/engine3d
parentfb032d58c71fc2d5c199b24b669a69ce119fff80 (diff)
tdf#42949 Fix IWYU warnings in svx/source/[a-e]*/*cxx and svx/qa/
Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I68110cdc5cff99a3bc15184c04ae309412511f9c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86633 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'svx/source/engine3d')
-rw-r--r--svx/source/engine3d/camera3d.cxx1
-rw-r--r--svx/source/engine3d/cube3d.cxx1
-rw-r--r--svx/source/engine3d/deflt3d.cxx4
-rw-r--r--svx/source/engine3d/e3dundo.cxx4
-rw-r--r--svx/source/engine3d/extrud3d.cxx6
-rw-r--r--svx/source/engine3d/float3d.cxx15
-rw-r--r--svx/source/engine3d/lathe3d.cxx5
-rw-r--r--svx/source/engine3d/obj3d.cxx36
-rw-r--r--svx/source/engine3d/objfac3d.cxx1
-rw-r--r--svx/source/engine3d/polygn3d.cxx1
-rw-r--r--svx/source/engine3d/scene3d.cxx10
-rw-r--r--svx/source/engine3d/sphere3d.cxx4
-rw-r--r--svx/source/engine3d/view3d.cxx20
-rw-r--r--svx/source/engine3d/view3d1.cxx11
-rw-r--r--svx/source/engine3d/viewpt3d2.cxx2
15 files changed, 7 insertions, 114 deletions
diff --git a/svx/source/engine3d/camera3d.cxx b/svx/source/engine3d/camera3d.cxx
index 91138d91b33b..abb7b39910f8 100644
--- a/svx/source/engine3d/camera3d.cxx
+++ b/svx/source/engine3d/camera3d.cxx
@@ -18,7 +18,6 @@
*/
#include <svx/camera3d.hxx>
-#include <tools/stream.hxx>
Camera3D::Camera3D(const basegfx::B3DPoint& rPos, const basegfx::B3DPoint& rLookAt,
double fFocalLen) :
diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx
index 2a092ef89fec..dddf6c3c930a 100644
--- a/svx/source/engine3d/cube3d.cxx
+++ b/svx/source/engine3d/cube3d.cxx
@@ -24,7 +24,6 @@
#include <svx/cube3d.hxx>
#include <svx/globl3d.hxx>
#include <basegfx/point/b3dpoint.hxx>
-#include <basegfx/polygon/b3dpolygon.hxx>
#include <sdr/contact/viewcontactofe3dcube.hxx>
diff --git a/svx/source/engine3d/deflt3d.cxx b/svx/source/engine3d/deflt3d.cxx
index ba1ab8835ddb..76589032bca6 100644
--- a/svx/source/engine3d/deflt3d.cxx
+++ b/svx/source/engine3d/deflt3d.cxx
@@ -19,10 +19,6 @@
#include <svx/deflt3d.hxx>
-#include <svx/cube3d.hxx>
-#include <svx/svxids.hrc>
-#include <editeng/colritem.hxx>
-#include <svx/e3ditem.hxx>
// Class to manage the 3D default attributes
diff --git a/svx/source/engine3d/e3dundo.cxx b/svx/source/engine3d/e3dundo.cxx
index 47268fcda660..b1d99ddfd2b3 100644
--- a/svx/source/engine3d/e3dundo.cxx
+++ b/svx/source/engine3d/e3dundo.cxx
@@ -18,10 +18,6 @@
*/
#include <svx/e3dundo.hxx>
-#include <svx/svdmodel.hxx>
-#include <editeng/outlobj.hxx>
-#include <svx/view3d.hxx>
-#include <svx/scene3d.hxx>
#include <svx/e3dsceneupdater.hxx>
diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx
index 13d4488afc83..0b66f8e0b977 100644
--- a/svx/source/engine3d/extrud3d.cxx
+++ b/svx/source/engine3d/extrud3d.cxx
@@ -21,22 +21,18 @@
#include <svx/strings.hrc>
#include <svx/deflt3d.hxx>
#include <svx/dialmgr.hxx>
-#include <svx/svdpage.hxx>
#include <svx/globl3d.hxx>
#include <svx/extrud3d.hxx>
-#include <svx/scene3d.hxx>
-#include <svx/svxids.hrc>
-#include <svx/xpoly.hxx>
#include <svx/svdopath.hxx>
#include <svx/svdmodel.hxx>
#include <svx/svx3ditems.hxx>
#include <svx/xlineit0.hxx>
#include <sdr/properties/e3dextrudeproperties.hxx>
#include <sdr/contact/viewcontactofe3dextrude.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
-#include <basegfx/polygon/b3dpolygontools.hxx>
#include <basegfx/polygon/b3dpolypolygontools.hxx>
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index c449f1c3505d..37d154ff22dc 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -23,27 +23,18 @@
#include <sfx2/module.hxx>
#include <sfx2/viewfrm.hxx>
#include <svl/eitem.hxx>
+#include <svl/intitem.hxx>
#include <svl/itempool.hxx>
#include <svtools/colrdlg.hxx>
-#include <sfx2/viewsh.hxx>
#include <svx/colorbox.hxx>
#include <svx/f3dchild.hxx>
#include <svx/xfillit0.hxx>
#include <svx/xflclit.hxx>
#include <svx/xlineit0.hxx>
-#include <svx/svdmodel.hxx>
-#include <svx/globl3d.hxx>
-#include <svx/view3d.hxx>
-#include <svx/obj3d.hxx>
-#include <svx/sphere3d.hxx>
-#include <svx/scene3d.hxx>
-#include <svx/camera3d.hxx>
#include <svx/fmmodel.hxx>
-#include <svx/fmpage.hxx>
-#include <editeng/eeitem.hxx>
-#include <svl/style.hxx>
#include <svx/dlgutil.hxx>
#include <svx/sdshitm.hxx>
+#include <svx/svx3ditems.hxx>
#include <svx/dialmgr.hxx>
#include <svx/viewpt3d.hxx>
@@ -52,8 +43,8 @@
#include <svx/strings.hrc>
#include <editeng/colritem.hxx>
+#include <osl/diagnose.h>
#include <svx/e3ditem.hxx>
-#include <svx/gallery.hxx>
#include <svl/whiter.hxx>
#include <svtools/unitconv.hxx>
diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx
index 1b6b16557e9b..47ae21449a1b 100644
--- a/svx/source/engine3d/lathe3d.cxx
+++ b/svx/source/engine3d/lathe3d.cxx
@@ -21,12 +21,8 @@
#include <svx/deflt3d.hxx>
#include <svx/strings.hrc>
#include <svx/dialmgr.hxx>
-#include <tools/poly.hxx>
-#include <svx/svdpage.hxx>
#include <svx/globl3d.hxx>
#include <svx/lathe3d.hxx>
-#include <svx/xpoly.hxx>
-#include <svx/svxids.hrc>
#include <svx/svdopath.hxx>
#include <svx/svdmodel.hxx>
#include <svx/svx3ditems.hxx>
@@ -34,7 +30,6 @@
#include <sdr/properties/e3dlatheproperties.hxx>
#include <sdr/contact/viewcontactofe3dlathe.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
-#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx
index 911a9b7ff70a..0094f7e86c60 100644
--- a/svx/source/engine3d/obj3d.cxx
+++ b/svx/source/engine3d/obj3d.cxx
@@ -21,52 +21,18 @@
#include <svx/strings.hrc>
#include <svx/dialmgr.hxx>
-#include <svx/svdview.hxx>
-#include <svx/svdpage.hxx>
+#include <svx/svdhdl.hxx>
#include <svx/svdmodel.hxx>
-#include <svx/svditer.hxx>
#include <svx/globl3d.hxx>
-#include <svx/camera3d.hxx>
#include <svx/scene3d.hxx>
-#include <svx/cube3d.hxx>
-#include <svx/lathe3d.hxx>
-#include <svx/sphere3d.hxx>
-#include <svx/extrud3d.hxx>
#include <svx/obj3d.hxx>
-#include <svx/xtable.hxx>
-#include <svx/xflclit.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
-#include <svx/xlnclit.hxx>
-#include <svl/metitem.hxx>
-#include <svx/xlnwtit.hxx>
-#include <vcl/virdev.hxx>
-#include <tools/poly.hxx>
-#include <tools/b3dtrans.hxx>
-#include <svx/svxids.hrc>
-#include <editeng/colritem.hxx>
-#include <svx/e3ditem.hxx>
-#include <svx/xlntrit.hxx>
-#include <svx/xfltrit.hxx>
-#include <svx/svdpagv.hxx>
-#include <vcl/gradient.hxx>
-#include <vcl/metaact.hxx>
-#include <svx/svx3ditems.hxx>
-#include <svl/whiter.hxx>
-#include <svtools/colorcfg.hxx>
-#include <editeng/eeitem.hxx>
-#include <svx/xgrscit.hxx>
#include <sdr/properties/e3dproperties.hxx>
#include <sdr/properties/e3dcompoundproperties.hxx>
#include <basegfx/polygon/b3dpolypolygontools.hxx>
#include <basegfx/point/b3dpoint.hxx>
-#include <basegfx/vector/b3dvector.hxx>
-#include <svx/xlndsit.hxx>
#include <basegfx/matrix/b3dhommatrix.hxx>
-#include <basegfx/polygon/b3dpolygon.hxx>
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
-#include <basegfx/polygon/b3dpolygontools.hxx>
#include <svx/helperhittest3d.hxx>
#include <svx/sdr/contact/viewcontactofe3d.hxx>
#include <drawinglayer/geometry/viewinformation3d.hxx>
diff --git a/svx/source/engine3d/objfac3d.cxx b/svx/source/engine3d/objfac3d.cxx
index 58e1479e413b..aed342eab8ee 100644
--- a/svx/source/engine3d/objfac3d.cxx
+++ b/svx/source/engine3d/objfac3d.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <svx/svdpage.hxx>
#include <svx/globl3d.hxx>
#include <svx/cube3d.hxx>
#include <svx/sphere3d.hxx>
diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx
index b69a4ad35231..12cdb312b58a 100644
--- a/svx/source/engine3d/polygn3d.cxx
+++ b/svx/source/engine3d/polygn3d.cxx
@@ -18,7 +18,6 @@
*/
#include <svx/polygn3d.hxx>
-#include <svx/svdpage.hxx>
#include <svx/globl3d.hxx>
#include <basegfx/point/b3dpoint.hxx>
#include <sdr/contact/viewcontactofe3dpolygon.hxx>
diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx
index ad77779c02b1..7ca73dd76b83 100644
--- a/svx/source/engine3d/scene3d.cxx
+++ b/svx/source/engine3d/scene3d.cxx
@@ -25,18 +25,8 @@
#include <stdlib.h>
#include <svx/globl3d.hxx>
#include <svx/svdpage.hxx>
-#include <svl/style.hxx>
#include <svx/scene3d.hxx>
-#include <svx/e3dundo.hxx>
#include <svx/svdtrans.hxx>
-#include <svx/svxids.hrc>
-#include <editeng/colritem.hxx>
-#include <svx/e3ditem.hxx>
-#include <svx/xlntrit.hxx>
-#include <svx/xfltrit.hxx>
-#include <svx/svx3ditems.hxx>
-#include <svl/whiter.hxx>
-#include <svx/xflftrit.hxx>
#include <sdr/properties/e3dsceneproperties.hxx>
#include <svx/sdr/contact/viewcontactofe3dscene.hxx>
#include <svx/svddrag.hxx>
diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx
index 0f5f9b5d88df..95f439db5bc9 100644
--- a/svx/source/engine3d/sphere3d.cxx
+++ b/svx/source/engine3d/sphere3d.cxx
@@ -22,17 +22,13 @@
#include <svx/deflt3d.hxx>
#include <svx/dialmgr.hxx>
#include <svx/svdmodel.hxx>
-#include <svx/svdpage.hxx>
#include <svx/globl3d.hxx>
#include <svx/sphere3d.hxx>
-#include <svx/svxids.hrc>
-#include <svx/svx3ditems.hxx>
#include <sdr/properties/e3dsphereproperties.hxx>
#include <basegfx/vector/b3dvector.hxx>
#include <basegfx/point/b3dpoint.hxx>
#include <sdr/contact/viewcontactofe3dsphere.hxx>
-#include <basegfx/polygon/b3dpolygon.hxx>
// DrawContact section
std::unique_ptr<sdr::contact::ViewContact> E3dSphereObj::CreateObjectSpecificViewContact()
diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx
index 4fd79ce943fd..07ec90033d43 100644
--- a/svx/source/engine3d/view3d.cxx
+++ b/svx/source/engine3d/view3d.cxx
@@ -18,49 +18,33 @@
*/
-#include <svx/svdogrp.hxx>
#include <svx/svdopath.hxx>
#include <svx/svditer.hxx>
-#include <svx/svdpool.hxx>
-#include <svx/svdorect.hxx>
#include <svx/svdmodel.hxx>
#include <svx/svdpagv.hxx>
-#include <svx/svxids.hrc>
#include <editeng/colritem.hxx>
#include <editeng/eeitem.hxx>
-#include <svx/xtable.hxx>
#include <svx/svdview.hxx>
#include <svx/strings.hrc>
#include <svx/dialmgr.hxx>
-#include <svx/globl3d.hxx>
#include <svx/obj3d.hxx>
#include <svx/lathe3d.hxx>
-#include <svx/sphere3d.hxx>
#include <svx/extrud3d.hxx>
-#include <svx/cube3d.hxx>
#include <dragmt3d.hxx>
+#include <svx/scene3d.hxx>
#include <svx/view3d.hxx>
#include <svx/svdundo.hxx>
#include <svx/xflclit.hxx>
#include <svx/xlnclit.hxx>
-#include <svx/svdograf.hxx>
-#include <svx/xbtmpit.hxx>
-#include <svx/xflbmtit.hxx>
#include <svx/xfillit0.hxx>
#include <svx/xlineit0.hxx>
#include <basegfx/range/b2drange.hxx>
-#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
#include <svx/xlnwtit.hxx>
#include <svx/sdr/overlay/overlaypolypolygon.hxx>
#include <svx/sdr/overlay/overlaymanager.hxx>
#include <svx/sdrpaintwindow.hxx>
-#include <svx/sdr/contact/viewcontactofe3dscene.hxx>
-#include <drawinglayer/geometry/viewinformation3d.hxx>
-#include <svx/sdrpagewindow.hxx>
-#include <svx/sdr/contact/displayinfo.hxx>
-#include <svx/sdr/contact/objectcontact.hxx>
-#include <svx/sdr/contact/viewobjectcontact.hxx>
+#include <svx/sdr/contact/viewcontact.hxx>
#include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
#include <svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx>
#include <drawinglayer/primitive2d/transformprimitive2d.hxx>
diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx
index 6f275fb2a919..332cc825aae4 100644
--- a/svx/source/engine3d/view3d1.cxx
+++ b/svx/source/engine3d/view3d1.cxx
@@ -18,29 +18,18 @@
*/
-#include <svx/svditer.hxx>
#include <svx/svdpool.hxx>
#include <svx/svdmodel.hxx>
#include <svx/svxids.hrc>
-#include <svx/xtable.hxx>
-#include <svx/fmview.hxx>
#include <svx/strings.hrc>
#include <svx/dialmgr.hxx>
-#include <svx/globl3d.hxx>
-#include <svx/obj3d.hxx>
-#include <svx/e3ditem.hxx>
-#include <editeng/colritem.hxx>
#include <svx/lathe3d.hxx>
#include <svx/scene3d.hxx>
#include <svx/sphere3d.hxx>
#include <svx/extrud3d.hxx>
-#include <svx/e3dundo.hxx>
#include <svx/view3d.hxx>
#include <svx/cube3d.hxx>
-#include <svx/xflclit.hxx>
#include <svx/xlineit0.hxx>
-#include <svx/svdogrp.hxx>
-#include <svx/e3dsceneupdater.hxx>
#include <com/sun/star/drawing/LineStyle.hpp>
void E3dView::ConvertMarkedToPolyObj()
diff --git a/svx/source/engine3d/viewpt3d2.cxx b/svx/source/engine3d/viewpt3d2.cxx
index bbf63fd4d6e7..660af6adfbe6 100644
--- a/svx/source/engine3d/viewpt3d2.cxx
+++ b/svx/source/engine3d/viewpt3d2.cxx
@@ -18,8 +18,6 @@
*/
#include <svx/viewpt3d.hxx>
-#include <basegfx/range/b3drange.hxx>
-#include <o3tl/numeric.hxx>
Viewport3D::Viewport3D() :
aVRP(0, 0, 5),