Skip to content

Commit 4d96090

Browse files
Gabor Kelemenvmiklos
Gabor Kelemen
authored andcommitted
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@collabora.com>
1 parent 202bee1 commit 4d96090

12 files changed

+9
-28
lines changed

sax/IwyuFilter_sax.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
---
2+
assumeFilename: sax/source/fastparser/fastparser.cxx

sax/inc/xml2utf.hxx

+3
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
#include <memory>
2626

2727
#include <sal/types.h>
28+
#include <rtl/string.hxx>
29+
30+
#include <com/sun/star/io/XInputStream.hpp>
2831

2932
namespace sax_expatwrap {
3033

sax/qa/cppunit/test_converter.cxx

-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
#include <rtl/ustrbuf.hxx>
2929

3030
#include <com/sun/star/util/DateTime.hpp>
31-
#include <com/sun/star/util/Date.hpp>
3231
#include <com/sun/star/util/Duration.hpp>
3332
#include <com/sun/star/util/MeasureUnit.hpp>
3433

sax/qa/cppunit/xmlimport.cxx

+2-10
Original file line numberDiff line numberDiff line change
@@ -22,31 +22,23 @@
2222
#include <cppunit/extensions/HelperMacros.h>
2323
#include <cppunit/plugin/TestPlugIn.h>
2424
#include <test/bootstrapfixture.hxx>
25-
#include <cppuhelper/weak.hxx>
2625
#include <cppuhelper/implbase.hxx>
2726
#include <com/sun/star/beans/Pair.hpp>
2827
#include <com/sun/star/xml/sax/SAXException.hpp>
2928
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
30-
#include <com/sun/star/xml/sax/XFastDocumentHandler.hpp>
31-
#include <com/sun/star/xml/sax/XFastAttributeList.hpp>
29+
#include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
3230
#include <comphelper/processfactory.hxx>
3331
#include <com/sun/star/xml/sax/Parser.hpp>
3432
#include <com/sun/star/xml/sax/XParser.hpp>
35-
#include <com/sun/star/xml/sax/FastParser.hpp>
36-
#include <com/sun/star/xml/sax/XFastParser.hpp>
3733
#include <com/sun/star/xml/sax/XLocator.hpp>
38-
#include <com/sun/star/io/XOutputStream.hpp>
3934
#include <com/sun/star/xml/sax/FastToken.hpp>
40-
#include <com/sun/star/xml/Attribute.hpp>
35+
#include <com/sun/star/lang/XInitialization.hpp>
4136
#include <osl/file.hxx>
42-
#include <osl/conditn.hxx>
4337
#include <unotools/ucbstreamhelper.hxx>
4438
#include <unotools/streamwrap.hxx>
4539
#include <sax/fastattribs.hxx>
46-
#include <string>
4740
#include <stack>
4841
#include <deque>
49-
#include <sax/fastparser.hxx>
5042
#include <rtl/ref.hxx>
5143

5244

sax/source/expatwrap/sax_expat.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* except in compliance with the License. You may obtain a copy of
1717
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
1818
*/
19-
#include <stdlib.h>
19+
2020
#include <string.h>
2121
#include <cassert>
2222
#include <memory>

sax/source/expatwrap/saxwriter.cxx

-7
Original file line numberDiff line numberDiff line change
@@ -28,22 +28,16 @@
2828
#include <com/sun/star/lang/XServiceInfo.hpp>
2929
#include <com/sun/star/uno/XComponentContext.hpp>
3030
#include <com/sun/star/util/XCloneable.hpp>
31-
#include <com/sun/star/xml/sax/XParser.hpp>
32-
#include <com/sun/star/xml/sax/SAXParseException.hpp>
3331
#include <com/sun/star/xml/sax/SAXInvalidCharacterException.hpp>
3432
#include <com/sun/star/xml/sax/XWriter.hpp>
3533

36-
#include <com/sun/star/io/XActiveDataSource.hpp>
37-
3834
#include <cppuhelper/exc_hlp.hxx>
3935
#include <cppuhelper/weak.hxx>
4036
#include <cppuhelper/implbase.hxx>
4137
#include <cppuhelper/supportsservice.hxx>
4238

4339
#include <osl/diagnose.h>
4440
#include <rtl/character.hxx>
45-
#include <rtl/ref.hxx>
46-
#include <rtl/ustrbuf.hxx>
4741

4842
using namespace ::std;
4943
using namespace ::osl;
@@ -54,7 +48,6 @@ using namespace ::com::sun::star::xml::sax;
5448
using namespace ::com::sun::star::util;
5549
using namespace ::com::sun::star::io;
5650

57-
#include <xml2utf.hxx>
5851
#include <memory>
5952

6053
#define LINEFEED 10

sax/source/fastparser/fastparser.cxx

-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
#include <sax/fastattribs.hxx>
2222
#include <xml2utf.hxx>
2323

24-
#include <com/sun/star/io/IOException.hpp>
2524
#include <com/sun/star/io/XSeekable.hpp>
2625
#include <com/sun/star/lang/DisposedException.hpp>
2726
#include <com/sun/star/lang/IllegalArgumentException.hpp>

sax/source/fastparser/legacyfastparser.cxx

-2
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,12 @@
2020
#include <com/sun/star/lang/XServiceInfo.hpp>
2121
#include <com/sun/star/xml/sax/XParser.hpp>
2222
#include <com/sun/star/xml/sax/FastParser.hpp>
23-
#include <com/sun/star/xml/sax/FastToken.hpp>
2423
#include <com/sun/star/lang/XInitialization.hpp>
2524
#include <com/sun/star/beans/Pair.hpp>
2625
#include <comphelper/attributelist.hxx>
2726
#include <cppuhelper/supportsservice.hxx>
2827
#include <comphelper/processfactory.hxx>
2928
#include <rtl/ref.hxx>
30-
#include <sax/fastparser.hxx>
3129
#include <memory>
3230
#include <vector>
3331

sax/source/tools/CachedOutputStream.hxx

-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include <com/sun/star/uno/Sequence.hxx>
1717

1818
#include <cstring>
19-
#include <cstdlib>
2019
#include <memory>
2120

2221
namespace sax_fastparser {

sax/source/tools/converter.cxx

-3
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,8 @@
2222
#include <com/sun/star/i18n/UnicodeType.hpp>
2323
#include <com/sun/star/util/DateTime.hpp>
2424
#include <com/sun/star/util/Date.hpp>
25-
#include <com/sun/star/util/DateTimeWithTimezone.hpp>
26-
#include <com/sun/star/util/DateWithTimezone.hpp>
2725
#include <com/sun/star/util/Duration.hpp>
2826
#include <com/sun/star/util/Time.hpp>
29-
#include <com/sun/star/uno/Sequence.hxx>
3027
#include <boost/optional.hpp>
3128

3229
#include <rtl/ustrbuf.hxx>

sax/source/tools/fastserializer.cxx

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include "fastserializer.hxx"
2121

2222
#include <com/sun/star/xml/sax/FastTokenHandler.hpp>
23-
#include <rtl/math.hxx>
23+
#include <rtl/math.h>
2424
#include <sal/log.hxx>
2525
#include <comphelper/processfactory.hxx>
2626
#include <comphelper/sequence.hxx>

sax/source/tools/fshelper.cxx

-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
#include <sax/fshelper.hxx>
2121
#include "fastserializer.hxx"
2222
#include <com/sun/star/xml/sax/XFastTokenHandler.hpp>
23-
#include <rtl/ustrbuf.hxx>
2423

2524
using namespace ::com::sun::star;
2625
using namespace ::com::sun::star::uno;

0 commit comments

Comments
 (0)