From 87d078a5a86d9a83395740e6c74e2e4cb52fe7cc Mon Sep 17 00:00:00 2001 From: Gabor Kelemen Date: Sun, 9 Feb 2020 16:45:40 +0100 Subject: tdf#42949 Fix IWYU warnings in writerperfect/ Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: Ia1ac2b3d254487f6b4e85b52eead13635d30a5af Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88416 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- writerperfect/IwyuFilter_writerperfect.yaml | 200 +++++++++++++++++++++ writerperfect/inc/DirectoryStream.hxx | 1 - writerperfect/inc/DocumentHandler.hxx | 2 - writerperfect/inc/DocumentHandlerForOdg.hxx | 2 + writerperfect/inc/DocumentHandlerForOdp.hxx | 2 + writerperfect/inc/DocumentHandlerForOds.hxx | 2 + writerperfect/inc/DocumentHandlerForOdt.hxx | 2 + writerperfect/inc/ImportFilter.hxx | 11 +- writerperfect/inc/WPFTEncodingDialog.hxx | 2 - writerperfect/inc/WPFTResMgr.hxx | 2 - writerperfect/qa/unit/DrawingImportTest.cxx | 1 - writerperfect/qa/unit/PresentationImportTest.cxx | 1 - writerperfect/qa/unit/SpreadsheetImportTest.cxx | 2 - writerperfect/qa/unit/WPXSvStreamTest.cxx | 2 - writerperfect/qa/unit/WpftLoader.cxx | 1 - .../source/calc/MSWorksCalcImportFilter.cxx | 1 + .../source/calc/MSWorksCalcImportFilter.hxx | 4 +- writerperfect/source/calc/MWAWCalcImportFilter.cxx | 2 - writerperfect/source/calc/MWAWCalcImportFilter.hxx | 4 +- writerperfect/source/calc/NumbersImportFilter.cxx | 1 - writerperfect/source/calc/NumbersImportFilter.hxx | 1 - .../source/calc/StarOfficeCalcImportFilter.cxx | 2 - .../source/calc/StarOfficeCalcImportFilter.hxx | 4 +- writerperfect/source/draw/CDRImportFilter.cxx | 3 - writerperfect/source/draw/CMXImportFilter.cxx | 3 - writerperfect/source/draw/FreehandImportFilter.cxx | 3 - writerperfect/source/draw/MSPUBImportFilter.cxx | 3 - writerperfect/source/draw/MWAWDrawImportFilter.cxx | 2 - writerperfect/source/draw/MWAWDrawImportFilter.hxx | 1 - .../source/draw/PageMakerImportFilter.cxx | 4 - writerperfect/source/draw/QXPImportFilter.cxx | 4 - .../source/draw/StarOfficeDrawImportFilter.cxx | 2 - .../source/draw/StarOfficeDrawImportFilter.hxx | 1 - writerperfect/source/draw/VisioImportFilter.cxx | 3 - writerperfect/source/draw/WPGImportFilter.cxx | 4 - writerperfect/source/draw/ZMFImportFilter.cxx | 4 - .../source/impress/KeynoteImportFilter.cxx | 7 - .../source/impress/KeynoteImportFilter.hxx | 1 - .../impress/MWAWPresentationImportFilter.cxx | 2 - .../impress/MWAWPresentationImportFilter.hxx | 1 - .../impress/StarOfficePresentationImportFilter.cxx | 2 - .../impress/StarOfficePresentationImportFilter.hxx | 1 - .../source/writer/AbiWordImportFilter.cxx | 1 - .../source/writer/AbiWordImportFilter.hxx | 1 - writerperfect/source/writer/EBookImportFilter.cxx | 1 - writerperfect/source/writer/EBookImportFilter.hxx | 1 - .../source/writer/MSWorksImportFilter.cxx | 2 - .../source/writer/MSWorksImportFilter.hxx | 1 - writerperfect/source/writer/MWAWImportFilter.cxx | 1 - writerperfect/source/writer/MWAWImportFilter.hxx | 1 - writerperfect/source/writer/PagesImportFilter.cxx | 1 - writerperfect/source/writer/PagesImportFilter.hxx | 1 - .../source/writer/StarOfficeWriterImportFilter.cxx | 1 - .../source/writer/StarOfficeWriterImportFilter.hxx | 1 - .../source/writer/WordPerfectImportFilter.cxx | 5 - .../source/writer/WordPerfectImportFilter.hxx | 4 - writerperfect/source/writer/exp/xmlimp.hxx | 2 + 57 files changed, 215 insertions(+), 112 deletions(-) create mode 100644 writerperfect/IwyuFilter_writerperfect.yaml diff --git a/writerperfect/IwyuFilter_writerperfect.yaml b/writerperfect/IwyuFilter_writerperfect.yaml new file mode 100644 index 000000000000..edfba6f966f9 --- /dev/null +++ b/writerperfect/IwyuFilter_writerperfect.yaml @@ -0,0 +1,200 @@ +--- +assumeFilename: writerperfect/source/common/WPXSvInputStream.cxx +blacklist: + writerperfect/inc/DocumentHandler.hxx: + # Wrapper header for external library + - libodfgen/libodfgen.hxx + writerperfect/inc/DocumentHandlerForOdt.hxx: + # Wrapper header for external library + - libodfgen/libodfgen.hxx + writerperfect/inc/DocumentHandlerForOdg.hxx: + # Wrapper header for external library + - libodfgen/libodfgen.hxx + writerperfect/inc/DocumentHandlerForOds.hxx: + # Wrapper header for external library + - libodfgen/libodfgen.hxx + writerperfect/inc/DocumentHandlerForOdp.hxx: + # Wrapper header for external library + - libodfgen/libodfgen.hxx + writerperfect/inc/DirectoryStream.hxx: + # Wrapper header for external library + - librevenge-stream/librevenge-stream.h + writerperfect/inc/WPXSvInputStream.hxx: + # Wrapper header for external library + - librevenge-stream/librevenge-stream.h + writerperfect/source/calc/NumbersImportFilter.hxx: + # Needed for direct member access + - DocumentHandlerForOds.hxx + writerperfect/source/calc/MWAWCalcImportFilter.hxx: + # Needed for direct member access + - DocumentHandlerForOds.hxx + writerperfect/source/calc/StarOfficeCalcImportFilter.hxx: + # Needed for direct member access + - DocumentHandlerForOds.hxx + writerperfect/source/calc/MSWorksCalcImportFilter.hxx: + # Needed for direct member access + - DocumentHandlerForOds.hxx + writerperfect/source/draw/CDRImportFilter.hxx: + # Needed for direct member access + - DocumentHandlerForOdg.hxx + writerperfect/source/draw/StarOfficeDrawImportFilter.hxx: + # Needed for direct member access + - DocumentHandlerForOdg.hxx + writerperfect/source/draw/PageMakerImportFilter.hxx: + # Needed for direct member access + - DocumentHandlerForOdg.hxx + writerperfect/source/draw/ZMFImportFilter.hxx: + # Needed for direct member access + - DocumentHandlerForOdg.hxx + writerperfect/source/draw/CMXImportFilter.hxx: + # Needed for direct member access + - DocumentHandlerForOdg.hxx + writerperfect/source/draw/QXPImportFilter.hxx: + # Needed for direct member access + - DocumentHandlerForOdg.hxx + writerperfect/source/draw/MWAWDrawImportFilter.hxx: + # Needed for direct member access + - DocumentHandlerForOdg.hxx + writerperfect/source/draw/WPGImportFilter.hxx: + # Needed for direct member access + - DocumentHandlerForOdg.hxx + writerperfect/source/draw/MSPUBImportFilter.hxx: + # Needed for direct member access + - DocumentHandlerForOdg.hxx + writerperfect/source/draw/VisioImportFilter.hxx: + # Needed for direct member access + - DocumentHandlerForOdg.hxx + writerperfect/source/draw/FreehandImportFilter.hxx: + # Needed for direct member access + - DocumentHandlerForOdg.hxx + writerperfect/source/impress/MWAWPresentationImportFilter.hxx: + # Needed for direct member access + - DocumentHandlerForOdp.hxx + writerperfect/source/impress/StarOfficePresentationImportFilter.hxx: + # Needed for direct member access + - DocumentHandlerForOdp.hxx + writerperfect/source/impress/KeynoteImportFilter.hxx: + # Needed for direct member access + - DocumentHandlerForOdp.hxx + writerperfect/source/writer/EBookImportFilter.hxx: + # Needed for direct member access + - DocumentHandlerForOdt.hxx + writerperfect/source/writer/MSWorksImportFilter.hxx: + # Needed for direct member access + - DocumentHandlerForOdt.hxx + writerperfect/source/writer/StarOfficeWriterImportFilter.hxx: + # Needed for direct member access + - DocumentHandlerForOdt.hxx + writerperfect/source/writer/PagesImportFilter.hxx: + # Needed for direct member access + - DocumentHandlerForOdt.hxx + writerperfect/source/writer/AbiWordImportFilter.hxx: + # Needed for direct member access + - DocumentHandlerForOdt.hxx + writerperfect/source/writer/MWAWImportFilter.hxx: + # Needed for direct member access + - DocumentHandlerForOdt.hxx + writerperfect/qa/unit/WpftLoader.cxx: + # Actually used + - com/sun/star/beans/PropertyValue.hpp + - com/sun/star/container/XNameAccess.hpp + - com/sun/star/document/XFilter.hpp + - com/sun/star/frame/XDesktop2.hpp + - com/sun/star/io/XInputStream.hpp + - com/sun/star/uno/XComponentContext.hpp + # Needed for UnoType template instatiation + - com/sun/star/ucb/XContent.hpp + writerperfect/qa/unit/DrawingImportTest.cxx: + # Needed for direct member access + - DocumentHandlerForOdg.hxx + writerperfect/qa/unit/SpreadsheetImportTest.cxx: + # Needed for direct member access + - DocumentHandlerForOds.hxx + writerperfect/qa/unit/PresentationImportTest.cxx: + # Needed for direct member access + - DocumentHandlerForOdp.hxx + writerperfect/qa/unit/TextImportTest.cxx: + # Needed for direct member access + - DocumentHandlerForOdt.hxx + writerperfect/source/common/DocumentHandler.cxx: + # Actually used + - com/sun/star/xml/sax/XDocumentHandler.hpp + writerperfect/source/calc/NumbersImportFilter.cxx: + # Wrapper header for external library + - libetonyek/libetonyek.h + writerperfect/source/calc/MWAWCalcImportFilter.cxx: + # Wrapper header for external library + - libmwaw/libmwaw.hxx + writerperfect/source/calc/StarOfficeCalcImportFilter.cxx: + # Wrapper header for external library + - libstaroffice/libstaroffice.hxx + writerperfect/source/calc/MSWorksCalcImportFilter.cxx: + # Wrapper header for external library + - libwps/libwps.h + writerperfect/source/draw/CDRImportFilter.cxx: + # Wrapper header for external library + - libcdr/libcdr.h + writerperfect/source/draw/CMXImportFilter.cxx: + # Wrapper header for external library + - libcdr/libcdr.h + writerperfect/source/draw/FreehandImportFilter.cxx: + # Wrapper header for external library + - libfreehand/libfreehand.h + writerperfect/source/draw/MWAWDrawImportFilter.cxx: + # Wrapper header for external library + - libmwaw/libmwaw.hxx + writerperfect/source/draw/MSPUBImportFilter.cxx: + # Wrapper header for external library + - libmspub/libmspub.h + writerperfect/source/draw/PageMakerImportFilter.cxx: + # Wrapper header for external library + - libpagemaker/libpagemaker.h + writerperfect/source/draw/StarOfficeDrawImportFilter.cxx: + # Wrapper header for external library + - libstaroffice/libstaroffice.hxx + writerperfect/source/draw/VisioImportFilter.cxx: + # Wrapper header for external library + - libvisio/libvisio.h + writerperfect/source/draw/QXPImportFilter.cxx: + # Wrapper header for external library + - libqxp/libqxp.h + writerperfect/source/draw/WPGImportFilter.cxx: + # Wrapper header for external library + - libwpg/libwpg.h + writerperfect/source/draw/ZMFImportFilter.cxx: + # Wrapper header for external library + - libzmf/libzmf.h + writerperfect/source/impress/MWAWPresentationImportFilter.cxx: + # Wrapper header for external library + - libmwaw/libmwaw.hxx + writerperfect/source/impress/StarOfficePresentationImportFilter.cxx: + # Wrapper header for external library + - libstaroffice/libstaroffice.hxx + writerperfect/source/impress/KeynoteImportFilter.cxx: + # Wrapper header for external library + - libetonyek/libetonyek.h + writerperfect/source/writer/PagesImportFilter.cxx: + # Wrapper header for external library + - libetonyek/libetonyek.h + writerperfect/source/writer/MWAWImportFilter.cxx: + # Wrapper header for external library + - libmwaw/libmwaw.hxx + writerperfect/source/writer/MSWorksImportFilter.cxx: + # Wrapper header for external library + - libwps/libwps.h + writerperfect/source/writer/WordPerfectImportFilter.cxx: + # Wrapper header for external library + - libwpd/libwpd.h + - libwpg/libwpg.h + writerperfect/source/writer/StarOfficeWriterImportFilter.cxx: + # Wrapper header for external library + - libstaroffice/libstaroffice.hxx + writerperfect/source/writer/AbiWordImportFilter.cxx: + # Wrapper header for external library + - libabw/libabw.h + writerperfect/source/writer/EBookImportFilter.cxx: + # Wrapper header for external library + - libe-book/libe-book.h + writerperfect/source/writer/EPUBExportFilter.cxx: + # Actually used + - com/sun/star/uno/XComponentContext.hpp diff --git a/writerperfect/inc/DirectoryStream.hxx b/writerperfect/inc/DirectoryStream.hxx index 1f9f32303cac..3da07bc1580f 100644 --- a/writerperfect/inc/DirectoryStream.hxx +++ b/writerperfect/inc/DirectoryStream.hxx @@ -14,7 +14,6 @@ #include #include "writerperfectdllapi.h" #include -#include namespace com { diff --git a/writerperfect/inc/DocumentHandler.hxx b/writerperfect/inc/DocumentHandler.hxx index d14bb273557f..6f8734008257 100644 --- a/writerperfect/inc/DocumentHandler.hxx +++ b/writerperfect/inc/DocumentHandler.hxx @@ -26,8 +26,6 @@ #include "writerperfectdllapi.h" -#include - namespace com { namespace sun diff --git a/writerperfect/inc/DocumentHandlerForOdg.hxx b/writerperfect/inc/DocumentHandlerForOdg.hxx index 9d46bcbe5492..e7017513da84 100644 --- a/writerperfect/inc/DocumentHandlerForOdg.hxx +++ b/writerperfect/inc/DocumentHandlerForOdg.hxx @@ -12,6 +12,8 @@ #include "DocumentHandlerFor.hxx" +#include + namespace writerperfect { template <> struct DocumentHandlerFor diff --git a/writerperfect/inc/DocumentHandlerForOdp.hxx b/writerperfect/inc/DocumentHandlerForOdp.hxx index 9ef36814df77..6ee5a83e7506 100644 --- a/writerperfect/inc/DocumentHandlerForOdp.hxx +++ b/writerperfect/inc/DocumentHandlerForOdp.hxx @@ -12,6 +12,8 @@ #include "DocumentHandlerFor.hxx" +#include + namespace writerperfect { template <> struct DocumentHandlerFor diff --git a/writerperfect/inc/DocumentHandlerForOds.hxx b/writerperfect/inc/DocumentHandlerForOds.hxx index a73944391f28..48b78fa9ac86 100644 --- a/writerperfect/inc/DocumentHandlerForOds.hxx +++ b/writerperfect/inc/DocumentHandlerForOds.hxx @@ -12,6 +12,8 @@ #include "DocumentHandlerFor.hxx" +#include + namespace writerperfect { template <> struct DocumentHandlerFor diff --git a/writerperfect/inc/DocumentHandlerForOdt.hxx b/writerperfect/inc/DocumentHandlerForOdt.hxx index b454e57d7b71..55acf1fc79c6 100644 --- a/writerperfect/inc/DocumentHandlerForOdt.hxx +++ b/writerperfect/inc/DocumentHandlerForOdt.hxx @@ -12,6 +12,8 @@ #include "DocumentHandlerFor.hxx" +#include + namespace writerperfect { template <> struct DocumentHandlerFor diff --git a/writerperfect/inc/ImportFilter.hxx b/writerperfect/inc/ImportFilter.hxx index b74f0ec88e62..4328b902181c 100644 --- a/writerperfect/inc/ImportFilter.hxx +++ b/writerperfect/inc/ImportFilter.hxx @@ -8,23 +8,16 @@ #ifndef INCLUDED_WRITERPERFECT_INC_WRITERPERFECT_IMPORTFILTER_HXX #define INCLUDED_WRITERPERFECT_INC_WRITERPERFECT_IMPORTFILTER_HXX -#include - -#include - -#include - +#include #include #include #include #include #include -#include #include #include #include #include -#include #include #include @@ -37,8 +30,6 @@ #include "DocumentHandler.hxx" #include "WPXSvInputStream.hxx" -#include - #include "DocumentHandlerFor.hxx" namespace writerperfect diff --git a/writerperfect/inc/WPFTEncodingDialog.hxx b/writerperfect/inc/WPFTEncodingDialog.hxx index b38977e6cce9..433141ebeac8 100644 --- a/writerperfect/inc/WPFTEncodingDialog.hxx +++ b/writerperfect/inc/WPFTEncodingDialog.hxx @@ -12,8 +12,6 @@ #ifndef INCLUDED_WRITERPERFECT_WPFTENCODINGDIALOG_HXX #define INCLUDED_WRITERPERFECT_WPFTENCODINGDIALOG_HXX -#include - #include #include "writerperfectdllapi.h" diff --git a/writerperfect/inc/WPFTResMgr.hxx b/writerperfect/inc/WPFTResMgr.hxx index a6cd38951716..0cff3e446c73 100644 --- a/writerperfect/inc/WPFTResMgr.hxx +++ b/writerperfect/inc/WPFTResMgr.hxx @@ -3,8 +3,6 @@ #ifndef INCLUDED_WRITERPERFECT_INC_WPFTRESMGR_HXX #define INCLUDED_WRITERPERFECT_INC_WPFTRESMGR_HXX -#include "writerperfectdllapi.h" - #include inline OUString WpResId(const char* pId) { return Translate::get(pId, Translate::Create("wpt")); } diff --git a/writerperfect/qa/unit/DrawingImportTest.cxx b/writerperfect/qa/unit/DrawingImportTest.cxx index a56007bcd7e9..6fb1f98ef6b2 100644 --- a/writerperfect/qa/unit/DrawingImportTest.cxx +++ b/writerperfect/qa/unit/DrawingImportTest.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include #include #include #include diff --git a/writerperfect/qa/unit/PresentationImportTest.cxx b/writerperfect/qa/unit/PresentationImportTest.cxx index 11a61d80d32c..e1414dec5b85 100644 --- a/writerperfect/qa/unit/PresentationImportTest.cxx +++ b/writerperfect/qa/unit/PresentationImportTest.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include #include #include #include diff --git a/writerperfect/qa/unit/SpreadsheetImportTest.cxx b/writerperfect/qa/unit/SpreadsheetImportTest.cxx index 06ac09ad8365..caf5d4de94ec 100644 --- a/writerperfect/qa/unit/SpreadsheetImportTest.cxx +++ b/writerperfect/qa/unit/SpreadsheetImportTest.cxx @@ -7,8 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include -#include #include #include #include diff --git a/writerperfect/qa/unit/WPXSvStreamTest.cxx b/writerperfect/qa/unit/WPXSvStreamTest.cxx index 87ad21f84cde..368a8223368e 100644 --- a/writerperfect/qa/unit/WPXSvStreamTest.cxx +++ b/writerperfect/qa/unit/WPXSvStreamTest.cxx @@ -22,8 +22,6 @@ #include #include -#include - #include #include diff --git a/writerperfect/qa/unit/WpftLoader.cxx b/writerperfect/qa/unit/WpftLoader.cxx index f28937668e5b..3338e72c3b0b 100644 --- a/writerperfect/qa/unit/WpftLoader.cxx +++ b/writerperfect/qa/unit/WpftLoader.cxx @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx index 9eec43b28545..521b7c0dbf5d 100644 --- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx +++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx @@ -24,6 +24,7 @@ #include +#include #include #include #include "MSWorksCalcImportFilter.hxx" diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.hxx b/writerperfect/source/calc/MSWorksCalcImportFilter.hxx index 8b303a1737dd..82cf7676339c 100644 --- a/writerperfect/source/calc/MSWorksCalcImportFilter.hxx +++ b/writerperfect/source/calc/MSWorksCalcImportFilter.hxx @@ -10,12 +10,10 @@ #ifndef INCLUDED_WRITERPERFECT_SOURCE_CALC_MSWORKSCALCIMPORTFILTER_HXX #define INCLUDED_WRITERPERFECT_SOURCE_CALC_MSWORKSCALCIMPORTFILTER_HXX -#include #include -#include - #include +#include /* This component will be instantiated for both import or export. Whether it calls * setSourceDocument or setTargetDocument determines which Impl function the filter diff --git a/writerperfect/source/calc/MWAWCalcImportFilter.cxx b/writerperfect/source/calc/MWAWCalcImportFilter.cxx index f68d20f67708..186084b17746 100644 --- a/writerperfect/source/calc/MWAWCalcImportFilter.cxx +++ b/writerperfect/source/calc/MWAWCalcImportFilter.cxx @@ -10,10 +10,8 @@ */ #include -#include #include -#include #include "MWAWCalcImportFilter.hxx" diff --git a/writerperfect/source/calc/MWAWCalcImportFilter.hxx b/writerperfect/source/calc/MWAWCalcImportFilter.hxx index 6deb1ff4c1eb..97cfc18915af 100644 --- a/writerperfect/source/calc/MWAWCalcImportFilter.hxx +++ b/writerperfect/source/calc/MWAWCalcImportFilter.hxx @@ -10,12 +10,10 @@ #ifndef INCLUDED_WRITERPERFECT_SOURCE_CALC_MWAWCALCIMPORTFILTER_HXX #define INCLUDED_WRITERPERFECT_SOURCE_CALC_MWAWCALCIMPORTFILTER_HXX -#include #include -#include - #include +#include /* This component will be instantiated for both import or export. Whether it calls * setSourceDocument or setTargetDocument determines which Impl function the filter diff --git a/writerperfect/source/calc/NumbersImportFilter.cxx b/writerperfect/source/calc/NumbersImportFilter.cxx index 8e2483dd8896..813684361a01 100644 --- a/writerperfect/source/calc/NumbersImportFilter.cxx +++ b/writerperfect/source/calc/NumbersImportFilter.cxx @@ -12,7 +12,6 @@ #include #include -#include #include "NumbersImportFilter.hxx" diff --git a/writerperfect/source/calc/NumbersImportFilter.hxx b/writerperfect/source/calc/NumbersImportFilter.hxx index 59ba90e25c15..9bbbc174b773 100644 --- a/writerperfect/source/calc/NumbersImportFilter.hxx +++ b/writerperfect/source/calc/NumbersImportFilter.hxx @@ -10,7 +10,6 @@ #ifndef INCLUDED_WRITERPERFECT_SOURCE_WRITER_NUMBERSIMPORTFILTER_HXX #define INCLUDED_WRITERPERFECT_SOURCE_WRITER_NUMBERSIMPORTFILTER_HXX -#include #include #include diff --git a/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx b/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx index 9e8a1ba18d7d..5892586e885d 100644 --- a/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx +++ b/writerperfect/source/calc/StarOfficeCalcImportFilter.cxx @@ -8,10 +8,8 @@ */ #include -#include #include -#include #include "StarOfficeCalcImportFilter.hxx" diff --git a/writerperfect/source/calc/StarOfficeCalcImportFilter.hxx b/writerperfect/source/calc/StarOfficeCalcImportFilter.hxx index 1120e5169e24..bef0e2cef4d2 100644 --- a/writerperfect/source/calc/StarOfficeCalcImportFilter.hxx +++ b/writerperfect/source/calc/StarOfficeCalcImportFilter.hxx @@ -10,12 +10,10 @@ #ifndef INCLUDED_WRITERPERFECT_SOURCE_CALC_STAROFFICECALCIMPORTFILTER_HXX #define INCLUDED_WRITERPERFECT_SOURCE_CALC_STAROFFICECALCIMPORTFILTER_HXX -#include #include -#include - #include +#include /* This component will be instantiated for both import or export. Whether it calls * setSourceDocument or setTargetDocument determines which Impl function the filter diff --git a/writerperfect/source/draw/CDRImportFilter.cxx b/writerperfect/source/draw/CDRImportFilter.cxx index dd9ba55f7985..34b490326168 100644 --- a/writerperfect/source/draw/CDRImportFilter.cxx +++ b/writerperfect/source/draw/CDRImportFilter.cxx @@ -11,12 +11,9 @@ * Corel Corporation or Corel Corporation Limited." */ -#include -#include #include #include -#include #include "CDRImportFilter.hxx" diff --git a/writerperfect/source/draw/CMXImportFilter.cxx b/writerperfect/source/draw/CMXImportFilter.cxx index c6e360c4ad04..23aab816af11 100644 --- a/writerperfect/source/draw/CMXImportFilter.cxx +++ b/writerperfect/source/draw/CMXImportFilter.cxx @@ -11,12 +11,9 @@ * Corel Corporation or Corel Corporation Limited." */ -#include -#include #include #include -#include #include "CMXImportFilter.hxx" diff --git a/writerperfect/source/draw/FreehandImportFilter.cxx b/writerperfect/source/draw/FreehandImportFilter.cxx index 6020f521acab..68dd7b56b823 100644 --- a/writerperfect/source/draw/FreehandImportFilter.cxx +++ b/writerperfect/source/draw/FreehandImportFilter.cxx @@ -7,12 +7,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include -#include #include #include -#include #include "FreehandImportFilter.hxx" diff --git a/writerperfect/source/draw/MSPUBImportFilter.cxx b/writerperfect/source/draw/MSPUBImportFilter.cxx index 89374bc220aa..ba34cd2f19a7 100644 --- a/writerperfect/source/draw/MSPUBImportFilter.cxx +++ b/writerperfect/source/draw/MSPUBImportFilter.cxx @@ -7,12 +7,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include -#include #include #include -#include #include "MSPUBImportFilter.hxx" diff --git a/writerperfect/source/draw/MWAWDrawImportFilter.cxx b/writerperfect/source/draw/MWAWDrawImportFilter.cxx index f8a05b343344..000debdcbd84 100644 --- a/writerperfect/source/draw/MWAWDrawImportFilter.cxx +++ b/writerperfect/source/draw/MWAWDrawImportFilter.cxx @@ -10,10 +10,8 @@ */ #include -#include #include -#include #include "MWAWDrawImportFilter.hxx" diff --git a/writerperfect/source/draw/MWAWDrawImportFilter.hxx b/writerperfect/source/draw/MWAWDrawImportFilter.hxx index 98963ebf7510..ddc305830989 100644 --- a/writerperfect/source/draw/MWAWDrawImportFilter.hxx +++ b/writerperfect/source/draw/MWAWDrawImportFilter.hxx @@ -10,7 +10,6 @@ #ifndef INCLUDED_WRITERPERFECT_SOURCE_DRAW_MWAWDRAWIMPORTFILTER_HXX #define INCLUDED_WRITERPERFECT_SOURCE_DRAW_MWAWDRAWIMPORTFILTER_HXX -#include #include #include diff --git a/writerperfect/source/draw/PageMakerImportFilter.cxx b/writerperfect/source/draw/PageMakerImportFilter.cxx index b66593e7c7b7..5f5379de94d9 100644 --- a/writerperfect/source/draw/PageMakerImportFilter.cxx +++ b/writerperfect/source/draw/PageMakerImportFilter.cxx @@ -7,12 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include - #include -#include -#include #include #include "PageMakerImportFilter.hxx" diff --git a/writerperfect/source/draw/QXPImportFilter.cxx b/writerperfect/source/draw/QXPImportFilter.cxx index a14402c49bba..6d81e4127285 100644 --- a/writerperfect/source/draw/QXPImportFilter.cxx +++ b/writerperfect/source/draw/QXPImportFilter.cxx @@ -7,12 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include - #include -#include -#include #include #include "QXPImportFilter.hxx" diff --git a/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx b/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx index 406a9887287b..f09a107a0a6f 100644 --- a/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx +++ b/writerperfect/source/draw/StarOfficeDrawImportFilter.cxx @@ -8,10 +8,8 @@ */ #include -#include #include -#include #include "StarOfficeDrawImportFilter.hxx" diff --git a/writerperfect/source/draw/StarOfficeDrawImportFilter.hxx b/writerperfect/source/draw/StarOfficeDrawImportFilter.hxx index f1cbb643f990..2526a96a9358 100644 --- a/writerperfect/source/draw/StarOfficeDrawImportFilter.hxx +++ b/writerperfect/source/draw/StarOfficeDrawImportFilter.hxx @@ -10,7 +10,6 @@ #ifndef INCLUDED_WRITERPERFECT_SOURCE_DRAW_STAROFFICEDRAWIMPORTFILTER_HXX #define INCLUDED_WRITERPERFECT_SOURCE_DRAW_STAROFFICEDRAWIMPORTFILTER_HXX -#include #include #include diff --git a/writerperfect/source/draw/VisioImportFilter.cxx b/writerperfect/source/draw/VisioImportFilter.cxx index 93f022a149ea..33b23aae4c08 100644 --- a/writerperfect/source/draw/VisioImportFilter.cxx +++ b/writerperfect/source/draw/VisioImportFilter.cxx @@ -7,12 +7,9 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include -#include #include #include -#include #include "VisioImportFilter.hxx" diff --git a/writerperfect/source/draw/WPGImportFilter.cxx b/writerperfect/source/draw/WPGImportFilter.cxx index 2ed706431887..10411ea3bb0b 100644 --- a/writerperfect/source/draw/WPGImportFilter.cxx +++ b/writerperfect/source/draw/WPGImportFilter.cxx @@ -13,12 +13,8 @@ * Corel Corporation or Corel Corporation Limited." */ -#include -#include #include -#include - #include #include "WPGImportFilter.hxx" diff --git a/writerperfect/source/draw/ZMFImportFilter.cxx b/writerperfect/source/draw/ZMFImportFilter.cxx index 14a47c6ca04f..e06f6d3d8571 100644 --- a/writerperfect/source/draw/ZMFImportFilter.cxx +++ b/writerperfect/source/draw/ZMFImportFilter.cxx @@ -7,12 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include - #include -#include -#include #include #include "ZMFImportFilter.hxx" diff --git a/writerperfect/source/impress/KeynoteImportFilter.cxx b/writerperfect/source/impress/KeynoteImportFilter.cxx index 0ffccf9f38d5..2b12e1a0e968 100644 --- a/writerperfect/source/impress/KeynoteImportFilter.cxx +++ b/writerperfect/source/impress/KeynoteImportFilter.cxx @@ -8,20 +8,15 @@ */ #include -#include #include #include #include #include #include #include -#include #include -#include #include -#include -#include #include #include @@ -29,8 +24,6 @@ #include #include -#include - #include "KeynoteImportFilter.hxx" using writerperfect::DocumentHandler; diff --git a/writerperfect/source/impress/KeynoteImportFilter.hxx b/writerperfect/source/impress/KeynoteImportFilter.hxx index cae19663a7c7..1ae6002a58e4 100644 --- a/writerperfect/source/impress/KeynoteImportFilter.hxx +++ b/writerperfect/source/impress/KeynoteImportFilter.hxx @@ -8,7 +8,6 @@ #ifndef INCLUDED_WRITERPERFECT_SOURCE_IMPRESS_KEYNOTEIMPORTFILTER_HXX #define INCLUDED_WRITERPERFECT_SOURCE_IMPRESS_KEYNOTEIMPORTFILTER_HXX -#include #include #include diff --git a/writerperfect/source/impress/MWAWPresentationImportFilter.cxx b/writerperfect/source/impress/MWAWPresentationImportFilter.cxx index 096bbd9647b3..c5de6984ab42 100644 --- a/writerperfect/source/impress/MWAWPresentationImportFilter.cxx +++ b/writerperfect/source/impress/MWAWPresentationImportFilter.cxx @@ -10,10 +10,8 @@ */ #include -#include #include -#include #include "MWAWPresentationImportFilter.hxx" diff --git a/writerperfect/source/impress/MWAWPresentationImportFilter.hxx b/writerperfect/source/impress/MWAWPresentationImportFilter.hxx index 0967eeec7b9e..4bb1afb55023 100644 --- a/writerperfect/source/impress/MWAWPresentationImportFilter.hxx +++ b/writerperfect/source/impress/MWAWPresentationImportFilter.hxx @@ -10,7 +10,6 @@ #ifndef INCLUDED_WRITERPERFECT_SOURCE_IMPRESS_MWAWPRESENTATIONIMPORTFILTER_HXX #define INCLUDED_WRITERPERFECT_SOURCE_IMPRESS_MWAWPRESENTATIONIMPORTFILTER_HXX -#include #include #include diff --git a/writerperfect/source/impress/StarOfficePresentationImportFilter.cxx b/writerperfect/source/impress/StarOfficePresentationImportFilter.cxx index f35b64728cf9..7242c15e51d1 100644 --- a/writerperfect/source/impress/StarOfficePresentationImportFilter.cxx +++ b/writerperfect/source/impress/StarOfficePresentationImportFilter.cxx @@ -8,10 +8,8 @@ */ #include -#include #include -#include #include "StarOfficePresentationImportFilter.hxx" diff --git a/writerperfect/source/impress/StarOfficePresentationImportFilter.hxx b/writerperfect/source/impress/StarOfficePresentationImportFilter.hxx index f8179455710f..7a5e6103aa1c 100644 --- a/writerperfect/source/impress/StarOfficePresentationImportFilter.hxx +++ b/writerperfect/source/impress/StarOfficePresentationImportFilter.hxx @@ -10,7 +10,6 @@ #ifndef INCLUDED_WRITERPERFECT_SOURCE_PRESENTATION_STAROFFICEPRESENTATIONIMPORTFILTER_HXX #define INCLUDED_WRITERPERFECT_SOURCE_PRESENTATION_STAROFFICEPRESENTATIONIMPORTFILTER_HXX -#include #include #include diff --git a/writerperfect/source/writer/AbiWordImportFilter.cxx b/writerperfect/source/writer/AbiWordImportFilter.cxx index 80b2631b0cdd..0661604bc14e 100644 --- a/writerperfect/source/writer/AbiWordImportFilter.cxx +++ b/writerperfect/source/writer/AbiWordImportFilter.cxx @@ -10,7 +10,6 @@ */ #include -#include #include diff --git a/writerperfect/source/writer/AbiWordImportFilter.hxx b/writerperfect/source/writer/AbiWordImportFilter.hxx index 4d49d9d572c4..99fa0b30ffe6 100644 --- a/writerperfect/source/writer/AbiWordImportFilter.hxx +++ b/writerperfect/source/writer/AbiWordImportFilter.hxx @@ -10,7 +10,6 @@ #ifndef INCLUDED_WRITERPERFECT_SOURCE_WRITER_ABIWORDIMPORTFILTER_HXX #define INCLUDED_WRITERPERFECT_SOURCE_WRITER_ABIWORDIMPORTFILTER_HXX -#include #include #include diff --git a/writerperfect/source/writer/EBookImportFilter.cxx b/writerperfect/source/writer/EBookImportFilter.cxx index feee101b27d8..d734397bce5b 100644 --- a/writerperfect/source/writer/EBookImportFilter.cxx +++ b/writerperfect/source/writer/EBookImportFilter.cxx @@ -10,7 +10,6 @@ */ #include -#include #include #include diff --git a/writerperfect/source/writer/EBookImportFilter.hxx b/writerperfect/source/writer/EBookImportFilter.hxx index 3bbc515783a3..9ebdc9234a88 100644 --- a/writerperfect/source/writer/EBookImportFilter.hxx +++ b/writerperfect/source/writer/EBookImportFilter.hxx @@ -10,7 +10,6 @@ #ifndef EBOOKIMPORTFILTER_HXX #define EBOOKIMPORTFILTER_HXX -#include #include #include diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx index 2adec49cfeba..5339d9e3f202 100644 --- a/writerperfect/source/writer/MSWorksImportFilter.cxx +++ b/writerperfect/source/writer/MSWorksImportFilter.cxx @@ -10,8 +10,6 @@ */ #include -#include -#include #include #include diff --git a/writerperfect/source/writer/MSWorksImportFilter.hxx b/writerperfect/source/writer/MSWorksImportFilter.hxx index a6bd7ec32186..33635cc37421 100644 --- a/writerperfect/source/writer/MSWorksImportFilter.hxx +++ b/writerperfect/source/writer/MSWorksImportFilter.hxx @@ -10,7 +10,6 @@ #ifndef INCLUDED_WRITERPERFECT_SOURCE_WRITER_MSWORKSIMPORTFILTER_HXX #define INCLUDED_WRITERPERFECT_SOURCE_WRITER_MSWORKSIMPORTFILTER_HXX -#include #include #include diff --git a/writerperfect/source/writer/MWAWImportFilter.cxx b/writerperfect/source/writer/MWAWImportFilter.cxx index 4dcf7bbca53e..33fe2d95f222 100644 --- a/writerperfect/source/writer/MWAWImportFilter.cxx +++ b/writerperfect/source/writer/MWAWImportFilter.cxx @@ -10,7 +10,6 @@ */ #include -#include #include diff --git a/writerperfect/source/writer/MWAWImportFilter.hxx b/writerperfect/source/writer/MWAWImportFilter.hxx index 810ca637ce14..5d67aa31da1c 100644 --- a/writerperfect/source/writer/MWAWImportFilter.hxx +++ b/writerperfect/source/writer/MWAWImportFilter.hxx @@ -10,7 +10,6 @@ #ifndef INCLUDED_WRITERPERFECT_SOURCE_WRITER_MWAWIMPORTFILTER_HXX #define INCLUDED_WRITERPERFECT_SOURCE_WRITER_MWAWIMPORTFILTER_HXX -#include #include #include diff --git a/writerperfect/source/writer/PagesImportFilter.cxx b/writerperfect/source/writer/PagesImportFilter.cxx index 89080e6e4cad..9d8bb5eb3828 100644 --- a/writerperfect/source/writer/PagesImportFilter.cxx +++ b/writerperfect/source/writer/PagesImportFilter.cxx @@ -12,7 +12,6 @@ #include #include -#include #include "PagesImportFilter.hxx" diff --git a/writerperfect/source/writer/PagesImportFilter.hxx b/writerperfect/source/writer/PagesImportFilter.hxx index 9457667f271c..5e9f5c50cf76 100644 --- a/writerperfect/source/writer/PagesImportFilter.hxx +++ b/writerperfect/source/writer/PagesImportFilter.hxx @@ -10,7 +10,6 @@ #ifndef INCLUDED_WRITERPERFECT_SOURCE_WRITER_PAGESIMPORTFILTER_HXX #define INCLUDED_WRITERPERFECT_SOURCE_WRITER_PAGESIMPORTFILTER_HXX -#include #include #include diff --git a/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx b/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx index 10eb0f8f6375..f5357cf38451 100644 --- a/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx +++ b/writerperfect/source/writer/StarOfficeWriterImportFilter.cxx @@ -8,7 +8,6 @@ */ #include -#include #include diff --git a/writerperfect/source/writer/StarOfficeWriterImportFilter.hxx b/writerperfect/source/writer/StarOfficeWriterImportFilter.hxx index 585dec14be5a..745b94786f32 100644 --- a/writerperfect/source/writer/StarOfficeWriterImportFilter.hxx +++ b/writerperfect/source/writer/StarOfficeWriterImportFilter.hxx @@ -10,7 +10,6 @@ #ifndef INCLUDED_WRITERPERFECT_SOURCE_WRITER_STAROFFICEWRITERIMPORTFILTER_HXX #define INCLUDED_WRITERPERFECT_SOURCE_WRITER_STAROFFICEWRITERIMPORTFILTER_HXX -#include #include #include diff --git a/writerperfect/source/writer/WordPerfectImportFilter.cxx b/writerperfect/source/writer/WordPerfectImportFilter.cxx index 2544e25944c6..ca27d5fbc1ec 100644 --- a/writerperfect/source/writer/WordPerfectImportFilter.cxx +++ b/writerperfect/source/writer/WordPerfectImportFilter.cxx @@ -9,25 +9,20 @@ */ #include -#include #include #include #include -#include #include -#include #include #include #include -#include #include #include #include -#include #include #include diff --git a/writerperfect/source/writer/WordPerfectImportFilter.hxx b/writerperfect/source/writer/WordPerfectImportFilter.hxx index 163da40b5035..2ed1f3c1f083 100644 --- a/writerperfect/source/writer/WordPerfectImportFilter.hxx +++ b/writerperfect/source/writer/WordPerfectImportFilter.hxx @@ -13,13 +13,9 @@ #include #include #include -#include -#include #include #include #include -#include -#include #include /* This component will be instantiated for both import or export. Whether it calls diff --git a/writerperfect/source/writer/exp/xmlimp.hxx b/writerperfect/source/writer/exp/xmlimp.hxx index 59219ecd25ea..6994be4720ac 100644 --- a/writerperfect/source/writer/exp/xmlimp.hxx +++ b/writerperfect/source/writer/exp/xmlimp.hxx @@ -22,6 +22,8 @@ #include #include +#include "xmlictxt.hxx" + namespace com { namespace sun -- cgit v1.2.3