[Libreoffice-commits] core.git: emfio/inc emfio/IwyuFilter_emfio.yaml emfio/qa emfio/source

[Gabor Kelemen (via logerrit)]

 emfio/IwyuFilter_emfio.yaml            |    6 ++++++
 emfio/inc/mtftools.hxx                 |    1 -
 emfio/qa/cppunit/emf/EmfImportTest.cxx |    2 --
 emfio/qa/cppunit/wmf/wmfimporttest.cxx |    3 +--
 emfio/source/emfuno/xemfparser.cxx     |   11 -----------
 emfio/source/emfuno/xemfparser.hxx     |    1 -
 emfio/source/reader/emfreader.cxx      |    2 --
 emfio/source/reader/mtftools.cxx       |    5 -----
 8 files changed, 7 insertions(+), 24 deletions(-)

New commits:
commit 8f4087138cb68d8dcdd06853df1a6deb53ee8844
Author:     Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Sun Dec 15 22:58:53 2019 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Fri Dec 20 10:25:19 2019 +0100

    tdf#42949 Fix IWYU warnings in emfio/
    
    Found with bin/find-unneeded-includes
    Only removal proposals are dealt with here.
    
    Change-Id: I644bbebe798329e68665b8c751eccbb829178e91
    Reviewed-on: https://gerrit.libreoffice.org/85182
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/emfio/IwyuFilter_emfio.yaml b/emfio/IwyuFilter_emfio.yaml
new file mode 100644
index 000000000000..5fa9fef5aea3
--- /dev/null
+++ b/emfio/IwyuFilter_emfio.yaml
@@ -0,0 +1,6 @@
+---
+assumeFilename: emfio/source/emfuno/xemfparser.cxx
+blacklist:
+    emfio/source/reader/wmfreader.cxx:
+    # OSL_BIGENDIAN is being checked
+    - osl/endian.h
diff --git a/emfio/inc/mtftools.hxx b/emfio/inc/mtftools.hxx
index e335dc99fbf1..784fe796efe7 100644
--- a/emfio/inc/mtftools.hxx
+++ b/emfio/inc/mtftools.hxx
@@ -26,7 +26,6 @@
 #include <vcl/bitmapex.hxx>
 #include <vcl/lineinfo.hxx>
 #include <vcl/outdevstate.hxx>
-#include <vcl/FilterConfigItem.hxx>
 
 #include "emfiodllapi.h"
 
diff --git a/emfio/qa/cppunit/emf/EmfImportTest.cxx b/emfio/qa/cppunit/emf/EmfImportTest.cxx
index 94b4f6acd11f..2601e0e69f8f 100644
--- a/emfio/qa/cppunit/emf/EmfImportTest.cxx
+++ b/emfio/qa/cppunit/emf/EmfImportTest.cxx
@@ -17,8 +17,6 @@
 #include <comphelper/sequence.hxx>
 
 #include <com/sun/star/graphic/EmfTools.hpp>
-#include <com/sun/star/graphic/Primitive2DTools.hpp>
-#include <com/sun/star/graphic/XPrimitive2D.hpp>
 
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
 #include <drawinglayer/tools/primitive2dxmldump.hxx>
diff --git a/emfio/qa/cppunit/wmf/wmfimporttest.cxx b/emfio/qa/cppunit/wmf/wmfimporttest.cxx
index 5f9de170c595..e121f248f979 100644
--- a/emfio/qa/cppunit/wmf/wmfimporttest.cxx
+++ b/emfio/qa/cppunit/wmf/wmfimporttest.cxx
@@ -18,10 +18,9 @@
  */
 
 #include <test/xmltesttools.hxx>
-#include <test/setupvcl.hxx>
 #include <test/bootstrapfixture.hxx>
+#include <vcl/gdimtf.hxx>
 #include <vcl/wmf.hxx>
-#include <vcl/metaact.hxx>
 #include <mtftools.hxx>
 
 using namespace css;
diff --git a/emfio/source/emfuno/xemfparser.cxx b/emfio/source/emfuno/xemfparser.cxx
index c5aad2411b2b..e80dc5631dbd 100644
--- a/emfio/source/emfuno/xemfparser.cxx
+++ b/emfio/source/emfuno/xemfparser.cxx
@@ -21,15 +21,10 @@
 
 #include <com/sun/star/graphic/XEmfParser.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
 #include <cppuhelper/implbase2.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <comphelper/sequence.hxx>
 #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
-#include <basegfx/color/bcolor.hxx>
-#include <basegfx/polygon/b2dpolygon.hxx>
-#include <basegfx/polygon/b2dpolygontools.hxx>
-#include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx>
 
 #include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
@@ -41,12 +36,6 @@
 #include <wmfreader.hxx>
 #include <emfreader.hxx>
 
-//#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 "xemfparser.hxx"
 
 using namespace ::com::sun::star;
diff --git a/emfio/source/emfuno/xemfparser.hxx b/emfio/source/emfuno/xemfparser.hxx
index d68e1e681d51..e4d1b53fa055 100644
--- a/emfio/source/emfuno/xemfparser.hxx
+++ b/emfio/source/emfuno/xemfparser.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 {
diff --git a/emfio/source/reader/emfreader.cxx b/emfio/source/reader/emfreader.cxx
index d0c975c2cc4c..24600e58c360 100644
--- a/emfio/source/reader/emfreader.cxx
+++ b/emfio/source/reader/emfreader.cxx
@@ -18,10 +18,8 @@
  */
 
 #include <emfreader.hxx>
-#include <osl/endian.h>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
-#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <vcl/dibtools.hxx>
 #include <o3tl/safeint.hxx>
 #include <tools/stream.hxx>
diff --git a/emfio/source/reader/mtftools.cxx b/emfio/source/reader/mtftools.cxx
index 8cd3ef1e86cf..f50f41a83717 100644
--- a/emfio/source/reader/mtftools.cxx
+++ b/emfio/source/reader/mtftools.cxx
@@ -19,7 +19,6 @@
 
 #include <mtftools.hxx>
 
-#include <cassert>
 #include <memory>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
@@ -29,9 +28,7 @@
 #include <vcl/metaact.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/svapp.hxx>
-#include <tools/fract.hxx>
 #include <tools/stream.hxx>
-#include <rtl/strbuf.hxx>
 #include <rtl/tencinfo.h>
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
@@ -41,8 +38,6 @@
 #include <officecfg/Office/Linguistic.hxx>
 #include <unotools/configmgr.hxx>
 #include <unotools/wincodepage.hxx>
-#include <tools/helpers.hxx>
-#include <vcl/bitmapaccess.hxx>
 
 #if OSL_DEBUG_LEVEL > 1
 #define EMFP_DEBUG(x) x