Kaydet (Commit) 6e5cdd9d authored tarafından Gabor Kelemen's avatar Gabor Kelemen Kaydeden (comit) Miklos Vajna

tdf#42949 Fix IWYU warnings in include/xmloff/*

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: Id20e0bc42e39f868a7c5d49d756f2ad5e14a86c0
Reviewed-on: https://gerrit.libreoffice.org/66637
Tested-by: Jenkins
Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.com>
üst eaa026a0
......@@ -32,6 +32,7 @@
#include <com/sun/star/sdb/XFormDocumentsSupplier.hpp>
#include <com/sun/star/sdb/XReportDocumentsSupplier.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/xml/sax/SAXException.hpp>
#include <comphelper/namedvaluecollection.hxx>
#include <cppuhelper/implbase.hxx>
......
......@@ -24,6 +24,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
#include <xmloff/ProgressBarHelper.hxx>
#include "xmlEnums.hxx"
#include "xmlDatabaseDescription.hxx"
#include "xmlConnectionResource.hxx"
......
......@@ -27,6 +27,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
#include <xmloff/ProgressBarHelper.hxx>
#include "xmlEnums.hxx"
#include <stringconstants.hxx>
#include <strings.hxx>
......
......@@ -29,6 +29,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
#include <xmloff/ProgressBarHelper.hxx>
#include "xmlEnums.hxx"
#include <stringconstants.hxx>
#include <rtl/strbuf.hxx>
......
......@@ -23,6 +23,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
#include <xmloff/ProgressBarHelper.hxx>
#include "xmlEnums.hxx"
#include <stringconstants.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
......
......@@ -21,6 +21,7 @@
#include "xmlfilter.hxx"
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/ProgressBarHelper.hxx>
#include "xmlDataSource.hxx"
#include "xmlDocuments.hxx"
#include "xmlEnums.hxx"
......
......@@ -23,6 +23,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
#include <xmloff/ProgressBarHelper.hxx>
#include "xmlEnums.hxx"
#include "xmlFileBasedDatabase.hxx"
#include "xmlServerDatabase.hxx"
......
......@@ -21,6 +21,7 @@
#include "xmlfilter.hxx"
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/ProgressBarHelper.hxx>
#include "xmlQuery.hxx"
#include "xmlTable.hxx"
#include "xmlComponent.hxx"
......
......@@ -37,6 +37,7 @@
#include "xmlEnums.hxx"
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/sdb/XFormDocumentsSupplier.hpp>
#include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp>
#include <com/sun/star/sdb/XReportDocumentsSupplier.hpp>
......
......@@ -35,6 +35,7 @@
#include <unotools/localfilehelper.hxx>
#include <xmloff/xmlexp.hxx>
#include <xmloff/xmlimp.hxx>
#include <xmloff/xmlexppr.hxx>
#include <dsntypes.hxx>
#include <comphelper/stl_types.hxx>
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
......
......@@ -30,6 +30,7 @@
#include <stringconstants.hxx>
#include <strings.hxx>
#include "xmlEnums.hxx"
#include <rtl/ref.hxx>
namespace dbaxml
{
......
......@@ -25,6 +25,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
#include <xmloff/ProgressBarHelper.hxx>
#include "xmlEnums.hxx"
#include <stringconstants.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
......
......@@ -22,6 +22,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
#include <xmloff/ProgressBarHelper.hxx>
#include "xmlEnums.hxx"
#include <stringconstants.hxx>
#include <strings.hxx>
......
......@@ -22,6 +22,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
#include <xmloff/ProgressBarHelper.hxx>
#include "xmlEnums.hxx"
#include "xmlStyleImport.hxx"
#include "xmlHierarchyCollection.hxx"
......@@ -30,6 +31,8 @@
#include <ucbhelper/content.hxx>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include <com/sun/star/container/XNameContainer.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <comphelper/propertysequence.hxx>
namespace dbaxml
......
......@@ -23,6 +23,7 @@
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/nmspmap.hxx>
#include <xmloff/ProgressBarHelper.hxx>
#include <stringconstants.hxx>
#include <strings.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
......
......@@ -23,6 +23,7 @@
#include <vcl/errinf.hxx>
#include <com/sun/star/uri/UriReferenceFactory.hpp>
#include <com/sun/star/util/MeasureUnit.hpp>
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <com/sun/star/packages/WrongPasswordException.hpp>
#include <com/sun/star/packages/zip/ZipIOException.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
......@@ -39,6 +40,7 @@
#include <xmloff/nmspmap.hxx>
#include <com/sun/star/xml/sax/InputSource.hpp>
#include <com/sun/star/xml/sax/Parser.hpp>
#include <com/sun/star/xml/sax/SAXParseException.hpp>
#include <xmloff/ProgressBarHelper.hxx>
#include <sfx2/docfile.hxx>
#include <com/sun/star/io/XInputStream.hpp>
......
......@@ -34,6 +34,7 @@
#include <unotools/tempfile.hxx>
#include <unotools/localfilehelper.hxx>
#include <xmloff/xmlimp.hxx>
#include <xmloff/xmlprmap.hxx>
#include <map>
#include <memory>
......
......@@ -20,6 +20,7 @@
#include "SvXMLAutoCorrectExport.hxx"
#include <com/sun/star/util/MeasureUnit.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <xmloff/xmltoken.hxx>
using namespace ::com::sun::star::uno;
......
......@@ -63,6 +63,7 @@
#include <com/sun/star/xml/sax/FastToken.hpp>
#include <com/sun/star/xml/sax/Writer.hpp>
#include <com/sun/star/xml/sax/FastTokenHandler.hpp>
#include <com/sun/star/xml/sax/SAXParseException.hpp>
#include <unotools/streamwrap.hxx>
#include "SvXMLAutoCorrectImport.hxx"
#include "SvXMLAutoCorrectExport.hxx"
......
......@@ -26,6 +26,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/io/XActiveDataSource.hpp>
#include <com/sun/star/xml/sax/Writer.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <svl/itemprop.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <sot/storage.hxx>
......
......@@ -24,6 +24,7 @@
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
#include <com/sun/star/text/XText.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <comphelper/processfactory.hxx>
#include <unotools/streamwrap.hxx>
#include <rtl/ustrbuf.hxx>
......
......@@ -31,6 +31,7 @@
#include <com/sun/star/lang/XLocalizable.hpp>
#include <com/sun/star/beans/XPropertyAccess.hpp>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <cppuhelper/implbase.hxx>
#include <xmloff/attrlist.hxx>
#include <i18nlangtag/languagetag.hxx>
......
......@@ -436,3 +436,51 @@ blacklist:
include/toolkit/helper/macros.hxx:
# Needed for macros
- comphelper/servicehelper.hxx
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
include/xmloff/unoatrcn.hxx:
# base class has to be a complete type
- com/sun/star/container/XNameContainer.hpp
- com/sun/star/lang/XServiceInfo.hpp
- com/sun/star/lang/XUnoTunnel.hpp
include/xmloff/xmlictxt.hxx:
# base class has to be a complete type
- com/sun/star/xml/sax/XFastContextHandler.hpp
include/xmloff/xmlexp.hxx:
# base class has to be a complete type
- com/sun/star/document/XFilter.hpp
- com/sun/star/lang/XServiceInfo.hpp
- com/sun/star/document/XExporter.hpp
- com/sun/star/lang/XInitialization.hpp
- com/sun/star/container/XNamed.hpp
- com/sun/star/lang/XUnoTunnel.hpp
include/xmloff/xmlmetae.hxx:
# base class has to be a complete type
- com/sun/star/xml/sax/XDocumentHandler.hpp
include/xmloff/xmlimp.hxx:
# base class has to be a complete type
- com/sun/star/document/XFilter.hpp
- com/sun/star/document/XImporter.hpp
- com/sun/star/lang/XInitialization.hpp
- com/sun/star/lang/XServiceInfo.hpp
- com/sun/star/lang/XUnoTunnel.hpp
- 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
......@@ -12,8 +12,11 @@
#define INCLUDED_XMLOFF_AUTOSTYLEENTRY_HXX
#include <sal/config.h>
#include <rtl/ustring.hxx>
#include <com/sun/star/uno/Any.hxx>
#include <xmloff/dllapi.h>
#include <memory>
#include <utility>
#include <vector>
namespace xmloff
{
......
......@@ -23,7 +23,6 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <xmloff/xmlictxt.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <memory>
......
......@@ -21,9 +21,9 @@
#define INCLUDED_XMLOFF_ENUMPROPERTYHDL_HXX
#include <xmloff/xmlprhdl.hxx>
#include <com/sun/star/uno/Type.h>
#include <cppu/unotype.hxx>
#include <xmloff/xmlement.hxx>
template <typename EnumT> struct SvXMLEnumMapEntry;
/**
PropertyHandler for a generic xml enumeration type:
......
......@@ -22,7 +22,6 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <sal/types.h>
#include <rtl/ustring.hxx>
class SvXMLImport;
......
......@@ -22,7 +22,6 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <sal/types.h>
#include <rtl/ustring.hxx>
class SvXMLImport;
......
......@@ -22,12 +22,12 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <sal/types.h>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <rtl/ustring.hxx>
namespace com { namespace sun { namespace star { namespace uno { class Any; } } } }
namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
class SvXMLNamespaceMap;
class SvXMLAttributeList;
class SvXMLUnitConverter;
class SvXMLExport;
class SvXMLImport;
......
......@@ -22,7 +22,6 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <sal/types.h>
#include <rtl/ustring.hxx>
class SvXMLImport;
......
......@@ -22,7 +22,6 @@
#include <xmloff/xmlprhdl.hxx>
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlement.hxx>
/**
PropertyHandler for a named xml bool type:
......
......@@ -21,16 +21,9 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <sal/types.h>
#include <rtl/ustring.hxx>
#include <salhelper/simplereferenceobject.hxx>
#include <rtl/ustrbuf.hxx>
#include <com/sun/star/util/XStringMapping.hpp>
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/awt/Point.hpp>
#include <xmloff/xmlprmap.hxx>
#include <queue>
#include <vector>
#include <memory>
class SvXMLAutoStylePoolP;
......
......@@ -23,35 +23,27 @@
#include <salhelper/simplereferenceobject.hxx>
#include <xmloff/families.hxx>
#include <com/sun/star/util/XStringMapping.hpp>
#include <com/sun/star/chart/XChartDocument.hpp>
#include <xmloff/xmltkmap.hxx>
namespace com { namespace sun { namespace star { namespace chart { class XChartDocument; } } } }
namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
namespace com { namespace sun { namespace star {
namespace frame {
class XModel;
}
namespace task {
class XStatusIndicator;
}
namespace xml {
namespace sax {
class XAttributeList;
}
}
namespace chart2 {
namespace data {
class XDataProvider;
class XLabeledDataSequence;
}
class XChartDocument;
class XDataSeries;
}
}}}
class SvXMLUnitConverter;
class SvXMLStylesContext;
class XMLChartImportPropertyMapper;
class SvXMLTokenMap;
class SvXMLImportContext;
class SvXMLImport;
......
......@@ -20,17 +20,17 @@
#ifndef INCLUDED_XMLOFF_SCHXMLSERIESHELPER_HXX
#define INCLUDED_XMLOFF_SCHXMLSERIESHELPER_HXX
#include <com/sun/star/chart2/data/XDataSequence.hpp>
#include <com/sun/star/chart2/data/XDataSource.hpp>
#include <com/sun/star/chart2/XDataSeries.hpp>
#include <com/sun/star/chart2/XDiagram.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <xmloff/dllapi.h>
#include <vector>
#include <map>
#include <iterator>
namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
namespace com { namespace sun { namespace star { namespace chart2 { class XDataSeries; } } } }
namespace com { namespace sun { namespace star { namespace chart2 { class XDiagram; } } } }
namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } }
class XMLOFF_DLLPUBLIC SchXMLSeriesHelper
{
......
......@@ -22,10 +22,11 @@
#include <xmloff/dllapi.h>
#include <com/sun/star/awt/Rectangle.hpp>
#include <com/sun/star/formula/SymbolDescriptor.hpp>
#include <com/sun/star/util/XStringSubstitution.hpp>
#include <xmloff/xmlexp.hxx>
#include <com/sun/star/uno/Reference.hxx>
namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } }
namespace com { namespace sun { namespace star { namespace formula { struct SymbolDescriptor; } } } }
namespace com { namespace sun { namespace star { namespace util { class XStringSubstitution; } } } }
namespace com
{
......
......@@ -24,7 +24,10 @@
#include <map>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/uno/Reference.hxx>
namespace com { namespace sun { namespace star { namespace beans { class XPropertySet; } } } }
namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } }
class SinglePropertySetInfoCache
{
......
......@@ -21,8 +21,6 @@
#define INCLUDED_XMLOFF_WORDWRAPPROPERTYHDL_HXX
#include <xmloff/xmlprhdl.hxx>
#include <xmloff/xmltoken.hxx>
#include <xmloff/xmlement.hxx>
/**
PropertyHandler for a named xml bool type:
......
......@@ -22,9 +22,10 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <xmloff/xmlictxt.hxx>
namespace com { namespace sun { namespace star { namespace xml { namespace sax { class XAttributeList; } } } } }
namespace com { namespace sun { namespace star { namespace io {
class XOutputStream; } } } }
......
......@@ -20,9 +20,10 @@
#define INCLUDED_XMLOFF_XMLCHARCONTEXT_HXX
#include <xmloff/dllapi.h>
#include <com/sun/star/uno/Reference.h>
#include <xmloff/xmlictxt.hxx>
namespace com { namespace sun { namespace star { namespace uno { template <typename > class Reference; } } } }
class XMLOFF_DLLPUBLIC XMLCharContext : public SvXMLImportContext
{
XMLCharContext(const XMLCharContext&) = delete;
......
......@@ -23,8 +23,6 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <sal/types.h>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <rtl/ustring.hxx>
#include <xmloff/xmlevent.hxx>
......@@ -39,6 +37,9 @@ namespace com { namespace sun { namespace star {
namespace beans { struct PropertyValue; }
} } }
namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } }
namespace com { namespace sun { namespace star { namespace uno { template <typename > class Sequence; } } } }
typedef ::std::map< OUString, std::unique_ptr<XMLEventExportHandler> > HandlerMap;
typedef ::std::map< OUString, XMLEventName > NameMap;
......
......@@ -23,11 +23,8 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <xmloff/xmlictxt.hxx>
#include <xmloff/xmlevent.hxx>
#include <map>
#include <vector>
namespace com { namespace sun { namespace star {
......@@ -37,6 +34,8 @@ namespace com { namespace sun { namespace star {
namespace document { class XEventsSupplier; }
} } }
namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } }
typedef ::std::pair<
OUString,
css::uno::Sequence<css::beans::PropertyValue> > EventNameValuesPair;
......
......@@ -24,11 +24,6 @@
#include <xmloff/dllapi.h>
#include <xmloff/prstylei.hxx>
namespace com { namespace sun { namespace star { namespace container
{
class XNameContainer;
} } } }
class XMLOFF_DLLPUBLIC XMLGraphicsDefaultStyle : public XMLPropStyleContext
{
public:
......
......@@ -25,14 +25,13 @@
#include <sal/types.h>
#include <rtl/ustring.hxx>
#include <vector>
#include <xmloff/attrlist.hxx>
#include <rtl/ref.hxx>
#include <salhelper/simplereferenceobject.hxx>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/uno/Reference.hxx>
namespace com { namespace sun { namespace star {
namespace style { class XStyle; }
namespace container { class XIndexReplace; class XNameAccess;}
namespace container { class XNameAccess;}
namespace beans { class XPropertySet; }
} } }
......
......@@ -20,10 +20,10 @@
#ifndef INCLUDED_XMLOFF_XMLSETTINGSEXPORTCONTEXT_HXX
#define INCLUDED_XMLOFF_XMLSETTINGSEXPORTCONTEXT_HXX
#include <com/sun/star/uno/XComponentContext.hpp>
#include <xmloff/xmltoken.hxx>
namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } }
namespace xmloff
{
......
......@@ -23,7 +23,6 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <xmloff/prstylei.hxx>
#include <xmloff/families.hxx>
class SvXMLImport;
......
......@@ -24,12 +24,13 @@
#include <xmloff/dllapi.h>
#include <sal/types.h>
#include <rtl/ustring.hxx>
#include <com/sun/star/ucb/XAnyCompare.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <memory>
#include <set>
namespace com { namespace sun { namespace star { namespace container {
class XIndexReplace; } } } }
namespace com { namespace sun { namespace star { namespace ucb { class XAnyCompare; } } } }
class XMLTextListAutoStylePool_Impl;
......
......@@ -22,8 +22,6 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <rtl/ustring.hxx>
#include <xmloff/attrlist.hxx>
#include <xmloff/XMLPageExport.hxx>
namespace com { namespace sun { namespace star {
......
......@@ -24,10 +24,6 @@
#include <xmloff/dllapi.h>
#include <xmloff/xmlictxt.hxx>