diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-09-27 23:08:16 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-09-30 10:03:30 +0200 |
| commit | f0e0fb71fc6eefc65afdf1650100ffd4c64c18d0 (patch) | |
| tree | ac45e47992992c5ac0de2d84bc7b2ebeb2bba125 /xmloff | |
| parent | 8aa8893be8f3c7e4acfdacb401f8fe3d297647b5 (diff) | |
tdf#42949 Fix IWYU warnings in xmloff/source/[c-m]*/*cxx
Also checked xmloff/qa
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I843917d255f841066ace8d944aa1d00f1b718108
Reviewed-on: https://gerrit.libreoffice.org/79773
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'xmloff')
85 files changed, 28 insertions, 281 deletions
diff --git a/xmloff/IwyuFilter_xmloff.yaml b/xmloff/IwyuFilter_xmloff.yaml index c9ecaf5bef5e..6e324a23ff12 100644 --- a/xmloff/IwyuFilter_xmloff.yaml +++ b/xmloff/IwyuFilter_xmloff.yaml @@ -30,3 +30,12 @@ blacklist: xmloff/source/xforms/XFormsModelExport.hxx: # Needed for css shortcut - sal/types.h + xmloff/source/core/fasttokenhandler.cxx: + # Needed for special array initialization + - tokennames.inc + xmloff/source/draw/sdpropls.cxx: + # Needed for extern type definitions at linking time + - enummaps.hxx + xmloff/source/meta/MetaExportComponent.cxx: + # Needed for direct member access + - com/sun/star/frame/XModel.hpp diff --git a/xmloff/qa/unit/tokenmap-test.cxx b/xmloff/qa/unit/tokenmap-test.cxx index ca31e78faa8d..540836b66f8a 100644 --- a/xmloff/qa/unit/tokenmap-test.cxx +++ b/xmloff/qa/unit/tokenmap-test.cxx @@ -11,7 +11,6 @@ #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> -#include <cppunit/plugin/TestPlugIn.h> #include <xmloff/fasttokenhandler.hxx> #include <xmloff/token/tokens.hxx> diff --git a/xmloff/qa/unit/uxmloff.cxx b/xmloff/qa/unit/uxmloff.cxx index 6e3485b2510b..27edb47004d2 100644 --- a/xmloff/qa/unit/uxmloff.cxx +++ b/xmloff/qa/unit/uxmloff.cxx @@ -16,6 +16,7 @@ #include <comphelper/genericpropertyset.hxx> #include <comphelper/propertysetinfo.hxx> +#include <xmloff/maptype.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/xmlmetai.hxx> #include <xmloff/xmlexp.hxx> @@ -23,9 +24,7 @@ #include <xmloff/xmlaustp.hxx> #include <SchXMLExport.hxx> #include <XMLChartPropertySetMapper.hxx> -#include <impastpl.hxx> #include <comphelper/processfactory.hxx> -#include <com/sun/star/util/MeasureUnit.hpp> using namespace ::xmloff::token; using namespace ::com::sun::star; diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx index bc5111262bec..ecf7f86b870a 100644 --- a/xmloff/source/chart/PropertyMaps.cxx +++ b/xmloff/source/chart/PropertyMaps.cxx @@ -37,31 +37,23 @@ #include <propimp0.hxx> #include <xmloff/EnumPropertyHdl.hxx> -#include <xmloff/XMLConstantsPropertyHandler.hxx> #include <xmloff/attrlist.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/shapeimport.hxx> -#include <xmloff/NamedBoolPropertyHdl.hxx> #include <xmloff/xmlexp.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/prhdlfac.hxx> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/drawing/LineStyle.hpp> -#include <com/sun/star/drawing/FillStyle.hpp> -#include <com/sun/star/drawing/LineJoint.hpp> #include <com/sun/star/chart/ChartAxisMarks.hpp> #include <com/sun/star/chart/ChartDataCaption.hpp> -#include <com/sun/star/chart/ChartSymbolType.hpp> -#include <com/sun/star/chart/ChartDataRowSource.hpp> -#include <com/sun/star/chart/ChartAxisPosition.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/data/XRangeXMLConversion.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <rtl/ustrbuf.hxx> -#include <rtl/math.hxx> #define SCH_XML_SETFLAG( status, flag ) (status)|= (flag) #define SCH_XML_UNSETFLAG( status, flag ) (status) = ((status) | (flag)) - (flag) diff --git a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx index ee5081c489ab..bcb6c6e3b041 100644 --- a/xmloff/source/chart/SchXMLAutoStylePoolP.cxx +++ b/xmloff/source/chart/SchXMLAutoStylePoolP.cxx @@ -20,10 +20,8 @@ #include <SchXMLAutoStylePoolP.hxx> #include "PropertyMap.hxx" #include <SchXMLExport.hxx> -#include <XMLChartPropertySetMapper.hxx> #include <xmloff/families.hxx> #include <xmloff/nmspmap.hxx> -#include <xmloff/xmltoken.hxx> SchXMLAutoStylePoolP::SchXMLAutoStylePoolP( SchXMLExport& rSchXMLExport ) : diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx index 1b0d52ef4bc8..f06936d9139a 100644 --- a/xmloff/source/chart/SchXMLChartContext.cxx +++ b/xmloff/source/chart/SchXMLChartContext.cxx @@ -30,12 +30,10 @@ #include <tools/diagnose_ex.h> #include <unotools/mediadescriptor.hxx> #include <xmloff/xmlnmspe.hxx> -#include <xmloff/xmlement.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmlstyle.hxx> -#include <xmloff/prstylei.hxx> #include <xmloff/SchXMLSeriesHelper.hxx> #include <vector> @@ -43,12 +41,9 @@ #include <com/sun/star/chart/XChartDocument.hpp> #include <com/sun/star/chart/XDiagram.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> -#include <com/sun/star/util/XStringMapping.hpp> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/chart/ChartDataRowSource.hpp> -#include <com/sun/star/chart/ChartSeriesAddress.hpp> -#include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/XVisualObject.hpp> diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 599d51a69d4f..d94732c7e4b0 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -43,19 +43,15 @@ #include <xmloff/families.hxx> #include <xmloff/xmlaustp.hxx> #include <xmloff/xmluconv.hxx> -#include <xmloff/xmlmetae.hxx> #include <xmloff/SchXMLSeriesHelper.hxx> -#include <xexptran.hxx> #include <rtl/math.hxx> #include <vector> -#include <typeinfo> #include <algorithm> #include <queue> #include <iterator> #include <numeric> -#include <com/sun/star/task/XStatusIndicatorSupplier.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XServiceName.hpp> @@ -66,18 +62,14 @@ #include <com/sun/star/chart/XAxis.hpp> #include <com/sun/star/chart/XAxisSupplier.hpp> #include <com/sun/star/chart/XChartDocument.hpp> -#include <com/sun/star/chart/ChartLegendPosition.hpp> #include <com/sun/star/chart/ChartLegendExpansion.hpp> #include <com/sun/star/chart/ChartDataRowSource.hpp> #include <com/sun/star/chart/ChartAxisAssign.hpp> -#include <com/sun/star/chart/ChartAxisType.hpp> #include <com/sun/star/chart/TimeIncrement.hpp> #include <com/sun/star/chart/TimeInterval.hpp> #include <com/sun/star/chart/TimeUnit.hpp> -#include <com/sun/star/chart/ChartSeriesAddress.hpp> #include <com/sun/star/chart/X3DDisplay.hpp> #include <com/sun/star/chart/XStatisticDisplay.hpp> -#include <com/sun/star/chart/XSecondAxisTitleSupplier.hpp> #include <com/sun/star/chart/XDiagramPositioning.hpp> #include <com/sun/star/chart2/XAnyDescriptionAccess.hpp> @@ -91,7 +83,6 @@ #include <com/sun/star/chart2/XDataSeriesContainer.hpp> #include <com/sun/star/chart2/data/XDataSource.hpp> #include <com/sun/star/chart2/data/XDataSink.hpp> -#include <com/sun/star/chart2/data/XDataReceiver.hpp> #include <com/sun/star/chart2/data/XDataProvider.hpp> #include <com/sun/star/chart2/data/XDatabaseDataProvider.hpp> #include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp> @@ -100,8 +91,6 @@ #include <com/sun/star/chart2/data/XNumericalDataSequence.hpp> #include <com/sun/star/util/MeasureUnit.hpp> -#include <com/sun/star/util/XStringMapping.hpp> -#include <com/sun/star/drawing/HomogenMatrix.hpp> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/embed/Aspects.hpp> diff --git a/xmloff/source/chart/SchXMLImport.cxx b/xmloff/source/chart/SchXMLImport.cxx index 52e24fdf56d3..5e026e346e63 100644 --- a/xmloff/source/chart/SchXMLImport.cxx +++ b/xmloff/source/chart/SchXMLImport.cxx @@ -20,11 +20,9 @@ #include <SchXMLImport.hxx> #include "SchXMLChartContext.hxx" #include "contexts.hxx" -#include <XMLChartPropertySetMapper.hxx> #include "SchXMLTools.hxx" #include <facreg.hxx> -#include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <comphelper/processfactory.hxx> #include <xmloff/nmspmap.hxx> @@ -34,24 +32,19 @@ #include <xmloff/xmluconv.hxx> #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlstyle.hxx> -#include <com/sun/star/task/XStatusIndicatorSupplier.hpp> #include <com/sun/star/chart/XChartDocument.hpp> -#include <com/sun/star/chart/ChartDataRowSource.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/chart2/data/XDataReceiver.hpp> -#include <com/sun/star/chart2/data/XDataProvider.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> #include <com/sun/star/chart2/XChartTypeContainer.hpp> #include <com/sun/star/chart2/XDataSeriesContainer.hpp> -#include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <tools/diagnose_ex.h> -#include <typeinfo> using namespace com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/chart/SchXMLLegendContext.cxx b/xmloff/source/chart/SchXMLLegendContext.cxx index 29b7ba09e960..902fffb25f46 100644 --- a/xmloff/source/chart/SchXMLLegendContext.cxx +++ b/xmloff/source/chart/SchXMLLegendContext.cxx @@ -22,14 +22,11 @@ #include <xmloff/xmlimp.hxx> #include <xmloff/xmlnmspe.hxx> -#include <xmloff/xmlement.hxx> -#include <xmloff/prstylei.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> #include <sal/log.hxx> -#include <com/sun/star/chart/ChartLegendPosition.hpp> #include <com/sun/star/chart/ChartLegendExpansion.hpp> #include <com/sun/star/chart/XChartDocument.hpp> #include <com/sun/star/drawing/FillStyle.hpp> diff --git a/xmloff/source/chart/SchXMLParagraphContext.cxx b/xmloff/source/chart/SchXMLParagraphContext.cxx index b023a8c7392b..65fcee594d77 100644 --- a/xmloff/source/chart/SchXMLParagraphContext.cxx +++ b/xmloff/source/chart/SchXMLParagraphContext.cxx @@ -18,13 +18,15 @@ */ -#include <SchXMLImport.hxx> #include "SchXMLParagraphContext.hxx" +#include <xmloff/xmlimp.hxx> #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/nmspmap.hxx> +#include <com/sun/star/xml/sax/XAttributeList.hpp> + using namespace com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.cxx b/xmloff/source/chart/SchXMLPlotAreaContext.cxx index 9fe59162480a..27def14f6ece 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.cxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.cxx @@ -17,10 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sax/tools/converter.hxx> - #include "SchXMLPlotAreaContext.hxx" -#include "SchXMLRegressionCurveObjectContext.hxx" #include <SchXMLImport.hxx> #include "SchXMLAxisContext.hxx" #include "SchXMLSeries2Context.hxx" @@ -30,35 +27,26 @@ #include <sal/log.hxx> #include <tools/diagnose_ex.h> #include <xmloff/xmlnmspe.hxx> -#include <xmloff/xmlement.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/prstylei.hxx> #include <xmloff/xmlstyle.hxx> -#include <xexptran.hxx> #include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/chart/ChartDataRowSource.hpp> -#include <com/sun/star/chart/ChartErrorCategory.hpp> -#include <com/sun/star/chart/ChartErrorIndicatorType.hpp> #include <com/sun/star/chart/ErrorBarStyle.hpp> #include <com/sun/star/chart/X3DDisplay.hpp> #include <com/sun/star/chart/XStatisticDisplay.hpp> #include <com/sun/star/chart/XDiagramPositioning.hpp> #include <com/sun/star/chart/XChartDocument.hpp> -#include <com/sun/star/chart2/RelativePosition.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/chart2/XChartTypeContainer.hpp> -#include <com/sun/star/chart2/XDataSeriesContainer.hpp> #include <com/sun/star/chart2/data/XDataSink.hpp> #include <com/sun/star/chart2/data/XRangeXMLConversion.hpp> #include <com/sun/star/chart2/data/LabeledDataSequence.hpp> #include <com/sun/star/drawing/CameraGeometry.hpp> -#include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/util/XStringMapping.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> using namespace com::sun::star; diff --git a/xmloff/source/chart/SchXMLPlotAreaContext.hxx b/xmloff/source/chart/SchXMLPlotAreaContext.hxx index c6e89274ac95..53fbd4986052 100644 --- a/xmloff/source/chart/SchXMLPlotAreaContext.hxx +++ b/xmloff/source/chart/SchXMLPlotAreaContext.hxx @@ -20,8 +20,8 @@ #define INCLUDED_XMLOFF_SOURCE_CHART_SCHXMLPLOTAREACONTEXT_HXX #include "SchXMLChartContext.hxx" -#include <xmloff/txtimp.hxx> #include <xmloff/xmlictxt.hxx> +#include <xmloff/prstylei.hxx> #include <xmloff/shapeimport.hxx> #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/chart/ChartDataRowSource.hpp> diff --git a/xmloff/source/chart/SchXMLPropertyMappingContext.cxx b/xmloff/source/chart/SchXMLPropertyMappingContext.cxx index 893748edf83b..688cfd752a1e 100644 --- a/xmloff/source/chart/SchXMLPropertyMappingContext.cxx +++ b/xmloff/source/chart/SchXMLPropertyMappingContext.cxx @@ -8,12 +8,10 @@ */ #include "SchXMLPropertyMappingContext.hxx" -#include "PropertyMap.hxx" #include "SchXMLTools.hxx" #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/nmspmap.hxx> -#include <xmloff/SchXMLSeriesHelper.hxx> #include <SchXMLImport.hxx> #include <com/sun/star/chart2/data/XLabeledDataSequence2.hpp> diff --git a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx index 96ffce0f921f..5977ef57abea 100644 --- a/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx +++ b/xmloff/source/chart/SchXMLRegressionCurveObjectContext.cxx @@ -25,7 +25,6 @@ #include <xmloff/nmspmap.hxx> #include <xmloff/xmlnmspe.hxx> -#include <xmloff/xmlement.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/prstylei.hxx> #include <xmloff/xmlstyle.hxx> diff --git a/xmloff/source/chart/SchXMLSeries2Context.cxx b/xmloff/source/chart/SchXMLSeries2Context.cxx index 8dccecc0f564..8b47555ccbb3 100644 --- a/xmloff/source/chart/SchXMLSeries2Context.cxx +++ b/xmloff/source/chart/SchXMLSeries2Context.cxx @@ -22,31 +22,25 @@ #include "SchXMLRegressionCurveObjectContext.hxx" #include "SchXMLPropertyMappingContext.hxx" #include "SchXMLTools.hxx" -#include "PropertyMap.hxx" #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/chart2/XRegressionCurve.hpp> #include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <com/sun/star/chart2/data/XDataSink.hpp> -#include <com/sun/star/chart2/data/XDataReceiver.hpp> #include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp> -#include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/chart/ChartAxisAssign.hpp> #include <com/sun/star/chart/ChartSymbolType.hpp> +#include <com/sun/star/chart/ErrorBarStyle.hpp> #include <com/sun/star/chart/XChartDocument.hpp> -#include <com/sun/star/container/XChild.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/chart/ChartLegendPosition.hpp> -#include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/XVisualObject.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <comphelper/processfactory.hxx> -#include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmlimp.hxx> @@ -54,11 +48,8 @@ #include <xmloff/SchXMLSeriesHelper.hxx> #include <SchXMLImport.hxx> #include <xmloff/prstylei.hxx> -#include <xmloff/xmlprmap.hxx> #include <tools/diagnose_ex.h> -#include <typeinfo> - using namespace ::com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/chart/SchXMLSeriesHelper.cxx b/xmloff/source/chart/SchXMLSeriesHelper.cxx index e8a44512515f..00adebc0d347 100644 --- a/xmloff/source/chart/SchXMLSeriesHelper.cxx +++ b/xmloff/source/chart/SchXMLSeriesHelper.cxx @@ -25,12 +25,9 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <rtl/ustring.h> #include <sal/log.hxx> #include <tools/diagnose_ex.h> -#include <typeinfo> - using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx index b05b8f3bfd3f..491c8c313d47 100644 --- a/xmloff/source/chart/SchXMLTableContext.cxx +++ b/xmloff/source/chart/SchXMLTableContext.cxx @@ -37,15 +37,9 @@ #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/XChartTypeContainer.hpp> #include <com/sun/star/chart2/XInternalDataProvider.hpp> -#include <com/sun/star/chart/ChartSeriesAddress.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/XPropertySetInfo.hpp> -#include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/chart2/XDiagram.hpp> -#include <com/sun/star/chart2/XAxis.hpp> #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> -#include <com/sun/star/chart2/AxisType.hpp> #include <vector> #include <algorithm> diff --git a/xmloff/source/chart/SchXMLTextListContext.cxx b/xmloff/source/chart/SchXMLTextListContext.cxx index cd608187787f..b2da8f6ad6f8 100644 --- a/xmloff/source/chart/SchXMLTextListContext.cxx +++ b/xmloff/source/chart/SchXMLTextListContext.cxx @@ -17,13 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <SchXMLImport.hxx> #include "SchXMLTextListContext.hxx" #include "SchXMLParagraphContext.hxx" #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> -#include <xmloff/nmspmap.hxx> using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::Reference; diff --git a/xmloff/source/chart/SchXMLTools.cxx b/xmloff/source/chart/SchXMLTools.cxx index 155871ab3ac6..14eee9b365a0 100644 --- a/xmloff/source/chart/SchXMLTools.cxx +++ b/xmloff/source/chart/SchXMLTools.cxx @@ -39,12 +39,10 @@ #include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> -#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XServiceName.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <comphelper/processfactory.hxx> diff --git a/xmloff/source/chart/XMLChartStyleContext.cxx b/xmloff/source/chart/XMLChartStyleContext.cxx index 51eb6e3100e8..834c951bd1da 100644 --- a/xmloff/source/chart/XMLChartStyleContext.cxx +++ b/xmloff/source/chart/XMLChartStyleContext.cxx @@ -25,7 +25,6 @@ #include <xmloff/xmltypes.hxx> #include <xmloff/xmlimppr.hxx> -#include <sal/log.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <tools/diagnose_ex.h> diff --git a/xmloff/source/chart/XMLLabelSeparatorContext.cxx b/xmloff/source/chart/XMLLabelSeparatorContext.cxx index 3775da281814..2ef83157e82d 100644 --- a/xmloff/source/chart/XMLLabelSeparatorContext.cxx +++ b/xmloff/source/chart/XMLLabelSeparatorContext.cxx @@ -21,10 +21,7 @@ #include "SchXMLParagraphContext.hxx" #include <xmloff/xmltoken.hxx> -#include <xmloff/xmltkmap.hxx> -#include <xmloff/xmlnmspe.hxx> #include <xmloff/xmlimp.hxx> -#include <xmloff/nmspmap.hxx> using namespace ::com::sun::star; diff --git a/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx b/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx index b69c36536def..fa51286635b8 100644 --- a/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx +++ b/xmloff/source/chart/XMLSymbolTypePropertyHdl.cxx @@ -19,7 +19,6 @@ #include "XMLSymbolTypePropertyHdl.hxx" #include <xmloff/xmluconv.hxx> -#include <com/sun/star/chart/ChartErrorIndicatorType.hpp> #include <rtl/ustrbuf.hxx> using namespace ::xmloff::token; diff --git a/xmloff/source/chart/contexts.cxx b/xmloff/source/chart/contexts.cxx index c0006b26637a..c0cf395a0a1d 100644 --- a/xmloff/source/chart/contexts.cxx +++ b/xmloff/source/chart/contexts.cxx @@ -25,7 +25,6 @@ #include "SchXMLCalculationSettingsContext.hxx" #include "contexts.hxx" -#include "SchXMLChartContext.hxx" #include <sal/log.hxx> diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx index 27d242abe19e..9d3bafb53b54 100644 --- a/xmloff/source/core/DocumentSettingsContext.cxx +++ b/xmloff/source/core/DocumentSettingsContext.cxx @@ -29,7 +29,6 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> -#include <xmloff/xmluconv.hxx> #include <comphelper/base64.hxx> #include <vector> @@ -43,7 +42,6 @@ #include <com/sun/star/document/IndexedPropertyValues.hpp> #include <com/sun/star/document/NamedPropertyValues.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <osl/diagnose.h> #include <tools/diagnose_ex.h> diff --git a/xmloff/source/core/DomExport.cxx b/xmloff/source/core/DomExport.cxx index 5f9afe16c187..d437f2617c6d 100644 --- a/xmloff/source/core/DomExport.cxx +++ b/xmloff/source/core/DomExport.cxx @@ -26,12 +26,8 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/xml/dom/XAttr.hpp> -#include <com/sun/star/xml/dom/XDocumentBuilder.hpp> #include <com/sun/star/xml/dom/XNode.hpp> #include <com/sun/star/xml/dom/XElement.hpp> -#include <com/sun/star/xml/dom/XEntity.hpp> -#include <com/sun/star/xml/dom/XNotation.hpp> -#include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/xml/dom/NodeType.hpp> #include <com/sun/star/xml/dom/XNamedNodeMap.hpp> diff --git a/xmloff/source/core/ProgressBarHelper.cxx b/xmloff/source/core/ProgressBarHelper.cxx index b16ecc7f0b8f..5c34cfadbc6b 100644 --- a/xmloff/source/core/ProgressBarHelper.cxx +++ b/xmloff/source/core/ProgressBarHelper.cxx @@ -18,7 +18,6 @@ */ #include <xmloff/ProgressBarHelper.hxx> -#include <xmloff/xmltoken.hxx> #include <osl/diagnose.h> diff --git a/xmloff/source/core/RDFaExportHelper.cxx b/xmloff/source/core/RDFaExportHelper.cxx index 2d0c48a2c4d0..169a4790b6ac 100644 --- a/xmloff/source/core/RDFaExportHelper.cxx +++ b/xmloff/source/core/RDFaExportHelper.cxx @@ -30,8 +30,6 @@ #include <com/sun/star/uri/XUriReference.hpp> #include <com/sun/star/uri/UriReferenceFactory.hpp> #include <com/sun/star/rdf/Statement.hpp> -#include <com/sun/star/rdf/URIs.hpp> -#include <com/sun/star/rdf/URI.hpp> #include <com/sun/star/rdf/XLiteral.hpp> #include <com/sun/star/rdf/XRepositorySupplier.hpp> #include <com/sun/star/rdf/XDocumentRepository.hpp> @@ -39,7 +37,6 @@ #include <rtl/ustrbuf.hxx> #include <osl/diagnose.h> -#include <functional> #include <algorithm> using namespace ::com::sun::star; diff --git a/xmloff/source/core/RDFaImportHelper.cxx b/xmloff/source/core/RDFaImportHelper.cxx index 4ee20b4e478b..7b408ecbbb49 100644 --- a/xmloff/source/core/RDFaImportHelper.cxx +++ b/xmloff/source/core/RDFaImportHelper.cxx @@ -25,16 +25,13 @@ #include <comphelper/sequence.hxx> #include <com/sun/star/rdf/URI.hpp> -#include <com/sun/star/rdf/XDocumentMetadataAccess.hpp> #include <com/sun/star/rdf/XDocumentRepository.hpp> +#include <com/sun/star/rdf/XRepositorySupplier.hpp> #include <rtl/ustring.hxx> #include <sal/log.hxx> #include <map> -#include <iterator> -#include <functional> -#include <algorithm> using namespace ::com::sun::star; diff --git a/xmloff/source/core/SettingsExportHelper.cxx b/xmloff/source/core/SettingsExportHelper.cxx index c7128965d6b6..09a615b51893 100644 --- a/xmloff/source/core/SettingsExportHelper.cxx +++ b/xmloff/source/core/SettingsExportHelper.cxx @@ -21,7 +21,6 @@ #include <sax/tools/converter.hxx> #include <xmloff/SettingsExportHelper.hxx> -#include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> #include <sal/log.hxx> #include <tools/debug.hxx> @@ -37,7 +36,6 @@ #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/util/PathSubstitution.hpp> #include <com/sun/star/util/DateTime.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/formula/SymbolDescriptor.hpp> #include <com/sun/star/document/PrinterIndependentLayout.hpp> #include <com/sun/star/document/IndexedPropertyValues.hpp> diff --git a/xmloff/source/core/SvXMLAttrCollection.cxx b/xmloff/source/core/SvXMLAttrCollection.cxx index 7217aee6393d..466008b9f80e 100644 --- a/xmloff/source/core/SvXMLAttrCollection.cxx +++ b/xmloff/source/core/SvXMLAttrCollection.cxx @@ -10,7 +10,6 @@ #include "SvXMLAttrCollection.hxx" #include <limits.h> #include <osl/diagnose.h> -#include <sal/log.hxx> bool SvXMLAttrCollection::operator ==( const SvXMLAttrCollection& rCmp ) const { diff --git a/xmloff/source/core/XMLBase64Export.cxx b/xmloff/source/core/XMLBase64Export.cxx index 26efc980f443..0aa2ff136f3f 100644 --- a/xmloff/source/core/XMLBase64Export.cxx +++ b/xmloff/source/core/XMLBase64Export.cxx @@ -22,7 +22,6 @@ #include <com/sun/star/io/XInputStream.hpp> -#include <sax/tools/converter.hxx> #include <comphelper/base64.hxx> #include <xmloff/xmlexp.hxx> diff --git a/xmloff/source/core/XMLBase64ImportContext.cxx b/xmloff/source/core/XMLBase64ImportContext.cxx index fd3fdae5b768..f7291c39a7d3 100644 --- a/xmloff/source/core/XMLBase64ImportContext.cxx +++ b/xmloff/source/core/XMLBase64ImportContext.cxx @@ -19,7 +19,6 @@ #include <com/sun/star/io/XOutputStream.hpp> -#include <sax/tools/converter.hxx> #include <comphelper/base64.hxx> #include <xmloff/xmlimp.hxx> diff --git a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx index 19e76a693117..a690a5770f1c 100644 --- a/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectImportContext.cxx @@ -19,7 +19,6 @@ #include <com/sun/star/document/XImporter.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/util/XModifiable2.hpp> #include <tools/globname.hxx> #include <comphelper/classids.hxx> @@ -27,7 +26,6 @@ #include <xmloff/xmlimp.hxx> #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> -#include <xmloff/xmlerror.hxx> #include <xmloff/attrlist.hxx> #include <xmloff/XMLFilterServiceNames.h> #include <XMLEmbeddedObjectImportContext.hxx> diff --git a/xmloff/source/core/attrlist.cxx b/xmloff/source/core/attrlist.cxx index c99086483d36..805cafdd45b6 100644 --- a/xmloff/source/core/attrlist.cxx +++ b/xmloff/source/core/attrlist.cxx @@ -18,7 +18,6 @@ */ -#include <string.h> #include <vector> #include <osl/diagnose.h> #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx index 949ea7518b1d..6e1a5bf48cad 100644 --- a/xmloff/source/core/facreg.cxx +++ b/xmloff/source/core/facreg.cxx @@ -23,8 +23,6 @@ #include <xmloff/dllapi.h> #include <string.h> -#include <com/sun/star/container/XSet.hpp> -#include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <cppuhelper/factory.hxx> diff --git a/xmloff/source/core/unoatrcn.cxx b/xmloff/source/core/unoatrcn.cxx index 8c858cca2ca2..81ec1e93ef00 100644 --- a/xmloff/source/core/unoatrcn.cxx +++ b/xmloff/source/core/unoatrcn.cxx @@ -18,7 +18,6 @@ */ #include <memory> -#include <string.h> #include <com/sun/star/xml/AttributeData.hpp> #include <o3tl/any.hxx> #include <rtl/ustrbuf.hxx> diff --git a/xmloff/source/core/xmlerror.cxx b/xmloff/source/core/xmlerror.cxx index 750cee7d820f..115c2b12de3a 100644 --- a/xmloff/source/core/xmlerror.cxx +++ b/xmloff/source/core/xmlerror.cxx @@ -19,7 +19,6 @@ #include <xmloff/xmlerror.hxx> #include <rtl/ustring.hxx> -#include <osl/diagnose.h> #include <sal/log.hxx> #include <com/sun/star/xml/sax/XLocator.hpp> #include <com/sun/star/xml/sax/SAXParseException.hpp> diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 83d3fd71af47..93ef19a46957 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -22,7 +22,6 @@ #include <sal/log.hxx> #include <stack> -#include <string.h> #include <officecfg/Office/Common.hxx> #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> @@ -51,13 +50,11 @@ #include <xmloff/xmlnumfe.hxx> #include <xmloff/xmlmetae.hxx> #include <xmloff/XMLSettingsExportContext.hxx> -#include <xmloff/families.hxx> #include <xmloff/XMLEventExport.hxx> #include <xmloff/ProgressBarHelper.hxx> #include <XMLStarBasicExportHandler.hxx> #include <XMLScriptExportHandler.hxx> #include <xmloff/SettingsExportHelper.hxx> -#include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/document/XEventsSupplier.hpp> #include <com/sun/star/document/XViewDataSupplier.hpp> #include <com/sun/star/frame/XModel.hpp> @@ -83,12 +80,7 @@ #include <comphelper/extract.hxx> #include <PropertySetMerger.hxx> -#include <svl/urihelper.hxx> -#include <xmloff/xformsexport.hxx> - #include <unotools/docinfohelper.hxx> -#include <unotools/bootstrap.hxx> -#include <unotools/configmgr.hxx> #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/document/XMLOasisBasicExporter.hpp> diff --git a/xmloff/source/core/xmlictxt.cxx b/xmloff/source/core/xmlictxt.cxx index a448e9fa773c..fb4e64ef8719 100644 --- a/xmloff/source/core/xmlictxt.cxx +++ b/xmloff/source/core/xmlictxt.cxx @@ -17,12 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <com/sun/star/xml/sax/SAXParseException.hpp> -#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> -#include <com/sun/star/xml/sax/SAXException.hpp> -#include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> -#include <com/sun/star/xml/sax/XLocator.hpp> #include <xmloff/xmlimp.hxx> #include <xmloff/xmlictxt.hxx> #include <sax/fastattribs.hxx> diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index ba715329736a..a956c316a49f 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -18,7 +18,6 @@ */ #include <memory> -#include <string.h> #include <tools/diagnose_ex.h> #include <sal/log.hxx> @@ -51,7 +50,6 @@ #include <com/sun/star/document/XStorageBasedDocument.hpp> #include <com/sun/star/document/XGraphicStorageHandler.hpp> #include <com/sun/star/document/XEmbeddedObjectResolver.hpp> -#include <com/sun/star/graphic/GraphicProvider.hpp> #include <com/sun/star/xml/sax/XLocator.hpp> #include <com/sun/star/xml/sax/FastParser.hpp> #include <com/sun/star/xml/sax/SAXException.hpp> diff --git a/xmloff/source/draw/EnhancedCustomShapeToken.cxx b/xmloff/source/draw/EnhancedCustomShapeToken.cxx index 8746974b2dac..6e65cabbde7e 100644 --- a/xmloff/source/draw/EnhancedCustomShapeToken.cxx +++ b/xmloff/source/draw/EnhancedCustomShapeToken.cxx @@ -21,7 +21,6 @@ #include <osl/mutex.hxx> #include <unordered_map> #include <memory> -#include <string.h> namespace xmloff { namespace EnhancedCustomShapeToken { diff --git a/xmloff/source/draw/QRCodeContext.cxx b/xmloff/source/draw/QRCodeContext.cxx index 5e4271377f9a..7a20e929a897 100644 --- a/xmloff/source/draw/QRCodeContext.cxx +++ b/xmloff/source/draw/QRCodeContext.cxx @@ -9,7 +9,6 @@ #include "QRCodeContext.hxx" -#include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/frame/XStorable.hpp> @@ -18,18 +17,12 @@ #include <com/sun/star/drawing/QRCodeErrorCorrection.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> -#include <sal/log.hxx> -#include <comphelper/processfactory.hxx> -#include <comphelper/storagehelper.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/xmlnmspe.hxx> -#include <xmloff/xmluconv.hxx> #include <xmloff/nmspmap.hxx> #include <sax/tools/converter.hxx> -#include <rtl/ustrbuf.hxx> -#include <rtl/strbuf.hxx> #include <rtl/ustring.hxx> using namespace css; diff --git a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx index 4341fb04dc6f..e502f4ea1aee 100644 --- a/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx +++ b/xmloff/source/draw/XMLGraphicsDefaultStyle.cxx @@ -25,7 +25,6 @@ #include <tools/color.hxx> #include <xmloff/xmlimp.hxx> -#include <xmloff/nmspmap.hxx> #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/families.hxx> diff --git a/xmloff/source/draw/XMLImageMapExport.cxx b/xmloff/source/draw/XMLImageMapExport.cxx index e34f85dd891f..30a13b6a28b1 100644 --- a/xmloff/source/draw/XMLImageMapExport.cxx +++ b/xmloff/source/draw/XMLImageMapExport.cxx @@ -30,7 +30,6 @@ #include <com/sun/star/document/XEventsSupplier.hpp> #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/awt/Point.hpp> -#include <com/sun/star/awt/Size.hpp> #include <com/sun/star/drawing/PointSequence.hpp> #include <xmloff/xmlexp.hxx> #include <xmloff/xmlnmspe.hxx> diff --git a/xmloff/source/draw/XMLReplacementImageContext.cxx b/xmloff/source/draw/XMLReplacementImageContext.cxx index eb5f6ea52c15..32ad125c9514 100644 --- a/xmloff/source/draw/XMLReplacementImageContext.cxx +++ b/xmloff/source/draw/XMLReplacementImageContext.cxx @@ -18,7 +18,6 @@ */ #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <osl/diagnose.h> #include <xmloff/xmlimp.hxx> diff --git a/xmloff/source/draw/XMLShapePropertySetContext.cxx b/xmloff/source/draw/XMLShapePropertySetContext.cxx index 692138804377..8d172a35eac0 100644 --- a/xmloff/source/draw/XMLShapePropertySetContext.cxx +++ b/xmloff/source/draw/XMLShapePropertySetContext.cxx @@ -27,8 +27,6 @@ #include <com/sun/star/container/XIndexReplace.hpp> -#include "sdpropls.hxx" - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/draw/XMLShapeStyleContext.cxx b/xmloff/source/draw/XMLShapeStyleContext.cxx index 42d55cc022c0..b301986afde1 100644 --- a/xmloff/source/draw/XMLShapeStyleContext.cxx +++ b/xmloff/source/draw/XMLShapeStyleContext.cxx @@ -26,18 +26,17 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/container/XIndexReplace.hpp> #include <xmloff/xmlimp.hxx> #include <xmloff/xmlnumi.hxx> #include <xmloff/xmlnmspe.hxx> +#include <xmloff/xmlprmap.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlerror.hxx> #include <xmloff/maptype.hxx> #include <xmloff/xmlimppr.hxx> #include <xmlsdtypes.hxx> -#include "sdpropls.hxx" using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/xmloff/source/draw/animationexport.cxx b/xmloff/source/draw/animationexport.cxx index efe49b08e4aa..947e26593d6b 100644 --- a/xmloff/source/draw/animationexport.cxx +++ b/xmloff/source/draw/animationexport.cxx @@ -51,7 +51,6 @@ #include <com/sun/star/presentation/TextAnimationType.hpp> #include <com/sun/star/presentation/ShapeAnimationSubType.hpp> #include <com/sun/star/presentation/EffectCommands.hpp> -#include <com/sun/star/drawing/XShape.hpp> #include <o3tl/any.hxx> #include <sax/tools/converter.hxx> #include <sal/log.hxx> @@ -59,7 +58,6 @@ #include <tools/diagnose_ex.h> #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> -#include "sdxmlexp_impl.hxx" #include "sdpropls.hxx" #include <xmlsdtypes.hxx> #include <xmloff/xmltoken.hxx> @@ -67,8 +65,6 @@ #include <xmloff/xmluconv.hxx> #include <xmloff/xmlexp.hxx> #include <xmloff/xmlement.hxx> -#include <xmloff/nmspmap.hxx> -#include <xmloff/shapeexport.hxx> #include <xmloff/xmlprhdl.hxx> #include <animations.hxx> diff --git a/xmloff/source/draw/animationimport.cxx b/xmloff/source/draw/animationimport.cxx index 437bd1a3c531..f436035ef56c 100644 --- a/xmloff/source/draw/animationimport.cxx +++ b/xmloff/source/draw/animationimport.cxx @@ -20,7 +20,6 @@ #include <memory> #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/animations/AnimationTransformType.hpp> #include <com/sun/star/animations/XAnimationNodeSupplier.hpp> @@ -63,7 +62,6 @@ #include <osl/diagnose.h> #include <xmloff/nmspmap.hxx> #include <xmloff/xmlprhdl.hxx> -#include <anim.hxx> #include <facreg.hxx> #include <xmlsdtypes.hxx> diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx index a972f61a007d..3036aa97e20d 100644 --- a/xmloff/source/draw/animexp.cxx +++ b/xmloff/source/draw/animexp.cxx @@ -34,9 +34,6 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmlexp.hxx> -#include <xmloff/xmlement.hxx> -#include <xmloff/nmspmap.hxx> -#include <xmloff/shapeexport.hxx> #include <anim.hxx> diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx index ea01252dc365..38d8f5eb0148 100644 --- a/xmloff/source/draw/animimp.cxx +++ b/xmloff/source/draw/animimp.cxx @@ -28,7 +28,6 @@ #include <sax/tools/converter.hxx> #include <osl/diagnose.h> -#include <list> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/xmlnmspe.hxx> diff --git a/xmloff/source/draw/descriptionimp.cxx b/xmloff/source/draw/descriptionimp.cxx index 705528886271..ca78afbee0ab 100644 --- a/xmloff/source/draw/descriptionimp.cxx +++ b/xmloff/source/draw/descriptionimp.cxx @@ -21,8 +21,6 @@ #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlimp.hxx> -#include <xmloff/xmlnmspe.hxx> -#include <xmloff/nmspmap.hxx> #include "descriptionimp.hxx" diff --git a/xmloff/source/draw/layerexp.cxx b/xmloff/source/draw/layerexp.cxx index a28599856f9f..1b68a7f2705d 100644 --- a/xmloff/source/draw/layerexp.cxx +++ b/xmloff/source/draw/layerexp.cxx @@ -24,8 +24,6 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmlexp.hxx> -#include <xmloff/xmlement.hxx> -#include <xmloff/nmspmap.hxx> #include "layerexp.hxx" #include <osl/diagnose.h> diff --git a/xmloff/source/draw/layerimp.cxx b/xmloff/source/draw/layerimp.cxx index abad8cf7a938..80c869da085b 100644 --- a/xmloff/source/draw/layerimp.cxx +++ b/xmloff/source/draw/layerimp.cxx @@ -27,7 +27,6 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/xmlnmspe.hxx> -#include <xmloff/xmluconv.hxx> #include <xmloff/nmspmap.hxx> #include "layerimp.hxx" diff --git a/xmloff/source/draw/propimp0.cxx b/xmloff/source/draw/propimp0.cxx index 41fb22df3b24..cbd909e3c7c9 100644 --- a/xmloff/source/draw/propimp0.cxx +++ b/xmloff/source/draw/propimp0.cxx @@ -20,13 +20,12 @@ #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <propimp0.hxx> -#include "sdxmlexp_impl.hxx" -#include <com/sun/star/drawing/LineDash.hpp> #include <com/sun/star/util/Duration.hpp> #include <com/sun/star/uno/Any.hxx> #include <sax/tools/converter.hxx> +#include <xmloff/xmlexp.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmlimp.hxx> diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index dc91e301e60b..de6a5e4655d5 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -62,8 +62,6 @@ #include <sax/tools/converter.hxx> #include <xmlsdtypes.hxx> -#include "sdxmlexp_impl.hxx" - using ::com::sun::star::uno::Any; using namespace ::com::sun::star; diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx index feba357d4595..b2bfd9d5b398 100644 --- a/xmloff/source/draw/sdxmlexp.cxx +++ b/xmloff/source/draw/sdxmlexp.cxx @@ -23,15 +23,11 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmltoken.hxx> -#include <xmloff/xmlmetae.hxx> -#include <com/sun/star/lang/ServiceNotRegisteredException.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/presentation/XPresentationSupplier.hpp> #include <com/sun/star/presentation/XCustomPresentationSupplier.hpp> #include <com/sun/star/geometry/RealPoint2D.hpp> -#include <com/sun/star/task/XStatusIndicatorSupplier.hpp> #include <com/sun/star/office/XAnnotationAccess.hpp> -#include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/uno/Any.hxx> #include "sdxmlexp_impl.hxx" #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> @@ -40,13 +36,11 @@ #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/view/PaperOrientation.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> -#include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/form/XFormsSupplier2.hpp> #include <com/sun/star/presentation/XPresentationPage.hpp> #include <com/sun/star/drawing/XMasterPageTarget.hpp> #include <com/sun/star/text/XText.hpp> -#include <com/sun/star/chart/XChartDocument.hpp> #include <com/sun/star/animations/XAnimationNodeSupplier.hpp> #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/util/Duration.hpp> @@ -64,12 +58,9 @@ #include <xmloff/ProgressBarHelper.hxx> #include "sdpropls.hxx" #include <xmloff/xmlexppr.hxx> -#include <com/sun/star/beans/XPropertyState.hpp> #include <facreg.hxx> -#include <xexptran.hxx> #include <comphelper/processfactory.hxx> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <PropertySetMerger.hxx> #include "layerexp.hxx" diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx index 5b5b1ad63ee2..829c0ad16c87 100644 --- a/xmloff/source/draw/sdxmlimp.cxx +++ b/xmloff/source/draw/sdxmlimp.cxx @@ -23,7 +23,6 @@ #include <comphelper/sequence.hxx> #include <xmloff/xmlscripti.hxx> -#include <facreg.hxx> #include "sdxmlimp_impl.hxx" #include "ximpbody.hxx" @@ -31,20 +30,15 @@ #include "ximpstyl.hxx" #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> -#include <xmloff/xmluconv.hxx> #include <xmloff/DocumentSettingsContext.hxx> +#include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/form/XFormsSupplier.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/task/XStatusIndicatorSupplier.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/drawing/XMasterPagesSupplier.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> -#include "sdpropls.hxx" -#include <xmloff/xmlexppr.hxx> -#include <xmloff/xmlerror.hxx> #include <xmloff/settingsstore.hxx> #include <xmloff/ProgressBarHelper.hxx> -#include <com/sun/star/style/XStyle.hpp> #include <xmloff/XMLFontStylesContext.hxx> diff --git a/xmloff/source/draw/shapeexport.cxx b/xmloff/source/draw/shapeexport.cxx index e6728b798ecc..0adf2202bb1e 100644 --- a/xmloff/source/draw/shapeexport.cxx +++ b/xmloff/source/draw/shapeexport.cxx @@ -18,9 +18,7 @@ */ #include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/matrix/b2dhommatrixtools.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> -#include <basegfx/point/b2dpoint.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> @@ -31,11 +29,9 @@ #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/beans/PropertyValues.hpp> -#include <com/sun/star/chart/XChartDocument.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XIdentifierAccess.hpp> -#include <com/sun/star/container/XIdentifierContainer.hpp> #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/document/XEventsSupplier.hpp> #include <com/sun/star/drawing/Alignment.hpp> @@ -43,7 +39,6 @@ #include <com/sun/star/drawing/CircleKind.hpp> #include <com/sun/star/drawing/ConnectorType.hpp> #include <com/sun/star/drawing/Direction3D.hpp> -#include <com/sun/star/drawing/DoubleSequence.hpp> #include <com/sun/star/drawing/EscapeDirection.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeGluePointType.hpp> @@ -67,11 +62,13 @@ #include <com/sun/star/drawing/QRCode.hpp> #include <com/sun/star/drawing/QRCodeErrorCorrection.hpp> #include <com/sun/star/embed/ElementModes.hpp> +#include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/graphic/GraphicProvider.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> #include <com/sun/star/io/XSeekableInputStream.hpp> +#include <com/sun/star/io/XStream.hpp> #include <com/sun/star/lang/ServiceNotRegisteredException.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/media/ZoomLevel.hpp> @@ -81,7 +78,6 @@ #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/table/XColumnRowRange.hpp> #include <com/sun/star/text/XText.hpp> -#include <com/sun/star/document/XStorageBasedDocument.hpp> #include <comphelper/classids.hxx> #include <comphelper/processfactory.hxx> @@ -93,7 +89,6 @@ #include <rtl/math.hxx> #include <rtl/ustrbuf.hxx> -#include <rtl/strbuf.hxx> #include <rtl/ustring.hxx> #include <sal/log.hxx> @@ -102,7 +97,6 @@ #include <tools/debug.hxx> #include <tools/globname.hxx> #include <tools/helpers.hxx> -#include <tools/urlobj.hxx> #include <tools/diagnose_ex.h> #include <xmloff/contextid.hxx> @@ -119,17 +113,13 @@ #include <anim.hxx> #include <EnhancedCustomShapeToken.hxx> -#include <PropertySetMerger.hxx> #include "sdpropls.hxx" -#include "sdxmlexp_impl.hxx" #include <xexptran.hxx> #include "ximpshap.hxx" #include <XMLBase64Export.hxx> #include <XMLImageMapExport.hxx> #include <memory> -#include <config_features.h> - using namespace ::com::sun::star; using namespace ::xmloff::EnhancedCustomShapeToken; using namespace ::xmloff::token; diff --git a/xmloff/source/draw/shapeimport.cxx b/xmloff/source/draw/shapeimport.cxx index 359c4398b14a..f3a5183b976e 100644 --- a/xmloff/source/draw/shapeimport.cxx +++ b/xmloff/source/draw/shapeimport.cxx @@ -21,21 +21,19 @@ #include <tools/diagnose_ex.h> #include <sal/log.hxx> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/text/PositionLayoutDir.hpp> -#include <com/sun/star/chart/XChartDocument.hpp> #include <utility> #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> -#include <list> - #include <xmloff/shapeimport.hxx> +#include <xmloff/xmlstyle.hxx> #include <xmloff/xmltkmap.hxx> #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/table/XMLTableImport.hxx> #include <xmloff/attrlist.hxx> -#include "ximpstyl.hxx" #include "ximpshap.hxx" #include "sdpropls.hxx" #include <xmloff/xmlprmap.hxx> diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx index 9b7a2da59285..c85022b20ae0 100644 --- a/xmloff/source/draw/xexptran.cxx +++ b/xmloff/source/draw/xexptran.cxx @@ -22,16 +22,11 @@ #include <osl/diagnose.h> #include <sax/tools/converter.hxx> #include <xmloff/xmluconv.hxx> -#include <xmloff/xmlexp.hxx> -#include <xmloff/xmlimp.hxx> -#include <tools/helpers.hxx> -#include <basegfx/vector/b2dvector.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/tuple/b3dtuple.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> #include <basegfx/numeric/ftools.hxx> -#include <basegfx/polygon/b2dpolypolygon.hxx> -#include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/matrix/b3dhommatrixtools.hxx> using namespace ::com::sun::star; diff --git a/xmloff/source/draw/ximp3dobject.cxx b/xmloff/source/draw/ximp3dobject.cxx index ccdbee0317b9..3c0ccec851de 100644 --- a/xmloff/source/draw/ximp3dobject.cxx +++ b/xmloff/source/draw/ximp3dobject.cxx @@ -18,18 +18,10 @@ */ #include "ximp3dobject.hxx" -#include <xmloff/XMLShapeStyleContext.hxx> #include <xmloff/xmluconv.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/drawing/PointSequenceSequence.hpp> -#include <com/sun/star/drawing/PointSequence.hpp> #include <xexptran.hxx> -#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp> -#include <xmloff/families.hxx> -#include "ximpstyl.hxx" -#include <xmloff/xmltoken.hxx> #include <com/sun/star/drawing/PolyPolygonShape3D.hpp> -#include <com/sun/star/drawing/DoubleSequence.hpp> #include <com/sun/star/drawing/Direction3D.hpp> #include <com/sun/star/drawing/Position3D.hpp> #include <osl/diagnose.h> diff --git a/xmloff/source/draw/ximpbody.cxx b/xmloff/source/draw/ximpbody.cxx index 7dac691723d2..e2015aedf1e6 100644 --- a/xmloff/source/draw/ximpbody.cxx +++ b/xmloff/source/draw/ximpbody.cxx @@ -18,7 +18,6 @@ */ #include "ximpbody.hxx" -#include <xmloff/prstylei.hxx> #include <xmloff/xmlnmspe.hxx> #include "ximpnote.hxx" #include <com/sun/star/drawing/XDrawPage.hpp> @@ -31,14 +30,10 @@ #include <com/sun/star/animations/XAnimationNodeSupplier.hpp> #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> -#include <xmloff/xmluconv.hxx> -#include <xmloff/xmlprmap.hxx> #include <xmloff/families.hxx> #include "ximpshow.hxx" #include "layerimp.hxx" -#include <PropertySetMerger.hxx> #include <animationimport.hxx> -#include <osl/diagnose.hxx> #include <sal/log.hxx> using namespace ::com::sun::star; diff --git a/xmloff/source/draw/ximpcustomshape.cxx b/xmloff/source/draw/ximpcustomshape.cxx index f484ac7b6664..9baf64552411 100644 --- a/xmloff/source/draw/ximpcustomshape.cxx +++ b/xmloff/source/draw/ximpcustomshape.cxx @@ -18,26 +18,20 @@ */ #include "ximpcustomshape.hxx" -#include "ximpshap.hxx" #include <o3tl/any.hxx> #include <rtl/math.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/awt/Rectangle.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/xml/sax/XAttributeList.hpp> -#include <com/sun/star/container/XIndexContainer.hpp> #include <xmloff/xmltoken.hxx> #include <EnhancedCustomShapeToken.hxx> #include <xmloff/xmlimp.hxx> -#include <xmloff/xmltkmap.hxx> -#include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmlement.hxx> #include <xexptran.hxx> -#include <xmloff/xmlerror.hxx> #include <com/sun/star/drawing/Direction3D.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeParameterType.hpp> diff --git a/xmloff/source/draw/ximppage.cxx b/xmloff/source/draw/ximppage.cxx index 2bfb61072352..5681095d0944 100644 --- a/xmloff/source/draw/ximppage.cxx +++ b/xmloff/source/draw/ximppage.cxx @@ -29,7 +29,6 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> #include "ximppage.hxx" -#include "ximpshap.hxx" #include <animimp.hxx> #include <XMLStringBufferImportContext.hxx> #include <xmloff/xmlictxt.hxx> diff --git a/xmloff/source/draw/ximpshap.cxx b/xmloff/source/draw/ximpshap.cxx index 15219b4fd23c..301415cea228 100644 --- a/xmloff/source/draw/ximpshap.cxx +++ b/xmloff/source/draw/ximpshap.cxx @@ -19,7 +19,6 @@ #include <cassert> -#include <tools/debug.hxx> #include <sal/log.hxx> #include <com/sun/star/document/XEventsSupplier.hpp> #include <com/sun/star/container/XNameReplace.hpp> @@ -28,7 +27,6 @@ #include <com/sun/star/drawing/LineStyle.hpp> #include <xmloff/unointerfacetouniqueidentifiermapper.hxx> #include <com/sun/star/drawing/XGluePointsSupplier.hpp> -#include <com/sun/star/container/XIdentifierAccess.hpp> #include <com/sun/star/drawing/GluePoint2.hpp> #include <com/sun/star/drawing/Alignment.hpp> #include <com/sun/star/drawing/EscapeDirection.hpp> @@ -61,9 +59,7 @@ #include <comphelper/sequence.hxx> #include <tools/diagnose_ex.h> -#include <PropertySetMerger.hxx> #include <xmloff/families.hxx> -#include "ximpstyl.hxx" #include<xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> #include <EnhancedCustomShapeToken.hxx> @@ -93,8 +89,6 @@ #include <basegfx/vector/b2dvector.hxx> #include <o3tl/safeint.hxx> -#include <config_features.h> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing; diff --git a/xmloff/source/draw/ximpstyl.cxx b/xmloff/source/draw/ximpstyl.cxx index a27dd8e7c1d1..a6f3592e015e 100644 --- a/xmloff/source/draw/ximpstyl.cxx +++ b/xmloff/source/draw/ximpstyl.cxx @@ -18,8 +18,10 @@ */ #include "ximpstyl.hxx" +#include <xmloff/maptype.hxx> #include <xmloff/XMLShapeStyleContext.hxx> #include <xmloff/xmlnmspe.hxx> +#include <xmloff/xmlprmap.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include "ximpnote.hxx" @@ -29,7 +31,6 @@ #include <sal/log.hxx> #include <com/sun/star/style/XStyle.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/presentation/XPresentationPage.hpp> #include <com/sun/star/drawing/XDrawPages.hpp> @@ -43,8 +44,6 @@ #include <xmloff/families.hxx> #include <com/sun/star/container/XNameContainer.hpp> #include <svl/zforlist.hxx> -#include <PropertySetMerger.hxx> -#include "sdpropls.hxx" #include "layerimp.hxx" #include <xmloff/XMLGraphicsDefaultStyle.hxx> #include <XMLNumberStylesImport.hxx> diff --git a/xmloff/source/forms/controlpropertyhdl.cxx b/xmloff/source/forms/controlpropertyhdl.cxx index 62914df2d3e1..7bd237a94721 100644 --- a/xmloff/source/forms/controlpropertyhdl.cxx +++ b/xmloff/source/forms/controlpropertyhdl.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/util/MeasureUnit.hpp> #include <com/sun/star/awt/TextAlign.hpp> -#include <com/sun/star/awt/FontWidth.hpp> #include <com/sun/star/awt/FontEmphasisMark.hpp> #include <sax/tools/converter.hxx> @@ -32,7 +31,6 @@ #include <xmloff/xmluconv.hxx> #include <xmloff/xmltoken.hxx> #include <rtl/ustrbuf.hxx> -#include "callbacks.hxx" #include <xmloff/XMLConstantsPropertyHandler.hxx> namespace xmloff diff --git a/xmloff/source/forms/elementexport.cxx b/xmloff/source/forms/elementexport.cxx index 7ba3b4700534..03c188de5da6 100644 --- a/xmloff/source/forms/elementexport.cxx +++ b/xmloff/source/forms/elementexport.cxx @@ -32,7 +32,6 @@ #include <com/sun/star/io/XPersistObject.hpp> #include <com/sun/star/util/Duration.hpp> #include <com/sun/star/form/FormComponentType.hpp> -#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/form/FormSubmitEncoding.hpp> #include <com/sun/star/form/FormSubmitMethod.hpp> #include <com/sun/star/sdb/CommandType.hpp> diff --git a/xmloff/source/forms/formattributes.cxx b/xmloff/source/forms/formattributes.cxx index 7020d91809e3..75c6f5f17805 100644 --- a/xmloff/source/forms/formattributes.cxx +++ b/xmloff/source/forms/formattributes.cxx @@ -19,11 +19,8 @@ #include "formattributes.hxx" -#include <sax/tools/converter.hxx> - #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmluconv.hxx> -#include <rtl/ustrbuf.hxx> #include <osl/diagnose.h> diff --git a/xmloff/source/forms/formcellbinding.cxx b/xmloff/source/forms/formcellbinding.cxx index a982c75cd438..cc03bf95009b 100644 --- a/xmloff/source/forms/formcellbinding.cxx +++ b/xmloff/source/forms/formcellbinding.cxx @@ -20,14 +20,9 @@ #include "formcellbinding.hxx" #include <com/sun/star/form/binding/XBindableValue.hpp> #include <com/sun/star/form/binding/XListEntrySink.hpp> -#include <com/sun/star/form/XGridColumnFactory.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/container/XChild.hpp> -#include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> -#include <com/sun/star/table/XCellRange.hpp> -#include <com/sun/star/form/XFormsSupplier.hpp> -#include <com/sun/star/form/XForm.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/NamedValue.hpp> diff --git a/xmloff/source/forms/formenums.cxx b/xmloff/source/forms/formenums.cxx index 62d1e7e418e4..31567ddf7478 100644 --- a/xmloff/source/forms/formenums.cxx +++ b/xmloff/source/forms/formenums.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/form/FormButtonType.hpp> #include <com/sun/star/form/ListSourceType.hpp> #include <com/sun/star/awt/TextAlign.hpp> -#include <com/sun/star/awt/FontWidth.hpp> #include <com/sun/star/awt/FontEmphasisMark.hpp> #include <com/sun/star/awt/FontRelief.hpp> #include <com/sun/star/awt/ScrollBarOrientation.hpp> diff --git a/xmloff/source/forms/formlayerexport.cxx b/xmloff/source/forms/formlayerexport.cxx index f9a2405ac2b0..661e83630e04 100644 --- a/xmloff/source/forms/formlayerexport.cxx +++ b/xmloff/source/forms/formlayerexport.cxx @@ -18,14 +18,9 @@ */ #include <xmloff/formlayerexport.hxx> -#include "strings.hxx" -#include "elementexport.hxx" -#include <xmloff/xmlnmspe.hxx> #include <xmloff/xmlexp.hxx> #include "layerexport.hxx" -#include "propertyexport.hxx" #include <osl/diagnose.h> -#include <com/sun/star/lang/XServiceInfo.hpp> #include "officeforms.hxx" namespace xmloff diff --git a/xmloff/source/forms/handler/form_handler_factory.cxx b/xmloff/source/forms/handler/form_handler_factory.cxx index 9699193af488..2a943aa82355 100644 --- a/xmloff/source/forms/handler/form_handler_factory.cxx +++ b/xmloff/source/forms/handler/form_handler_factory.cxx @@ -21,7 +21,6 @@ #include "vcl_date_handler.hxx" #include "vcl_time_handler.hxx" #include <osl/diagnose.h> -#include <osl/mutex.hxx> namespace xmloff { diff --git a/xmloff/source/forms/handler/vcl_date_handler.cxx b/xmloff/source/forms/handler/vcl_date_handler.cxx index 8821eec23361..1961f332e536 100644 --- a/xmloff/source/forms/handler/vcl_date_handler.cxx +++ b/xmloff/source/forms/handler/vcl_date_handler.cxx @@ -26,7 +26,7 @@ #include <sax/tools/converter.hxx> -#include <tools/diagnose_ex.h> +#include <osl/diagnose.h> #include <tools/date.hxx> namespace xmloff diff --git a/xmloff/source/forms/handler/vcl_time_handler.cxx b/xmloff/source/forms/handler/vcl_time_handler.cxx index c37379b37b64..038559a0a80c 100644 --- a/xmloff/source/forms/handler/vcl_time_handler.cxx +++ b/xmloff/source/forms/handler/vcl_time_handler.cxx @@ -26,7 +26,7 @@ #include <sax/tools/converter.hxx> -#include <tools/diagnose_ex.h> +#include <osl/diagnose.h> #include <tools/time.hxx> namespace xmloff diff --git a/xmloff/source/forms/layerexport.cxx b/xmloff/source/forms/layerexport.cxx index a4de8636d8e8..41dce892b047 100644 --- a/xmloff/source/forms/layerexport.cxx +++ b/xmloff/source/forms/layerexport.cxx @@ -20,9 +20,6 @@ #include "layerexport.hxx" #include "strings.hxx" #include <xmloff/xmlexp.hxx> -#include <xmloff/nmspmap.hxx> -#include <xmloff/xmlnmspe.hxx> -#include <xmloff/xmluconv.hxx> #include <xmloff/xmlprmap.hxx> #include <xmloff/prhdlfac.hxx> #include "elementexport.hxx" @@ -32,22 +29,18 @@ #include <xmloff/maptype.hxx> #include <sal/log.hxx> #include <tools/diagnose_ex.h> -#include <tools/debug.hxx> #include "controlpropertymap.hxx" #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/form/XFormsSupplier2.hpp> #include <com/sun/star/xforms/XFormsSupplier.hpp> #include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/container/XChild.hpp> #include <com/sun/star/script/XEventAttacherManager.hpp> #include <com/sun/star/util/NumberFormatsSupplier.hpp> -#include "eventexport.hxx" #include <xmloff/XMLEventExport.hxx> #include "formevents.hxx" #include <xmloff/xmlnumfe.hxx> #include <xmloff/xformsexport.hxx> -#include <comphelper/processfactory.hxx> #include <com/sun/star/text/XText.hpp> diff --git a/xmloff/source/forms/layerimport.cxx b/xmloff/source/forms/layerimport.cxx index da569c8e29b0..7bf0ed4177b1 100644 --- a/xmloff/source/forms/layerimport.cxx +++ b/xmloff/source/forms/layerimport.cxx @@ -25,11 +25,8 @@ #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlstyle.hxx> #include <xmloff/families.hxx> -#include <xmloff/xmlprmap.hxx> -#include <xmloff/prstylei.hxx> #include <xmloff/xmlimp.hxx> #include <XMLEventImportHelper.hxx> -#include <xmloff/xmlimppr.hxx> #include <xmloff/xmlnumfi.hxx> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/form/FormSubmitEncoding.hpp> @@ -38,13 +35,7 @@ #include <com/sun/star/form/NavigationBarMode.hpp> #include <com/sun/star/form/TabulatorCycle.hpp> #include <com/sun/star/form/FormButtonType.hpp> -#include <com/sun/star/awt/ScrollBarOrientation.hpp> -#include <com/sun/star/awt/VisualEffect.hpp> #include <com/sun/star/form/ListSourceType.hpp> -#include <tools/gen.hxx> -#include <com/sun/star/lang/Locale.hpp> -#include <xmloff/controlpropertyhdl.hxx> -#include "controlpropertymap.hxx" #include "formevents.hxx" #include "formcellbinding.hxx" #include <xmloff/xformsimport.hxx> @@ -52,7 +43,6 @@ #include <xmloff/xmlnmspe.hxx> #include <rtl/strbuf.hxx> #include <algorithm> -#include <functional> namespace xmloff { diff --git a/xmloff/source/forms/propertyexport.cxx b/xmloff/source/forms/propertyexport.cxx index 891e33460450..ca507c0d675a 100644 --- a/xmloff/source/forms/propertyexport.cxx +++ b/xmloff/source/forms/propertyexport.cxx @@ -25,12 +25,10 @@ #include "strings.hxx" #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmluconv.hxx> -#include <xmloff/families.hxx> #include <xmloff/xmlexppr.hxx> #include <xmloff/xmlprmap.hxx> #include <sax/tools/converter.hxx> #include <osl/diagnose.h> -#include <rtl/strbuf.hxx> #include <sal/log.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/util/Date.hpp> @@ -38,7 +36,6 @@ #include <com/sun/star/util/Time.hpp> #include <com/sun/star/util/DateTime.hpp> #include <comphelper/extract.hxx> -#include <comphelper/sequence.hxx> #include <comphelper/types.hxx> #include "callbacks.hxx" #include <unotools/datetime.hxx> diff --git a/xmloff/source/forms/propertyimport.cxx b/xmloff/source/forms/propertyimport.cxx index 1099af354d77..d14f0afefa81 100644 --- a/xmloff/source/forms/propertyimport.cxx +++ b/xmloff/source/forms/propertyimport.cxx @@ -32,7 +32,6 @@ #include <osl/diagnose.h> #include <sal/log.hxx> #include <comphelper/extract.hxx> -#include "callbacks.hxx" #include <xmloff/xmlnmspe.hxx> #include <tools/date.hxx> #include <tools/time.hxx> @@ -42,10 +41,6 @@ #include <unotools/datetime.hxx> #include <rtl/strbuf.hxx> -#if OSL_DEBUG_LEVEL > 0 - #include <osl/thread.h> -#endif - namespace xmloff { diff --git a/xmloff/source/meta/MetaExportComponent.cxx b/xmloff/source/meta/MetaExportComponent.cxx index 3c1c4225d5cb..eeb9a97882d7 100644 --- a/xmloff/source/meta/MetaExportComponent.cxx +++ b/xmloff/source/meta/MetaExportComponent.cxx @@ -31,7 +31,6 @@ #include <comphelper/genericpropertyset.hxx> #include <comphelper/propertysetinfo.hxx> #include <comphelper/processfactory.hxx> -#include <rtl/ustrbuf.hxx> #include <osl/diagnose.h> #include <xmloff/xmlnmspe.hxx> #include <xmloff/nmspmap.hxx> diff --git a/xmloff/source/meta/MetaImportComponent.cxx b/xmloff/source/meta/MetaImportComponent.cxx index 728b925b413f..72661847c046 100644 --- a/xmloff/source/meta/MetaImportComponent.cxx +++ b/xmloff/source/meta/MetaImportComponent.cxx @@ -20,8 +20,6 @@ #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlmetai.hxx> -#include <xmloff/nmspmap.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <xmloff/xmlimp.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/document/XDocumentProperties.hpp> diff --git a/xmloff/source/meta/xmlmetae.cxx b/xmloff/source/meta/xmlmetae.cxx index ac4a1da506f5..bb50930e1ec5 100644 --- a/xmloff/source/meta/xmlmetae.cxx +++ b/xmloff/source/meta/xmlmetae.cxx @@ -31,7 +31,6 @@ #include <com/sun/star/document/XDocumentProperties.hpp> #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/util/Duration.hpp> -#include <com/sun/star/xml/dom/XDocument.hpp> #include <com/sun/star/xml/sax/XSAXSerializable.hpp> #include <sax/tools/converter.hxx> @@ -39,8 +38,6 @@ #include <comphelper/sequence.hxx> #include <unotools/docinfohelper.hxx> -#include <string.h> - using namespace com::sun::star; using namespace ::xmloff::token; diff --git a/xmloff/source/meta/xmlmetai.cxx b/xmloff/source/meta/xmlmetai.cxx index 671978230406..907fd68d4e0d 100644 --- a/xmloff/source/meta/xmlmetai.cxx +++ b/xmloff/source/meta/xmlmetai.cxx @@ -33,7 +33,6 @@ #include <rtl/character.hxx> #include <xmloff/xmlmetai.hxx> #include <xmloff/xmlimp.hxx> -#include <xmloff/nmspmap.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmlnmspe.hxx> diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx index 30f2fdf8e1e0..c4a71689ae84 100644 --- a/xmloff/source/meta/xmlversion.cxx +++ b/xmloff/source/meta/xmlversion.cxx @@ -18,7 +18,6 @@ */ #include <com/sun/star/embed/ElementModes.hpp> -#include <unotools/streamwrap.hxx> #include <xmlversion.hxx> #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmlmetae.hxx> @@ -28,7 +27,6 @@ #include <comphelper/processfactory.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/io/IOException.hpp> -#include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/util/MeasureUnit.hpp> |