From 7b5193e2ae9eceba881163787b98c90f2310056d Mon Sep 17 00:00:00 2001 From: Gabor Kelemen Date: Mon, 24 Jan 2022 00:17:20 +0100 Subject: [PATCH] Recheck modules [o-r]* with IWYU See tdf#42949 for motivation Change-Id: I6b4b05a5e59b256653c4caf5297fffd601b45083 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128845 Tested-by: Jenkins Reviewed-by: Thorsten Behrens --- o3tl/IwyuFilter_o3tl.yaml | 2 ++ o3tl/qa/cow_wrapper_clients.hxx | 2 +- o3tl/qa/test-enumarray.cxx | 2 -- o3tl/qa/test-lru_map.cxx | 1 - o3tl/qa/test-string_view.cxx | 2 -- o3tl/qa/test-vector_pool.cxx | 1 - oox/IwyuFilter_oox.yaml | 9 +++++++ oox/inc/drawingml/chart/datasourcecontext.hxx | 1 - oox/inc/drawingml/textliststyle.hxx | 1 - oox/source/core/fragmenthandler2.cxx | 1 - oox/source/docprop/ooxmldocpropimport.cxx | 1 - .../drawingml/chart/seriesconverter.cxx | 1 - oox/source/drawingml/chart/titleconverter.cxx | 1 - .../drawingml/chart/typegroupconverter.cxx | 1 - oox/source/drawingml/drawingmltypes.cxx | 1 - oox/source/drawingml/lineproperties.cxx | 1 - oox/source/drawingml/shape.cxx | 7 +++--- .../drawingml/table/tableproperties.cxx | 2 -- .../textcharacterpropertiescontext.cxx | 1 - .../textparagraphpropertiescontext.cxx | 2 -- oox/source/export/chartexport.cxx | 1 - oox/source/export/drawingml.cxx | 2 -- oox/source/export/shapes.cxx | 2 -- oox/source/helper/binarystreambase.cxx | 1 - oox/source/helper/graphichelper.cxx | 5 ---- oox/source/ppt/pptshape.cxx | 1 - oox/source/ppt/presPropsfragmenthandler.cxx | 1 - oox/source/ppt/slidetransition.cxx | 1 - oox/source/shape/ShapeContextHandler.cxx | 2 -- oox/source/vml/vmlformatting.cxx | 1 - oox/source/vml/vmlshape.cxx | 2 -- opencl/inc/opencl_device.hxx | 2 -- opencl/source/openclconfig.cxx | 2 -- package/IwyuFilter_package.yaml | 24 +++++++++++++++++++ package/inc/ByteChucker.hxx | 5 ---- package/inc/ByteGrabber.hxx | 5 ---- package/inc/CRC32.hxx | 2 +- package/inc/PackageConstants.hxx | 1 + package/inc/ThreadedDeflater.hxx | 2 -- package/inc/ZipFile.hxx | 6 ----- package/inc/ZipPackage.hxx | 3 --- package/inc/ZipPackageEntry.hxx | 1 - package/inc/ZipPackageStream.hxx | 1 - package/inc/zipfileaccess.hxx | 4 ---- package/source/manifest/ManifestDefines.hxx | 2 +- package/source/manifest/ManifestExport.cxx | 3 --- package/source/manifest/ManifestExport.hxx | 1 - package/source/manifest/ManifestImport.cxx | 2 +- package/source/manifest/ManifestImport.hxx | 3 +-- package/source/manifest/ManifestReader.cxx | 4 ---- package/source/manifest/ManifestReader.hxx | 1 - package/source/manifest/ManifestWriter.cxx | 5 ---- package/source/manifest/ManifestWriter.hxx | 1 - package/source/xstor/ocompinstream.cxx | 1 - package/source/xstor/ocompinstream.hxx | 2 -- package/source/xstor/owriteablestream.cxx | 3 +-- package/source/xstor/owriteablestream.hxx | 3 --- .../source/xstor/selfterminatefilestream.hxx | 1 + .../source/xstor/switchpersistencestream.hxx | 5 +--- package/source/xstor/xfactory.cxx | 2 -- package/source/xstor/xfactory.hxx | 1 + package/source/xstor/xstorage.cxx | 3 +-- package/source/xstor/xstorage.hxx | 5 ---- package/source/zipapi/ByteChucker.cxx | 2 -- package/source/zipapi/ByteGrabber.cxx | 2 ++ package/source/zipapi/MemoryByteGrabber.hxx | 4 +--- .../source/zipapi/XBufferedThreadedStream.cxx | 3 --- .../source/zipapi/XBufferedThreadedStream.hxx | 7 ++++-- package/source/zipapi/XUnbufferedStream.cxx | 2 -- package/source/zipapi/XUnbufferedStream.hxx | 2 -- package/source/zipapi/ZipFile.cxx | 13 +++++----- package/source/zipapi/ZipOutputEntry.cxx | 3 --- package/source/zipapi/ZipOutputStream.cxx | 3 +-- package/source/zippackage/ZipPackage.cxx | 12 ++-------- package/source/zippackage/ZipPackageEntry.cxx | 1 - .../source/zippackage/ZipPackageFolder.cxx | 8 ++----- .../source/zippackage/ZipPackageStream.cxx | 10 ++++---- package/source/zippackage/zipfileaccess.cxx | 2 +- pyuno/IwyuFilter_pyuno.yaml | 2 ++ .../unourl_resolver/unourl_resolver.cxx | 2 -- reportdesign/inc/helpids.h | 2 ++ reportdesign/inc/stringarray.hrc | 2 ++ .../source/core/api/ReportDefinition.cxx | 1 - .../source/core/api/ReportEngineJFree.cxx | 1 - reportdesign/source/core/api/Shape.cxx | 2 +- .../source/core/sdr/ReportDrawPage.cxx | 2 -- reportdesign/source/core/sdr/RptPage.cxx | 1 - reportdesign/source/filter/xml/xmlColumn.cxx | 1 - .../source/filter/xml/xmlComponent.cxx | 1 - .../source/filter/xml/xmlCondPrtExpr.cxx | 1 - .../source/filter/xml/xmlControlProperty.cxx | 1 - .../filter/xml/xmlExportDocumentHandler.cxx | 1 - .../source/filter/xml/xmlFormatCondition.cxx | 1 - .../source/filter/xml/xmlFormattedField.cxx | 1 - .../source/filter/xml/xmlFunction.cxx | 1 - reportdesign/source/filter/xml/xmlGroup.cxx | 1 - reportdesign/source/filter/xml/xmlHelper.cxx | 1 - .../source/filter/xml/xmlMasterFields.cxx | 1 - .../source/filter/xml/xmlReportElement.cxx | 1 - .../filter/xml/xmlReportElementBase.cxx | 3 +-- reportdesign/source/filter/xml/xmlSection.cxx | 2 -- reportdesign/source/filter/xml/xmlTable.cxx | 1 - .../source/ui/misc/FunctionHelper.cxx | 1 - reportdesign/source/ui/misc/RptUndo.cxx | 1 - .../source/ui/report/ReportSection.cxx | 2 +- reportdesign/source/ui/report/StartMarker.cxx | 1 - reportdesign/source/ui/report/ViewsWindow.cxx | 1 - reportdesign/source/ui/report/dlgedfac.cxx | 1 - 108 files changed, 83 insertions(+), 196 deletions(-) create mode 100644 o3tl/IwyuFilter_o3tl.yaml create mode 100644 package/IwyuFilter_package.yaml diff --git a/o3tl/IwyuFilter_o3tl.yaml b/o3tl/IwyuFilter_o3tl.yaml new file mode 100644 index 000000000000..15a5a2a0d26c --- /dev/null +++ b/o3tl/IwyuFilter_o3tl.yaml @@ -0,0 +1,2 @@ +--- +assumeFilename: o3tl/qa/test-cow_wrapper.cxx diff --git a/o3tl/qa/cow_wrapper_clients.hxx b/o3tl/qa/cow_wrapper_clients.hxx index 36d77553b178..d0e416c96318 100644 --- a/o3tl/qa/cow_wrapper_clients.hxx +++ b/o3tl/qa/cow_wrapper_clients.hxx @@ -21,8 +21,8 @@ #define INCLUDED_O3TL_QA_COW_WRAPPER_CLIENTS_HXX #include -#include #include +#include /* Definition of Cow_Wrapper_Clients classes */ diff --git a/o3tl/qa/test-enumarray.cxx b/o3tl/qa/test-enumarray.cxx index 9da8dae18f0b..f54a92394195 100644 --- a/o3tl/qa/test-enumarray.cxx +++ b/o3tl/qa/test-enumarray.cxx @@ -9,8 +9,6 @@ #include -#include - #include #include #include diff --git a/o3tl/qa/test-lru_map.cxx b/o3tl/qa/test-lru_map.cxx index aac8a3e25283..e749e7bd85ec 100644 --- a/o3tl/qa/test-lru_map.cxx +++ b/o3tl/qa/test-lru_map.cxx @@ -8,7 +8,6 @@ * */ -#include #include #include #include diff --git a/o3tl/qa/test-string_view.cxx b/o3tl/qa/test-string_view.cxx index 80f757529eee..b400c9605962 100644 --- a/o3tl/qa/test-string_view.cxx +++ b/o3tl/qa/test-string_view.cxx @@ -7,10 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include #include -#include #include #include diff --git a/o3tl/qa/test-vector_pool.cxx b/o3tl/qa/test-vector_pool.cxx index 78975e4d5dc0..6e739ebcd18f 100644 --- a/o3tl/qa/test-vector_pool.cxx +++ b/o3tl/qa/test-vector_pool.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include #include #include #include diff --git a/oox/IwyuFilter_oox.yaml b/oox/IwyuFilter_oox.yaml index d652ce192592..73ee5e144247 100644 --- a/oox/IwyuFilter_oox.yaml +++ b/oox/IwyuFilter_oox.yaml @@ -7,6 +7,9 @@ excludelist: oox/source/core/filterbase.cxx: # Actually used - comphelper/scopeguard.hxx + oox/source/core/contexthandler2.cxx: + # Needed for template + - com/sun/star/frame/XModel.hpp oox/source/core/fragmenthandler2.cxx: # Needed for template - com/sun/star/frame/XModel.hpp @@ -76,6 +79,12 @@ excludelist: oox/source/drawingml/diagram/diagram.cxx: # Actually used - com/sun/star/xml/dom/XDocument.hpp + oox/source/export/drawingml.cxx: + # Needed for template + - com/sun/star/text/XTextFrame.hpp + oox/source/export/vmlexport.cxx: + # Needed for template + - com/sun/star/text/XTextFrame.hpp oox/source/helper/binarystreambase.cxx: # Actually used - com/sun/star/io/XSeekable.hpp diff --git a/oox/inc/drawingml/chart/datasourcecontext.hxx b/oox/inc/drawingml/chart/datasourcecontext.hxx index ec64c4768180..7edb029eb336 100644 --- a/oox/inc/drawingml/chart/datasourcecontext.hxx +++ b/oox/inc/drawingml/chart/datasourcecontext.hxx @@ -22,7 +22,6 @@ #include #include -#include class SvNumberFormatter; diff --git a/oox/inc/drawingml/textliststyle.hxx b/oox/inc/drawingml/textliststyle.hxx index 5f986ff45afa..464e48756165 100644 --- a/oox/inc/drawingml/textliststyle.hxx +++ b/oox/inc/drawingml/textliststyle.hxx @@ -22,7 +22,6 @@ #include #include -#include namespace oox::drawingml { diff --git a/oox/source/core/fragmenthandler2.cxx b/oox/source/core/fragmenthandler2.cxx index 3ee410fad854..e4eeef076f41 100644 --- a/oox/source/core/fragmenthandler2.cxx +++ b/oox/source/core/fragmenthandler2.cxx @@ -24,7 +24,6 @@ #include #include #include -#include namespace oox::core { diff --git a/oox/source/docprop/ooxmldocpropimport.cxx b/oox/source/docprop/ooxmldocpropimport.cxx index 30c058e209a4..f58476c5688f 100644 --- a/oox/source/docprop/ooxmldocpropimport.cxx +++ b/oox/source/docprop/ooxmldocpropimport.cxx @@ -29,7 +29,6 @@ #include #include #include -#include #include "docprophandler.hxx" #include diff --git a/oox/source/drawingml/chart/seriesconverter.cxx b/oox/source/drawingml/chart/seriesconverter.cxx index d4fa267da536..72253723f91c 100644 --- a/oox/source/drawingml/chart/seriesconverter.cxx +++ b/oox/source/drawingml/chart/seriesconverter.cxx @@ -45,7 +45,6 @@ #include #include #include -#include #include #include #include diff --git a/oox/source/drawingml/chart/titleconverter.cxx b/oox/source/drawingml/chart/titleconverter.cxx index 0faf8aa5f79e..113c7fea7a9e 100644 --- a/oox/source/drawingml/chart/titleconverter.cxx +++ b/oox/source/drawingml/chart/titleconverter.cxx @@ -36,7 +36,6 @@ #include #include #include -#include #include #include #include diff --git a/oox/source/drawingml/chart/typegroupconverter.cxx b/oox/source/drawingml/chart/typegroupconverter.cxx index 36c035efcc60..e8d8bb47bc33 100644 --- a/oox/source/drawingml/chart/typegroupconverter.cxx +++ b/oox/source/drawingml/chart/typegroupconverter.cxx @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include diff --git a/oox/source/drawingml/drawingmltypes.cxx b/oox/source/drawingml/drawingmltypes.cxx index 3a94a449f317..6ce901ab1ef9 100644 --- a/oox/source/drawingml/drawingmltypes.cxx +++ b/oox/source/drawingml/drawingmltypes.cxx @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include diff --git a/oox/source/drawingml/lineproperties.cxx b/oox/source/drawingml/lineproperties.cxx index dedde505e61a..2d10e82871ab 100644 --- a/oox/source/drawingml/lineproperties.cxx +++ b/oox/source/drawingml/lineproperties.cxx @@ -31,7 +31,6 @@ #include #include #include -#include #include #include diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 3fbdc37933c8..f7161e01291f 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -59,8 +59,8 @@ #include #include #include -#include #include +#include #include #include #include @@ -75,6 +75,7 @@ #include #include #include +#include #include #include #include @@ -87,10 +88,10 @@ #include #include #include -#include #include #include #include +#include #include #include #include @@ -100,8 +101,6 @@ #include #include #include -#include -#include #include using namespace ::oox::core; diff --git a/oox/source/drawingml/table/tableproperties.cxx b/oox/source/drawingml/table/tableproperties.cxx index 1622b8fc22ca..07f670df1976 100644 --- a/oox/source/drawingml/table/tableproperties.cxx +++ b/oox/source/drawingml/table/tableproperties.cxx @@ -19,8 +19,6 @@ #include #include -#include -#include #include #include #include diff --git a/oox/source/drawingml/textcharacterpropertiescontext.cxx b/oox/source/drawingml/textcharacterpropertiescontext.cxx index 31ad3bee7c9f..5ec22d45e2a4 100644 --- a/oox/source/drawingml/textcharacterpropertiescontext.cxx +++ b/oox/source/drawingml/textcharacterpropertiescontext.cxx @@ -29,7 +29,6 @@ #include #include #include -#include #include diff --git a/oox/source/drawingml/textparagraphpropertiescontext.cxx b/oox/source/drawingml/textparagraphpropertiescontext.cxx index e7e77da8564f..20810ce1b5c8 100644 --- a/oox/source/drawingml/textparagraphpropertiescontext.cxx +++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx @@ -26,7 +26,6 @@ #include #include -#include #include #include #include @@ -41,7 +40,6 @@ #include #include #include -#include using namespace ::oox::core; using namespace ::com::sun::star::uno; diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index 491211bd1999..8dd99152aadf 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -98,7 +98,6 @@ #include "ColorPropertySet.hxx" #include -#include #include #include #include diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index 55cea6049c83..cdc026375d10 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -107,7 +107,6 @@ #include #include #include -#include #include #include #include @@ -124,7 +123,6 @@ #include #include #include -#include #include #include #include diff --git a/oox/source/export/shapes.cxx b/oox/source/export/shapes.cxx index 54c6a58299e9..2617e3c76d1b 100644 --- a/oox/source/export/shapes.cxx +++ b/oox/source/export/shapes.cxx @@ -62,7 +62,6 @@ #include #include #include -#include #include #include #include @@ -76,7 +75,6 @@ #include #include #include -#include #include #include #include diff --git a/oox/source/helper/binarystreambase.cxx b/oox/source/helper/binarystreambase.cxx index a75832fa475f..1e3ef11ae9ea 100644 --- a/oox/source/helper/binarystreambase.cxx +++ b/oox/source/helper/binarystreambase.cxx @@ -21,7 +21,6 @@ #include #include -#include #include namespace oox { diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx index 8ff8c7939f4f..f327d7eba943 100644 --- a/oox/source/helper/graphichelper.cxx +++ b/oox/source/helper/graphichelper.cxx @@ -21,12 +21,8 @@ #include #include -#include -#include #include -#include #include -#include #include #include #include @@ -37,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx index b703f615d0cf..49aa9cae139f 100644 --- a/oox/source/ppt/pptshape.cxx +++ b/oox/source/ppt/pptshape.cxx @@ -22,7 +22,6 @@ #include #include #include -#include #include #include diff --git a/oox/source/ppt/presPropsfragmenthandler.cxx b/oox/source/ppt/presPropsfragmenthandler.cxx index 708f194853fb..4792d07c0d80 100644 --- a/oox/source/ppt/presPropsfragmenthandler.cxx +++ b/oox/source/ppt/presPropsfragmenthandler.cxx @@ -12,7 +12,6 @@ #include #include #include -#include #include #include diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx index a5c756e62b59..3ec5100583c1 100644 --- a/oox/source/ppt/slidetransition.cxx +++ b/oox/source/ppt/slidetransition.cxx @@ -23,7 +23,6 @@ #include #include -#include #include #include #include diff --git a/oox/source/shape/ShapeContextHandler.cxx b/oox/source/shape/ShapeContextHandler.cxx index 3454c0e03f87..6eb9e5ce9083 100644 --- a/oox/source/shape/ShapeContextHandler.cxx +++ b/oox/source/shape/ShapeContextHandler.cxx @@ -35,9 +35,7 @@ #include #include #include -#include #include -#include using namespace ::com::sun::star; diff --git a/oox/source/vml/vmlformatting.cxx b/oox/source/vml/vmlformatting.cxx index c7ff6796db21..5474f782aa64 100644 --- a/oox/source/vml/vmlformatting.cxx +++ b/oox/source/vml/vmlformatting.cxx @@ -20,7 +20,6 @@ #include #include -#include #include diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index 38b632be843b..f87cb12a6899 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -63,14 +63,12 @@ #include #include #include -#include #include #include #include #include #include #include -#include using ::com::sun::star::beans::XPropertySet; using ::com::sun::star::uno::Any; diff --git a/opencl/inc/opencl_device.hxx b/opencl/inc/opencl_device.hxx index 036a06fb2736..e5bd62b7e3d9 100644 --- a/opencl/inc/opencl_device.hxx +++ b/opencl/inc/opencl_device.hxx @@ -14,8 +14,6 @@ #include -#include - namespace openclwrapper { struct GPUEnv; diff --git a/opencl/source/openclconfig.cxx b/opencl/source/openclconfig.cxx index 9c4452c153d3..525ef84ced6f 100644 --- a/opencl/source/openclconfig.cxx +++ b/opencl/source/openclconfig.cxx @@ -9,8 +9,6 @@ #include -#include - #include #include diff --git a/package/IwyuFilter_package.yaml b/package/IwyuFilter_package.yaml new file mode 100644 index 000000000000..cd456c41cd1d --- /dev/null +++ b/package/IwyuFilter_package.yaml @@ -0,0 +1,24 @@ +--- +assumeFilename: package/source/zippackage/ZipPackage.cxx +excludelist: + package/source/manifest/ManifestExport.cxx: + # Actually used + - com/sun/star/beans/PropertyValue.hpp + package/source/manifest/ManifestImport.cxx: + # Actually used + - com/sun/star/xml/sax/XAttributeList.hpp + package/source/xstor/owriteablestream.cxx: + # Actually used + - com/sun/star/uno/XComponentContext.hpp + package/source/zippackage/ZipPackage.cxx: + # Actually used + - com/sun/star/beans/PropertyValue.hpp + package/source/zippackage/ZipPackageFolder.cxx: + # Actually used + - com/sun/star/beans/PropertyValue.hpp + package/source/zippackage/ZipPackageStream.cxx: + # Actually used + - com/sun/star/beans/PropertyValue.hpp + package/source/xstor/xstorage.cxx: + # Actually used + - com/sun/star/beans/PropertyValue.hpp diff --git a/package/inc/ByteChucker.hxx b/package/inc/ByteChucker.hxx index 156b41f6001a..707b678ff2a5 100644 --- a/package/inc/ByteChucker.hxx +++ b/package/inc/ByteChucker.hxx @@ -21,11 +21,6 @@ #include #include -#include -#include -#include -#include -#include namespace com::sun::star { namespace io { class XSeekable; class XOutputStream; } diff --git a/package/inc/ByteGrabber.hxx b/package/inc/ByteGrabber.hxx index 2ccacc1705f1..ba1512cf5162 100644 --- a/package/inc/ByteGrabber.hxx +++ b/package/inc/ByteGrabber.hxx @@ -21,11 +21,6 @@ #include #include -#include -#include -#include -#include -#include #include diff --git a/package/inc/CRC32.hxx b/package/inc/CRC32.hxx index 2539d8e8c44e..72243d0d8342 100644 --- a/package/inc/CRC32.hxx +++ b/package/inc/CRC32.hxx @@ -20,7 +20,7 @@ #define INCLUDED_PACKAGE_INC_CRC32_HXX #include -#include +#include namespace com::sun::star { namespace io { class XInputStream; } diff --git a/package/inc/PackageConstants.hxx b/package/inc/PackageConstants.hxx index 82aa94fc180c..2e9f1527b0f7 100644 --- a/package/inc/PackageConstants.hxx +++ b/package/inc/PackageConstants.hxx @@ -20,6 +20,7 @@ #define INCLUDED_PACKAGE_INC_PACKAGECONSTANTS_HXX #include +#include const sal_Int32 n_ConstBufferSize = 32768; diff --git a/package/inc/ThreadedDeflater.hxx b/package/inc/ThreadedDeflater.hxx index f22a40a0c941..361129d0f927 100644 --- a/package/inc/ThreadedDeflater.hxx +++ b/package/inc/ThreadedDeflater.hxx @@ -23,9 +23,7 @@ #include #include #include -#include #include -#include #include #include #include diff --git a/package/inc/ZipFile.hxx b/package/inc/ZipFile.hxx index abfb6674ae18..15b800430555 100644 --- a/package/inc/ZipFile.hxx +++ b/package/inc/ZipFile.hxx @@ -19,10 +19,6 @@ #ifndef INCLUDED_PACKAGE_INC_ZIPFILE_HXX #define INCLUDED_PACKAGE_INC_ZIPFILE_HXX -#include -#include -#include -#include #include #include @@ -33,8 +29,6 @@ #include "HashMaps.hxx" #include "EncryptionData.hxx" -#include - namespace com::sun::star { namespace uno { class XComponentContext; } namespace ucb { class XProgressHandler; } diff --git a/package/inc/ZipPackage.hxx b/package/inc/ZipPackage.hxx index 77d0130f0b9b..729d025e089d 100644 --- a/package/inc/ZipPackage.hxx +++ b/package/inc/ZipPackage.hxx @@ -30,15 +30,12 @@ #include #include #include -#include #include #include #include "HashMaps.hxx" #include "ZipFile.hxx" -#include #include -#include #include class ZipOutputStream; diff --git a/package/inc/ZipPackageEntry.hxx b/package/inc/ZipPackageEntry.hxx index 0fa479cb8465..2617e6275628 100644 --- a/package/inc/ZipPackageEntry.hxx +++ b/package/inc/ZipPackageEntry.hxx @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include "ZipEntry.hxx" diff --git a/package/inc/ZipPackageStream.hxx b/package/inc/ZipPackageStream.hxx index f4f6d438c8d9..20ee2cab7275 100644 --- a/package/inc/ZipPackageStream.hxx +++ b/package/inc/ZipPackageStream.hxx @@ -20,7 +20,6 @@ #define INCLUDED_PACKAGE_INC_ZIPPACKAGESTREAM_HXX #include -#include #include #include #include diff --git a/package/inc/zipfileaccess.hxx b/package/inc/zipfileaccess.hxx index ae795665b0bd..5d85a846cfcd 100644 --- a/package/inc/zipfileaccess.hxx +++ b/package/inc/zipfileaccess.hxx @@ -21,19 +21,15 @@ #define INCLUDED_PACKAGE_INC_ZIPFILEACCESS_HXX #include -#include #include #include -#include #include -#include #include #include #include #include "ZipFile.hxx" -#include "HashMaps.hxx" #include #include diff --git a/package/source/manifest/ManifestDefines.hxx b/package/source/manifest/ManifestDefines.hxx index ecb789eadff0..b5006f2d1c08 100644 --- a/package/source/manifest/ManifestDefines.hxx +++ b/package/source/manifest/ManifestDefines.hxx @@ -18,7 +18,7 @@ */ #pragma once -#include +#include inline constexpr OUStringLiteral MANIFEST_NSPREFIX = u"manifest:"; inline constexpr OUStringLiteral ELEMENT_MANIFEST = u"manifest:manifest"; diff --git a/package/source/manifest/ManifestExport.cxx b/package/source/manifest/ManifestExport.cxx index b603200f061a..7e7f22a3adfd 100644 --- a/package/source/manifest/ManifestExport.cxx +++ b/package/source/manifest/ManifestExport.cxx @@ -18,8 +18,6 @@ */ #include -#include -#include #include #include #include @@ -28,7 +26,6 @@ #include "ManifestDefines.hxx" #include "ManifestExport.hxx" -#include #include #include diff --git a/package/source/manifest/ManifestExport.hxx b/package/source/manifest/ManifestExport.hxx index f7fbff66bd2b..0148ea62c8ab 100644 --- a/package/source/manifest/ManifestExport.hxx +++ b/package/source/manifest/ManifestExport.hxx @@ -22,7 +22,6 @@ #include #include -#include namespace com::sun::star { namespace beans { struct PropertyValue;} diff --git a/package/source/manifest/ManifestImport.cxx b/package/source/manifest/ManifestImport.cxx index 7fbb3cff512f..d2b3177e34cf 100644 --- a/package/source/manifest/ManifestImport.cxx +++ b/package/source/manifest/ManifestImport.cxx @@ -19,7 +19,7 @@ #include "ManifestImport.hxx" #include "ManifestDefines.hxx" -#include +#include #include #include #include diff --git a/package/source/manifest/ManifestImport.hxx b/package/source/manifest/ManifestImport.hxx index 1a2b4de11a6d..0240146395a8 100644 --- a/package/source/manifest/ManifestImport.hxx +++ b/package/source/manifest/ManifestImport.hxx @@ -23,11 +23,10 @@ #include #include #include +#include #include #include -#include - namespace com::sun::star { namespace xml::sax { class XAttributeList; } namespace beans { struct PropertyValue; } diff --git a/package/source/manifest/ManifestReader.cxx b/package/source/manifest/ManifestReader.cxx index dcb296d7e6f0..6464681f2aa3 100644 --- a/package/source/manifest/ManifestReader.cxx +++ b/package/source/manifest/ManifestReader.cxx @@ -19,9 +19,7 @@ #include "ManifestReader.hxx" #include "ManifestImport.hxx" -#include #include -#include #include #include #include @@ -29,8 +27,6 @@ #include #include #include -#include -#include #include using namespace ::std; diff --git a/package/source/manifest/ManifestReader.hxx b/package/source/manifest/ManifestReader.hxx index d9546cd30ddf..f85644162d05 100644 --- a/package/source/manifest/ManifestReader.hxx +++ b/package/source/manifest/ManifestReader.hxx @@ -22,7 +22,6 @@ #include #include -#include #include namespace com::sun::star { diff --git a/package/source/manifest/ManifestWriter.cxx b/package/source/manifest/ManifestWriter.cxx index 08c12510afee..5515cc26df07 100644 --- a/package/source/manifest/ManifestWriter.cxx +++ b/package/source/manifest/ManifestWriter.cxx @@ -20,17 +20,12 @@ #include "ManifestWriter.hxx" #include "ManifestExport.hxx" #include -#include #include #include -#include #include #include -#include -#include #include -#include #include using namespace ::com::sun::star; diff --git a/package/source/manifest/ManifestWriter.hxx b/package/source/manifest/ManifestWriter.hxx index 1378ebf8edd7..ca08bb0e4078 100644 --- a/package/source/manifest/ManifestWriter.hxx +++ b/package/source/manifest/ManifestWriter.hxx @@ -22,7 +22,6 @@ #include #include -#include #include namespace com::sun::star { diff --git a/package/source/xstor/ocompinstream.cxx b/package/source/xstor/ocompinstream.cxx index 7f59275f491d..14bfd3cab354 100644 --- a/package/source/xstor/ocompinstream.cxx +++ b/package/source/xstor/ocompinstream.cxx @@ -27,7 +27,6 @@ #include #include "owriteablestream.hxx" -#include "xstorage.hxx" using namespace ::com::sun::star; diff --git a/package/source/xstor/ocompinstream.hxx b/package/source/xstor/ocompinstream.hxx index 438f38631108..4001cf1187a1 100644 --- a/package/source/xstor/ocompinstream.hxx +++ b/package/source/xstor/ocompinstream.hxx @@ -21,8 +21,6 @@ #define INCLUDED_PACKAGE_SOURCE_XSTOR_OCOMPINSTREAM_HXX #include -#include -#include #include #include #include diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx index 720632c87d60..7c80a6e86152 100644 --- a/package/source/xstor/owriteablestream.cxx +++ b/package/source/xstor/owriteablestream.cxx @@ -21,10 +21,10 @@ #include #include +#include #include #include #include -#include #include #include #include @@ -49,7 +49,6 @@ #include #include -#include #include #include diff --git a/package/source/xstor/owriteablestream.hxx b/package/source/xstor/owriteablestream.hxx index f902bebd6749..5e87aa3e3047 100644 --- a/package/source/xstor/owriteablestream.hxx +++ b/package/source/xstor/owriteablestream.hxx @@ -26,10 +26,8 @@ #include #include #include -#include #include #include -#include #include #include #include @@ -40,7 +38,6 @@ #include #include -#include #include #include diff --git a/package/source/xstor/selfterminatefilestream.hxx b/package/source/xstor/selfterminatefilestream.hxx index 4aecd337d9eb..14bf3a049958 100644 --- a/package/source/xstor/selfterminatefilestream.hxx +++ b/package/source/xstor/selfterminatefilestream.hxx @@ -23,6 +23,7 @@ #include #include #include +#include #include struct OWriteStream_Impl; diff --git a/package/source/xstor/switchpersistencestream.hxx b/package/source/xstor/switchpersistencestream.hxx index 76562d09d52e..f1e9ddceea96 100644 --- a/package/source/xstor/switchpersistencestream.hxx +++ b/package/source/xstor/switchpersistencestream.hxx @@ -21,15 +21,12 @@ #include #include +#include #include #include #include #include #include -#include -#include -#include -#include #include #include #include diff --git a/package/source/xstor/xfactory.cxx b/package/source/xstor/xfactory.cxx index 575715dab15b..38c8d4df29df 100644 --- a/package/source/xstor/xfactory.cxx +++ b/package/source/xstor/xfactory.cxx @@ -20,7 +20,6 @@ #include #include -#include #include #include #include @@ -29,7 +28,6 @@ #include #include -#include #include #include #include diff --git a/package/source/xstor/xfactory.hxx b/package/source/xstor/xfactory.hxx index 96033464b874..366911849217 100644 --- a/package/source/xstor/xfactory.hxx +++ b/package/source/xstor/xfactory.hxx @@ -22,6 +22,7 @@ #include #include +#include #include #include diff --git a/package/source/xstor/xstorage.cxx b/package/source/xstor/xstorage.cxx index de84e2372bd3..ba942c867379 100644 --- a/package/source/xstor/xstorage.cxx +++ b/package/source/xstor/xstorage.cxx @@ -30,16 +30,15 @@ #include #include #include +#include #include #include -#include #include #include #include #include #include #include -#include #include #include diff --git a/package/source/xstor/xstorage.hxx b/package/source/xstor/xstorage.hxx index 92cfc62c14eb..50e0fb78a7e3 100644 --- a/package/source/xstor/xstorage.hxx +++ b/package/source/xstor/xstorage.hxx @@ -27,13 +27,10 @@ #include #include #include -#include #include #include #include -#include #include -#include #include #include #include @@ -41,11 +38,9 @@ #include #include #include -#include #include #include -#include #include #include #include diff --git a/package/source/zipapi/ByteChucker.cxx b/package/source/zipapi/ByteChucker.cxx index af534e58e22e..6c5994aa6a2f 100644 --- a/package/source/zipapi/ByteChucker.cxx +++ b/package/source/zipapi/ByteChucker.cxx @@ -18,13 +18,11 @@ */ #include -#include #include #include using namespace ::com::sun::star::io; using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::lang; ByteChucker::ByteChucker(Reference const & xOstream) : xStream(xOstream) diff --git a/package/source/zipapi/ByteGrabber.cxx b/package/source/zipapi/ByteGrabber.cxx index 89ce1af5634b..b58a7087f468 100644 --- a/package/source/zipapi/ByteGrabber.cxx +++ b/package/source/zipapi/ByteGrabber.cxx @@ -19,8 +19,10 @@ #include #include +#include #include #include +#include using namespace ::com::sun::star; diff --git a/package/source/zipapi/MemoryByteGrabber.hxx b/package/source/zipapi/MemoryByteGrabber.hxx index 9f52204ead67..8dcf7f067064 100644 --- a/package/source/zipapi/MemoryByteGrabber.hxx +++ b/package/source/zipapi/MemoryByteGrabber.hxx @@ -19,9 +19,7 @@ #ifndef INCLUDED_PACKAGE_SOURCE_ZIPAPI_MEMORYBYTEGRABBER_HXX #define INCLUDED_PACKAGE_SOURCE_ZIPAPI_MEMORYBYTEGRABBER_HXX -#include -#include -#include +#include class MemoryByteGrabber final { diff --git a/package/source/zipapi/XBufferedThreadedStream.cxx b/package/source/zipapi/XBufferedThreadedStream.cxx index e2f963bf88c1..d3bf995d9073 100644 --- a/package/source/zipapi/XBufferedThreadedStream.cxx +++ b/package/source/zipapi/XBufferedThreadedStream.cxx @@ -8,9 +8,6 @@ */ #include "XBufferedThreadedStream.hxx" -#include -#include -#include using namespace css::uno; diff --git a/package/source/zipapi/XBufferedThreadedStream.hxx b/package/source/zipapi/XBufferedThreadedStream.hxx index 272414c37504..ad5d3b0ce116 100644 --- a/package/source/zipapi/XBufferedThreadedStream.hxx +++ b/package/source/zipapi/XBufferedThreadedStream.hxx @@ -10,10 +10,13 @@ #ifndef INCLUDED_PACKAGE_SOURCE_ZIPAPI_XBUFFEREDTHREADEDSTREAM_HXX #define INCLUDED_PACKAGE_SOURCE_ZIPAPI_XBUFFEREDTHREADEDSTREAM_HXX +#include + +#include +#include #include -#include "XUnbufferedStream.hxx" + #include -#include #include #include diff --git a/package/source/zipapi/XUnbufferedStream.cxx b/package/source/zipapi/XUnbufferedStream.cxx index 6fe09c1162c1..56f864a2df05 100644 --- a/package/source/zipapi/XUnbufferedStream.cxx +++ b/package/source/zipapi/XUnbufferedStream.cxx @@ -23,7 +23,6 @@ #include "XUnbufferedStream.hxx" #include -#include #include #include #include @@ -31,7 +30,6 @@ #include #include -#include #include using namespace ::com::sun::star; diff --git a/package/source/zipapi/XUnbufferedStream.hxx b/package/source/zipapi/XUnbufferedStream.hxx index 9cb97b1c35c5..277f356ee18c 100644 --- a/package/source/zipapi/XUnbufferedStream.hxx +++ b/package/source/zipapi/XUnbufferedStream.hxx @@ -19,10 +19,8 @@ #ifndef INCLUDED_PACKAGE_SOURCE_ZIPAPI_XUNBUFFEREDSTREAM_HXX #define INCLUDED_PACKAGE_SOURCE_ZIPAPI_XUNBUFFEREDSTREAM_HXX -#include #include #include -#include #include #include diff --git a/package/source/zipapi/ZipFile.cxx b/package/source/zipapi/ZipFile.cxx index 3e9d24858df1..dba57c1f200c 100644 --- a/package/source/zipapi/ZipFile.cxx +++ b/package/source/zipapi/ZipFile.cxx @@ -17,13 +17,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include -#include +#include +#include +#include +#include +#include #include +#include +#include #include #include -#include -#include #include #include #include @@ -36,7 +39,6 @@ #include #include -#include #include #include "blowfishcontext.hxx" @@ -55,7 +57,6 @@ using namespace com::sun::star; using namespace com::sun::star::io; using namespace com::sun::star::uno; -using namespace com::sun::star::ucb; using namespace com::sun::star::lang; using namespace com::sun::star::packages; using namespace com::sun::star::packages::zip; diff --git a/package/source/zipapi/ZipOutputEntry.cxx b/package/source/zipapi/ZipOutputEntry.cxx index 734840865a14..897ea6212430 100644 --- a/package/source/zipapi/ZipOutputEntry.cxx +++ b/package/source/zipapi/ZipOutputEntry.cxx @@ -21,8 +21,6 @@ #include #include -#include -#include #include @@ -30,7 +28,6 @@ #include #include #include -#include #include #include diff --git a/package/source/zipapi/ZipOutputStream.cxx b/package/source/zipapi/ZipOutputStream.cxx index 6bf3bd33f49e..a4d67fcfd54a 100644 --- a/package/source/zipapi/ZipOutputStream.cxx +++ b/package/source/zipapi/ZipOutputStream.cxx @@ -20,10 +20,9 @@ #include #include +#include #include -#include #include -#include #include #include diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index 81b8ee9f89a5..e00c47d10a5f 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -29,6 +29,8 @@ #include #include #include +#include +#include #include #include #include @@ -37,28 +39,22 @@ #include #include #include -#include #include #include -#include #include #include -#include #include #include #include #include #include #include -#include #include #include -#include #include #include #include #include -#include #include #include #include @@ -66,12 +62,8 @@ #include #include -#include -#include #include -#include -#include #include #include #include diff --git a/package/source/zippackage/ZipPackageEntry.cxx b/package/source/zippackage/ZipPackageEntry.cxx index 385981b5c901..df18f0874f25 100644 --- a/package/source/zippackage/ZipPackageEntry.cxx +++ b/package/source/zippackage/ZipPackageEntry.cxx @@ -24,7 +24,6 @@ #include #include -#include #include #include diff --git a/package/source/zippackage/ZipPackageFolder.cxx b/package/source/zippackage/ZipPackageFolder.cxx index 5690fd2fb530..b65c9c697788 100644 --- a/package/source/zippackage/ZipPackageFolder.cxx +++ b/package/source/zippackage/ZipPackageFolder.cxx @@ -17,24 +17,20 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include - #include -#include #include #include #include #include "ZipPackageFolderEnumeration.hxx" +#include #include +#include #include #include #include #include -#include #include -#include #include -#include using namespace com::sun::star; using namespace com::sun::star::packages::zip::ZipConstants; diff --git a/package/source/zippackage/ZipPackageStream.cxx b/package/source/zippackage/ZipPackageStream.cxx index 58f55768066a..b8157839bbba 100644 --- a/package/source/zippackage/ZipPackageStream.cxx +++ b/package/source/zippackage/ZipPackageStream.cxx @@ -20,10 +20,14 @@ #include #include +#include #include #include #include #include +#include +#include +#include #include #include #include @@ -32,14 +36,10 @@ #include #include -#include - #include -#include #include #include #include -#include #include #include #include @@ -48,7 +48,6 @@ #include #include #include -#include #include #include @@ -58,7 +57,6 @@ #include #include -#include using namespace com::sun::star::packages::zip::ZipConstants; using namespace com::sun::star::packages::zip; diff --git a/package/source/zippackage/zipfileaccess.cxx b/package/source/zippackage/zipfileaccess.cxx index 85a674ef6e50..318943b02a42 100644 --- a/package/source/zippackage/zipfileaccess.cxx +++ b/package/source/zippackage/zipfileaccess.cxx @@ -20,6 +20,7 @@ #include #include #include +#include #include #include #include @@ -28,7 +29,6 @@ #include #include #include -#include #include "ZipPackageSink.hxx" #include diff --git a/pyuno/IwyuFilter_pyuno.yaml b/pyuno/IwyuFilter_pyuno.yaml index c39a7992cc0a..6e3a5df38bbe 100644 --- a/pyuno/IwyuFilter_pyuno.yaml +++ b/pyuno/IwyuFilter_pyuno.yaml @@ -18,6 +18,8 @@ excludelist: - osl/file.hxx # Needed for direct member access - com/sun/star/uno/XComponentContext.hpp + # Needed on WIN32 + - o3tl/char16_t2wchar_t.hxx pyuno/source/module/pyuno_module.cxx: # Needed on MACOSX - config_folders.h diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx index 9aa8293fa67b..6dc273ab365e 100644 --- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx +++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include @@ -35,7 +34,6 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::connection; using namespace com::sun::star::bridge; -using namespace com::sun::star::registry; namespace unourl_resolver { diff --git a/reportdesign/inc/helpids.h b/reportdesign/inc/helpids.h index 5a02dbeea0ab..219d967228c0 100644 --- a/reportdesign/inc/helpids.h +++ b/reportdesign/inc/helpids.h @@ -18,6 +18,8 @@ */ #pragma once +#include + inline constexpr OUStringLiteral UID_RPT_PROP_FORMULA = u"REPORTDESIGN_UID_RPT_PROP_FORMULA"; inline constexpr OUStringLiteral UID_RPT_RPT_PROP_DLG_FONT_TYPE = u"REPORTDESIGN_UID_RPT_RPT_PROP_DLG_FONT_TYPE"; inline constexpr OUStringLiteral UID_RPT_RPT_PROP_DLG_AREA = u"REPORTDESIGN_UID_RPT_RPT_PROP_DLG_AREA"; diff --git a/reportdesign/inc/stringarray.hrc b/reportdesign/inc/stringarray.hrc index 99bdc9a296c5..1d6800bf0cb0 100644 --- a/reportdesign/inc/stringarray.hrc +++ b/reportdesign/inc/stringarray.hrc @@ -10,6 +10,8 @@ #ifndef INCLUDED_REPORTDESIGN_INC_FNP_HRC #define INCLUDED_REPORTDESIGN_INC_FNP_HRC +#include + #define NC_(Context, String) TranslateId(Context, reinterpret_cast(u8##String)) const TranslateId RID_STR_FORCENEWPAGE_CONST[] = diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx index 116de59b0690..636346a163c3 100644 --- a/reportdesign/source/core/api/ReportDefinition.cxx +++ b/reportdesign/source/core/api/ReportDefinition.cxx @@ -109,7 +109,6 @@ #include #include #include -#include #include // page styles diff --git a/reportdesign/source/core/api/ReportEngineJFree.cxx b/reportdesign/source/core/api/ReportEngineJFree.cxx index 01585aebbabf..182294c7be4a 100644 --- a/reportdesign/source/core/api/ReportEngineJFree.cxx +++ b/reportdesign/source/core/api/ReportEngineJFree.cxx @@ -40,7 +40,6 @@ #include #include -#include #include namespace reportdesign diff --git a/reportdesign/source/core/api/Shape.cxx b/reportdesign/source/core/api/Shape.cxx index 464d7ac46cbc..cdeb8f221436 100644 --- a/reportdesign/source/core/api/Shape.cxx +++ b/reportdesign/source/core/api/Shape.cxx @@ -19,8 +19,8 @@ #include #include +#include #include -#include #include #include diff --git a/reportdesign/source/core/sdr/ReportDrawPage.cxx b/reportdesign/source/core/sdr/ReportDrawPage.cxx index abb56f534a58..1f80905252ec 100644 --- a/reportdesign/source/core/sdr/ReportDrawPage.cxx +++ b/reportdesign/source/core/sdr/ReportDrawPage.cxx @@ -19,11 +19,9 @@ #include #include #include -#include #include #include #include -#include #include #include diff --git a/reportdesign/source/core/sdr/RptPage.cxx b/reportdesign/source/core/sdr/RptPage.cxx index d774f37100a1..1ad1cb8e11b0 100644 --- a/reportdesign/source/core/sdr/RptPage.cxx +++ b/reportdesign/source/core/sdr/RptPage.cxx @@ -20,7 +20,6 @@ #include #include #include -#include #include namespace rptui diff --git a/reportdesign/source/filter/xml/xmlColumn.cxx b/reportdesign/source/filter/xml/xmlColumn.cxx index da8a6966169b..f57c8085f7c5 100644 --- a/reportdesign/source/filter/xml/xmlColumn.cxx +++ b/reportdesign/source/filter/xml/xmlColumn.cxx @@ -32,7 +32,6 @@ #include #include #include -#include #define PROPERTY_ID_WIDTH 1 #define PROPERTY_ID_HEIGHT 2 diff --git a/reportdesign/source/filter/xml/xmlComponent.cxx b/reportdesign/source/filter/xml/xmlComponent.cxx index fc87f8da56e6..68111bb04625 100644 --- a/reportdesign/source/filter/xml/xmlComponent.cxx +++ b/reportdesign/source/filter/xml/xmlComponent.cxx @@ -21,7 +21,6 @@ #include #include #include -#include #include namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx index 0ef9c8d98f61..0521fb895702 100644 --- a/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx +++ b/reportdesign/source/filter/xml/xmlCondPrtExpr.cxx @@ -22,7 +22,6 @@ #include #include #include -#include #include namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlControlProperty.cxx b/reportdesign/source/filter/xml/xmlControlProperty.cxx index ca5cba2ae459..95415257a40d 100644 --- a/reportdesign/source/filter/xml/xmlControlProperty.cxx +++ b/reportdesign/source/filter/xml/xmlControlProperty.cxx @@ -37,7 +37,6 @@ #include #include #include -#include #define TYPE_DATE 1 #define TYPE_TIME 2 diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx index 123e4a1bb888..b8b064cc670d 100644 --- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx @@ -30,7 +30,6 @@ #include #include #include -#include #include #include diff --git a/reportdesign/source/filter/xml/xmlFormatCondition.cxx b/reportdesign/source/filter/xml/xmlFormatCondition.cxx index 2e90c98e2dc2..6f5f430322e3 100644 --- a/reportdesign/source/filter/xml/xmlFormatCondition.cxx +++ b/reportdesign/source/filter/xml/xmlFormatCondition.cxx @@ -22,7 +22,6 @@ #include #include "xmlHelper.hxx" #include -#include #include namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx index ad84810e8cdb..b7fd48ae2582 100644 --- a/reportdesign/source/filter/xml/xmlFormattedField.cxx +++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx @@ -21,7 +21,6 @@ #include #include #include -#include #include diff --git a/reportdesign/source/filter/xml/xmlFunction.cxx b/reportdesign/source/filter/xml/xmlFunction.cxx index cd6d072d24ac..1e052bcb4bff 100644 --- a/reportdesign/source/filter/xml/xmlFunction.cxx +++ b/reportdesign/source/filter/xml/xmlFunction.cxx @@ -21,7 +21,6 @@ #include #include #include -#include #include namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx index 355ed8feab8f..a0f2e6bf7bd4 100644 --- a/reportdesign/source/filter/xml/xmlGroup.cxx +++ b/reportdesign/source/filter/xml/xmlGroup.cxx @@ -29,7 +29,6 @@ #include #include #include -#include #include namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx index a73474711523..a7e0c2ca45db 100644 --- a/reportdesign/source/filter/xml/xmlHelper.cxx +++ b/reportdesign/source/filter/xml/xmlHelper.cxx @@ -43,7 +43,6 @@ #include #include #include -#include #include #define XML_RPT_ALIGNMENT (XML_DB_TYPES_START+1) diff --git a/reportdesign/source/filter/xml/xmlMasterFields.cxx b/reportdesign/source/filter/xml/xmlMasterFields.cxx index 64cb935db286..2dfd0ac4d9b1 100644 --- a/reportdesign/source/filter/xml/xmlMasterFields.cxx +++ b/reportdesign/source/filter/xml/xmlMasterFields.cxx @@ -23,7 +23,6 @@ #include #include #include "xmlEnums.hxx" -#include namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlReportElement.cxx b/reportdesign/source/filter/xml/xmlReportElement.cxx index ea1871d7f655..7e4e89221651 100644 --- a/reportdesign/source/filter/xml/xmlReportElement.cxx +++ b/reportdesign/source/filter/xml/xmlReportElement.cxx @@ -26,7 +26,6 @@ #include "xmlCondPrtExpr.hxx" #include "xmlFormatCondition.hxx" #include -#include #include namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlReportElementBase.cxx b/reportdesign/source/filter/xml/xmlReportElementBase.cxx index dc601abe56ab..ffcb8b7b66a9 100644 --- a/reportdesign/source/filter/xml/xmlReportElementBase.cxx +++ b/reportdesign/source/filter/xml/xmlReportElementBase.cxx @@ -18,14 +18,13 @@ */ #include #include -#include +#include #include "xmlReportElementBase.hxx" #include "xmlfilter.hxx" #include "xmlControlProperty.hxx" #include "xmlReportElement.hxx" #include "xmlEnums.hxx" #include "xmlTable.hxx" -#include #include namespace rptxml diff --git a/reportdesign/source/filter/xml/xmlSection.cxx b/reportdesign/source/filter/xml/xmlSection.cxx index 0b0834eac1e3..957c3a2ca974 100644 --- a/reportdesign/source/filter/xml/xmlSection.cxx +++ b/reportdesign/source/filter/xml/xmlSection.cxx @@ -24,8 +24,6 @@ #include "xmlHelper.hxx" #include #include "xmlTable.hxx" -#include -#include #include diff --git a/reportdesign/source/filter/xml/xmlTable.cxx b/reportdesign/source/filter/xml/xmlTable.cxx index 130b5d6b7394..34075b46d97f 100644 --- a/reportdesign/source/filter/xml/xmlTable.cxx +++ b/reportdesign/source/filter/xml/xmlTable.cxx @@ -35,7 +35,6 @@ #include #include #include -#include #include #include diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx index d5265a514bfb..5475671781f9 100644 --- a/reportdesign/source/ui/misc/FunctionHelper.cxx +++ b/reportdesign/source/ui/misc/FunctionHelper.cxx @@ -20,7 +20,6 @@ #include #include -#include #include #include diff --git a/reportdesign/source/ui/misc/RptUndo.cxx b/reportdesign/source/ui/misc/RptUndo.cxx index 6e718e0e156a..e0c7df4dcb25 100644 --- a/reportdesign/source/ui/misc/RptUndo.cxx +++ b/reportdesign/source/ui/misc/RptUndo.cxx @@ -36,7 +36,6 @@ #include #include -#include namespace rptui { diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 57c1bddb2797..51a2d381e7d4 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -31,8 +31,8 @@ #include #include +#include #include -#include #include #include #include diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index 150f7aff5156..3d05f2910050 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -24,7 +24,6 @@ #include #include #include -#include #include #include #include diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index f856654fed63..b5ce7a48fe60 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include diff --git a/reportdesign/source/ui/report/dlgedfac.cxx b/reportdesign/source/ui/report/dlgedfac.cxx index f7b8a27f64b4..820f3e8f7ff3 100644 --- a/reportdesign/source/ui/report/dlgedfac.cxx +++ b/reportdesign/source/ui/report/dlgedfac.cxx @@ -19,7 +19,6 @@ #include #include #include -#include #include #include