[Libreoffice-commits] core.git: sax/inc sax/IwyuFilter_sax.yaml sax/qa sax/source
Gabor Kelemen (via logerrit)
logerrit at kemper.freedesktop.org
Wed Sep 25 07:06:28 UTC 2019
sax/IwyuFilter_sax.yaml | 2 ++
sax/inc/xml2utf.hxx | 3 +++
sax/qa/cppunit/test_converter.cxx | 1 -
sax/qa/cppunit/xmlimport.cxx | 12 ++----------
sax/source/expatwrap/sax_expat.cxx | 2 +-
sax/source/expatwrap/saxwriter.cxx | 7 -------
sax/source/fastparser/fastparser.cxx | 1 -
sax/source/fastparser/legacyfastparser.cxx | 2 --
sax/source/tools/CachedOutputStream.hxx | 1 -
sax/source/tools/converter.cxx | 3 ---
sax/source/tools/fastserializer.cxx | 2 +-
sax/source/tools/fshelper.cxx | 1 -
12 files changed, 9 insertions(+), 28 deletions(-)
New commits:
commit 4d960908094292c9bac925976ac489c46a6127e9
Author: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Wed Sep 18 07:41:32 2019 +0200
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Wed Sep 25 09:05:54 2019 +0200
tdf#42949 Fix IWYU warnings in sax/
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I793b7996c019b694e70569bc37f89e5b089e3296
Reviewed-on: https://gerrit.libreoffice.org/79078
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
diff --git a/sax/IwyuFilter_sax.yaml b/sax/IwyuFilter_sax.yaml
new file mode 100644
index 000000000000..986dcdc9881a
--- /dev/null
+++ b/sax/IwyuFilter_sax.yaml
@@ -0,0 +1,2 @@
+---
+assumeFilename: sax/source/fastparser/fastparser.cxx
diff --git a/sax/inc/xml2utf.hxx b/sax/inc/xml2utf.hxx
index 3e6d09cda3a0..ead6ac114362 100644
--- a/sax/inc/xml2utf.hxx
+++ b/sax/inc/xml2utf.hxx
@@ -25,6 +25,9 @@
#include <memory>
#include <sal/types.h>
+#include <rtl/string.hxx>
+
+#include <com/sun/star/io/XInputStream.hpp>
namespace sax_expatwrap {
diff --git a/sax/qa/cppunit/test_converter.cxx b/sax/qa/cppunit/test_converter.cxx
index e786be2f1cd5..536aa53bbdcd 100644
--- a/sax/qa/cppunit/test_converter.cxx
+++ b/sax/qa/cppunit/test_converter.cxx
@@ -28,7 +28,6 @@
#include <rtl/ustrbuf.hxx>
#include <com/sun/star/util/DateTime.hpp>
-#include <com/sun/star/util/Date.hpp>
#include <com/sun/star/util/Duration.hpp>
#include <com/sun/star/util/MeasureUnit.hpp>
diff --git a/sax/qa/cppunit/xmlimport.cxx b/sax/qa/cppunit/xmlimport.cxx
index ff560c2625b0..0762c249bdd4 100644
--- a/sax/qa/cppunit/xmlimport.cxx
+++ b/sax/qa/cppunit/xmlimport.cxx
@@ -22,31 +22,23 @@
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/plugin/TestPlugIn.h>
#include <test/bootstrapfixture.hxx>
-#include <cppuhelper/weak.hxx>
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/beans/Pair.hpp>
#include <com/sun/star/xml/sax/SAXException.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
-#include <com/sun/star/xml/sax/XFastAttributeList.hpp>
+#include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/xml/sax/Parser.hpp>
#include <com/sun/star/xml/sax/XParser.hpp>
-#include <com/sun/star/xml/sax/FastParser.hpp>
-#include <com/sun/star/xml/sax/XFastParser.hpp>
#include <com/sun/star/xml/sax/XLocator.hpp>
-#include <com/sun/star/io/XOutputStream.hpp>
#include <com/sun/star/xml/sax/FastToken.hpp>
-#include <com/sun/star/xml/Attribute.hpp>
+#include <com/sun/star/lang/XInitialization.hpp>
#include <osl/file.hxx>
-#include <osl/conditn.hxx>
#include <unotools/ucbstreamhelper.hxx>
#include <unotools/streamwrap.hxx>
#include <sax/fastattribs.hxx>
-#include <string>
#include <stack>
#include <deque>
-#include <sax/fastparser.hxx>
#include <rtl/ref.hxx>
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index 87225fac08dd..3030b5f001e0 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -16,7 +16,7 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <stdlib.h>
+
#include <string.h>
#include <cassert>
#include <memory>
diff --git a/sax/source/expatwrap/saxwriter.cxx b/sax/source/expatwrap/saxwriter.cxx
index 38826c04fc36..901682a5ca01 100644
--- a/sax/source/expatwrap/saxwriter.cxx
+++ b/sax/source/expatwrap/saxwriter.cxx
@@ -28,13 +28,9 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/util/XCloneable.hpp>
-#include <com/sun/star/xml/sax/XParser.hpp>
-#include <com/sun/star/xml/sax/SAXParseException.hpp>
#include <com/sun/star/xml/sax/SAXInvalidCharacterException.hpp>
#include <com/sun/star/xml/sax/XWriter.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
-
#include <cppuhelper/exc_hlp.hxx>
#include <cppuhelper/weak.hxx>
#include <cppuhelper/implbase.hxx>
@@ -42,8 +38,6 @@
#include <osl/diagnose.h>
#include <rtl/character.hxx>
-#include <rtl/ref.hxx>
-#include <rtl/ustrbuf.hxx>
using namespace ::std;
using namespace ::osl;
@@ -54,7 +48,6 @@ using namespace ::com::sun::star::xml::sax;
using namespace ::com::sun::star::util;
using namespace ::com::sun::star::io;
-#include <xml2utf.hxx>
#include <memory>
#define LINEFEED 10
diff --git a/sax/source/fastparser/fastparser.cxx b/sax/source/fastparser/fastparser.cxx
index 3a8bbcfb9a62..ac04d1522a24 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -21,7 +21,6 @@
#include <sax/fastattribs.hxx>
#include <xml2utf.hxx>
-#include <com/sun/star/io/IOException.hpp>
#include <com/sun/star/io/XSeekable.hpp>
#include <com/sun/star/lang/DisposedException.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
diff --git a/sax/source/fastparser/legacyfastparser.cxx b/sax/source/fastparser/legacyfastparser.cxx
index f5a4a433f8df..2f355c956b4c 100644
--- a/sax/source/fastparser/legacyfastparser.cxx
+++ b/sax/source/fastparser/legacyfastparser.cxx
@@ -20,14 +20,12 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/xml/sax/XParser.hpp>
#include <com/sun/star/xml/sax/FastParser.hpp>
-#include <com/sun/star/xml/sax/FastToken.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/beans/Pair.hpp>
#include <comphelper/attributelist.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <comphelper/processfactory.hxx>
#include <rtl/ref.hxx>
-#include <sax/fastparser.hxx>
#include <memory>
#include <vector>
diff --git a/sax/source/tools/CachedOutputStream.hxx b/sax/source/tools/CachedOutputStream.hxx
index 0a2db555752a..c3f442f9d93d 100644
--- a/sax/source/tools/CachedOutputStream.hxx
+++ b/sax/source/tools/CachedOutputStream.hxx
@@ -16,7 +16,6 @@
#include <com/sun/star/uno/Sequence.hxx>
#include <cstring>
-#include <cstdlib>
#include <memory>
namespace sax_fastparser {
diff --git a/sax/source/tools/converter.cxx b/sax/source/tools/converter.cxx
index 956cdc097348..95bb262a846c 100644
--- a/sax/source/tools/converter.cxx
+++ b/sax/source/tools/converter.cxx
@@ -22,11 +22,8 @@
#include <com/sun/star/i18n/UnicodeType.hpp>
#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/util/Date.hpp>
-#include <com/sun/star/util/DateTimeWithTimezone.hpp>
-#include <com/sun/star/util/DateWithTimezone.hpp>
#include <com/sun/star/util/Duration.hpp>
#include <com/sun/star/util/Time.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
#include <boost/optional.hpp>
#include <rtl/ustrbuf.hxx>
diff --git a/sax/source/tools/fastserializer.cxx b/sax/source/tools/fastserializer.cxx
index 2741bb4d4a28..cc7293a6a3f9 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -20,7 +20,7 @@
#include "fastserializer.hxx"
#include <com/sun/star/xml/sax/FastTokenHandler.hpp>
-#include <rtl/math.hxx>
+#include <rtl/math.h>
#include <sal/log.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/sequence.hxx>
diff --git a/sax/source/tools/fshelper.cxx b/sax/source/tools/fshelper.cxx
index 69056a626d14..383d4a794bbc 100644
--- a/sax/source/tools/fshelper.cxx
+++ b/sax/source/tools/fshelper.cxx
@@ -20,7 +20,6 @@
#include <sax/fshelper.hxx>
#include "fastserializer.hxx"
#include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
-#include <rtl/ustrbuf.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
More information about the Libreoffice-commits
mailing list