tdf#42949 Fix IWYU warnings in svgio/

Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: I66cde1ea02569cd8244b23be16a5550cac8adf12 Reviewed-on: https://gerrit.libreoffice.org/85237 Tested-by: Jenkins Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
2019-12-16 18:54:31 +01:00 · 2019-12-16 18:54:31 +01:00 · aa7a23f4f7
commit aa7a23f4f7
parent 8f4087138c
39 changed files with 28 additions and 48 deletions
--- a/svgio/IwyuFilter_svgio.yaml
+++ b/svgio/IwyuFilter_svgio.yaml
@ -0,0 +1,2 @@
+---
+assumeFilename: svgio/source/svgreader/svgdocument.cxx
--- a/svgio/inc/svganode.hxx
+++ b/svgio/inc/svganode.hxx
@ -22,6 +22,7 @@

 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <memory>

 namespace svgio
--- a/svgio/inc/svgcirclenode.hxx
+++ b/svgio/inc/svgcirclenode.hxx
@ -22,6 +22,7 @@

 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <memory>

 namespace svgio
--- a/svgio/inc/svgclippathnode.hxx
+++ b/svgio/inc/svgclippathnode.hxx
@ -22,6 +22,7 @@

 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <memory>

 namespace svgio
--- a/svgio/inc/svgellipsenode.hxx
+++ b/svgio/inc/svgellipsenode.hxx
@ -22,6 +22,7 @@

 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <memory>

 namespace svgio
--- a/svgio/inc/svggnode.hxx
+++ b/svgio/inc/svggnode.hxx
@ -22,6 +22,7 @@

 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <memory>

 namespace svgio
--- a/svgio/inc/svgimagenode.hxx
+++ b/svgio/inc/svgimagenode.hxx
@ -22,6 +22,7 @@

 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <memory>

 namespace svgio
--- a/svgio/inc/svglinenode.hxx
+++ b/svgio/inc/svglinenode.hxx
@ -22,6 +22,7 @@

 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <memory>

 namespace svgio
--- a/svgio/inc/svgmasknode.hxx
+++ b/svgio/inc/svgmasknode.hxx
@ -22,6 +22,7 @@

 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <memory>

 namespace svgio
--- a/svgio/inc/svgnode.hxx
+++ b/svgio/inc/svgnode.hxx
@ -22,9 +22,8 @@

 #include "svgtools.hxx"
 #include "svgtoken.hxx"
-#include "svgpaint.hxx"
-#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <com/sun/star/xml/sax/XAttributeList.hpp>
+#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <memory>
 #include <vector>
 #include <o3tl/optional.hxx>
