[Libreoffice-commits] core.git: include/IwyuFilter_include.yaml include/osl sal/osl sal/rtl sc/source sd/source sw/source

Gabor Kelemen kelemeng at ubuntu.com
Thu Jun 28 07:08:44 UTC 2018 

 include/IwyuFilter_include.yaml              |   12 ++++++++++++
 include/osl/diagnose.h                       |    1 -
 include/osl/module.h                         |    1 -
 include/osl/process.h                        |    3 ---
 include/osl/socket.h                         |    3 ---
 sal/osl/unx/process_impl.cxx                 |    1 +
 sal/osl/unx/socket.cxx                       |    1 +
 sal/rtl/cmdargs.cxx                          |    1 +
 sc/source/core/data/column3.cxx              |    1 +
 sc/source/ui/docshell/docsh.cxx              |    1 +
 sc/source/ui/docshell/docsh8.cxx             |    1 +
 sd/source/filter/html/htmlex.cxx             |    1 +
 sw/source/filter/ww8/docxattributeoutput.cxx |    1 +
 sw/source/filter/ww8/rtfexport.cxx           |    1 +
 sw/source/ui/dbui/mmresultdialogs.cxx        |    1 +
 sw/source/uibase/dbui/dbmgr.cxx              |    1 +
 sw/source/uibase/uiview/srcview.cxx          |    1 +
 17 files changed, 24 insertions(+), 8 deletions(-)

New commits:
commit f4dafe050abe42a36ed56576c23539eb808db5ba
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date:   Tue Jun 26 07:09:39 2018 +0200

    tdf#42949 Fix IWYU warnings in include/osl/*h
    
    Found with bin/find-unneeded-includes
    Only removal proposals are dealt with here.
    
    Change-Id: Ib2301526d7aa6982af6c8c79ed7e9a4c34b7bbf7
    Reviewed-on: https://gerrit.libreoffice.org/56491
    Tested-by: Jenkins
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index 184c9680648c..f679943627c1 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -10,3 +10,15 @@ blacklist:
     include/sal/mathconf.h:
     # Platform dependent
     - cmath
+    include/osl/endian.h:
+    # needed for base types used in macros
+    - sal/types.h
+    include/osl/conditn.h:
+    # ODK API test would fail with fw decl here
+    - osl/time.h
+    include/osl/socket.h:
+    # ODK API test would fail with fw decl here
+    - osl/time.h
+    include/osl/thread.h:
+    # ODK API test would fail with fw decl here
+    - osl/time.h
diff --git a/include/osl/diagnose.h b/include/osl/diagnose.h
index 9f0d90468d76..18c08ef84eb8 100644
--- a/include/osl/diagnose.h
+++ b/include/osl/diagnose.h
@@ -24,7 +24,6 @@
 #include "sal/config.h"
 
 #include "sal/detail/log.h"
-#include "sal/saldllapi.h"
 #include "sal/types.h"
 
 /** @file
diff --git a/include/osl/module.h b/include/osl/module.h
index 76099a94ca6c..563f3492c987 100644
--- a/include/osl/module.h
+++ b/include/osl/module.h
@@ -22,7 +22,6 @@
 
 #include "sal/config.h"
 
-#include "rtl/tencinfo.h"
 #include "rtl/ustring.h"
 #include "sal/saldllapi.h"
 
diff --git a/include/osl/process.h b/include/osl/process.h
index 772db9abc7c5..120d87e64ab8 100644
--- a/include/osl/process.h
+++ b/include/osl/process.h
@@ -24,12 +24,9 @@
 #include "sal/config.h"
 
 #include "osl/file.h"
-#include "osl/pipe.h"
 #include "osl/security.h"
-#include "osl/socket.h"
 #include "osl/time.h"
 #include "rtl/locale.h"
-#include "rtl/textenc.h"
 #include "rtl/ustring.h"
 #include "sal/saldllapi.h"
 
diff --git a/include/osl/socket.h b/include/osl/socket.h
index 97b0cdf429cf..a7eda5e9c69f 100644
--- a/include/osl/socket.h
+++ b/include/osl/socket.h
@@ -21,10 +21,7 @@
 #define INCLUDED_OSL_SOCKET_H
 
 #include "rtl/ustring.h"
-#include "rtl/byteseq.h"
-
 #include "osl/time.h"
-#include "rtl/tencinfo.h"
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx
index 9982a84306c8..f7397d48f242 100644
--- a/sal/osl/unx/process_impl.cxx
+++ b/sal/osl/unx/process_impl.cxx
@@ -28,6 +28,7 @@
 #include <osl/file.h>
 #include <osl/module.h>
 #include <osl/thread.h>
+#include <rtl/alloc.h>
 #include <rtl/ustring.hxx>
 #include <rtl/strbuf.h>
 #include <sal/log.hxx>
diff --git a/sal/osl/unx/socket.cxx b/sal/osl/unx/socket.cxx
index dcd7b5509aba..c941f25658eb 100644
--- a/sal/osl/unx/socket.cxx
+++ b/sal/osl/unx/socket.cxx
@@ -24,6 +24,7 @@
 #include <osl/signal.h>
 
 #include <rtl/alloc.h>
+#include <rtl/byteseq.h>
 #include <assert.h>
 #include <sal/types.h>
 #include <sal/log.hxx>
diff --git a/sal/rtl/cmdargs.cxx b/sal/rtl/cmdargs.cxx
index bb70e4a65120..8e10b0bca04d 100644
--- a/sal/rtl/cmdargs.cxx
+++ b/sal/rtl/cmdargs.cxx
@@ -18,6 +18,7 @@
  */
 
 #include <osl/mutex.hxx>
