diff options
34 files changed, 27 insertions, 77 deletions
diff --git a/xmloff/IwyuFilter_xmloff.yaml b/xmloff/IwyuFilter_xmloff.yaml index 02fb7c1b4010..b187263736d0 100644 --- a/xmloff/IwyuFilter_xmloff.yaml +++ b/xmloff/IwyuFilter_xmloff.yaml @@ -1,25 +1,15 @@ --- assumeFilename: xmloff/source/core/xmlexp.cxx excludelist: + xmloff/inc/DomExport.hxx: + # Needed for css shortcut + - sal/types.h xmloff/inc/XMLImageMapExport.hxx: # Needed for css shortcut - sal/types.h xmloff/inc/XMLTextColumnsExport.hxx: # Needed for css shortcut - sal/types.h - xmloff/source/chart/PropertyMap.hxx: - # Needed for constants used in arrays - - xmloff/maptype.hxx - - xmloff/xmlnamespace.hxx - - xmloff/xmlement.hxx - - com/sun/star/chart/ChartAxisArrangeOrderType.hpp - - com/sun/star/chart/ChartAxisLabelPosition.hpp - - com/sun/star/chart/ChartAxisMarkPosition.hpp - - com/sun/star/chart/ErrorBarStyle.hpp - - com/sun/star/chart/ChartSolidType.hpp - - com/sun/star/chart/ChartDataRowSource.hpp - - com/sun/star/chart/DataLabelPlacement.hpp - - com/sun/star/chart/MissingValueTreatment.hpp xmloff/source/forms/logging.hxx: # Used after #ifdef TIMELOG - stack diff --git a/xmloff/inc/AutoStyleEntry.hxx b/xmloff/inc/AutoStyleEntry.hxx index 15f99f1b113f..9e3aadbd32df 100644 --- a/xmloff/inc/AutoStyleEntry.hxx +++ b/xmloff/inc/AutoStyleEntry.hxx @@ -13,7 +13,6 @@ #include <sal/config.h> #include <rtl/ustring.hxx> #include <com/sun/star/uno/Any.hxx> -#include <xmloff/dllapi.h> #include <utility> #include <vector> diff --git a/xmloff/inc/DomExport.hxx b/xmloff/inc/DomExport.hxx index b6646214f7e8..ebf3779b0bff 100644 --- a/xmloff/inc/DomExport.hxx +++ b/xmloff/inc/DomExport.hxx @@ -18,14 +18,12 @@ */ #pragma once -// the Solaris compiler apparently needs the following include: -#include <com/sun/star/uno/Reference.hxx> +#include <sal/types.h> class SvXMLExport; namespace com::sun::star { namespace uno { template<typename T> class Reference; } namespace xml::dom { class XDocument; } - namespace xml::dom { class XNode; } } void exportDom( SvXMLExport&, const css::uno::Reference<css::xml::dom::XDocument>& ); diff --git a/xmloff/inc/StyleMap.hxx b/xmloff/inc/StyleMap.hxx index 796245f52fc7..0e7fe1b40b06 100644 --- a/xmloff/inc/StyleMap.hxx +++ b/xmloff/inc/StyleMap.hxx @@ -19,7 +19,6 @@ #pragma once -#include <comphelper/servicehelper.hxx> #include <cppuhelper/implbase.hxx> #include <o3tl/hash_combine.hxx> #include <unordered_map> diff --git a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx index 2bd8efc40364..4b1b50fc45da 100644 --- a/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx +++ b/xmloff/inc/XMLFootnoteConfigurationImportContext.hxx @@ -19,7 +19,6 @@ #pragma once -#include <memory> #include <xmloff/xmlstyle.hxx> namespace com::sun::star { diff --git a/xmloff/inc/XMLImageMapContext.hxx b/xmloff/inc/XMLImageMapContext.hxx index aec96fb29e9c..0579494b7213 100644 --- a/xmloff/inc/XMLImageMapContext.hxx +++ b/xmloff/inc/XMLImageMapContext.hxx @@ -20,7 +20,6 @@ #pragma once #include <xmloff/xmlictxt.hxx> -#include <rtl/ustring.hxx> #include <com/sun/star/uno/Reference.h> namespace com::sun::star { diff --git a/xmloff/inc/XMLThemeContext.hxx b/xmloff/inc/XMLThemeContext.hxx index c3056fa74216..7b24671eb3ff 100644 --- a/xmloff/inc/XMLThemeContext.hxx +++ b/xmloff/inc/XMLThemeContext.hxx @@ -7,12 +7,10 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <utility> -#include <xmloff/xmlprcon.hxx> +#include <xmloff/xmlictxt.hxx> #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/util/Color.hpp> -#include <com/sun/star/container/XNameContainer.hpp> #include <docmodel/theme/ColorSet.hxx> diff --git a/xmloff/inc/animimp.hxx b/xmloff/inc/animimp.hxx index b26c138ab6a5..9653d810b32e 100644 --- a/xmloff/inc/animimp.hxx +++ b/xmloff/inc/animimp.hxx @@ -19,8 +19,6 @@ #pragma once -#include <memory> - #include <xmloff/xmlictxt.hxx> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/xmloff/inc/fasttokenhandler.hxx b/xmloff/inc/fasttokenhandler.hxx index 528ecde17546..ed64c6938065 100644 --- a/xmloff/inc/fasttokenhandler.hxx +++ b/xmloff/inc/fasttokenhandler.hxx @@ -9,12 +9,9 @@ #pragma once -#include <com/sun/star/xml/sax/XFastTokenHandler.hpp> -#include <cppuhelper/implbase.hxx> #include <sax/fastattribs.hxx> #include <xmloff/token/tokens.hxx> #include <sal/log.hxx> -#include <xmloff/dllapi.h> namespace xmloff::token { diff --git a/xmloff/inc/forms/property_handler.hxx b/xmloff/inc/forms/property_handler.hxx index 822baaf3c9e6..1eadd2d88444 100644 --- a/xmloff/inc/forms/property_handler.hxx +++ b/xmloff/inc/forms/property_handler.hxx @@ -27,7 +27,6 @@ #include <salhelper/simplereferenceobject.hxx> #include <map> -#include <vector> namespace xmloff { diff --git a/xmloff/inc/txtflde.hxx b/xmloff/inc/txtflde.hxx index f21b85eb1b2a..06d5edcaa2b4 100644 --- a/xmloff/inc/txtflde.hxx +++ b/xmloff/inc/txtflde.hxx @@ -35,19 +35,15 @@ #include <optional> #include <string_view> -#include "txtfld.hxx" - class SvXMLExport; struct XMLPropertyState; namespace com::sun::star { namespace util { struct DateTime; } - namespace util { struct Date; } namespace text { class XTextField; } namespace text { class XText; } namespace beans { class XPropertySet; } namespace beans { class XPropertySetInfo; } - namespace frame { class XModel; } namespace uno { template<typename A> class Sequence; } } diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx index 3d56c547811e..4639ec43f38b 100644 --- a/xmloff/inc/txtfldi.hxx +++ b/xmloff/inc/txtfldi.hxx @@ -30,11 +30,10 @@ #include <com/sun/star/text/PageNumberType.hpp> #include <com/sun/star/util/DateTime.hpp> #include <xmloff/xmlictxt.hxx> +#include <xmloff/XMLEventsImportContext.hxx> #include <xmloff/txtimp.hxx> -#include <xmloff/xmltkmap.hxx> #include <rtl/ustrbuf.hxx> #include <vector> -#include "txtfld.hxx" namespace com::sun::star { namespace xml::sax { class XAttributeList; } diff --git a/xmloff/inc/xmlprop.hxx b/xmloff/inc/xmlprop.hxx index 89c53b72a8ea..50978ed0fa75 100644 --- a/xmloff/inc/xmlprop.hxx +++ b/xmloff/inc/xmlprop.hxx @@ -8,6 +8,8 @@ */ #pragma once +#include <rtl/ustring.hxx> + inline constexpr OUString PROP_ = u""_ustr; inline constexpr OUString PROP_AdjustBlue = u"AdjustBlue"_ustr; inline constexpr OUString PROP_AdjustContrast = u"AdjustContrast"_ustr; diff --git a/xmloff/inc/xmltabe.hxx b/xmloff/inc/xmltabe.hxx index ad28e77147e3..5239648935cb 100644 --- a/xmloff/inc/xmltabe.hxx +++ b/xmloff/inc/xmltabe.hxx @@ -21,7 +21,6 @@ // prevent funny things like "#define sun 1" from the compiler #include <sal/config.h> -#include <sal/types.h> class SvXMLExport; namespace com::sun::star { diff --git a/xmloff/source/chart/PropertyMap.hxx b/xmloff/source/chart/PropertyMap.hxx index f9a3dc4e3b8e..cd6370e78bc9 100644 --- a/xmloff/source/chart/PropertyMap.hxx +++ b/xmloff/source/chart/PropertyMap.hxx @@ -18,19 +18,8 @@ */ #pragma once -#include <xmloff/maptype.hxx> -#include <xmloff/xmlnamespace.hxx> #include <xmloff/xmltypes.hxx> #include <xmloff/contextid.hxx> -#include <xmloff/xmlement.hxx> -#include <com/sun/star/chart/ChartAxisArrangeOrderType.hpp> -#include <com/sun/star/chart/ChartAxisLabelPosition.hpp> -#include <com/sun/star/chart/ChartAxisMarkPosition.hpp> -#include <com/sun/star/chart/ErrorBarStyle.hpp> -#include <com/sun/star/chart/ChartSolidType.hpp> -#include <com/sun/star/chart/ChartDataRowSource.hpp> -#include <com/sun/star/chart/DataLabelPlacement.hpp> -#include <com/sun/star/chart/MissingValueTreatment.hpp> // custom types #define XML_SCH_TYPE_AXIS_ARRANGEMENT ( XML_SCH_TYPES_START + 0 ) diff --git a/xmloff/source/chart/PropertyMaps.cxx b/xmloff/source/chart/PropertyMaps.cxx index 964e317e780c..c51818af7b5b 100644 --- a/xmloff/source/chart/PropertyMaps.cxx +++ b/xmloff/source/chart/PropertyMaps.cxx @@ -33,8 +33,10 @@ #include <xmloff/EnumPropertyHdl.hxx> #include <comphelper/attributelist.hxx> #include <xmloff/namespacemap.hxx> +#include <xmloff/xmlnamespace.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/shapeimport.hxx> +#include <xmloff/xmlement.hxx> #include <xmloff/xmlexp.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/prhdlfac.hxx> @@ -42,8 +44,16 @@ #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/chart/ChartAxisArrangeOrderType.hpp> +#include <com/sun/star/chart/ChartAxisLabelPosition.hpp> +#include <com/sun/star/chart/ChartAxisMarkPosition.hpp> #include <com/sun/star/chart/ChartAxisMarks.hpp> #include <com/sun/star/chart/ChartDataCaption.hpp> +#include <com/sun/star/chart/ChartDataRowSource.hpp> +#include <com/sun/star/chart/ChartSolidType.hpp> +#include <com/sun/star/chart/DataLabelPlacement.hpp> +#include <com/sun/star/chart/ErrorBarStyle.hpp> +#include <com/sun/star/chart/MissingValueTreatment.hpp> #include <com/sun/star/chart2/MovingAverageType.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart2/data/XRangeXMLConversion.hpp> diff --git a/xmloff/source/chart/SchXMLAxisContext.hxx b/xmloff/source/chart/SchXMLAxisContext.hxx index f128edeab461..8ac8653f4623 100644 --- a/xmloff/source/chart/SchXMLAxisContext.hxx +++ b/xmloff/source/chart/SchXMLAxisContext.hxx @@ -24,7 +24,6 @@ #include "transporttypes.hxx" #include <com/sun/star/chart/XDiagram.hpp> -#include <com/sun/star/xml/sax/XAttributeList.hpp> class SchXMLAxisContext : public SvXMLImportContext { diff --git a/xmloff/source/chart/SchXMLDataTableContext.hxx b/xmloff/source/chart/SchXMLDataTableContext.hxx index fbf87fb44967..28d0e2010361 100644 --- a/xmloff/source/chart/SchXMLDataTableContext.hxx +++ b/xmloff/source/chart/SchXMLDataTableContext.hxx @@ -18,8 +18,6 @@ */ #pragma once -#include <com/sun/star/xml/sax/XAttributeList.hpp> - #include <xmloff/SchXMLImportHelper.hxx> #include <xmloff/xmlictxt.hxx> diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx index 4566941f4fca..5426509e8c31 100644 --- a/xmloff/source/chart/SchXMLExport.cxx +++ b/xmloff/source/chart/SchXMLExport.cxx @@ -67,6 +67,7 @@ #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/ErrorBarStyle.hpp> #include <com/sun/star/chart/DataLabelPlacement.hpp> #include <com/sun/star/chart/TimeIncrement.hpp> #include <com/sun/star/chart/TimeInterval.hpp> diff --git a/xmloff/source/chart/SchXMLLegendContext.hxx b/xmloff/source/chart/SchXMLLegendContext.hxx index 9477e45b77cc..29ef794f52a5 100644 --- a/xmloff/source/chart/SchXMLLegendContext.hxx +++ b/xmloff/source/chart/SchXMLLegendContext.hxx @@ -18,8 +18,6 @@ */ #pragma once -#include <com/sun/star/xml/sax/XAttributeList.hpp> - #include <xmloff/SchXMLImportHelper.hxx> #include <xmloff/xmlictxt.hxx> diff --git a/xmloff/source/chart/SchXMLPropertyMappingContext.hxx b/xmloff/source/chart/SchXMLPropertyMappingContext.hxx index ec9010a6c69a..3ac7cb7191a4 100644 --- a/xmloff/source/chart/SchXMLPropertyMappingContext.hxx +++ b/xmloff/source/chart/SchXMLPropertyMappingContext.hxx @@ -11,7 +11,6 @@ #include "transporttypes.hxx" #include <xmloff/xmlictxt.hxx> -#include <xmloff/SchXMLImportHelper.hxx> namespace com::sun::star { namespace chart2 { diff --git a/xmloff/source/draw/ximp3dscene.hxx b/xmloff/source/draw/ximp3dscene.hxx index b0155591e3e9..57cf8b64fa30 100644 --- a/xmloff/source/draw/ximp3dscene.hxx +++ b/xmloff/source/draw/ximp3dscene.hxx @@ -19,7 +19,6 @@ #pragma once -#include <xmloff/xmlictxt.hxx> #include <com/sun/star/drawing/XShapes.hpp> #include "ximpshap.hxx" diff --git a/xmloff/source/draw/ximpgrp.hxx b/xmloff/source/draw/ximpgrp.hxx index 8dda1b9ba15f..3bda33b22757 100644 --- a/xmloff/source/draw/ximpgrp.hxx +++ b/xmloff/source/draw/ximpgrp.hxx @@ -19,7 +19,6 @@ #pragma once -#include <xmloff/xmlictxt.hxx> #include <com/sun/star/drawing/XShapes.hpp> #include "ximpshap.hxx" diff --git a/xmloff/source/draw/ximpshow.hxx b/xmloff/source/draw/ximpshow.hxx index 33948c3a644c..a72cf2dbd37c 100644 --- a/xmloff/source/draw/ximpshow.hxx +++ b/xmloff/source/draw/ximpshow.hxx @@ -21,7 +21,6 @@ #include <xmloff/xmlictxt.hxx> #include "sdxmlimp_impl.hxx" -#include <memory> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/container/XNameContainer.hpp> diff --git a/xmloff/source/draw/ximpstyl.hxx b/xmloff/source/draw/ximpstyl.hxx index b26e46eacd7c..115bf2bcb5b5 100644 --- a/xmloff/source/draw/ximpstyl.hxx +++ b/xmloff/source/draw/ximpstyl.hxx @@ -19,7 +19,7 @@ #pragma once -#include <svl/zforlist.hxx> +#include <svl/numformat.hxx> #include <xmloff/xmlictxt.hxx> #include <xmloff/xmlimppr.hxx> #include <xmloff/xmlnumfi.hxx> @@ -30,9 +30,6 @@ #include <memory> #include <vector> -class SvNumberFormatter; -class SvXMLNumFmtHelper; - // special style:style context inside style:page-master context class SdXMLPageMasterStyleContext: public SvXMLStyleContext diff --git a/xmloff/source/forms/layerimport.hxx b/xmloff/source/forms/layerimport.hxx index 21e3a79c723b..9cf17f00bb85 100644 --- a/xmloff/source/forms/layerimport.hxx +++ b/xmloff/source/forms/layerimport.hxx @@ -24,7 +24,7 @@ #include <map> #include <unordered_map> -#include <com/sun/star/xml/sax/XAttributeList.hpp> +#include <com/sun/star/xml/sax/XFastAttributeList.hpp> #include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/form/XFormsSupplier2.hpp> #include <rtl/ref.hxx> diff --git a/xmloff/source/script/xmlbasicscript.hxx b/xmloff/source/script/xmlbasicscript.hxx index 04dd31211ce5..3f272d041466 100644 --- a/xmloff/source/script/xmlbasicscript.hxx +++ b/xmloff/source/script/xmlbasicscript.hxx @@ -21,10 +21,7 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/script/XLibraryContainer2.hpp> -#include <cppuhelper/implbase.hxx> -#include <osl/mutex.hxx> #include <rtl/ustrbuf.hxx> -#include <rtl/ref.hxx> #include <xmloff/xmlimp.hxx> namespace xmloff @@ -108,4 +105,4 @@ public: } // namespace xmloff -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/source/style/XMLFontStylesContext_impl.hxx b/xmloff/source/style/XMLFontStylesContext_impl.hxx index b86bedbd1203..0fdcb8104175 100644 --- a/xmloff/source/style/XMLFontStylesContext_impl.hxx +++ b/xmloff/source/style/XMLFontStylesContext_impl.hxx @@ -20,6 +20,7 @@ #pragma once #include <xmloff/xmlstyle.hxx> +#include <xmloff/XMLFontStylesContext.hxx> namespace com::sun::star::io { class XOutputStream; diff --git a/xmloff/source/style/impastpl.hxx b/xmloff/source/style/impastpl.hxx index 7cbb89817132..9b0c981e7e74 100644 --- a/xmloff/source/style/impastpl.hxx +++ b/xmloff/source/style/impastpl.hxx @@ -23,21 +23,15 @@ #include <rtl/ustring.hxx> #include <rtl/ref.hxx> #include <set> -#include <memory> #include <utility> #include <vector> -#include <comphelper/stl_types.hxx> - #include <xmloff/maptype.hxx> #include <xmloff/xmlexppr.hxx> #include <AutoStyleEntry.hxx> class SvXMLAutoStylePoolP; -class XMLAutoStylePoolParent; struct XMLAutoStyleFamily; -class SvXMLExportPropertyMapper; -class SvXMLExport; enum class XmlStyleFamily; // Properties of a pool diff --git a/xmloff/source/text/XMLRedlineExport.hxx b/xmloff/source/text/XMLRedlineExport.hxx index 9031aacdbd20..a1180a954ffa 100644 --- a/xmloff/source/text/XMLRedlineExport.hxx +++ b/xmloff/source/text/XMLRedlineExport.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/uno/Sequence.h> #include <vector> -#include <memory> #include <map> class SvXMLExport; diff --git a/xmloff/source/text/txtflde.cxx b/xmloff/source/text/txtflde.cxx index 0beab8dd8994..83debd8eb7f7 100644 --- a/xmloff/source/text/txtflde.cxx +++ b/xmloff/source/text/txtflde.cxx @@ -24,6 +24,7 @@ */ #include <comphelper/propertyvalue.hxx> #include <txtflde.hxx> +#include <txtfld.hxx> #include <xmloff/XMLEventExport.hxx> #include <xmloff/families.hxx> #include <xmloff/namespacemap.hxx> diff --git a/xmloff/source/text/txtfldi.cxx b/xmloff/source/text/txtfldi.cxx index 183c55e6d54d..532824a728af 100644 --- a/xmloff/source/text/txtfldi.cxx +++ b/xmloff/source/text/txtfldi.cxx @@ -29,6 +29,7 @@ #include <cassert> +#include <txtfld.hxx> #include <txtfldi.hxx> #include <txtvfldi.hxx> #include <utility> diff --git a/xmloff/source/text/xmlcontentcontrolcontext.hxx b/xmloff/source/text/xmlcontentcontrolcontext.hxx index 13c1e50f23fa..99d126c5d0bb 100644 --- a/xmloff/source/text/xmlcontentcontrolcontext.hxx +++ b/xmloff/source/text/xmlcontentcontrolcontext.hxx @@ -22,7 +22,7 @@ #include <vector> -#include <com/sun/star/text/XTextContent.hpp> +#include <com/sun/star/text/XTextRange.hpp> #include <com/sun/star/beans/PropertyValues.hpp> class XMLHints_Impl; diff --git a/xmloff/source/xforms/TokenContext.hxx b/xmloff/source/xforms/TokenContext.hxx index 84ed18ab535e..f45c1a1c7f95 100644 --- a/xmloff/source/xforms/TokenContext.hxx +++ b/xmloff/source/xforms/TokenContext.hxx @@ -20,15 +20,12 @@ #pragma once #include <xmloff/xmlictxt.hxx> -#include <xmloff/xmltkmap.hxx> +#include <sax/fastattribs.hxx> namespace com::sun::star { - namespace xml::sax { class XFastAttributeList; } namespace uno { template<typename T> class Reference; } } -class SvXMLImport; - /** handle attributes through an SvXMLTokenMap */ class TokenContext : public SvXMLImportContext { |