diff options
29 files changed, 37 insertions, 48 deletions
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index ce9a9100dff6..85507711eb80 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -465,19 +465,11 @@ blacklist: # Needed for macros - comphelper/servicehelper.hxx - tools/diagnose_ex.h - include/xmloff/XMLEmbeddedObjectExportFilter.hxx: - # base class has to be a complete type - - com/sun/star/lang/XInitialization.hpp - - com/sun/star/lang/XServiceInfo.hpp - - com/sun/star/xml/sax/XExtendedDocumentHandler.hpp include/xmloff/attrlist.hxx: # base class has to be a complete type - com/sun/star/lang/XUnoTunnel.hpp - com/sun/star/util/XCloneable.hpp - com/sun/star/xml/sax/XAttributeList.hpp - include/xmloff/fasttokenhandler.hxx: - # base class has to be a complete type - - com/sun/star/xml/sax/XFastTokenHandler.hpp include/xmloff/unointerfacetouniqueidentifiermapper.hxx: # base class has to be a complete type - com/sun/star/uno/XInterface.hpp @@ -510,9 +502,6 @@ blacklist: - com/sun/star/xml/sax/XExtendedDocumentHandler.hpp - com/sun/star/xml/sax/XFastDocumentHandler.hpp - com/sun/star/xml/sax/XFastParser.hpp - include/xmloff/xmltabe.hxx: - # Needed for css shortcut - - sal/types.h include/svtools/accessibleruler.hxx: # base class has to be a complete type - com/sun/star/accessibility/XAccessible.hpp diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 454e57c4d1d1..e69df4d693de 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -7911,18 +7911,15 @@ include/xmloff/HatchStyle.hxx include/xmloff/ImageStyle.hxx include/xmloff/MarkerStyle.hxx include/xmloff/NamedBoolPropertyHdl.hxx -include/xmloff/PageMasterStyleMap.hxx include/xmloff/ProgressBarHelper.hxx include/xmloff/SchXMLExportHelper.hxx include/xmloff/SchXMLImportHelper.hxx include/xmloff/SchXMLSeriesHelper.hxx include/xmloff/SettingsExportHelper.hxx include/xmloff/SinglePropertySetInfoCache.hxx -include/xmloff/WordWrapPropertyHdl.hxx include/xmloff/XMLBase64ImportContext.hxx include/xmloff/XMLCharContext.hxx include/xmloff/XMLConstantsPropertyHandler.hxx -include/xmloff/XMLEmbeddedObjectExportFilter.hxx include/xmloff/XMLEventExport.hxx include/xmloff/XMLEventsImportContext.hxx include/xmloff/XMLFilterServiceNames.h @@ -7947,7 +7944,6 @@ include/xmloff/contextid.hxx include/xmloff/controlpropertyhdl.hxx include/xmloff/dllapi.h include/xmloff/families.hxx -include/xmloff/fasttokenhandler.hxx include/xmloff/formlayerexport.hxx include/xmloff/formlayerimport.hxx include/xmloff/i18nmap.hxx @@ -7995,7 +7991,6 @@ include/xmloff/xmlprhdl.hxx include/xmloff/xmlprmap.hxx include/xmloff/xmlscripti.hxx include/xmloff/xmlstyle.hxx -include/xmloff/xmltabe.hxx include/xmloff/xmltkmap.hxx include/xmloff/xmltoken.hxx include/xmloff/xmltypes.hxx @@ -18391,6 +18386,7 @@ xmloff/inc/EnhancedCustomShapeToken.hxx xmloff/inc/MetaExportComponent.hxx xmloff/inc/MultiPropertySetHelper.hxx xmloff/inc/PageMasterImportContext.hxx +xmloff/inc/PageMasterStyleMap.hxx xmloff/inc/PropertySetMerger.hxx xmloff/inc/RDFaExportHelper.hxx xmloff/inc/RDFaImportHelper.hxx @@ -18399,6 +18395,7 @@ xmloff/inc/SchXMLExport.hxx xmloff/inc/SchXMLImport.hxx xmloff/inc/StyleMap.hxx xmloff/inc/TransGradientStyle.hxx +xmloff/inc/WordWrapPropertyHdl.hxx xmloff/inc/XMLBackgroundImageContext.hxx xmloff/inc/XMLBackgroundImageExport.hxx xmloff/inc/XMLBase64Export.hxx @@ -18409,6 +18406,7 @@ xmloff/inc/XMLChartPropertySetMapper.hxx xmloff/inc/XMLChartStyleContext.hxx xmloff/inc/XMLClipPropertyHandler.hxx xmloff/inc/XMLElementPropertyContext.hxx +xmloff/inc/XMLEmbeddedObjectExportFilter.hxx xmloff/inc/XMLEmbeddedObjectImportContext.hxx xmloff/inc/XMLEventImportHelper.hxx xmloff/inc/XMLFillBitmapSizePropertyHandler.hxx @@ -18438,6 +18436,7 @@ xmloff/inc/animations.hxx xmloff/inc/animimp.hxx xmloff/inc/enummaps.hxx xmloff/inc/facreg.hxx +xmloff/inc/fasttokenhandler.hxx xmloff/inc/forms/form_handler_factory.hxx xmloff/inc/forms/property_handler.hxx xmloff/inc/forms/property_ids.hxx @@ -18447,6 +18446,7 @@ xmloff/inc/pch/precompiled_xof.cxx xmloff/inc/pch/precompiled_xof.hxx xmloff/inc/propimp0.hxx xmloff/inc/prstylecond.hxx +xmloff/inc/xmltabe.hxx xmloff/inc/txtflde.hxx xmloff/inc/txtfldi.hxx xmloff/inc/txtlists.hxx diff --git a/include/xmloff/PageMasterStyleMap.hxx b/xmloff/inc/PageMasterStyleMap.hxx index 2b6a1b373768..e3df3350720d 100644 --- a/include/xmloff/PageMasterStyleMap.hxx +++ b/xmloff/inc/PageMasterStyleMap.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLOFF_PAGEMASTERSTYLEMAP_HXX -#define INCLUDED_XMLOFF_PAGEMASTERSTYLEMAP_HXX +#ifndef XMLOFF_INC_PAGEMASTERSTYLEMAP_HXX +#define XMLOFF_INC_PAGEMASTERSTYLEMAP_HXX #include <xmloff/maptype.hxx> #include <xmloff/xmltypes.hxx> diff --git a/include/xmloff/WordWrapPropertyHdl.hxx b/xmloff/inc/WordWrapPropertyHdl.hxx index 12fca72171e3..12fca72171e3 100644 --- a/include/xmloff/WordWrapPropertyHdl.hxx +++ b/xmloff/inc/WordWrapPropertyHdl.hxx diff --git a/include/xmloff/XMLEmbeddedObjectExportFilter.hxx b/xmloff/inc/XMLEmbeddedObjectExportFilter.hxx index e3d3577f1ac3..1513215fb776 100644 --- a/include/xmloff/XMLEmbeddedObjectExportFilter.hxx +++ b/xmloff/inc/XMLEmbeddedObjectExportFilter.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLOFF_XMLEMBEDDEDOBJECTEXPORTFILTER_HXX -#define INCLUDED_XMLOFF_XMLEMBEDDEDOBJECTEXPORTFILTER_HXX +#ifndef XMLOFF_INC_XMLEMBEDDEDOBJECTEXPORTFILTER_HXX +#define XMLOFF_INC_XMLEMBEDDEDOBJECTEXPORTFILTER_HXX #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -66,6 +66,6 @@ public: }; -#endif // INCLUDED_XMLOFF_XMLEMBEDDEDOBJECTEXPORTFILTER_HXX +#endif // XMLOFF_INC_XMLEMBEDDEDOBJECTEXPORTFILTER_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/xmloff/fasttokenhandler.hxx b/xmloff/inc/fasttokenhandler.hxx index 613df97ae03d..b0d0fb9f92ce 100644 --- a/include/xmloff/fasttokenhandler.hxx +++ b/xmloff/inc/fasttokenhandler.hxx @@ -7,8 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#ifndef INCLUDED_XMLOFF_FASTTOKENHANDLER_HXX -#define INCLUDED_XMLOFF_FASTTOKENHANDLER_HXX +#ifndef XMLOFF_INC_FASTTOKENHANDLER_HXX +#define XMLOFF_INC_FASTTOKENHANDLER_HXX #include <com/sun/star/xml/sax/XFastTokenHandler.hpp> #include <cppuhelper/implbase.hxx> diff --git a/xmloff/inc/pch/precompiled_xo.hxx b/xmloff/inc/pch/precompiled_xo.hxx index 138a80638935..7bbc24d6e58a 100644 --- a/xmloff/inc/pch/precompiled_xo.hxx +++ b/xmloff/inc/pch/precompiled_xo.hxx @@ -196,7 +196,7 @@ #include <XMLStringBufferImportContext.hxx> #include <facreg.hxx> #include <xexptran.hxx> -#include <xmloff/PageMasterStyleMap.hxx> +#include <PageMasterStyleMap.hxx> #include <xmloff/ProgressBarHelper.hxx> #include <xmloff/XMLBase64ImportContext.hxx> #include <xmloff/XMLEventsImportContext.hxx> diff --git a/include/xmloff/xmltabe.hxx b/xmloff/inc/xmltabe.hxx index 7d4fb76dc53a..19d55234517c 100644 --- a/include/xmloff/xmltabe.hxx +++ b/xmloff/inc/xmltabe.hxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#ifndef INCLUDED_XMLOFF_XMLTABE_HXX -#define INCLUDED_XMLOFF_XMLTABE_HXX +#ifndef XMLOFF_INC_XMLTABE_HXX +#define XMLOFF_INC_XMLTABE_HXX // prevent funny things like "#define sun 1" from the compiler #include <sal/config.h> @@ -47,6 +47,6 @@ public: }; -#endif // INCLUDED_XMLOFF_XMLTABE_HXX +#endif // XMLOFF_INC_XMLTABE_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmloff/qa/unit/tokenmap-test.cxx b/xmloff/qa/unit/tokenmap-test.cxx index 540836b66f8a..fb6916444454 100644 --- a/xmloff/qa/unit/tokenmap-test.cxx +++ b/xmloff/qa/unit/tokenmap-test.cxx @@ -12,7 +12,7 @@ #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> -#include <xmloff/fasttokenhandler.hxx> +#include <fasttokenhandler.hxx> #include <xmloff/token/tokens.hxx> #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx index 87a1c0b45f4a..e89c192a052f 100644 --- a/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx +++ b/xmloff/source/core/XMLEmbeddedObjectExportFilter.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <xmloff/XMLEmbeddedObjectExportFilter.hxx> +#include <XMLEmbeddedObjectExportFilter.hxx> #include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star::uno; diff --git a/xmloff/source/core/fasttokenhandler.cxx b/xmloff/source/core/fasttokenhandler.cxx index d2a44b1228a8..8d63cb74f8fc 100644 --- a/xmloff/source/core/fasttokenhandler.cxx +++ b/xmloff/source/core/fasttokenhandler.cxx @@ -7,7 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <xmloff/fasttokenhandler.hxx> +#include <fasttokenhandler.hxx> #include <xmloff/token/tokens.hxx> diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx index 7ee74bb4e6ce..9ba14a6f4840 100644 --- a/xmloff/source/core/xmlexp.cxx +++ b/xmloff/source/core/xmlexp.cxx @@ -72,7 +72,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <xmloff/XMLFilterServiceNames.h> -#include <xmloff/XMLEmbeddedObjectExportFilter.hxx> +#include <XMLEmbeddedObjectExportFilter.hxx> #include <XMLBasicExportFilter.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase.hxx> diff --git a/xmloff/source/core/xmlimp.cxx b/xmloff/source/core/xmlimp.cxx index 09a7f8665ab5..9c1059f852d9 100644 --- a/xmloff/source/core/xmlimp.cxx +++ b/xmloff/source/core/xmlimp.cxx @@ -65,7 +65,7 @@ #include <comphelper/storagehelper.hxx> #include <comphelper/attributelist.hxx> #include <unotools/fontcvt.hxx> -#include <xmloff/fasttokenhandler.hxx> +#include <fasttokenhandler.hxx> #include <vcl/GraphicExternalLink.hxx> #include <com/sun/star/rdf/XMetadatable.hpp> diff --git a/xmloff/source/draw/sdpropls.cxx b/xmloff/source/draw/sdpropls.cxx index b2325aa84769..aeeb4f788edb 100644 --- a/xmloff/source/draw/sdpropls.cxx +++ b/xmloff/source/draw/sdpropls.cxx @@ -30,7 +30,7 @@ #include <com/sun/star/text/WritingMode2.hpp> #include <xmloff/EnumPropertyHdl.hxx> #include <xmloff/NamedBoolPropertyHdl.hxx> -#include <xmloff/WordWrapPropertyHdl.hxx> +#include <WordWrapPropertyHdl.hxx> #include <enummaps.hxx> #include "numithdl.hxx" #include <XMLBitmapRepeatOffsetPropertyHandler.hxx> diff --git a/xmloff/source/style/PageMasterExportPropMapper.cxx b/xmloff/source/style/PageMasterExportPropMapper.cxx index c19d145ed299..3581c9d6a720 100644 --- a/xmloff/source/style/PageMasterExportPropMapper.cxx +++ b/xmloff/source/style/PageMasterExportPropMapper.cxx @@ -23,7 +23,7 @@ #include <comphelper/types.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/table/BorderLine2.hpp> -#include <xmloff/PageMasterStyleMap.hxx> +#include <PageMasterStyleMap.hxx> #include <rtl/ref.hxx> #include <comphelper/extract.hxx> diff --git a/xmloff/source/style/PageMasterImportContext.cxx b/xmloff/source/style/PageMasterImportContext.cxx index 1634f1457117..4334fa09d6f8 100644 --- a/xmloff/source/style/PageMasterImportContext.cxx +++ b/xmloff/source/style/PageMasterImportContext.cxx @@ -25,7 +25,7 @@ #include "PageMasterPropHdl.hxx" #include "PagePropertySetContext.hxx" #include "PageHeaderFooterContext.hxx" -#include <xmloff/PageMasterStyleMap.hxx> +#include <PageMasterStyleMap.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <osl/diagnose.h> diff --git a/xmloff/source/style/PageMasterImportPropMapper.cxx b/xmloff/source/style/PageMasterImportPropMapper.cxx index 0b8565a570b3..13f1bbd12299 100644 --- a/xmloff/source/style/PageMasterImportPropMapper.cxx +++ b/xmloff/source/style/PageMasterImportPropMapper.cxx @@ -19,7 +19,7 @@ #include "PageMasterImportPropMapper.hxx" -#include <xmloff/PageMasterStyleMap.hxx> +#include <PageMasterStyleMap.hxx> #include <xmloff/maptype.hxx> #include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/container/XNameContainer.hpp> diff --git a/xmloff/source/style/PageMasterPropHdlFactory.cxx b/xmloff/source/style/PageMasterPropHdlFactory.cxx index 9aabc961a445..6f40f439307a 100644 --- a/xmloff/source/style/PageMasterPropHdlFactory.cxx +++ b/xmloff/source/style/PageMasterPropHdlFactory.cxx @@ -27,7 +27,7 @@ #include <XMLTextColumnsPropertyHandler.hxx> #include <xmloff/XMLConstantsPropertyHandler.hxx> #include "PageMasterPropHdl.hxx" -#include <xmloff/PageMasterStyleMap.hxx> +#include <PageMasterStyleMap.hxx> #include <com/sun/star/text/TextGridMode.hpp> #include <xmloff/EnumPropertyHdl.hxx> #include <osl/diagnose.h> diff --git a/xmloff/source/style/PageMasterPropMapper.cxx b/xmloff/source/style/PageMasterPropMapper.cxx index 3134ef8e1533..c741632ad9dd 100644 --- a/xmloff/source/style/PageMasterPropMapper.cxx +++ b/xmloff/source/style/PageMasterPropMapper.cxx @@ -20,7 +20,7 @@ #include "PageMasterPropMapper.hxx" #include <rtl/ref.hxx> -#include <xmloff/PageMasterStyleMap.hxx> +#include <PageMasterStyleMap.hxx> #include "PageMasterPropHdlFactory.hxx" #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/xmloff/source/style/PageMasterStyleMap.cxx b/xmloff/source/style/PageMasterStyleMap.cxx index 963b905d4eec..f774186562c4 100644 --- a/xmloff/source/style/PageMasterStyleMap.cxx +++ b/xmloff/source/style/PageMasterStyleMap.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <xmloff/PageMasterStyleMap.hxx> +#include <PageMasterStyleMap.hxx> #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmltoken.hxx> diff --git a/xmloff/source/style/PagePropertySetContext.cxx b/xmloff/source/style/PagePropertySetContext.cxx index 1af2181c034d..6c46c174671e 100644 --- a/xmloff/source/style/PagePropertySetContext.cxx +++ b/xmloff/source/style/PagePropertySetContext.cxx @@ -21,7 +21,7 @@ #include "PagePropertySetContext.hxx" #include <XMLBackgroundImageContext.hxx> #include <XMLTextColumnsContext.hxx> -#include <xmloff/PageMasterStyleMap.hxx> +#include <PageMasterStyleMap.hxx> #include "XMLFootnoteSeparatorImport.hxx" #include <xmloff/xmlimppr.hxx> #include <xmloff/xmlprmap.hxx> diff --git a/xmloff/source/style/WordWrapPropertyHdl.cxx b/xmloff/source/style/WordWrapPropertyHdl.cxx index 1d857b850621..0a01bd11dda9 100644 --- a/xmloff/source/style/WordWrapPropertyHdl.cxx +++ b/xmloff/source/style/WordWrapPropertyHdl.cxx @@ -18,7 +18,7 @@ */ #include <xmloff/xmlimp.hxx> -#include <xmloff/WordWrapPropertyHdl.hxx> +#include <WordWrapPropertyHdl.hxx> #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include <comphelper/extract.hxx> diff --git a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx index 3c709b005993..e79bc6f07a86 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorExport.cxx +++ b/xmloff/source/style/XMLFootnoteSeparatorExport.cxx @@ -29,7 +29,7 @@ #include <xmloff/xmlprmap.hxx> #include <xmloff/xmlement.hxx> -#include <xmloff/PageMasterStyleMap.hxx> +#include <PageMasterStyleMap.hxx> #include <com/sun/star/text/HorizontalAdjust.hpp> #include <rtl/ustrbuf.hxx> diff --git a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx index 5e928fe196f8..f4f72883314f 100644 --- a/xmloff/source/style/XMLFootnoteSeparatorImport.cxx +++ b/xmloff/source/style/XMLFootnoteSeparatorImport.cxx @@ -39,7 +39,7 @@ #include <xmloff/maptype.hxx> #include <xmloff/xmlement.hxx> -#include <xmloff/PageMasterStyleMap.hxx> +#include <PageMasterStyleMap.hxx> #include <vector> diff --git a/xmloff/source/style/XMLPageExport.cxx b/xmloff/source/style/XMLPageExport.cxx index 4f78e273c8b5..9ac210aadde5 100644 --- a/xmloff/source/style/XMLPageExport.cxx +++ b/xmloff/source/style/XMLPageExport.cxx @@ -29,7 +29,7 @@ #include <xmloff/families.hxx> #include <xmloff/xmlexp.hxx> #include "PageMasterPropHdlFactory.hxx" -#include <xmloff/PageMasterStyleMap.hxx> +#include <PageMasterStyleMap.hxx> #include "PageMasterPropMapper.hxx" #include "PageMasterExportPropMapper.hxx" diff --git a/xmloff/source/style/impastpl.cxx b/xmloff/source/style/impastpl.cxx index 6934de7383e2..22939b13af31 100644 --- a/xmloff/source/style/impastpl.cxx +++ b/xmloff/source/style/impastpl.cxx @@ -23,7 +23,7 @@ #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <tools/solar.h> -#include <xmloff/PageMasterStyleMap.hxx> +#include <PageMasterStyleMap.hxx> #include <xmloff/families.hxx> #include <xmloff/xmlaustp.hxx> #include <xmloff/xmlexp.hxx> diff --git a/xmloff/source/style/xmlaustp.cxx b/xmloff/source/style/xmlaustp.cxx index 61cc664c3180..fe3d89188006 100644 --- a/xmloff/source/style/xmlaustp.cxx +++ b/xmloff/source/style/xmlaustp.cxx @@ -28,7 +28,7 @@ #include <xmloff/xmlprmap.hxx> #include <xmloff/XMLTextListAutoStylePool.hxx> -#include <xmloff/PageMasterStyleMap.hxx> +#include <PageMasterStyleMap.hxx> #include <osl/diagnose.h> diff --git a/xmloff/source/style/xmltabe.cxx b/xmloff/source/style/xmltabe.cxx index 8448c6255dd4..ac58af3f32e1 100644 --- a/xmloff/source/style/xmltabe.cxx +++ b/xmloff/source/style/xmltabe.cxx @@ -27,7 +27,7 @@ #include <xmloff/xmltoken.hxx> #include <xmloff/xmluconv.hxx> #include <xmloff/xmlexp.hxx> -#include <xmloff/xmltabe.hxx> +#include <xmltabe.hxx> using namespace ::com::sun::star; diff --git a/xmloff/source/text/txtexppr.hxx b/xmloff/source/text/txtexppr.hxx index be456afd0a14..7e13180e1543 100644 --- a/xmloff/source/text/txtexppr.hxx +++ b/xmloff/source/text/txtexppr.hxx @@ -22,7 +22,7 @@ #include <xmloff/xmlexppr.hxx> #include "txtdrope.hxx" -#include <xmloff/xmltabe.hxx> +#include <xmltabe.hxx> #include <XMLTextColumnsExport.hxx> #include <XMLBackgroundImageExport.hxx> |