+#include <rtl/alloc.h>
 #include <rtl/process.h>
 #include <rtl/ustring.hxx>
 
diff --git a/sc/source/core/data/column3.cxx b/sc/source/core/data/column3.cxx
index 5ef13e7a951a..7abfce080af0 100644
--- a/sc/source/core/data/column3.cxx
+++ b/sc/source/core/data/column3.cxx
@@ -53,6 +53,7 @@
 
 #include <memory>
 
+#include <rtl/tencinfo.h>
 #include <mdds/flat_segment_tree.hpp>
 
 #include <sfx2/objsh.hxx>
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 5ac53c1e4e10..ab0759367d59 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -29,6 +29,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/waitobj.hxx>
 #include <rtl/bootstrap.hxx>
+#include <rtl/tencinfo.h>
 #include <svl/PasswordHelper.hxx>
 #include <sfx2/app.hxx>
 #include <sfx2/bindings.hxx>
diff --git a/sc/source/ui/docshell/docsh8.cxx b/sc/source/ui/docshell/docsh8.cxx
index 3c5c7b4566d3..aae269593844 100644
--- a/sc/source/ui/docshell/docsh8.cxx
+++ b/sc/source/ui/docshell/docsh8.cxx
@@ -29,6 +29,7 @@
 #include <ucbhelper/content.hxx>
 #include <svx/txenctab.hxx>
 #include <unotools/sharedunocomponent.hxx>
+#include <rtl/tencinfo.h>
 
 #include <com/sun/star/sdb/CommandType.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index b072437e5325..0e47c46add57 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -25,6 +25,7 @@
 #include <com/sun/star/ucb/SimpleFileAccess.hpp>
 
 #include <rtl/uri.hxx>
+#include <rtl/tencinfo.h>
 #include <comphelper/processfactory.hxx>
 #include <osl/file.hxx>
 #include <unotools/pathoptions.hxx>
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index e3cfea969113..ec2030f55507 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -97,6 +97,7 @@
 #include <sfx2/sfxbasemodel.hxx>
 #include <tools/datetimeutils.hxx>
 #include <svl/whiter.hxx>
+#include <rtl/tencinfo.h>
 
 #include <docufld.hxx>
 #include <authfld.hxx>
diff --git a/sw/source/filter/ww8/rtfexport.cxx b/sw/source/filter/ww8/rtfexport.cxx
index 7c5e096ea5b3..1d70464c35d5 100644
--- a/sw/source/filter/ww8/rtfexport.cxx
+++ b/sw/source/filter/ww8/rtfexport.cxx
@@ -48,6 +48,7 @@
 #include <svtools/rtfkeywd.hxx>
 #include <filter/msfilter/rtfutil.hxx>
 #include <unotools/docinfohelper.hxx>
+#include <rtl/tencinfo.h>
 #if OSL_DEBUG_LEVEL > 1
 #include <iostream>
 #endif
diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx
index 0e2d1bf4d533..1b3c4f237772 100644
--- a/sw/source/ui/dbui/mmresultdialogs.cxx
+++ b/sw/source/ui/dbui/mmresultdialogs.cxx
@@ -52,6 +52,7 @@
 #include <svl/urihelper.hxx>
 #include <vcl/print.hxx>
 #include <vcl/settings.hxx>
+#include <rtl/tencinfo.h>
 
 #include <unotools/tempfile.hxx>
 #include <osl/file.hxx>
diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index 6d8694e905df..4e1b4c1b7909 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -119,6 +119,7 @@
 #include <svx/dataaccessdescriptor.hxx>
 #include <osl/mutex.hxx>
 #include <rtl/textenc.h>
+#include <rtl/tencinfo.h>
 #include <cppuhelper/implbase.hxx>
 #include <ndindex.hxx>
 #include <pam.hxx>
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index fe051ff12bae..255357f6cf38 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -17,6 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <rtl/tencinfo.h>
 #include <hintids.hxx>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <unotools/tempfile.hxx>

More information about the Libreoffice-commits mailing list