--- a/svgio/inc/svgpathnode.hxx
+++ b/svgio/inc/svgpathnode.hxx
@ -22,7 +22,9 @@

 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>

 namespace svgio
 {
--- a/svgio/inc/svgpatternnode.hxx
+++ b/svgio/inc/svgpatternnode.hxx
@ -22,6 +22,7 @@

 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <memory>

 namespace svgio
--- a/svgio/inc/svgpolynode.hxx
+++ b/svgio/inc/svgpolynode.hxx
@ -22,6 +22,7 @@

 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>

 namespace svgio
--- a/svgio/inc/svgrectnode.hxx
+++ b/svgio/inc/svgrectnode.hxx
@ -22,6 +22,7 @@

 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <memory>

 namespace svgio
--- a/svgio/inc/svgstyleattributes.hxx
+++ b/svgio/inc/svgstyleattributes.hxx
@ -22,9 +22,9 @@

 #include "svgpaint.hxx"
 #include "svgnode.hxx"
-#include <vcl/vclenum.hxx>
 #include <tools/fontenum.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <drawinglayer/primitive2d/baseprimitive2d.hxx>


 // predefines
--- a/svgio/inc/svgsymbolnode.hxx
+++ b/svgio/inc/svgsymbolnode.hxx
@ -21,7 +21,6 @@
 #define INCLUDED_SVGIO_INC_SVGSYMBOLNODE_HXX

 #include "svgstyleattributes.hxx"
-#include <memory>

 namespace svgio
 {
--- a/svgio/inc/svgtextnode.hxx
+++ b/svgio/inc/svgtextnode.hxx
@ -23,6 +23,7 @@
 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
 #include "svgcharacternode.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <memory>

 namespace svgio
--- a/svgio/inc/svgtextpathnode.hxx
+++ b/svgio/inc/svgtextpathnode.hxx
@ -22,7 +22,6 @@

 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
-#include "svgpathnode.hxx"

 namespace svgio
 {
--- a/svgio/inc/svgtools.hxx
+++ b/svgio/inc/svgtools.hxx
@ -20,9 +20,9 @@
 #ifndef INCLUDED_SVGIO_INC_SVGTOOLS_HXX
 #define INCLUDED_SVGIO_INC_SVGTOOLS_HXX

-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <basegfx/color/bcolor.hxx>
-#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/vector/b2ivector.hxx>
 #include "svgpaint.hxx"
 #include <vector>

--- a/svgio/inc/svgtspannode.hxx
+++ b/svgio/inc/svgtspannode.hxx
@ -22,7 +22,6 @@

 #include "svgcharacternode.hxx"
 #include "svgstyleattributes.hxx"
-#include "svgtools.hxx"

 namespace svgio
 {
--- a/svgio/inc/svgusenode.hxx
+++ b/svgio/inc/svgusenode.hxx
@ -22,6 +22,7 @@

 #include "svgnode.hxx"
 #include "svgstyleattributes.hxx"
+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <memory>

 namespace svgio
--- a/svgio/qa/cppunit/SvgImportTest.cxx
+++ b/svgio/qa/cppunit/SvgImportTest.cxx
@ -16,7 +16,6 @@
 #include <comphelper/sequence.hxx>

 #include <com/sun/star/graphic/SvgTools.hpp>
-#include <com/sun/star/graphic/Primitive2DTools.hpp>
 #include <com/sun/star/graphic/XPrimitive2D.hpp>

 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
--- a/svgio/qa/cppunit/SvgRead.cxx
+++ b/svgio/qa/cppunit/SvgRead.cxx
@ -14,32 +14,14 @@
 #include <memory>

 #include <comphelper/seqstream.hxx>
-#include <comphelper/sequence.hxx>
 #include <comphelper/processfactory.hxx>
 #include <tools/stream.hxx>

 #include <com/sun/star/graphic/SvgTools.hpp>
-#include <com/sun/star/graphic/Primitive2DTools.hpp>
-#include <com/sun/star/graphic/XPrimitive2D.hpp>
-
-#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-
 #include <com/sun/star/graphic/XSvgParser.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/xml/sax/XParser.hpp>
-#include <com/sun/star/xml/sax/Parser.hpp>
-#include <com/sun/star/xml/sax/InputSource.hpp>
-#include <cppuhelper/implbase2.hxx>
-#include <cppuhelper/supportsservice.hxx>
-
-#include <svgdocumenthandler.hxx>
-#include <svgrectnode.hxx>
-#include <svgsvgnode.hxx>
-#include <svggnode.hxx>

 #include <basegfx/DrawCommands.hxx>
-#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>

 namespace
 {
--- a/svgio/source/svgreader/svgcharacternode.cxx
+++ b/svgio/source/svgreader/svgcharacternode.cxx
@ -23,7 +23,6 @@
 #include <drawinglayer/primitive2d/textprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textlayoutdevice.hxx>
 #include <drawinglayer/primitive2d/textbreakuphelper.hxx>
-#include <drawinglayer/primitive2d/groupprimitive2d.hxx>
 #include <drawinglayer/primitive2d/textdecoratedprimitive2d.hxx>

 namespace svgio
--- a/svgio/source/svgreader/svgcirclenode.cxx
+++ b/svgio/source/svgreader/svgcirclenode.cxx
@ -20,6 +20,7 @@
 #include <svgcirclenode.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>

 namespace svgio
 {
--- a/svgio/source/svgreader/svgellipsenode.cxx
+++ b/svgio/source/svgreader/svgellipsenode.cxx
@ -20,6 +20,7 @@
 #include <svgellipsenode.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>

 namespace svgio
 {
--- a/svgio/source/svgreader/svgimagenode.cxx
+++ b/svgio/source/svgreader/svgimagenode.cxx
@ -19,13 +19,11 @@

 #include <svgimagenode.hxx>
 #include <svgdocument.hxx>
-#include <sax/tools/converter.hxx>
 #include <tools/stream.hxx>
 #include <vcl/bitmapex.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
-#include <drawinglayer/primitive2d/groupprimitive2d.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <drawinglayer/primitive2d/maskprimitive2d.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
--- a/svgio/source/svgreader/svglinenode.cxx
+++ b/svgio/source/svgreader/svglinenode.cxx
@ -19,7 +19,7 @@

 #include <svglinenode.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>

 namespace svgio
 {
--- a/svgio/source/svgreader/svgnode.cxx
+++ b/svgio/source/svgreader/svgnode.cxx
@ -17,7 +17,6 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

-#include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <svgdocument.hxx>
 #include <svgnode.hxx>
 #include <svgstyleattributes.hxx>
--- a/svgio/source/svgreader/svgpolynode.cxx
+++ b/svgio/source/svgreader/svgpolynode.cxx
@ -19,8 +19,8 @@

 #include <svgpolynode.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>

 namespace svgio
 {
--- a/svgio/source/svgreader/svgrectnode.cxx
+++ b/svgio/source/svgreader/svgrectnode.cxx
@ -20,6 +20,7 @@
 #include <svgrectnode.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>

 namespace svgio
 {
--- a/svgio/source/svgreader/svgstyleattributes.cxx
+++ b/svgio/source/svgreader/svgstyleattributes.cxx
@ -37,7 +37,6 @@
 #include <svgmasknode.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <svgmarkernode.hxx>
-#include <basegfx/curve/b2dcubicbezier.hxx>
 #include <svgpatternnode.hxx>
 #include <drawinglayer/primitive2d/patternfillprimitive2d.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
--- a/svgio/source/svgreader/svgsymbolnode.cxx
+++ b/svgio/source/svgreader/svgsymbolnode.cxx
@ -18,8 +18,6 @@
 */

 #include <svgsymbolnode.hxx>
-#include <drawinglayer/geometry/viewinformation2d.hxx>
-#include <drawinglayer/primitive2d/transformprimitive2d.hxx>

 namespace svgio
 {
--- a/svgio/source/svgreader/svgtextnode.cxx
+++ b/svgio/source/svgreader/svgtextnode.cxx
@ -23,8 +23,6 @@
 #include <svgtrefnode.hxx>
 #include <svgtextpathnode.hxx>
 #include <svgtspannode.hxx>
-#include <drawinglayer/primitive2d/transformprimitive2d.hxx>
-#include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>

 namespace svgio
 {
--- a/svgio/source/svgreader/svgtextpathnode.cxx
+++ b/svgio/source/svgreader/svgtextpathnode.cxx
@ -21,12 +21,10 @@
 #include <svgstyleattributes.hxx>
 #include <svgpathnode.hxx>
 #include <svgdocument.hxx>
-#include <svgtrefnode.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <drawinglayer/primitive2d/textbreakuphelper.hxx>
 #include <drawinglayer/primitive2d/textprimitive2d.hxx>
-#include <drawinglayer/primitive2d/groupprimitive2d.hxx>
 #include <basegfx/curve/b2dcubicbezier.hxx>
 #include <basegfx/curve/b2dbeziertools.hxx>

--- a/svgio/source/svgreader/svgtools.cxx
+++ b/svgio/source/svgreader/svgtools.cxx
@ -19,7 +19,7 @@

 #include <svgtools.hxx>
 #include <sal/log.hxx>
-#include <osl/thread.h>
+#include <osl/diagnose.h>
 #include <tools/color.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
--- a/svgio/source/svgreader/svgvisitor.cxx
+++ b/svgio/source/svgreader/svgvisitor.cxx
@ -9,9 +9,7 @@
 */

 #include <sal/config.h>
-#include <sal/log.hxx>

-#include <svgdocumenthandler.hxx>
 #include <svgrectnode.hxx>
 #include <svgsvgnode.hxx>
 #include <svggnode.hxx>
@ -19,7 +17,6 @@
 #include <svggradientnode.hxx>

 #include <svgvisitor.hxx>
-#include <tools/color.hxx>

 namespace svgio
 {
--- a/svgio/source/svguno/xsvgparser.cxx
+++ b/svgio/source/svguno/xsvgparser.cxx
@ -18,7 +18,6 @@
 */

 #include <sal/config.h>
-#include <sal/log.hxx>

 #include <com/sun/star/graphic/XSvgParser.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
@ -29,7 +28,6 @@
 #include <com/sun/star/xml/sax/XParser.hpp>
 #include <com/sun/star/xml/sax/Parser.hpp>
 #include <com/sun/star/xml/sax/InputSource.hpp>
-#include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <svgdocumenthandler.hxx>
 #include <tools/diagnose_ex.h>

--- a/svgio/source/svguno/xsvgparser.hxx
+++ b/svgio/source/svguno/xsvgparser.hxx
@ -24,7 +24,6 @@

 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <sal/types.h>

 namespace com { namespace sun { namespace star {
    namespace uno {