bin/find-unneeded-includes | 5 +++-- cppuhelper/IwyuFilter_cppuhelper.yaml | 2 -- dbaccess/IwyuFilter_dbaccess.yaml | 3 --- desktop/IwyuFilter_desktop.yaml | 12 ------------ framework/IwyuFilter_framework.yaml | 2 -- helpcompiler/IwyuFilter_helpcompiler.yaml | 2 -- jvmfwk/IwyuFilter_jvmfwk.yaml | 8 -------- sc/IwyuFilter_sc.yaml | 5 ----- svx/IwyuFilter_svx.yaml | 3 --- sw/IwyuFilter_sw.yaml | 3 --- vcl/IwyuFilter_vcl.yaml | 6 ------ xmlsecurity/IwyuFilter_xmlsecurity.yaml | 3 --- 12 files changed, 3 insertions(+), 51 deletions(-)
New commits: commit c1cb3276e709710d5f1894090659ee8118c48266 Author: Gabor Kelemen <[email protected]> AuthorDate: Mon Sep 15 22:33:09 2025 +0200 Commit: Miklos Vajna <[email protected]> CommitDate: Wed Sep 24 12:09:52 2025 +0200 bin/find-unneeded-includes: add exception for URE headers as well so that these can be removed from per-module yaml files Change-Id: I8bf8da64b51072ccd926e3555c7c8da89f29e648 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191003 Tested-by: Jenkins Reviewed-by: Miklos Vajna <[email protected]> diff --git a/bin/find-unneeded-includes b/bin/find-unneeded-includes index 369a30d80086..fc45b68f7cac 100755 --- a/bin/find-unneeded-includes +++ b/bin/find-unneeded-includes @@ -94,12 +94,13 @@ def ignoreRemoval(include, toAdd, absFileName, moduleRules, noexclude): if include == "boost/functional/hash.hpp" and "boost/container_hash/extensions.hpp" in toAdd: return True - # Avoid .hxx to .h proposals in basic css/uno/* API + # Avoid .hxx to .h proposals in basic css/uno/* and basic URE API unoapi = { "com/sun/star/uno/Any.hxx": "com/sun/star/uno/Any.h", "com/sun/star/uno/Reference.hxx": "com/sun/star/uno/Reference.h", "com/sun/star/uno/Sequence.hxx": "com/sun/star/uno/Sequence.h", - "com/sun/star/uno/Type.hxx": "com/sun/star/uno/Type.h" + "com/sun/star/uno/Type.hxx": "com/sun/star/uno/Type.h", + "osl/thread.hxx": "osl/thread.h" } for k, v in unoapi.items(): if include == k and v in toAdd: diff --git a/cppuhelper/IwyuFilter_cppuhelper.yaml b/cppuhelper/IwyuFilter_cppuhelper.yaml index e42f1aa8601c..cbae100fb19d 100644 --- a/cppuhelper/IwyuFilter_cppuhelper.yaml +++ b/cppuhelper/IwyuFilter_cppuhelper.yaml @@ -16,8 +16,6 @@ excludelist: cppuhelper/source/bootstrap.cxx: # Needed on win32 - o3tl/char16_t2wchar_t.hxx - # Don't replace hxx -> h in URE API - - osl/thread.hxx cppuhelper/source/defaultbootstrap.cxx: # Needed for template specialization - com/sun/star/lang/XSingleComponentFactory.hpp diff --git a/dbaccess/IwyuFilter_dbaccess.yaml b/dbaccess/IwyuFilter_dbaccess.yaml index afd00322e626..f4378245d1d2 100644 --- a/dbaccess/IwyuFilter_dbaccess.yaml +++ b/dbaccess/IwyuFilter_dbaccess.yaml @@ -105,9 +105,6 @@ excludelist: dbaccess/source/ui/dlg/UserAdmin.cxx: # Needed for template - com/sun/star/sdbc/XDriver.hpp - dbaccess/source/ui/dlg/dbfindex.cxx: - # Keep for osl_getThreadTextEncoding - - osl/thread.hxx dbaccess/source/ui/dlg/odbcconfig.cxx: # Needed for HAVE_ODBC_ADMINISTRATION on WIN32 - config_folders.h diff --git a/desktop/IwyuFilter_desktop.yaml b/desktop/IwyuFilter_desktop.yaml index 63740e64360d..adcd3d62552c 100644 --- a/desktop/IwyuFilter_desktop.yaml +++ b/desktop/IwyuFilter_desktop.yaml @@ -4,9 +4,6 @@ excludelist: desktop/inc/lib/init.hxx: # Complete type is needed - boost/property_tree/ptree.hpp - desktop/source/offacc/acceptor.hxx: - # Don't propose hxx -> h change in URE libs - - osl/thread.hxx desktop/qa/desktop_lib/test_desktop_lib.cxx: # Actually used - rtl/math.hxx @@ -29,9 +26,6 @@ excludelist: desktop/source/app/crashreport.cxx: # Needed on WIN32 - o3tl/char16_t2wchar_t.hxx - desktop/source/app/dispatchwatcher.cxx: - # Don't propose hxx -> h change in URE libs - - osl/thread.hxx desktop/source/app/sofficemain.cxx: # Might be needed on WIN32 - prewin.h @@ -88,9 +82,3 @@ excludelist: desktop/source/deployment/registry/help/dp_help.cxx: # Actually used - com/sun/star/util/XMacroExpander.hpp - desktop/source/lib/lokandroid.cxx: - # Needed for osl_getThreadTextEncoding - - osl/thread.hxx - desktop/source/deployment/misc/dp_misc.cxx: - # Needed for osl_getThreadTextEncoding - - osl/thread.hxx diff --git a/framework/IwyuFilter_framework.yaml b/framework/IwyuFilter_framework.yaml index c18fd72cbcf3..317551896c0c 100644 --- a/framework/IwyuFilter_framework.yaml +++ b/framework/IwyuFilter_framework.yaml @@ -59,8 +59,6 @@ excludelist: - com/sun/star/ui/DockingArea.hpp - com/sun/star/ui/XUIElement.hpp framework/source/services/substitutepathvars.cxx: - # Don't propose hxx -> h change in URE libs - - osl/thread.hxx # Needed for template - com/sun/star/container/XNameAccess.hpp framework/source/uifactory/menubarfactory.cxx: diff --git a/helpcompiler/IwyuFilter_helpcompiler.yaml b/helpcompiler/IwyuFilter_helpcompiler.yaml index ddb88e6aa3a4..af322f959860 100644 --- a/helpcompiler/IwyuFilter_helpcompiler.yaml +++ b/helpcompiler/IwyuFilter_helpcompiler.yaml @@ -13,8 +13,6 @@ excludelist: helpcompiler/source/HelpSearch.cxx: # Better to keep the generic, details are order-sensitive - CLucene.h - # Don't propose hxx -> h change in URE libs - - osl/thread.hxx helpcompiler/source/HelpLinker.cxx: # Needed on WIN32 - o3tl/char16_t2wchar_t.hxx diff --git a/jvmfwk/IwyuFilter_jvmfwk.yaml b/jvmfwk/IwyuFilter_jvmfwk.yaml index 610f31ef454b..8a2e1cad85be 100644 --- a/jvmfwk/IwyuFilter_jvmfwk.yaml +++ b/jvmfwk/IwyuFilter_jvmfwk.yaml @@ -6,12 +6,6 @@ excludelist: - config_folders.h # Don't replace with URE impl. detail - rtl/byteseq.hxx - jvmfwk/source/framework.cxx: - # Don't replace with URE impl. detail - - osl/thread.hxx - jvmfwk/source/fwkbase.cxx: - # Don't replace with URE impl. detail - - osl/thread.hxx jvmfwk/source/fwkutil.cxx: # Needed on WIN32 - sal/log.hxx @@ -22,8 +16,6 @@ excludelist: # Needed on WIN32 - o3tl/char16_t2wchar_t.hxx - string_view - # Don't replace with URE impl. detail - - osl/thread.hxx # Don't replace with bits/types, needed for sig_atomic_t - signal.h jvmfwk/plugins/sunmajor/pluginlib/util.cxx: diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml index a7f7c1d949d1..cdf091a2b2d1 100644 --- a/sc/IwyuFilter_sc.yaml +++ b/sc/IwyuFilter_sc.yaml @@ -719,9 +719,6 @@ excludelist: sc/source/core/tool/addincol.cxx: # Needed for template - com/sun/star/frame/XModel.hpp - sc/source/core/tool/autoform.cxx: - # Don't propose hxx -> h in URE headers - - osl/thread.hxx sc/source/core/tool/cellkeytranslator.cxx: # Needed for localized keywords - cellkeywords.inl @@ -856,8 +853,6 @@ excludelist: - tokenarray.hxx # Needed for direct member access - com/sun/star/task/XStatusIndicator.hpp - # Don't propose hxx -> h in URE headers - - osl/thread.hxx sc/source/filter/orcus/xmlcontext.cxx: # Needed for implicit dtor - tokenarray.hxx diff --git a/svx/IwyuFilter_svx.yaml b/svx/IwyuFilter_svx.yaml index 64e0761dfaf9..47d0870ef4e6 100644 --- a/svx/IwyuFilter_svx.yaml +++ b/svx/IwyuFilter_svx.yaml @@ -44,9 +44,6 @@ excludelist: svx/source/fmcomp/gridcell.cxx: # Needed to avoid mysterious linking error on WIN32 no-pch - toolkit/helper/listenermultiplexer.hxx - svx/source/gallery2/galtheme.cxx: - # Don't propose hxx -> h change in URE libs - - osl/thread.hxx svx/source/gallery2/galobj.cxx: # Actually used - com/sun/star/frame/XModel.hpp diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml index b1f4c0eb27bb..2ad6b8003cff 100644 --- a/sw/IwyuFilter_sw.yaml +++ b/sw/IwyuFilter_sw.yaml @@ -853,9 +853,6 @@ excludelist: sw/qa/extras/rtfexport/rtfexport4.cxx: # Required in C++20 mode. - o3tl/cppunittraitshelper.hxx - sw/qa/extras/txtexport/txtexport.cxx: - # No .hxx -> .h replacement in URE headers - - osl/thread.hxx sw/source/writerfilter/dmapper/BorderHandler.cxx: # Needed for method parameter type - tools/color.hxx diff --git a/vcl/IwyuFilter_vcl.yaml b/vcl/IwyuFilter_vcl.yaml index 4d7da7da1c9e..918a18505ef9 100644 --- a/vcl/IwyuFilter_vcl.yaml +++ b/vcl/IwyuFilter_vcl.yaml @@ -1,12 +1,6 @@ --- assumeFilename: vcl/source/app/svapp.cxx excludelist: - vcl/inc/salusereventlist.hxx: - # Don't propose hxx -> h change in URE libs - - osl/thread.hxx - vcl/inc/headless/svpinst.hxx: - # Don't propose hxx -> h change in URE libs - - osl/thread.hxx vcl/inc/unx/gendata.hxx: # Don't propose hxx -> h change in URE libs - osl/socket.hxx diff --git a/xmlsecurity/IwyuFilter_xmlsecurity.yaml b/xmlsecurity/IwyuFilter_xmlsecurity.yaml index bd9330459571..a58a966898a0 100644 --- a/xmlsecurity/IwyuFilter_xmlsecurity.yaml +++ b/xmlsecurity/IwyuFilter_xmlsecurity.yaml @@ -118,6 +118,3 @@ excludelist: - certerrors.h # Needed for macros used by certerrors.h - nss.h - xmlsecurity/qa/unit/signing/signing.cxx: - # Don't replace URE header with impl. detail - - osl/thread.hxx
