desktop/IwyuFilter_desktop.yaml | 6 ++++++ desktop/qa/desktop_lib/test_desktop_lib.cxx | 7 +------ desktop/source/app/app.cxx | 2 -- desktop/source/app/appinit.cxx | 1 - desktop/source/app/dispatchwatcher.cxx | 1 - desktop/source/app/sofficemain.cxx | 1 - desktop/source/deployment/gui/dp_gui_dialog2.cxx | 1 - desktop/source/deployment/inc/dp_version.hxx | 2 +- desktop/source/deployment/manager/dp_commandenvironments.cxx | 2 -- desktop/source/deployment/manager/dp_extensionmanager.cxx | 3 --- desktop/source/deployment/misc/dp_misc.cxx | 1 - desktop/source/deployment/misc/dp_platform.cxx | 1 - desktop/source/deployment/misc/dp_version.cxx | 1 - desktop/source/deployment/registry/configuration/dp_configuration.cxx | 1 - desktop/source/deployment/registry/script/dp_lib_container.cxx | 1 - desktop/source/lib/init.cxx | 10 ---------- desktop/source/migration/services/oo3extensionmigration.cxx | 1 - desktop/source/splash/splash.cxx | 2 -- 18 files changed, 8 insertions(+), 36 deletions(-)
New commits: commit 75706c003c3e224047e2f5b079aebde4e3d40d74 Author: Rafał Dobrakowski <[email protected]> AuthorDate: Tue Apr 2 02:11:44 2024 +0200 Commit: Gabor Kelemen <[email protected]> CommitDate: Tue Apr 2 17:27:27 2024 +0200 tdf#146619 Remove unused #includes from C/C++ files the 'desktop' module was cleaned Change-Id: Ia7dcb77a42ca7f9be67e30d10cd54697bf93b6d0 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/165663 Tested-by: Jenkins Reviewed-by: Gabor Kelemen <[email protected]> diff --git a/desktop/IwyuFilter_desktop.yaml b/desktop/IwyuFilter_desktop.yaml index cfe94e22cc28..76a0c31ad2d5 100644 --- a/desktop/IwyuFilter_desktop.yaml +++ b/desktop/IwyuFilter_desktop.yaml @@ -94,3 +94,9 @@ excludelist: desktop/source/splash/splash.cxx: # Needed for rtl::math::round - rtl/math.hxx + 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/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index 298e5a5d7a9b..4310e64f25dd 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -11,7 +11,6 @@ #include <memory> #include <string_view> -#include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/awt/Key.hpp> @@ -31,8 +30,6 @@ #include <vcl/uitest/uiobject.hxx> #include <comphelper/processfactory.hxx> #include <rtl/math.hxx> -#include <rtl/uri.hxx> -#include <sfx2/app.hxx> #include <sfx2/childwin.hxx> #include <sfx2/lokhelper.hxx> #include <test/unoapi_test.hxx> @@ -45,14 +42,11 @@ #include <sfx2/viewsh.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/bindings.hxx> -#include <sfx2/sidebar/SidebarController.hxx> -#include <sfx2/sidebar/SidebarDockingWindow.hxx> #include <unotools/datetime.hxx> #include <unotools/syslocaleoptions.hxx> #include <comphelper/string.hxx> #include <comphelper/scopeguard.hxx> #include <cairo.h> -#include <config_features.h> #include <config_fonts.h> #include <config_mpl.h> #include <tools/json_writer.hxx> @@ -2343,6 +2337,7 @@ void DesktopLOKTest::testPaintPartTileDifferentSchemes() } #if HAVE_MORE_FONTS +#include <rtl/uri.hxx> void DesktopLOKTest::testGetFontSubset() { LibLODocument_Impl* pDocument = loadDoc("blank_text.odt"); diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 0a893b9adc28..d02041c220a2 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -60,7 +60,6 @@ #include <com/sun/star/system/SystemShellExecuteFlags.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/StartModule.hpp> -#include <com/sun/star/view/XPrintable.hpp> #include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> @@ -118,7 +117,6 @@ #include <svl/eitem.hxx> #include <basic/sbstar.hxx> #include <desktop/crashreport.hxx> -#include <tools/time.hxx> #include <tools/urlobj.hxx> #include <comphelper/diagnose_ex.hxx> #include <svtools/fontsubstconfig.hxx> diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index 76bd04347ad6..887b717d43ad 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -24,7 +24,6 @@ #include <dp_shared.hxx> #include "cmdlineargs.hxx" #include <strings.hrc> -#include <com/sun/star/registry/XSimpleRegistry.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/Exception.hpp> diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index 863d246951e9..af26ef9eaab9 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -20,7 +20,6 @@ #include <sal/config.h> #include <sal/log.hxx> -#include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/fcontnr.hxx> #include <svl/fstathelper.hxx> diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index 0b02155f59fb..448977684b9a 100644 --- a/desktop/source/app/sofficemain.cxx +++ b/desktop/source/app/sofficemain.cxx @@ -30,7 +30,6 @@ #include <prewin.h> #include <rtl/bootstrap.hxx> -#include <sal/log.hxx> #include <sal/main.h> #include <tools/extendapplicationenvironment.hxx> #include <vcl/svmain.hxx> diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 03885b161941..d5af09441405 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -38,7 +38,6 @@ #include <vcl/commandevent.hxx> #include <vcl/svapp.hxx> -#include <osl/mutex.hxx> #include <sal/log.hxx> #include <rtl/ustrbuf.hxx> diff --git a/desktop/source/deployment/inc/dp_version.hxx b/desktop/source/deployment/inc/dp_version.hxx index f088b6861a2f..2b7c8787bdc0 100644 --- a/desktop/source/deployment/inc/dp_version.hxx +++ b/desktop/source/deployment/inc/dp_version.hxx @@ -21,9 +21,9 @@ #include <sal/config.h> -#include <rtl/ustring.hxx> #include "dp_misc_api.hxx" +#include <string_view> namespace dp_misc { diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx index 0a25e042f0e9..2b98ff971908 100644 --- a/desktop/source/deployment/manager/dp_commandenvironments.cxx +++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx @@ -24,8 +24,6 @@ #include <com/sun/star/deployment/DependencyException.hpp> #include <com/sun/star/deployment/PlatformException.hpp> #include <com/sun/star/task/XInteractionApprove.hpp> -#include <com/sun/star/task/XInteractionHandler.hpp> -#include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <utility> #include "dp_commandenvironments.hxx" #include <osl/diagnose.h> diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index f393a30c9489..6c210101fcc0 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -24,14 +24,12 @@ #include <cppuhelper/exc_hlp.hxx> #include <rtl/bootstrap.hxx> #include <com/sun/star/deployment/DeploymentException.hpp> -#include <com/sun/star/deployment/XExtensionManager.hpp> #include <com/sun/star/deployment/thePackageManagerFactory.hpp> #include <com/sun/star/deployment/XPackageManager.hpp> #include <com/sun/star/deployment/XPackage.hpp> #include <com/sun/star/deployment/InstallException.hpp> #include <com/sun/star/deployment/VersionException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/Optional.hpp> #include <com/sun/star/task/XInteractionApprove.hpp> #include <com/sun/star/beans/Ambiguous.hpp> @@ -39,7 +37,6 @@ #include <com/sun/star/ucb/CommandFailedException.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/util/XModifyBroadcaster.hpp> #include <comphelper/sequence.hxx> #include <utility> #include <xmlscript/xml_helper.hxx> diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index 01fb414a7909..6011d15cb11d 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -19,7 +19,6 @@ #include <config_folders.h> #include <config_features.h> -#include <chrono> #include <dp_misc.h> #include <dp_interact.h> diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx index b2af59f9b926..aeab3e567051 100644 --- a/desktop/source/deployment/misc/dp_platform.cxx +++ b/desktop/source/deployment/misc/dp_platform.cxx @@ -20,7 +20,6 @@ #include <dp_platform.hxx> #include <rtl/ustring.hxx> -#include <rtl/instance.hxx> #include <rtl/bootstrap.hxx> #include <osl/diagnose.h> #include <o3tl/string_view.hxx> diff --git a/desktop/source/deployment/misc/dp_version.cxx b/desktop/source/deployment/misc/dp_version.cxx index 8006e7b6cf8c..6f918068541a 100644 --- a/desktop/source/deployment/misc/dp_version.cxx +++ b/desktop/source/deployment/misc/dp_version.cxx @@ -21,7 +21,6 @@ #include <sal/config.h> #include <o3tl/string_view.hxx> -#include <rtl/ustring.hxx> #include <dp_version.hxx> diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index 622814248670..3bfac940bce6 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -30,7 +30,6 @@ #include <dp_ucb.h> #include <rtl/string.hxx> #include <rtl/strbuf.hxx> -#include <rtl/ustrbuf.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/supportsservice.hxx> #include <ucbhelper/content.hxx> diff --git a/desktop/source/deployment/registry/script/dp_lib_container.cxx b/desktop/source/deployment/registry/script/dp_lib_container.cxx index 3a6f30253fb0..601cb5b39daa 100644 --- a/desktop/source/deployment/registry/script/dp_lib_container.cxx +++ b/desktop/source/deployment/registry/script/dp_lib_container.cxx @@ -22,7 +22,6 @@ #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <strings.hrc> -#include <dp_resource.h> #include <dp_shared.hxx> #include <dp_xml.h> #include "dp_lib_container.h" diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 52057cd2645d..3963b86eab34 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -17,8 +17,6 @@ #include <config_features.h> #include <stdio.h> -#include <string.h> -#include <stdlib.h> #ifdef IOS #include <sys/mman.h> @@ -53,7 +51,6 @@ #include <memory> #include <iostream> #include <string_view> -#include <queue> #include <boost/property_tree/json_parser.hpp> #include <boost/algorithm/string.hpp> @@ -74,7 +71,6 @@ #include <rtl/bootstrap.hxx> #include <rtl/strbuf.hxx> #include <rtl/uri.hxx> -#include <svl/zforlist.hxx> #include <linguistic/misc.hxx> #include <cppuhelper/bootstrap.hxx> #include <comphelper/base64.hxx> @@ -88,14 +84,12 @@ #include <comphelper/scopeguard.hxx> #include <comphelper/threadpool.hxx> #include <comphelper/types.hxx> -#include <comphelper/servicehelper.hxx> #include <comphelper/sequenceashashmap.hxx> #include <com/sun/star/connection/XConnection.hpp> #include <com/sun/star/document/MacroExecMode.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/document/XDocumentLanguages.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/DispatchResultEvent.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> @@ -126,7 +120,6 @@ #include <com/sun/star/security/XCertificate.hpp> #include <com/sun/star/linguistic2/DictionaryList.hpp> -#include <com/sun/star/linguistic2/LanguageGuessing.hpp> #include <com/sun/star/linguistic2/LinguServiceManager.hpp> #include <com/sun/star/linguistic2/XSpellChecker.hpp> #include <com/sun/star/linguistic2/XProofreader.hpp> @@ -148,8 +141,6 @@ #include <sfx2/dispatch.hxx> #include <sfx2/lokcomponenthelpers.hxx> #include <sfx2/DocumentSigner.hxx> -#include <sfx2/sidebar/SidebarDockingWindow.hxx> -#include <sfx2/sidebar/SidebarController.hxx> #include <sfx2/sidebar/Sidebar.hxx> #include <svl/numformat.hxx> #include <svx/dialmgr.hxx> @@ -227,7 +218,6 @@ #include <unotools/moduleoptions.hxx> #include <unotools/searchopt.hxx> #include <unotools/useroptions.hxx> -#include <unotools/viewoptions.hxx> #include <vcl/settings.hxx> #include <officecfg/Setup.hxx> diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx index 174f82ec6936..d8e90abe416f 100644 --- a/desktop/source/migration/services/oo3extensionmigration.cxx +++ b/desktop/source/migration/services/oo3extensionmigration.cxx @@ -30,7 +30,6 @@ #include <com/sun/star/task/XInteractionApprove.hpp> #include <com/sun/star/ucb/CommandAbortedException.hpp> -#include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> #include <com/sun/star/xml/xpath/XPathAPI.hpp> #include <com/sun/star/xml/xpath/XPathException.hpp> diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index 17cc7fb53438..01a2ed3f0bf8 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -26,11 +26,9 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> -#include <comphelper/string.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <rtl/bootstrap.hxx> -#include <rtl/strbuf.hxx> #include <rtl/math.hxx> #include <vcl/introwin.hxx> #include <vcl/virdev.hxx>
