UnoControls/IwyuFilter_UnoControls.yaml | 6 ------ bin/find-unneeded-includes | 1 + extensions/IwyuFilter_extensions.yaml | 9 --------- forms/IwyuFilter_forms.yaml | 3 --- framework/IwyuFilter_framework.yaml | 15 --------------- include/IwyuFilter_include.yaml | 10 ---------- io/IwyuFilter_io.yaml | 3 --- sfx2/IwyuFilter_sfx2.yaml | 6 ------ svx/IwyuFilter_svx.yaml | 3 --- sw/IwyuFilter_sw.yaml | 3 --- 10 files changed, 1 insertion(+), 58 deletions(-)
New commits: commit 4ba94c18b2ebf1872d1db1f03857172e9a114917 Author: Gabor Kelemen <[email protected]> AuthorDate: Fri Sep 19 08:47:37 2025 +0200 Commit: Gabor Kelemen <[email protected]> CommitDate: Wed Sep 24 23:16:15 2025 +0200 bin/find-unneeded-includes: add exception for URE header cppuhelper/interfacecontainer.hxx, so that these can be removed from per-module yaml files Change-Id: Id5650dab557921f9e51794b95f41e5a3c21c9689 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191337 Tested-by: Jenkins Reviewed-by: Gabor Kelemen <[email protected]> diff --git a/UnoControls/IwyuFilter_UnoControls.yaml b/UnoControls/IwyuFilter_UnoControls.yaml index 7f18b36621cb..dead31050385 100644 --- a/UnoControls/IwyuFilter_UnoControls.yaml +++ b/UnoControls/IwyuFilter_UnoControls.yaml @@ -1,12 +1,6 @@ --- assumeFilename: UnoControls/source/base/basecontrol.cxx excludelist: - UnoControls/inc/multiplexer.hxx: - # Don't propose hxx -> h change in URE libs - - cppuhelper/interfacecontainer.hxx - UnoControls/source/inc/OConnectionPointContainerHelper.hxx: - # Don't propose hxx -> h change in URE libs - - cppuhelper/interfacecontainer.hxx UnoControls/source/controls/framecontrol.cxx: # Needed for use in cppu::UnoType template - com/sun/star/awt/XControlContainer.hpp diff --git a/bin/find-unneeded-includes b/bin/find-unneeded-includes index 1d6efb0963fe..7c19119088b2 100755 --- a/bin/find-unneeded-includes +++ b/bin/find-unneeded-includes @@ -101,6 +101,7 @@ def ignoreRemoval(include, toAdd, absFileName, moduleRules, noexclude): "com/sun/star/uno/Sequence.hxx": "com/sun/star/uno/Sequence.h", "com/sun/star/uno/Type.hxx": "com/sun/star/uno/Type.h", "rtl/byteseq.hxx": "rtl/byteseq.h", + "cppuhelper/interfacecontainer.hxx": "cppuhelper/interfacecontainer.h", "osl/thread.hxx": "osl/thread.h" } for k, v in unoapi.items(): diff --git a/extensions/IwyuFilter_extensions.yaml b/extensions/IwyuFilter_extensions.yaml index 9a81eecf5fff..6258e71ad7bb 100644 --- a/extensions/IwyuFilter_extensions.yaml +++ b/extensions/IwyuFilter_extensions.yaml @@ -4,18 +4,12 @@ excludelist: extensions/inc/strings.hrc: # Needed for TranslateId macro - unotools/resmgr.hxx - extensions/source/logging/loghandler.hxx: - # Don't propose hxx -> h change in URE libs - - cppuhelper/interfacecontainer.hxx extensions/source/abpilot/admininvokationimpl.cxx: # Needed for direct member access - com/sun/star/awt/XWindow.hpp extensions/source/abpilot/unodialogabp.cxx: # Needed for direct member access - com/sun/star/awt/XWindow.hpp - extensions/source/bibliography/framectr.cxx: - # Don't propose hxx -> h change in URE libs - - cppuhelper/interfacecontainer.hxx # Actually used - com/sun/star/form/runtime/XFormController.hpp - com/sun/star/beans/PropertyValue.hpp @@ -51,9 +45,6 @@ excludelist: extensions/source/propctrlr/formlinkdialog.cxx: # Needed for template - com/sun/star/sdb/XSingleSelectQueryComposer.hpp - extensions/source/propctrlr/formgeometryhandler.cxx: - # Don't propose hxx -> h change in URE libs - - cppuhelper/interfacecontainer.hxx extensions/source/propctrlr/handlerhelper.cxx: # Actually used - com/sun/star/inspection/LineDescriptor.hpp diff --git a/forms/IwyuFilter_forms.yaml b/forms/IwyuFilter_forms.yaml index f14c4c6d7377..432373604333 100644 --- a/forms/IwyuFilter_forms.yaml +++ b/forms/IwyuFilter_forms.yaml @@ -7,9 +7,6 @@ excludelist: forms/inc/strings.hrc: # Needed for TranslateId macro - unotools/resmgr.hxx - forms/source/component/errorbroadcaster.hxx: - # Don't propose hxx -> h change in URE libs - - cppuhelper/interfacecontainer.hxx forms/source/xforms/unohelper.hxx: # Needed for css shortcut - sal/types.h diff --git a/framework/IwyuFilter_framework.yaml b/framework/IwyuFilter_framework.yaml index 317551896c0c..e2c1a2ef3d4a 100644 --- a/framework/IwyuFilter_framework.yaml +++ b/framework/IwyuFilter_framework.yaml @@ -1,27 +1,12 @@ --- assumeFilename: framework/source/services/autorecovery.cxx excludelist: - framework/inc/stdtypes.h: - # Don't propose hxx -> h change in URE libs - - cppuhelper/interfacecontainer.hxx - framework/inc/services/layoutmanager.hxx: - # Don't propose hxx -> h change in URE libs - - cppuhelper/interfacecontainer.hxx - framework/inc/uielement/statusbarmanager.hxx: - # Don't propose hxx -> h change in URE libs - - cppuhelper/interfacecontainer.hxx - framework/inc/uielement/toolbarmanager.hxx: - # Don't propose hxx -> h change in URE libs - - cppuhelper/interfacecontainer.hxx framework/inc/statusbarconfiguration.hxx: # Needed for css shortcut - sal/types.h framework/inc/toolboxconfiguration.hxx: # Needed for css shortcut - sal/types.h - framework/source/uiconfiguration/imagemanagerimpl.hxx: - # Don't propose hxx -> h change in URE libs - - cppuhelper/interfacecontainer.hxx framework/source/dispatch/closedispatcher.cxx: # Needed on MAC - com/sun/star/beans/XFastPropertySet.hpp diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index d1c4085345d7..05d7ecc3b71f 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -452,9 +452,6 @@ excludelist: include/svtools/sfxecode.hxx: # Needed for macro defines - class ErrCode - include/svtools/statusbarcontroller.hxx: - # Don't propose hxx -> h change in URE libs - - cppuhelper/interfacecontainer.hxx include/svtools/toolboxcontroller.hxx: # base class has to be a complete type - com/sun/star/frame/XStatusListener.hpp @@ -463,8 +460,6 @@ excludelist: - com/sun/star/lang/XInitialization.hpp # Complete type is needed for DispatchInfo struct - com/sun/star/beans/PropertyValue.hpp - # Don't propose hxx -> h change in URE libs - - cppuhelper/interfacecontainer.hxx include/svtools/unoevent.hxx: # base class has to be a complete type - com/sun/star/container/XNameReplace.hpp @@ -480,8 +475,6 @@ excludelist: - com/sun/star/frame/XTitleChangeBroadcaster.hpp - com/sun/star/frame/XFrameActionListener.hpp - com/sun/star/document/XDocumentEventListener.hpp - # Don't propose hxx -> h change in URE libs - - cppuhelper/interfacecontainer.hxx include/linguistic/hyphdta.hxx: # base class has to be a complete type - com/sun/star/linguistic2/XHyphenatedWord.hpp @@ -824,9 +817,6 @@ excludelist: include/svx/sdr/properties/defaultproperties.hxx: # Needed for fwdecl mode - struct _xmlTextWriter - include/svx/unopage.hxx: - # Don't propose hxx -> h change in URE libs - - cppuhelper/interfacecontainer.hxx include/svx/unoshprp.hxx: # Needed for macro defines - com/sun/star/drawing/PointSequence.hpp diff --git a/io/IwyuFilter_io.yaml b/io/IwyuFilter_io.yaml index 88e7eb0e05ae..0f99498fc73e 100644 --- a/io/IwyuFilter_io.yaml +++ b/io/IwyuFilter_io.yaml @@ -8,6 +8,3 @@ excludelist: # Don't replace with impl. detail - osl/socket.hxx - osl/pipe.hxx - io/source/stm/opump.cxx: - # Don't replace with URE API impl. detail - - cppuhelper/interfacecontainer.hxx diff --git a/sfx2/IwyuFilter_sfx2.yaml b/sfx2/IwyuFilter_sfx2.yaml index 9d653c2ae023..8e884bc29cb3 100644 --- a/sfx2/IwyuFilter_sfx2.yaml +++ b/sfx2/IwyuFilter_sfx2.yaml @@ -122,12 +122,6 @@ excludelist: sfx2/source/doc/syspathw32.cxx: # Needed on WIN32 - o3tl/char16_t2wchar_t.hxx - sfx2/source/doc/printhelper.cxx: - # Don't propose hxx -> h change in URE libs - - cppuhelper/interfacecontainer.hxx - sfx2/source/doc/sfxbasemodel.cxx: - # Don't propose hxx -> h change in URE libs - - cppuhelper/interfacecontainer.hxx sfx2/source/doc/signaturestate.cxx: # Actually used - com/sun/star/security/DocumentSignatureInformation.hpp diff --git a/svx/IwyuFilter_svx.yaml b/svx/IwyuFilter_svx.yaml index 47d0870ef4e6..73604ff0e94d 100644 --- a/svx/IwyuFilter_svx.yaml +++ b/svx/IwyuFilter_svx.yaml @@ -135,9 +135,6 @@ excludelist: svx/source/unodraw/recoveryui.cxx: # Needed for LIBO_ETC_FOLDER on WIN32 - config_folders.h - svx/source/unodraw/unoshcol.cxx: - # Don't propose hxx -> h change in URE libs - - cppuhelper/interfacecontainer.hxx svx/source/unodraw/unoprov.cxx: # Needed for UnoType instantiation - com/sun/star/lang/Locale.hpp diff --git a/sw/IwyuFilter_sw.yaml b/sw/IwyuFilter_sw.yaml index 2ad6b8003cff..3ec155280cd9 100644 --- a/sw/IwyuFilter_sw.yaml +++ b/sw/IwyuFilter_sw.yaml @@ -543,9 +543,6 @@ excludelist: # Actually used - com/sun/star/text/TextMarkupDescriptor.hpp - com/sun/star/text/XTextRange.hpp - sw/source/core/unocore/unotbl.cxx: - # No .hxx -> .h replacement in URE headers - - cppuhelper/interfacecontainer.hxx sw/source/core/unocore/unoredline.cxx: # Needed for template - com/sun/star/text/XTextSection.hpp
