[Libreoffice-commits] core.git: sw/IwyuFilter_sw.yaml sw/source writerfilter/qa writerfilter/source writerperfect/qa

[Miklos Vajna (via logerrit)]

 sw/IwyuFilter_sw.yaml                                  |    2 ++
 sw/source/filter/ww8/rtfexport.cxx                     |    3 ---
 writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx |    5 -----
 writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx   |    7 -------
 writerfilter/source/filter/RtfFilter.cxx               |    1 -
 writerperfect/qa/unit/EPUBExportTest.cxx               |    1 -
 6 files changed, 2 insertions(+), 17 deletions(-)

New commits:
commit bc3734244e5e2919b3ff413d3c86e010de438bf8
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Wed Mar 4 21:06:53 2020 +0100
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Thu Mar 5 09:26:05 2020 +0100

    Remove some unused includes
    
    Change-Id: I808b7e3f6b580ee6f1876aa06038b5741d7ff6a2
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90001
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.com>

diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml
index 2c37782198f3..860950e24c04 100644
--- a/sw/IwyuFilter_sw.yaml
+++ b/sw/IwyuFilter_sw.yaml
@@ -417,6 +417,8 @@ blacklist:
     # Needed for direct member access
     - com/sun/star/graphic/XGraphic.hpp
     - com/sun/star/text/XDocumentIndexMark.hpp
+    # Needed in C++20 mode
+    - o3tl/cppunittraitshelper.hxx
     sw/qa/extras/uiwriter/uiwriter.cxx:
     # Needed for for-loop range
     - PostItMgr.hxx
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 4d297bfb475f..c7831f992bf3 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -43,11 +43,9 @@
 #include <editeng/boxitem.hxx>
 #include <editeng/shaditem.hxx>
 #include <lineinfo.hxx>
-#include <poolfmt.hxx>
 #include <redline.hxx>
 #include <swmodule.hxx>
 #include <IDocumentLayoutAccess.hxx>
-#include <IDocumentStylePoolAccess.hxx>
 #include <comphelper/string.hxx>
 #include <svtools/rtfkeywd.hxx>
 #include <filter/msfilter/rtfutil.hxx>
@@ -59,7 +57,6 @@
 #include <iostream>
 #endif
 #include <svx/xflclit.hxx>
-#include <editeng/hyphenzoneitem.hxx>
 #include <fmtmeta.hxx>
 #include <IDocumentSettingAccess.hxx>
 #include <fmtfsize.hxx>
diff --git a/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx b/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
index c148ee518833..a98288fc40d3 100644
--- a/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/GraphicImport.cxx
@@ -13,13 +13,8 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/table/BorderLine2.hpp>
-#include <com/sun/star/text/XTextTable.hpp>
-#include <com/sun/star/text/XTextTablesSupplier.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 
-#include <comphelper/processfactory.hxx>
-
 using namespace ::com::sun::star;
 
 namespace
diff --git a/writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx b/writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx
index ce17941b4983..71b3ab80e50b 100644
--- a/writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx
+++ b/writerfilter/qa/cppunittests/dmapper/PropertyMap.cxx
@@ -10,17 +10,10 @@
 #include <test/bootstrapfixture.hxx>
 #include <unotest/macros_test.hxx>
 
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/table/BorderLine2.hpp>
 #include <com/sun/star/text/XPageCursor.hpp>
-#include <com/sun/star/text/XTextTable.hpp>
-#include <com/sun/star/text/XTextTablesSupplier.hpp>
 #include <com/sun/star/text/XTextViewCursorSupplier.hpp>
 
-#include <comphelper/processfactory.hxx>
-
 using namespace ::com::sun::star;
 
 namespace
diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx
index c58867646657..3197b8d77b3d 100644
--- a/writerfilter/source/filter/RtfFilter.cxx
+++ b/writerfilter/source/filter/RtfFilter.cxx
@@ -30,7 +30,6 @@
 #include <cppuhelper/exc_hlp.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/file.hxx>
-#include <sal/log.hxx>
 #include <tools/diagnose_ex.h>
 #include <unotools/mediadescriptor.hxx>
 #include <unotools/streamwrap.hxx>
diff --git a/writerperfect/qa/unit/EPUBExportTest.cxx b/writerperfect/qa/unit/EPUBExportTest.cxx
index d7c9447a1ad1..c6518433de0e 100644
--- a/writerperfect/qa/unit/EPUBExportTest.cxx
+++ b/writerperfect/qa/unit/EPUBExportTest.cxx
@@ -15,7 +15,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/packages/zip/ZipFileAccess.hpp>
 
-#include <comphelper/processfactory.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/string.hxx>
 #include <o3tl/safeint.hxx>