[Libreoffice-commits] core.git: include/xmloff xmloff/inc xmloff/IwyuFilter_xmloff.yaml xmloff/source
Gabor Kelemen (via logerrit)
logerrit at kemper.freedesktop.org
Tue Sep 17 08:04:44 UTC 2019
include/xmloff/table/XMLTableExport.hxx | 3 ---
xmloff/IwyuFilter_xmloff.yaml | 9 +++++++++
xmloff/inc/SchXMLExport.hxx | 1 -
xmloff/inc/SchXMLImport.hxx | 3 ---
xmloff/inc/TransGradientStyle.hxx | 1 -
xmloff/inc/XMLBackgroundImageExport.hxx | 1 +
xmloff/inc/XMLBase64Export.hxx | 1 +
xmloff/inc/XMLElementPropertyContext.hxx | 1 -
xmloff/inc/XMLImageMapExport.hxx | 2 +-
xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx | 1 -
xmloff/inc/XMLNumberStylesImport.hxx | 1 -
xmloff/inc/XMLReplacementImageContext.hxx | 1 -
xmloff/inc/XMLScriptExportHandler.hxx | 2 --
xmloff/inc/XMLStarBasicExportHandler.hxx | 2 --
xmloff/inc/XMLTextColumnsContext.hxx | 2 ++
xmloff/inc/XMLTextColumnsExport.hxx | 2 ++
xmloff/inc/anim.hxx | 1 -
xmloff/inc/animationimport.hxx | 1 +
xmloff/inc/animimp.hxx | 1 -
xmloff/inc/facreg.hxx | 2 --
xmloff/inc/prstylecond.hxx | 2 ++
xmloff/inc/txtfldi.hxx | 2 +-
xmloff/inc/txtvfldi.hxx | 1 -
xmloff/inc/xexptran.hxx | 5 -----
xmloff/inc/xmlmultiimagehelper.hxx | 1 -
xmloff/inc/xmlversion.hxx | 2 --
xmloff/source/chart/XMLChartPropertyContext.cxx | 1 +
xmloff/source/draw/animexp.cxx | 1 +
xmloff/source/draw/animimp.cxx | 1 +
xmloff/source/meta/xmlversion.cxx | 1 +
xmloff/source/style/PagePropertySetContext.cxx | 1 +
31 files changed, 25 insertions(+), 31 deletions(-)
New commits:
commit a944d4c2aacafdac78eabd7fb0f8909a66d935eb
Author: Gabor Kelemen <kelemen.gabor2 at nisz.hu>
AuthorDate: Fri Sep 6 21:25:16 2019 +0200
Commit: Miklos Vajna <vmiklos at collabora.com>
CommitDate: Tue Sep 17 10:03:46 2019 +0200
tdf#42949 Fix IWYU warnings in xmloff/inc/
Also recheck include/xmloff/
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: If01cb2844209b119063772d829e4ae21b74fc164
Reviewed-on: https://gerrit.libreoffice.org/78747
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos at collabora.com>
diff --git a/include/xmloff/table/XMLTableExport.hxx b/include/xmloff/table/XMLTableExport.hxx
index 1d6655e50712..a1ccc6dd47d2 100644
--- a/include/xmloff/table/XMLTableExport.hxx
+++ b/include/xmloff/table/XMLTableExport.hxx
@@ -23,16 +23,13 @@
#include <sal/types.h>
#include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
#include <map>
#include <memory>
#include <vector>
-#include <com/sun/star/table/XTableColumns.hpp>
#include <com/sun/star/table/XColumnRowRange.hpp>
#include <com/sun/star/table/XCell.hpp>
-#include <com/sun/star/text/XText.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <rtl/ref.hxx>
diff --git a/xmloff/IwyuFilter_xmloff.yaml b/xmloff/IwyuFilter_xmloff.yaml
new file mode 100644
index 000000000000..51d2715014db
--- /dev/null
+++ b/xmloff/IwyuFilter_xmloff.yaml
@@ -0,0 +1,9 @@
+---
+assumeFilename: xmloff/source/core/xmlexp.cxx
+blacklist:
+ xmloff/inc/XMLImageMapExport.hxx:
+ # Needed for css shortcut
+ - sal/types.h
+ xmloff/inc/XMLTextColumnsExport.hxx:
+ # Needed for css shortcut
+ - sal/types.h
diff --git a/xmloff/inc/SchXMLExport.hxx b/xmloff/inc/SchXMLExport.hxx
index eacdfca75419..7a94f4df253c 100644
--- a/xmloff/inc/SchXMLExport.hxx
+++ b/xmloff/inc/SchXMLExport.hxx
@@ -23,7 +23,6 @@
#include "SchXMLAutoStylePoolP.hxx"
#include <xmloff/xmlexp.hxx>
#include <xmloff/xmlprmap.hxx>
-#include <xmloff/prhdlfac.hxx>
namespace com { namespace sun { namespace star {
namespace task {
diff --git a/xmloff/inc/SchXMLImport.hxx b/xmloff/inc/SchXMLImport.hxx
index e8ca86cd589a..5b587a4abdb1 100644
--- a/xmloff/inc/SchXMLImport.hxx
+++ b/xmloff/inc/SchXMLImport.hxx
@@ -21,10 +21,7 @@
#include <xmloff/SchXMLImportHelper.hxx>
#include <xmloff/xmlimp.hxx>
-#include <xmloff/xmltkmap.hxx>
#include <xmloff/xmlictxt.hxx>
-#include <xmloff/prhdlfac.hxx>
-#include <xmloff/families.hxx>
/*
these enums are used for the
diff --git a/xmloff/inc/TransGradientStyle.hxx b/xmloff/inc/TransGradientStyle.hxx
index 6bf80fce1cd1..eedac509e1fb 100644
--- a/xmloff/inc/TransGradientStyle.hxx
+++ b/xmloff/inc/TransGradientStyle.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_XMLOFF_INC_TRANSGRADIENTSTYLE_HXX
-#include <sal/types.h>
#include <rtl/ustring.hxx>
class SvXMLImport;
diff --git a/xmloff/inc/XMLBackgroundImageExport.hxx b/xmloff/inc/XMLBackgroundImageExport.hxx
index a6dca781ff26..222f875a709b 100644
--- a/xmloff/inc/XMLBackgroundImageExport.hxx
+++ b/xmloff/inc/XMLBackgroundImageExport.hxx
@@ -21,6 +21,7 @@
#define INCLUDED_XMLOFF_INC_XMLBACKGROUNDIMAGEEXPORT_HXX
#include <sal/types.h>
+#include <rtl/ustring.hxx>
namespace com { namespace sun { namespace star { namespace uno {
class Any;
diff --git a/xmloff/inc/XMLBase64Export.hxx b/xmloff/inc/XMLBase64Export.hxx
index f148148bcbe0..be5e62b48f4c 100644
--- a/xmloff/inc/XMLBase64Export.hxx
+++ b/xmloff/inc/XMLBase64Export.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_XMLOFF_INC_XMLBASE64EXPORT_HXX
#include <com/sun/star/uno/Reference.h>
+#include <xmloff/xmltoken.hxx>
namespace com { namespace sun { namespace star { namespace io {
class XInputStream; } } } }
diff --git a/xmloff/inc/XMLElementPropertyContext.hxx b/xmloff/inc/XMLElementPropertyContext.hxx
index 88aac3d136b3..2027131cc493 100644
--- a/xmloff/inc/XMLElementPropertyContext.hxx
+++ b/xmloff/inc/XMLElementPropertyContext.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_XMLOFF_INC_XMLELEMENTPROPERTYCONTEXT_HXX
#define INCLUDED_XMLOFF_INC_XMLELEMENTPROPERTYCONTEXT_HXX
-#include <xmloff/xmlprmap.hxx>
#include <xmloff/xmlictxt.hxx>
#include <xmloff/maptype.hxx>
diff --git a/xmloff/inc/XMLImageMapExport.hxx b/xmloff/inc/XMLImageMapExport.hxx
index 507adce612c9..3504d31a5b0e 100644
--- a/xmloff/inc/XMLImageMapExport.hxx
+++ b/xmloff/inc/XMLImageMapExport.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_XMLOFF_INC_XMLIMAGEMAPEXPORT_HXX
#define INCLUDED_XMLOFF_INC_XMLIMAGEMAPEXPORT_HXX
-#include <rtl/ustring.hxx>
+#include <sal/types.h>
namespace com { namespace sun { namespace star {
namespace uno { template<class X> class Reference; }
diff --git a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
index 563a0b904a2d..a835864d5c50 100644
--- a/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
+++ b/xmloff/inc/XMLIndexBibliographyConfigurationContext.hxx
@@ -25,7 +25,6 @@
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/lang/Locale.hpp>
#include <rtl/ustring.hxx>
diff --git a/xmloff/inc/XMLNumberStylesImport.hxx b/xmloff/inc/XMLNumberStylesImport.hxx
index 7f745ec9189d..29196c460244 100644
--- a/xmloff/inc/XMLNumberStylesImport.hxx
+++ b/xmloff/inc/XMLNumberStylesImport.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_XMLOFF_INC_XMLNUMBERSTYLESIMPORT_HXX
#include <xmloff/xmlnumfi.hxx>
-#include <com/sun/star/container/XNameAccess.hpp>
// presentations:animations
diff --git a/xmloff/inc/XMLReplacementImageContext.hxx b/xmloff/inc/XMLReplacementImageContext.hxx
index 1885d46a7fe0..78404bee9654 100644
--- a/xmloff/inc/XMLReplacementImageContext.hxx
+++ b/xmloff/inc/XMLReplacementImageContext.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_XMLOFF_INC_XMLREPLACEMENTIMAGECONTEXT_HXX
#define INCLUDED_XMLOFF_INC_XMLREPLACEMENTIMAGECONTEXT_HXX
-#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
#include <xmloff/xmlictxt.hxx>
diff --git a/xmloff/inc/XMLScriptExportHandler.hxx b/xmloff/inc/XMLScriptExportHandler.hxx
index 1708d7a1ba3d..f6313210546d 100644
--- a/xmloff/inc/XMLScriptExportHandler.hxx
+++ b/xmloff/inc/XMLScriptExportHandler.hxx
@@ -24,8 +24,6 @@
#include <rtl/ustring.hxx>
#include <xmloff/xmlevent.hxx>
-#include <map>
-
class SvXMLExport;
namespace com { namespace sun { namespace star {
namespace beans { struct PropertyValue; }
diff --git a/xmloff/inc/XMLStarBasicExportHandler.hxx b/xmloff/inc/XMLStarBasicExportHandler.hxx
index 878d748680f9..b659306b19b2 100644
--- a/xmloff/inc/XMLStarBasicExportHandler.hxx
+++ b/xmloff/inc/XMLStarBasicExportHandler.hxx
@@ -24,8 +24,6 @@
#include <rtl/ustring.hxx>
#include <xmloff/xmlevent.hxx>
-#include <map>
-
class SvXMLExport;
namespace com { namespace sun { namespace star {
namespace beans { struct PropertyValue; }
diff --git a/xmloff/inc/XMLTextColumnsContext.hxx b/xmloff/inc/XMLTextColumnsContext.hxx
index 0aaa16866a73..9f9f4036fac5 100644
--- a/xmloff/inc/XMLTextColumnsContext.hxx
+++ b/xmloff/inc/XMLTextColumnsContext.hxx
@@ -20,6 +20,8 @@
#ifndef INCLUDED_XMLOFF_INC_XMLTEXTCOLUMNSCONTEXT_HXX
#define INCLUDED_XMLOFF_INC_XMLTEXTCOLUMNSCONTEXT_HXX
+#include <xmloff/xmltkmap.hxx>
+
#include <memory>
#include "XMLElementPropertyContext.hxx"
diff --git a/xmloff/inc/XMLTextColumnsExport.hxx b/xmloff/inc/XMLTextColumnsExport.hxx
index 9713ac33cda8..5662edccbd0d 100644
--- a/xmloff/inc/XMLTextColumnsExport.hxx
+++ b/xmloff/inc/XMLTextColumnsExport.hxx
@@ -19,6 +19,8 @@
#ifndef INCLUDED_XMLOFF_INC_XMLTEXTCOLUMNSEXPORT_HXX
#define INCLUDED_XMLOFF_INC_XMLTEXTCOLUMNSEXPORT_HXX
+#include <sal/types.h>
+
namespace com { namespace sun { namespace star { namespace uno {
class Any; } } } }
class SvXMLExport;
diff --git a/xmloff/inc/anim.hxx b/xmloff/inc/anim.hxx
index b881b5fc250a..b4c2e6d58b6e 100644
--- a/xmloff/inc/anim.hxx
+++ b/xmloff/inc/anim.hxx
@@ -22,7 +22,6 @@
#include <com/sun/star/presentation/AnimationEffect.hpp>
#include <com/sun/star/presentation/AnimationSpeed.hpp>
-#include <com/sun/star/drawing/XShape.hpp>
#include <xmloff/xmlement.hxx>
enum XMLEffect
diff --git a/xmloff/inc/animationimport.hxx b/xmloff/inc/animationimport.hxx
index b59f8cb60b30..f0bf94ef85c8 100644
--- a/xmloff/inc/animationimport.hxx
+++ b/xmloff/inc/animationimport.hxx
@@ -24,6 +24,7 @@
#include <xmloff/xmlictxt.hxx>
#include <com/sun/star/animations/XAnimationNode.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
// presentations:animations
diff --git a/xmloff/inc/animimp.hxx b/xmloff/inc/animimp.hxx
index 971071e82d79..ca2a16c4ab8b 100644
--- a/xmloff/inc/animimp.hxx
+++ b/xmloff/inc/animimp.hxx
@@ -23,7 +23,6 @@
#include <memory>
#include <xmloff/xmlictxt.hxx>
-#include <com/sun/star/drawing/XShapes.hpp>
class AnimImpImpl;
diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx
index 431bb1126de7..d09f0e5cb566 100644
--- a/xmloff/inc/facreg.hxx
+++ b/xmloff/inc/facreg.hxx
@@ -22,11 +22,9 @@
#include <sal/config.h>
-#include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <rtl/ustring.hxx>
-#include <sal/types.h>
namespace com { namespace sun { namespace star {
namespace lang { class XMultiServiceFactory; }
diff --git a/xmloff/inc/prstylecond.hxx b/xmloff/inc/prstylecond.hxx
index f1642e7ecd2d..57df2f80ae17 100644
--- a/xmloff/inc/prstylecond.hxx
+++ b/xmloff/inc/prstylecond.hxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <rtl/ustring.hxx>
+
OUString GetParaStyleCondExternal( OUString const &);
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index 1bff41f8c29c..829e9daef527 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -27,9 +27,9 @@
#define INCLUDED_XMLOFF_INC_TXTFLDI_HXX
#include <com/sun/star/uno/Reference.h>
+#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/text/PageNumberType.hpp>
#include <com/sun/star/util/DateTime.hpp>
-#include <com/sun/star/util/Date.hpp>
#include <xmloff/xmlictxt.hxx>
#include <xmloff/txtimp.hxx>
#include <xmloff/xmltkmap.hxx>
diff --git a/xmloff/inc/txtvfldi.hxx b/xmloff/inc/txtvfldi.hxx
index b572cc1fec2d..389a5c56ab68 100644
--- a/xmloff/inc/txtvfldi.hxx
+++ b/xmloff/inc/txtvfldi.hxx
@@ -27,7 +27,6 @@
#include "txtfldi.hxx"
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/beans/XPropertySetInfo.hpp>
/** helper class: parses value-type and associated value attributes */
diff --git a/xmloff/inc/xexptran.hxx b/xmloff/inc/xexptran.hxx
index 3242d5211e3f..b5ed9f5bba2f 100644
--- a/xmloff/inc/xexptran.hxx
+++ b/xmloff/inc/xexptran.hxx
@@ -21,12 +21,7 @@
#define INCLUDED_XMLOFF_INC_XEXPTRAN_HXX
#include <rtl/ustring.hxx>
-#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
-#include <com/sun/star/drawing/PointSequence.hpp>
-#include <com/sun/star/drawing/FlagSequence.hpp>
-#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/drawing/HomogenMatrix.hpp>
-#include <tools/mapunit.hxx>
#include <memory>
#include <vector>
diff --git a/xmloff/inc/xmlmultiimagehelper.hxx b/xmloff/inc/xmlmultiimagehelper.hxx
index 1a4956929812..1661130f3f51 100644
--- a/xmloff/inc/xmlmultiimagehelper.hxx
+++ b/xmloff/inc/xmlmultiimagehelper.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_XMLOFF_INC_XMLMULTIIMAGEHELPER_HXX
#define INCLUDED_XMLOFF_INC_XMLMULTIIMAGEHELPER_HXX
-#include <sal/types.h>
#include <xmloff/xmlimp.hxx>
diff --git a/xmloff/inc/xmlversion.hxx b/xmloff/inc/xmlversion.hxx
index e39cfdda5521..0e2b9d855912 100644
--- a/xmloff/inc/xmlversion.hxx
+++ b/xmloff/inc/xmlversion.hxx
@@ -28,8 +28,6 @@
#include <xmloff/xmlictxt.hxx>
#include <xmloff/xmlexp.hxx>
#include <xmloff/xmlimp.hxx>
-#include <xmloff/nmspmap.hxx>
-#include <xmloff/xmlnmspe.hxx>
#include <xmloff/xmltoken.hxx>
class XMLVersionListExport : public SvXMLExport
diff --git a/xmloff/source/chart/XMLChartPropertyContext.cxx b/xmloff/source/chart/XMLChartPropertyContext.cxx
index 6cd56d8e3f44..ea3ead155232 100644
--- a/xmloff/source/chart/XMLChartPropertyContext.cxx
+++ b/xmloff/source/chart/XMLChartPropertyContext.cxx
@@ -23,6 +23,7 @@
#include "XMLSymbolImageContext.hxx"
#include "XMLLabelSeparatorContext.hxx"
#include <xmloff/xmlimppr.hxx>
+#include <xmloff/xmlprmap.hxx>
using namespace ::com::sun::star;
diff --git a/xmloff/source/draw/animexp.cxx b/xmloff/source/draw/animexp.cxx
index 02a4a071a37e..a972f61a007d 100644
--- a/xmloff/source/draw/animexp.cxx
+++ b/xmloff/source/draw/animexp.cxx
@@ -19,6 +19,7 @@
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/presentation/AnimationSpeed.hpp>
#include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
diff --git a/xmloff/source/draw/animimp.cxx b/xmloff/source/draw/animimp.cxx
index 19deda30a463..ea01252dc365 100644
--- a/xmloff/source/draw/animimp.cxx
+++ b/xmloff/source/draw/animimp.cxx
@@ -22,6 +22,7 @@
#include <com/sun/star/presentation/AnimationEffect.hpp>
#include <com/sun/star/presentation/AnimationSpeed.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/xml/sax/XAttributeList.hpp>
#include <sax/tools/converter.hxx>
diff --git a/xmloff/source/meta/xmlversion.cxx b/xmloff/source/meta/xmlversion.cxx
index 37e84ee3fcfe..30f2fdf8e1e0 100644
--- a/xmloff/source/meta/xmlversion.cxx
+++ b/xmloff/source/meta/xmlversion.cxx
@@ -20,6 +20,7 @@
#include <com/sun/star/embed/ElementModes.hpp>
#include <unotools/streamwrap.hxx>
#include <xmlversion.hxx>
+#include <xmloff/xmlnmspe.hxx>
#include <xmloff/xmlmetae.hxx>
#include <osl/diagnose.h>
diff --git a/xmloff/source/style/PagePropertySetContext.cxx b/xmloff/source/style/PagePropertySetContext.cxx
index c3c4c4875d57..1af2181c034d 100644
--- a/xmloff/source/style/PagePropertySetContext.cxx
+++ b/xmloff/source/style/PagePropertySetContext.cxx
@@ -24,6 +24,7 @@
#include <xmloff/PageMasterStyleMap.hxx>
#include "XMLFootnoteSeparatorImport.hxx"
#include <xmloff/xmlimppr.hxx>
+#include <xmloff/xmlprmap.hxx>
using namespace ::com::sun::star::uno;
More information about the Libreoffice-commits
mailing list