From 3381e35ec2b567f0b85cce6192df11d0be9cdbe2 Mon Sep 17 00:00:00 2001 From: Gabor Kelemen Date: Tue, 21 Jan 2020 00:07:16 +0100 Subject: [PATCH] tdf#42949 Fix IWYU warnings in desktop/ Found with bin/find-unneeded-includes Only removal proposals are dealt with here. Change-Id: If72377cb352be71050a5b0a471bbe3b02d9c0f74 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87117 Tested-by: Jenkins Reviewed-by: Miklos Vajna --- desktop/IwyuFilter_desktop.yaml | 94 +++++++++++++++++++ desktop/inc/app.hxx | 2 - desktop/inc/dp_misc.h | 5 - desktop/inc/dp_shared.hxx | 1 - desktop/inc/lib/init.hxx | 1 + desktop/inc/migration.hxx | 3 - .../qa/deployment_misc/test_dp_version.cxx | 1 - desktop/qa/desktop_app/test_desktop_app.cxx | 2 - desktop/qa/desktop_lib/test_desktop_lib.cxx | 5 - desktop/qa/unit/desktop-dialogs-test.cxx | 3 - desktop/qa/unit/desktop-lok-init.cxx | 5 - desktop/source/app/app.cxx | 12 +-- desktop/source/app/appinit.cxx | 13 +-- desktop/source/app/check_ext_deps.cxx | 7 -- desktop/source/app/cmdlineargs.cxx | 5 +- desktop/source/app/cmdlinehelp.cxx | 2 - desktop/source/app/desktopcontext.cxx | 1 - desktop/source/app/desktopcontext.hxx | 2 +- desktop/source/app/dispatchwatcher.cxx | 7 +- desktop/source/app/dispatchwatcher.hxx | 3 +- desktop/source/app/langselect.cxx | 2 - desktop/source/app/langselect.hxx | 2 - desktop/source/app/officeipcthread.cxx | 7 +- desktop/source/app/officeipcthread.hxx | 4 +- desktop/source/app/sofficemain.cxx | 8 -- desktop/source/app/userinstall.cxx | 2 - desktop/source/deployment/dp_log.cxx | 12 +-- desktop/source/deployment/dp_xml.cxx | 2 - desktop/source/deployment/gui/dp_gui.h | 27 ------ .../gui/dp_gui_dependencydialog.cxx | 3 - .../gui/dp_gui_dependencydialog.hxx | 1 - .../source/deployment/gui/dp_gui_dialog2.cxx | 16 +--- .../source/deployment/gui/dp_gui_dialog2.hxx | 9 -- .../gui/dp_gui_extensioncmdqueue.cxx | 10 +- .../deployment/gui/dp_gui_extlistbox.cxx | 5 +- .../deployment/gui/dp_gui_extlistbox.hxx | 2 + .../source/deployment/gui/dp_gui_service.cxx | 5 +- .../deployment/gui/dp_gui_theextmgr.cxx | 6 +- .../deployment/gui/dp_gui_theextmgr.hxx | 2 - .../deployment/gui/dp_gui_updatedialog.cxx | 32 ------- .../gui/dp_gui_updateinstalldialog.cxx | 15 +-- .../source/deployment/gui/license_dialog.cxx | 7 -- .../source/deployment/gui/license_dialog.hxx | 4 +- desktop/source/deployment/inc/dp_interact.h | 1 - desktop/source/deployment/inc/dp_resource.h | 1 - desktop/source/deployment/inc/dp_ucb.h | 2 - desktop/source/deployment/inc/dp_update.hxx | 1 - desktop/source/deployment/inc/dp_version.hxx | 2 + desktop/source/deployment/inc/dp_xml.h | 3 - desktop/source/deployment/inc/lockfile.hxx | 2 - .../deployment/manager/dp_activepackages.cxx | 7 +- .../manager/dp_commandenvironments.cxx | 2 - .../manager/dp_commandenvironments.hxx | 6 +- .../manager/dp_extensionmanager.cxx | 7 -- .../manager/dp_extensionmanager.hxx | 7 +- .../manager/dp_informationprovider.cxx | 5 - .../source/deployment/manager/dp_manager.cxx | 9 +- .../source/deployment/manager/dp_manager.h | 2 - .../deployment/manager/dp_managerfac.cxx | 3 +- .../deployment/manager/dp_properties.hxx | 1 + .../deployment/misc/dp_dependencies.cxx | 4 +- .../deployment/misc/dp_descriptioninfoset.cxx | 8 +- .../source/deployment/misc/dp_identifier.cxx | 2 - .../source/deployment/misc/dp_interact.cxx | 2 - desktop/source/deployment/misc/dp_misc.cxx | 3 +- .../source/deployment/misc/dp_platform.cxx | 1 - .../source/deployment/misc/dp_resource.cxx | 5 - desktop/source/deployment/misc/dp_ucb.cxx | 1 - desktop/source/deployment/misc/dp_version.cxx | 1 - desktop/source/deployment/misc/lockfile.cxx | 2 - .../registry/component/dp_compbackenddb.cxx | 5 - .../registry/component/dp_component.cxx | 1 + .../configuration/dp_configuration.cxx | 5 - .../dp_configurationbackenddb.cxx | 4 - .../source/deployment/registry/dp_backend.cxx | 3 - .../deployment/registry/dp_backenddb.cxx | 4 - .../deployment/registry/dp_registry.cxx | 7 +- .../registry/executable/dp_executable.cxx | 1 - .../executable/dp_executablebackenddb.cxx | 2 - .../deployment/registry/help/dp_help.cxx | 2 - .../registry/help/dp_helpbackenddb.cxx | 5 - .../deployment/registry/inc/dp_backend.h | 4 - .../deployment/registry/inc/dp_backenddb.hxx | 1 + .../registry/package/dp_extbackenddb.cxx | 4 - .../registry/package/dp_package.cxx | 7 +- .../deployment/registry/script/dp_script.cxx | 3 - .../registry/script/dp_scriptbackenddb.cxx | 5 - .../registry/sfwk/dp_parceldesc.hxx | 5 - .../deployment/registry/sfwk/dp_sfwk.cxx | 1 - desktop/source/lib/init.cxx | 15 --- desktop/source/lib/lokinteractionhandler.cxx | 1 - desktop/source/lib/lokinteractionhandler.hxx | 5 +- desktop/source/migration/migration.cxx | 6 -- desktop/source/migration/migration_impl.hxx | 9 -- .../migration/services/basicmigration.cxx | 1 + .../migration/services/basicmigration.hxx | 1 - desktop/source/migration/services/jvmfwk.cxx | 4 - desktop/source/migration/services/jvmfwk.hxx | 9 +- .../services/oo3extensionmigration.cxx | 9 +- .../services/oo3extensionmigration.hxx | 4 +- .../migration/services/wordbookmigration.cxx | 1 + .../migration/services/wordbookmigration.hxx | 1 - desktop/source/minidump/minidump.cxx | 1 - desktop/source/offacc/acceptor.hxx | 5 - desktop/source/pkgchk/unopkg/unopkg_app.cxx | 8 -- .../source/pkgchk/unopkg/unopkg_cmdenv.cxx | 9 +- desktop/source/pkgchk/unopkg/unopkg_misc.cxx | 5 +- desktop/source/pkgchk/unopkg/unopkg_shared.h | 6 +- desktop/source/splash/splash.cxx | 6 -- desktop/source/splash/splash.hxx | 1 - desktop/source/splash/unxsplash.cxx | 3 - desktop/source/splash/unxsplash.hxx | 6 -- 112 files changed, 158 insertions(+), 474 deletions(-) create mode 100644 desktop/IwyuFilter_desktop.yaml diff --git a/desktop/IwyuFilter_desktop.yaml b/desktop/IwyuFilter_desktop.yaml new file mode 100644 index 000000000000..da4c75f2ce7b --- /dev/null +++ b/desktop/IwyuFilter_desktop.yaml @@ -0,0 +1,94 @@ +--- +assumeFilename: desktop/source/lib/init.cxx +blacklist: + 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 + - comphelper/scopeguard.hxx + desktop/source/app/app.cxx: + # Needed on WIN32 + - o3tl/char16_t2wchar_t.hxx + # Needed for HAVE_FEATURE_UPDATE_MAR + - com/sun/star/system/XSystemShellExecute.hpp + - com/sun/star/system/SystemShellExecute.hpp + - officecfg/Office/Update.hxx + desktop/source/app/appinit.cxx: + # Needed on IOS + - rtl/bootstrap.hxx + desktop/source/app/cmdlineargs.cxx: + # Don't propose hxx -> h change in URE libs + - osl/thread.hxx + desktop/source/app/cmdlinehelp.cxx: + # Needed on WIN32 + - comphelper/string.hxx + 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 + - postwin.h + # Needed on ANDROID + - rtl/bootstrap.hxx + desktop/source/lib/init.cxx: + # Needed for boost::trim_copy + - boost/algorithm/string.hpp + # Actually used + - comphelper/scopeguard.hxx + # Needed on IOS & ANDROID + - officecfg/Office/Impress.hxx + desktop/source/minidump/minidump.cxx: + # Needed for ostringstream + - sstream + desktop/source/deployment/manager/dp_properties.cxx: + # Actually used + - com/sun/star/ucb/XCommandEnvironment.hpp + desktop/source/deployment/manager/dp_informationprovider.cxx: + # Needed for extern functions + - dp_services.hxx + desktop/source/deployment/manager/dp_extensionmanager.cxx: + # Actually used + - com/sun/star/deployment/XPackage.hpp + - com/sun/star/deployment/XPackageManager.hpp + - com/sun/star/uno/XComponentContext.hpp + # Needed for extern functions + - dp_services.hxx + desktop/source/deployment/misc/lockfile.cxx: + # Needed on WIN32 + - memory + desktop/source/deployment/misc/dp_descriptioninfoset.cxx: + # Actually used + - o3tl/optional.hxx + desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx: + # Actually used + - com/sun/star/uno/XComponentContext.hpp + desktop/source/deployment/registry/component/dp_compbackenddb.cxx: + # Actually used + - com/sun/star/uno/XComponentContext.hpp + desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx: + # Actually used + - com/sun/star/uno/XComponentContext.hpp + desktop/source/deployment/registry/package/dp_extbackenddb.cxx: + # Actually used + - com/sun/star/uno/XComponentContext.hpp + desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx: + # Actually used + - com/sun/star/uno/XComponentContext.hpp + desktop/source/deployment/registry/help/dp_helpbackenddb.cxx: + # Actually used + - com/sun/star/uno/XComponentContext.hpp + desktop/source/deployment/registry/script/dp_lib_container.cxx: + # Actually used + - com/sun/star/uno/XComponentContext.hpp + - com/sun/star/ucb/XCommandEnvironment.hpp + desktop/source/deployment/registry/help/dp_help.cxx: + # Actually used + - com/sun/star/util/XMacroExpander.hpp diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 04b5a57cdae3..2bd3051bed26 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -21,12 +21,10 @@ #define INCLUDED_DESKTOP_INC_APP_HXX #include -#include #include #include #include #include -#include #include #include #include diff --git a/desktop/inc/dp_misc.h b/desktop/inc/dp_misc.h index 3f4b07bc8790..204132210249 100644 --- a/desktop/inc/dp_misc.h +++ b/desktop/inc/dp_misc.h @@ -20,16 +20,11 @@ #ifndef INCLUDED_DESKTOP_INC_DP_MISC_H #define INCLUDED_DESKTOP_INC_DP_MISC_H -#include -#include #include #include #include #include -#include -#include #include -#include #include namespace dp_misc { diff --git a/desktop/inc/dp_shared.hxx b/desktop/inc/dp_shared.hxx index 8c38545ed7fa..b4f86e44556f 100644 --- a/desktop/inc/dp_shared.hxx +++ b/desktop/inc/dp_shared.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SHARED_HXX #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SHARED_HXX -#include #include #include diff --git a/desktop/inc/lib/init.hxx b/desktop/inc/lib/init.hxx index 420b0d481583..568c1fe9e3e1 100644 --- a/desktop/inc/lib/init.hxx +++ b/desktop/inc/lib/init.hxx @@ -15,6 +15,7 @@ #include #include +#include #include #include diff --git a/desktop/inc/migration.hxx b/desktop/inc/migration.hxx index cb73bdd42eb5..e193407236a0 100644 --- a/desktop/inc/migration.hxx +++ b/desktop/inc/migration.hxx @@ -20,9 +20,6 @@ #ifndef INCLUDED_DESKTOP_INC_MIGRATION_HXX #define INCLUDED_DESKTOP_INC_MIGRATION_HXX -#include -#include - namespace desktop { class Migration diff --git a/desktop/qa/deployment_misc/test_dp_version.cxx b/desktop/qa/deployment_misc/test_dp_version.cxx index 19cbfd1a69ad..e896686865be 100644 --- a/desktop/qa/deployment_misc/test_dp_version.cxx +++ b/desktop/qa/deployment_misc/test_dp_version.cxx @@ -24,7 +24,6 @@ #include #include #include -#include #include #include "../../source/deployment/inc/dp_version.hxx" diff --git a/desktop/qa/desktop_app/test_desktop_app.cxx b/desktop/qa/desktop_app/test_desktop_app.cxx index 9a1b94606d8c..a87ea1974796 100644 --- a/desktop/qa/desktop_app/test_desktop_app.cxx +++ b/desktop/qa/desktop_app/test_desktop_app.cxx @@ -17,14 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include #include #include #include #include #include -#include #include #include #include diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx b/desktop/qa/desktop_lib/test_desktop_lib.cxx index 48e1411aa3d1..14ecd2bcb196 100644 --- a/desktop/qa/desktop_lib/test_desktop_lib.cxx +++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx @@ -15,13 +15,10 @@ #include #include #include -#include #include #include #include -#include - #include #include #include @@ -30,7 +27,6 @@ #include #include #include -#include #include #include #include @@ -49,7 +45,6 @@ #include #include #include -#include #include #include diff --git a/desktop/qa/unit/desktop-dialogs-test.cxx b/desktop/qa/unit/desktop-dialogs-test.cxx index c820ad0f5c5f..2a48c03f909c 100644 --- a/desktop/qa/unit/desktop-dialogs-test.cxx +++ b/desktop/qa/unit/desktop-dialogs-test.cxx @@ -9,9 +9,6 @@ #include #include -#include -#include -#include #include using namespace ::com::sun::star; diff --git a/desktop/qa/unit/desktop-lok-init.cxx b/desktop/qa/unit/desktop-lok-init.cxx index 180b95c33a6a..7e6e266cf899 100644 --- a/desktop/qa/unit/desktop-lok-init.cxx +++ b/desktop/qa/unit/desktop-lok-init.cxx @@ -7,16 +7,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include -#include #include #include #include #include #include -#include -#include -#include #include diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index 96172623cb45..b125883951b6 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -28,21 +28,16 @@ #include #include -#include -#if defined UNX -#include -#endif #include #include #include #include "cmdlineargs.hxx" -#include "cmdlinehelp.hxx" -#include "dispatchwatcher.hxx" #include #include "userinstall.hxx" #include "desktopcontext.hxx" #include +#include "officeipcthread.hxx" #if HAVE_FEATURE_UPDATE_MAR #include "updater.hxx" #endif @@ -61,7 +56,6 @@ #include #include #include -#include #include #include #include @@ -79,8 +73,6 @@ #include #include #include -#include -#include #include #include #include @@ -93,6 +85,7 @@ #include #include #include +#include #include #include #include @@ -105,7 +98,6 @@ #include #include #include -#include #include #include #include diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index dc2095a14af5..b3d0c98cea27 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -20,28 +20,18 @@ #include -#include - #include #include #include "cmdlineargs.hxx" #include #include -#include #include +#include #include -#include -#include -#include #include -#include -#include #include #include #include -#include -#include -#include #include #include #include @@ -52,7 +42,6 @@ #include #include #include -#include #include using namespace desktop; diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx index 292637a19423..2d7c2e1b277b 100644 --- a/desktop/source/app/check_ext_deps.cxx +++ b/desktop/source/app/check_ext_deps.cxx @@ -20,22 +20,16 @@ #include #include -#include - #include #include #include #include -#include - -#include #include #include #include #include -#include #include #include #include @@ -50,7 +44,6 @@ #include #include #include -#include #include #include #include diff --git a/desktop/source/app/cmdlineargs.cxx b/desktop/source/app/cmdlineargs.cxx index f66e8142849d..8169f541840f 100644 --- a/desktop/source/app/cmdlineargs.cxx +++ b/desktop/source/app/cmdlineargs.cxx @@ -26,9 +26,8 @@ #endif #include "cmdlineargs.hxx" +#include #include -#include -#include #include #include #include @@ -36,8 +35,6 @@ #include #include -#include - #include #include #include diff --git a/desktop/source/app/cmdlinehelp.cxx b/desktop/source/app/cmdlinehelp.cxx index bdb04bb9d4d8..1d7fe7613be7 100644 --- a/desktop/source/app/cmdlinehelp.cxx +++ b/desktop/source/app/cmdlinehelp.cxx @@ -18,10 +18,8 @@ */ -#include #include #include -#include #include #include "cmdlinehelp.hxx" diff --git a/desktop/source/app/desktopcontext.cxx b/desktop/source/app/desktopcontext.cxx index 364eacc63223..efabac38328e 100644 --- a/desktop/source/app/desktopcontext.cxx +++ b/desktop/source/app/desktopcontext.cxx @@ -21,7 +21,6 @@ #include "desktopcontext.hxx" -#include #include using namespace com::sun::star::uno; diff --git a/desktop/source/app/desktopcontext.hxx b/desktop/source/app/desktopcontext.hxx index 0781993b7af5..2deeb4ba8488 100644 --- a/desktop/source/app/desktopcontext.hxx +++ b/desktop/source/app/desktopcontext.hxx @@ -21,7 +21,7 @@ #define INCLUDED_DESKTOP_SOURCE_APP_DESKTOPCONTEXT_HXX #include -#include +#include namespace desktop { diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx index ade5ad25acc8..07e28d69d04b 100644 --- a/desktop/source/app/dispatchwatcher.cxx +++ b/desktop/source/app/dispatchwatcher.cxx @@ -23,11 +23,11 @@ #include #include #include -#include #include #include #include "dispatchwatcher.hxx" +#include "officeipcthread.hxx" #include #include #include @@ -49,8 +49,6 @@ #include #include #include -#include -#include #include #include @@ -60,11 +58,8 @@ #include #include -#include #include #include -#include -#include #include using namespace ::osl; diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx index 103b882b9172..a2bb5d6b1ff0 100644 --- a/desktop/source/app/dispatchwatcher.hxx +++ b/desktop/source/app/dispatchwatcher.hxx @@ -22,9 +22,8 @@ #include #include +#include -#include "officeipcthread.hxx" -#include #include namespace desktop diff --git a/desktop/source/app/langselect.cxx b/desktop/source/app/langselect.cxx index 0b321f9285f4..17b7913c09e3 100644 --- a/desktop/source/app/langselect.cxx +++ b/desktop/source/app/langselect.cxx @@ -34,8 +34,6 @@ #include #include #include -#include -#include #include #include #include diff --git a/desktop/source/app/langselect.hxx b/desktop/source/app/langselect.hxx index 617e635e63f5..24abcf22cbd6 100644 --- a/desktop/source/app/langselect.hxx +++ b/desktop/source/app/langselect.hxx @@ -22,8 +22,6 @@ #include -#include - namespace desktop { namespace langselect { bool prepareLocale(); diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx index 04617652c76d..16ec688c7c36 100644 --- a/desktop/source/app/officeipcthread.cxx +++ b/desktop/source/app/officeipcthread.cxx @@ -27,15 +27,13 @@ #include "officeipcthread.hxx" #include "cmdlineargs.hxx" #include "dispatchwatcher.hxx" -#include #include -#include +#include #include #include #include -#include #include -#include +#include #include #include #include @@ -46,7 +44,6 @@ #include #include -#include #include #include #include diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx index 79b550e70768..d0faf6a84e06 100644 --- a/desktop/source/app/officeipcthread.hxx +++ b/desktop/source/app/officeipcthread.hxx @@ -26,14 +26,12 @@ #include #include -#include -#include #include #include #include +#include #include #include -#include #include namespace desktop diff --git a/desktop/source/app/sofficemain.cxx b/desktop/source/app/sofficemain.cxx index 064c08579ab9..90e322260c1e 100644 --- a/desktop/source/app/sofficemain.cxx +++ b/desktop/source/app/sofficemain.cxx @@ -19,8 +19,6 @@ #include #include -#include -#include #include @@ -31,8 +29,6 @@ // needed before sal/main.h to avoid redefinition of macros #include -#include -#include #include #include #include @@ -40,10 +36,6 @@ #include #include -#include -#include -#include - #if HAVE_FEATURE_BREAKPAD #include #endif diff --git a/desktop/source/app/userinstall.cxx b/desktop/source/app/userinstall.cxx index f42b975c17d9..1e00ab80e716 100644 --- a/desktop/source/app/userinstall.cxx +++ b/desktop/source/app/userinstall.cxx @@ -27,9 +27,7 @@ #include #include #include -#include #include -#include #include #include diff --git a/desktop/source/deployment/dp_log.cxx b/desktop/source/deployment/dp_log.cxx index 9f962f05a497..1d68709ba5ba 100644 --- a/desktop/source/deployment/dp_log.cxx +++ b/desktop/source/deployment/dp_log.cxx @@ -20,23 +20,13 @@ #include #include -#include -#include -#include -#include #include #include #include -#include #include -#include +#include #include #include -#include -#include -#include -#include -#include using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/desktop/source/deployment/dp_xml.cxx b/desktop/source/deployment/dp_xml.cxx index 31ebedc41643..d61267e2faf4 100644 --- a/desktop/source/deployment/dp_xml.cxx +++ b/desktop/source/deployment/dp_xml.cxx @@ -18,9 +18,7 @@ */ -#include #include -#include #include #include diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h index b5a6d84c9646..713700f44735 100644 --- a/desktop/source/deployment/gui/dp_gui.h +++ b/desktop/source/deployment/gui/dp_gui.h @@ -20,33 +20,6 @@ #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_H #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_H -#include "dp_gui_updatedata.hxx" -#include -#include -#include -#include -#include -#include -#include - -namespace com { namespace sun { namespace star { - namespace container { - class XNameAccess; - } - namespace frame { - class XDesktop; - } - namespace awt { - class XWindow; - } - namespace uno { - class XComponentContext; - } - namespace deployment { - class XPackageManagerFactory; - } -} } } - namespace dp_gui { enum PackageState { REGISTERED, NOT_REGISTERED, AMBIGUOUS, NOT_AVAILABLE }; diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx index 293a5c06fed4..2f02a991aea8 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx @@ -20,9 +20,6 @@ #include -#include -#include - #include #include diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx index 9c350b328b16..6b974ae9e9ee 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.hxx @@ -22,7 +22,6 @@ #include -#include #include #include diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 5fb33529c395..b2f4d0c48c68 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -17,9 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include + #include #include -#include #include "dp_gui.h" #include "dp_gui_dialog2.hxx" @@ -28,10 +29,8 @@ #include "dp_gui_theextmgr.hxx" #include "dp_gui_extensioncmdqueue.hxx" #include -#include #include #include -#include #include @@ -48,28 +47,19 @@ #include #include -#include #include #include -#include -#include #include -#include #include -#include #include #include #include #include #include -#include -#include - -#include -#include +#include #include diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 84a755677843..b3d348c840f3 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -20,30 +20,21 @@ #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_DIALOG2_HXX #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_DIALOG2_HXX -#include - #include #include #include #include #include -#include #include -#include #include #include -#include #include #include #include -#include - -#include -#include namespace dp_gui { diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index acf23a0d5bf8..2a8e41b3a497 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -19,8 +19,6 @@ #include -#include - #include #include @@ -31,7 +29,6 @@ #include #include -#include #include #include @@ -46,15 +43,13 @@ #include #include -#include #include -#include #include #include +#include #include #include #include -#include #include #include #include @@ -64,9 +59,7 @@ #include #include #include -#include -#include "dp_gui.h" #include "dp_gui_extensioncmdqueue.hxx" #include "dp_gui_dependencydialog.hxx" #include "dp_gui_dialog2.hxx" @@ -76,6 +69,7 @@ #include "dp_gui_updatedialog.hxx" #include "dp_gui_updateinstalldialog.hxx" #include +#include #include #include diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 73cee9a90264..4ccac79a4f24 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -17,14 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include - #include #include #include "dp_gui.h" #include "dp_gui_extlistbox.hxx" #include "dp_gui_theextmgr.hxx" -#include "dp_gui_dialog2.hxx" #include #include @@ -38,7 +35,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index 7621807f1ef6..9295cb09a147 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -35,6 +35,8 @@ #include +#include "dp_gui.h" + namespace dp_gui { #define SMALL_ICON_SIZE 16 diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index 5110308bf787..a3bd0c0ed844 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -19,11 +19,9 @@ #include -#include "dp_gui.h" #include "dp_gui_theextmgr.hxx" #include #include -#include #include #include #include @@ -31,8 +29,6 @@ #include #include #include -#include -#include #include #include @@ -40,6 +36,7 @@ #include "license_dialog.hxx" #include "dp_gui_dialog2.hxx" #include "dp_gui_extensioncmdqueue.hxx" +#include using namespace ::dp_misc; using namespace ::com::sun::star; diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx index 1a9a3cd43798..446c4ae06571 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.cxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.cxx @@ -19,11 +19,10 @@ #include -#include - #include #include #include +#include #include #include #include @@ -31,14 +30,13 @@ #include #include #include -#include #include #include #include "dp_gui_dialog2.hxx" #include "dp_gui_extensioncmdqueue.hxx" #include "dp_gui_theextmgr.hxx" -#include +#include #include #define USER_PACKAGE_MANAGER "user" diff --git a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx index db862a5f388d..8595fb3c87af 100644 --- a/desktop/source/deployment/gui/dp_gui_theextmgr.hxx +++ b/desktop/source/deployment/gui/dp_gui_theextmgr.hxx @@ -24,7 +24,6 @@ #include #include -#include #include #include #include @@ -32,7 +31,6 @@ #include "dp_gui.h" #include "dp_gui_dialog2.hxx" -#include "dp_gui_updatedata.hxx" namespace dp_gui { diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index 28ff3563cc54..3214ac098fb0 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -20,86 +20,54 @@ #include -#include -#include -#include #include #include #include -#include -#include -#include -#include -#include -#include #include -#include #include #include #include #include -#include -#include #include -#include -#include #include #include #include #include #include #include -#include -#include -#include #include -#include -#include -#include #include #include #include #include #include -#include #include -#include #include -#include #include #include #include -#include #include #include -#include #include -#include #include #include #include -#include #include #include -#include #include #include #include -#include #include #include #include -#include #include #include -#include "dp_gui.h" #include -#include #include "dp_gui_updatedata.hxx" #include "dp_gui_updatedialog.hxx" #include diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index 3fe66f665ea1..8db0ece84be2 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -22,32 +22,20 @@ #include #include -#include #include #include #include -#include #include -#include -#include -#include +#include #include -#include #include #include #include -#include #include -#include -#include #include #include -#include #include -#include -#include -#include #include #include @@ -56,7 +44,6 @@ #include #include #include -#include #include "dp_gui_extensioncmdqueue.hxx" #include #include diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index 7f7f14402278..3e92f8cf626f 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -18,13 +18,7 @@ */ -#include -#include #include -#include -#include -#include -#include #include #include #include @@ -35,7 +29,6 @@ #include -using namespace ::dp_misc; using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/desktop/source/deployment/gui/license_dialog.hxx b/desktop/source/deployment/gui/license_dialog.hxx index 85be01aac2e8..4cb615ef8278 100644 --- a/desktop/source/deployment/gui/license_dialog.hxx +++ b/desktop/source/deployment/gui/license_dialog.hxx @@ -19,9 +19,9 @@ #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_LICENSE_DIALOG_HXX #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_LICENSE_DIALOG_HXX -#include "dp_gui.h" #include -#include +#include +#include #include diff --git a/desktop/source/deployment/inc/dp_interact.h b/desktop/source/deployment/inc/dp_interact.h index 5f5fb610558c..511311e817f3 100644 --- a/desktop/source/deployment/inc/dp_interact.h +++ b/desktop/source/deployment/inc/dp_interact.h @@ -22,7 +22,6 @@ #include #include -#include #include #include #include "dp_misc_api.hxx" diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h index f6711d6d4d0a..f7840819c18e 100644 --- a/desktop/source/deployment/inc/dp_resource.h +++ b/desktop/source/deployment/inc/dp_resource.h @@ -21,7 +21,6 @@ #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_RESOURCE_H #include -#include #include "dp_misc_api.hxx" namespace dp_misc { diff --git a/desktop/source/deployment/inc/dp_ucb.h b/desktop/source/deployment/inc/dp_ucb.h index a5fa819cec94..abfad29927ea 100644 --- a/desktop/source/deployment/inc/dp_ucb.h +++ b/desktop/source/deployment/inc/dp_ucb.h @@ -21,8 +21,6 @@ #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_UCB_H #include -#include -#include #include #include #include "dp_misc_api.hxx" diff --git a/desktop/source/deployment/inc/dp_update.hxx b/desktop/source/deployment/inc/dp_update.hxx index 921f6680d255..c0e5bb2c0165 100644 --- a/desktop/source/deployment/inc/dp_update.hxx +++ b/desktop/source/deployment/inc/dp_update.hxx @@ -27,7 +27,6 @@ #include #include -#include #include "dp_misc_api.hxx" #include diff --git a/desktop/source/deployment/inc/dp_version.hxx b/desktop/source/deployment/inc/dp_version.hxx index 3be8da955ec8..a74f5fdca3ad 100644 --- a/desktop/source/deployment/inc/dp_version.hxx +++ b/desktop/source/deployment/inc/dp_version.hxx @@ -21,6 +21,8 @@ #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_VERSION_HXX #include + +#include #include "dp_misc_api.hxx" diff --git a/desktop/source/deployment/inc/dp_xml.h b/desktop/source/deployment/inc/dp_xml.h index 0bd215ed3651..1831e2b32169 100644 --- a/desktop/source/deployment/inc/dp_xml.h +++ b/desktop/source/deployment/inc/dp_xml.h @@ -20,10 +20,7 @@ #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_XML_H #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_XML_H -#include -#include #include -#include #include diff --git a/desktop/source/deployment/inc/lockfile.hxx b/desktop/source/deployment/inc/lockfile.hxx index 6fa8fcfdcae3..18a0f1a62803 100644 --- a/desktop/source/deployment/inc/lockfile.hxx +++ b/desktop/source/deployment/inc/lockfile.hxx @@ -35,8 +35,6 @@ #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_LOCKFILE_HXX #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_LOCKFILE_HXX -#include -#include #include #include "dp_misc_api.hxx" diff --git a/desktop/source/deployment/manager/dp_activepackages.cxx b/desktop/source/deployment/manager/dp_activepackages.cxx index ab2cbf0d4a9f..b301bc5ad22b 100644 --- a/desktop/source/deployment/manager/dp_activepackages.cxx +++ b/desktop/source/deployment/manager/dp_activepackages.cxx @@ -17,20 +17,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include +#include #include -#include #include -#include #include -#include #include #include -#include -#include #include #include diff --git a/desktop/source/deployment/manager/dp_commandenvironments.cxx b/desktop/source/deployment/manager/dp_commandenvironments.cxx index 1ac6ae7ecb92..755657a9d21e 100644 --- a/desktop/source/deployment/manager/dp_commandenvironments.cxx +++ b/desktop/source/deployment/manager/dp_commandenvironments.cxx @@ -24,10 +24,8 @@ #include #include #include -#include #include #include -#include #include "dp_commandenvironments.hxx" #include diff --git a/desktop/source/deployment/manager/dp_commandenvironments.hxx b/desktop/source/deployment/manager/dp_commandenvironments.hxx index 71759bc43337..680e1e891149 100644 --- a/desktop/source/deployment/manager/dp_commandenvironments.hxx +++ b/desktop/source/deployment/manager/dp_commandenvironments.hxx @@ -21,7 +21,11 @@ #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_COMMANDENVIRONMENTS_HXX #include -#include +#include +#include +#include +#include + namespace dp_manager { diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index e99dbda3454d..93e049b3308e 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -24,18 +24,13 @@ #include #include #include -#include #include #include #include -#include #include #include #include -#include #include -#include -#include #include #include #include @@ -47,9 +42,7 @@ #include #include #include -#include #include -#include #include #include #include diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx index 0e1778ed1c01..2432279c37b4 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.hxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx @@ -23,13 +23,10 @@ #include #include #include -#include -#include "dp_activepackages.hxx" -#include #include -#include -#include +#include #include +#include #include #include #include diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx index 2866d0dccac3..bde956937a3d 100644 --- a/desktop/source/deployment/manager/dp_informationprovider.cxx +++ b/desktop/source/deployment/manager/dp_informationprovider.cxx @@ -26,18 +26,14 @@ #include #include #include -#include -#include #include #include #include #include #include -#include #include #include -#include #include #include #include @@ -47,7 +43,6 @@ #include #include #include -#include #include namespace beans = com::sun::star::beans ; diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 5d86410ef145..7445c95822e1 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -19,11 +19,11 @@ #include +#include #include #include #include #include -#include #include #include "dp_manager.h" #include @@ -37,15 +37,12 @@ #include #include #include -#include #include -#include #include #include #include #include #include -#include #include #include #include @@ -63,10 +60,7 @@ #include #include #include -#include -#include #include -#include #include #include @@ -75,7 +69,6 @@ #include "dp_properties.hxx" #include -#include #include using namespace ::dp_misc; diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h index 3f2168695e5a..6ec26c9aec3f 100644 --- a/desktop/source/deployment/manager/dp_manager.h +++ b/desktop/source/deployment/manager/dp_manager.h @@ -21,9 +21,7 @@ #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_MANAGER_H #include -#include #include "dp_activepackages.hxx" -#include #include #include #include diff --git a/desktop/source/deployment/manager/dp_managerfac.cxx b/desktop/source/deployment/manager/dp_managerfac.cxx index 7960b3ce6497..f7feac323c90 100644 --- a/desktop/source/deployment/manager/dp_managerfac.cxx +++ b/desktop/source/deployment/manager/dp_managerfac.cxx @@ -19,11 +19,10 @@ #include "dp_manager.h" -#include #include #include #include -#include +#include #include using namespace ::dp_misc; diff --git a/desktop/source/deployment/manager/dp_properties.hxx b/desktop/source/deployment/manager/dp_properties.hxx index cc4bd931df34..aface6bb7f89 100644 --- a/desktop/source/deployment/manager/dp_properties.hxx +++ b/desktop/source/deployment/manager/dp_properties.hxx @@ -23,6 +23,7 @@ #include #include +#include #include diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx index adde640b91e9..9d74f1b92910 100644 --- a/desktop/source/deployment/misc/dp_dependencies.cxx +++ b/desktop/source/deployment/misc/dp_dependencies.cxx @@ -25,15 +25,13 @@ #include #include #include +#include #include -#include -#include #include #include #include #include -#include #include #include diff --git a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx index 585fcec13224..735e7373dd01 100644 --- a/desktop/source/deployment/misc/dp_descriptioninfoset.cxx +++ b/desktop/source/deployment/misc/dp_descriptioninfoset.cxx @@ -23,23 +23,22 @@ #include #include -#include #include #include #include #include #include #include -#include -#include #include #include #include #include +#include +#include +#include #include #include #include -#include #include #include #include @@ -51,7 +50,6 @@ #include #include #include -#include #include #include #include diff --git a/desktop/source/deployment/misc/dp_identifier.cxx b/desktop/source/deployment/misc/dp_identifier.cxx index 7f07b5362bda..30a02890918b 100644 --- a/desktop/source/deployment/misc/dp_identifier.cxx +++ b/desktop/source/deployment/misc/dp_identifier.cxx @@ -25,8 +25,6 @@ #include #include #include -#include -#include #include #include diff --git a/desktop/source/deployment/misc/dp_interact.cxx b/desktop/source/deployment/misc/dp_interact.cxx index 2d0233b7cd90..6bb4e7e3c1fa 100644 --- a/desktop/source/deployment/misc/dp_interact.cxx +++ b/desktop/source/deployment/misc/dp_interact.cxx @@ -22,8 +22,6 @@ #include -#include -#include #include #include diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index 368735ccf1c2..0621cc51e099 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -22,12 +22,12 @@ #include #include -#include #include #include #include #include #include +#include #include #include #include @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #include diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx index 18ad1a8adc38..50ca73a362f4 100644 --- a/desktop/source/deployment/misc/dp_platform.cxx +++ b/desktop/source/deployment/misc/dp_platform.cxx @@ -18,7 +18,6 @@ */ -#include #include #include #include diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx index a6b3285b3850..3204061762c2 100644 --- a/desktop/source/deployment/misc/dp_resource.cxx +++ b/desktop/source/deployment/misc/dp_resource.cxx @@ -18,12 +18,7 @@ */ -#include #include -#include -#include -#include -#include #include #include diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx index ef9b4b390d37..7f72208e5d6a 100644 --- a/desktop/source/deployment/misc/dp_ucb.cxx +++ b/desktop/source/deployment/misc/dp_ucb.cxx @@ -27,7 +27,6 @@ #include #include #include -#include #include #include #include diff --git a/desktop/source/deployment/misc/dp_version.cxx b/desktop/source/deployment/misc/dp_version.cxx index bdae36782730..703045ddebb1 100644 --- a/desktop/source/deployment/misc/dp_version.cxx +++ b/desktop/source/deployment/misc/dp_version.cxx @@ -20,7 +20,6 @@ #include -#include #include #include diff --git a/desktop/source/deployment/misc/lockfile.cxx b/desktop/source/deployment/misc/lockfile.cxx index 4bd475e89ccd..50da67e9706e 100644 --- a/desktop/source/deployment/misc/lockfile.cxx +++ b/desktop/source/deployment/misc/lockfile.cxx @@ -21,7 +21,6 @@ #include -#include #include #ifndef _WIN32 #include @@ -34,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx index 9b4945addf82..b00b9f0c6fc8 100644 --- a/desktop/source/deployment/registry/component/dp_compbackenddb.cxx +++ b/desktop/source/deployment/registry/component/dp_compbackenddb.cxx @@ -18,14 +18,9 @@ */ -#include -#include #include #include #include -#include -#include -#include #include "dp_compbackenddb.hxx" diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index eb364a6e677e..7709d1c48eae 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index 47312a192ac5..d95a8c5f0766 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -31,8 +31,6 @@ #include #include #include -#include -#include #include #include #include @@ -41,11 +39,8 @@ #include #include #include -#include -#include #include #include -#include #include #include #include diff --git a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx index ab19d8cdf772..9c9feabf5884 100644 --- a/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configurationbackenddb.cxx @@ -18,14 +18,10 @@ */ -#include -#include #include #include #include -#include #include -#include #include "dp_configurationbackenddb.hxx" diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index daee1d862bbf..428b74d2fce1 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -24,10 +24,8 @@ #include #include #include -#include #include #include -#include #include #include #include @@ -35,7 +33,6 @@ #include #include #include -#include #include #include #include diff --git a/desktop/source/deployment/registry/dp_backenddb.cxx b/desktop/source/deployment/registry/dp_backenddb.cxx index 7b0ec523fe52..bb47161ec846 100644 --- a/desktop/source/deployment/registry/dp_backenddb.cxx +++ b/desktop/source/deployment/registry/dp_backenddb.cxx @@ -18,9 +18,6 @@ */ -#include -#include -#include #include #include #include @@ -29,7 +26,6 @@ #include #include #include -#include #include #include #include diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index 2bd542379a59..7a63de3250f0 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -25,27 +25,24 @@ #include #include #include -#include -#include #include #include #include #include #include -#include #include #include #include #include #include #include -#include #include #include #include #include #include -#include +#include +#include #include #include #include diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx index 157da6b2f6b2..ca403d8d113a 100644 --- a/desktop/source/deployment/registry/executable/dp_executable.cxx +++ b/desktop/source/deployment/registry/executable/dp_executable.cxx @@ -25,7 +25,6 @@ #include #include #include -#include #include #include #include diff --git a/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx b/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx index d4a044e00667..16d7ed865720 100644 --- a/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx +++ b/desktop/source/deployment/registry/executable/dp_executablebackenddb.cxx @@ -18,9 +18,7 @@ */ -#include #include -#include #include "dp_executablebackenddb.hxx" diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index f940ca963be2..cb76be1d987c 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -27,11 +27,9 @@ #include #include #include -#include #include #include #include -#include #include #if HAVE_FEATURE_DESKTOP diff --git a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx index cbb9f991c25a..937609e7bd7a 100644 --- a/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx +++ b/desktop/source/deployment/registry/help/dp_helpbackenddb.cxx @@ -18,14 +18,9 @@ */ -#include -#include #include #include #include -#include -#include -#include #include "dp_helpbackenddb.hxx" diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h index 319c0904541c..ea54e41859fc 100644 --- a/desktop/source/deployment/registry/inc/dp_backend.h +++ b/desktop/source/deployment/registry/inc/dp_backend.h @@ -21,17 +21,13 @@ #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_INC_DP_BACKEND_H #include -#include #include #include #include -#include #include #include #include #include -#include -#include #include #include diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx index 53ee5e56569d..57e3131cb1f9 100644 --- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx +++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_INC_DP_BACKENDDB_HXX #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_REGISTRY_INC_DP_BACKENDDB_HXX +#include #include #include #include diff --git a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx index 16766a913b8d..95904470fcce 100644 --- a/desktop/source/deployment/registry/package/dp_extbackenddb.cxx +++ b/desktop/source/deployment/registry/package/dp_extbackenddb.cxx @@ -18,13 +18,9 @@ */ -#include #include #include #include -#include -#include -#include #include "dp_extbackenddb.hxx" diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 3bb6f2c5bd40..d55ea3319ffd 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -27,18 +27,18 @@ #include #include #include +#include #include +#include #include #include #include #include #include #include -#include #include #include #include -#include #include #include #include @@ -65,9 +65,6 @@ #include #include #include -#include -#include -#include #include #include diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx index df9d93eaba5e..48b0c15fd507 100644 --- a/desktop/source/deployment/registry/script/dp_script.cxx +++ b/desktop/source/deployment/registry/script/dp_script.cxx @@ -23,15 +23,12 @@ #include "dp_lib_container.h" #include #include -#include #include -#include #include #include #include #include #include -#include #include #include "dp_scriptbackenddb.hxx" diff --git a/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx b/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx index 425fa4fe0579..1f9c7fad19a5 100644 --- a/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx +++ b/desktop/source/deployment/registry/script/dp_scriptbackenddb.cxx @@ -18,12 +18,7 @@ */ -#include -#include #include -#include -#include -#include #include "dp_scriptbackenddb.hxx" diff --git a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx index 001e8b2e156f..0d09f6288d99 100644 --- a/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx +++ b/desktop/source/deployment/registry/sfwk/dp_parceldesc.hxx @@ -23,13 +23,8 @@ #include #include -#include #include -#include -#include -#include -#include namespace dp_registry { namespace backend diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx index b1041ef31135..5268bdf4c042 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx @@ -26,7 +26,6 @@ #include "dp_parceldesc.hxx" #include #include -#include #include #include #include diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index a308e28ba942..5a5bafb0c2fe 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -8,7 +8,6 @@ */ #include -#include #include #include @@ -75,8 +74,6 @@ #include #include #include -#include -#include #include #include #include @@ -89,8 +86,6 @@ #include #include #include -#include -#include #include #include @@ -98,9 +93,7 @@ #include #include -#include #include -#include #include #include #include @@ -108,12 +101,9 @@ #include #include #include -#include #include #include -#include #include -#include #include #include #include @@ -127,15 +117,11 @@ #include #include #include -#include -#include #include #include #include -#include #include #include -#include #include #include #include @@ -144,7 +130,6 @@ #include #include #include -#include #include #include #include diff --git a/desktop/source/lib/lokinteractionhandler.cxx b/desktop/source/lib/lokinteractionhandler.cxx index cebfcb72f579..f749bd4397c2 100644 --- a/desktop/source/lib/lokinteractionhandler.cxx +++ b/desktop/source/lib/lokinteractionhandler.cxx @@ -21,7 +21,6 @@ #include -#include #include #include diff --git a/desktop/source/lib/lokinteractionhandler.hxx b/desktop/source/lib/lokinteractionhandler.hxx index f6dc441327d8..8c11fd6b31de 100644 --- a/desktop/source/lib/lokinteractionhandler.hxx +++ b/desktop/source/lib/lokinteractionhandler.hxx @@ -26,9 +26,8 @@ #include #include -#include -#include -#include +#include +#include namespace desktop { struct LibLibreOffice_Impl; diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx index 93757d366b42..262251d1fba8 100644 --- a/desktop/source/migration/migration.cxx +++ b/desktop/source/migration/migration.cxx @@ -22,7 +22,6 @@ #include #include #include -#include #include #include @@ -33,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -44,21 +42,17 @@ #include #include -#include #include #include #include #include #include -#include #include #include #include #include #include #include -#include -#include #include using namespace osl; diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx index 51de2125db0b..029380a710c7 100644 --- a/desktop/source/migration/migration_impl.hxx +++ b/desktop/source/migration/migration_impl.hxx @@ -19,27 +19,18 @@ #ifndef INCLUDED_DESKTOP_SOURCE_MIGRATION_MIGRATION_IMPL_HXX #define INCLUDED_DESKTOP_SOURCE_MIGRATION_MIGRATION_IMPL_HXX -#include #include #include #include -#include - #include -#include #include #include #include -#include #include -#include -#include -#include #include -#include namespace desktop { diff --git a/desktop/source/migration/services/basicmigration.cxx b/desktop/source/migration/services/basicmigration.cxx index 52388235f607..bec200e21a6b 100644 --- a/desktop/source/migration/services/basicmigration.cxx +++ b/desktop/source/migration/services/basicmigration.cxx @@ -22,6 +22,7 @@ #include #include #include +#include using namespace ::com::sun::star; diff --git a/desktop/source/migration/services/basicmigration.hxx b/desktop/source/migration/services/basicmigration.hxx index e28c8f8af548..88f668581664 100644 --- a/desktop/source/migration/services/basicmigration.hxx +++ b/desktop/source/migration/services/basicmigration.hxx @@ -27,7 +27,6 @@ #include #include #include -#include class INetURLObject; diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx index e0c13c7767ee..a4fe6aaaf09d 100644 --- a/desktop/source/migration/services/jvmfwk.cxx +++ b/desktop/source/migration/services/jvmfwk.cxx @@ -19,10 +19,7 @@ #include -#include #include -#include -#include #include #include #include @@ -41,7 +38,6 @@ #include #include -#include #include #define SERVICE_NAME "com.sun.star.migration.Java" diff --git a/desktop/source/migration/services/jvmfwk.hxx b/desktop/source/migration/services/jvmfwk.hxx index 7fe46970fc6d..31c35feb489e 100644 --- a/desktop/source/migration/services/jvmfwk.hxx +++ b/desktop/source/migration/services/jvmfwk.hxx @@ -20,15 +20,8 @@ #ifndef INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_JVMFWK_HXX #define INCLUDED_DESKTOP_SOURCE_MIGRATION_SERVICES_JVMFWK_HXX -#include -#include -#include #include -#include -#include -#include -#include -#include +#include namespace migration diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx index 20b8d27403ed..979ab8dacce4 100644 --- a/desktop/source/migration/services/oo3extensionmigration.cxx +++ b/desktop/source/migration/services/oo3extensionmigration.cxx @@ -19,25 +19,18 @@ #include "oo3extensionmigration.hxx" -#include #include #include -#include #include -#include #include #include #include #include -#include #include -#include #include -#include -#include -#include #include +#include #include #include #include diff --git a/desktop/source/migration/services/oo3extensionmigration.hxx b/desktop/source/migration/services/oo3extensionmigration.hxx index 30f198648798..3d2c4b5d8a86 100644 --- a/desktop/source/migration/services/oo3extensionmigration.hxx +++ b/desktop/source/migration/services/oo3extensionmigration.hxx @@ -25,14 +25,12 @@ #include #include #include -#include +#include #include #include #include -#include #include -#include namespace com { namespace sun { namespace star { namespace uno { diff --git a/desktop/source/migration/services/wordbookmigration.cxx b/desktop/source/migration/services/wordbookmigration.cxx index 21edc727b40f..354643e8ef17 100644 --- a/desktop/source/migration/services/wordbookmigration.cxx +++ b/desktop/source/migration/services/wordbookmigration.cxx @@ -23,6 +23,7 @@ #include #include #include +#include using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/desktop/source/migration/services/wordbookmigration.hxx b/desktop/source/migration/services/wordbookmigration.hxx index a312c52e3e4a..6da5526d8a58 100644 --- a/desktop/source/migration/services/wordbookmigration.hxx +++ b/desktop/source/migration/services/wordbookmigration.hxx @@ -27,7 +27,6 @@ #include #include #include -#include class INetURLObject; diff --git a/desktop/source/minidump/minidump.cxx b/desktop/source/minidump/minidump.cxx index 8b96d2ff37f1..cdf7bf049ecb 100644 --- a/desktop/source/minidump/minidump.cxx +++ b/desktop/source/minidump/minidump.cxx @@ -10,7 +10,6 @@ #include #include -#include #include #include #include diff --git a/desktop/source/offacc/acceptor.hxx b/desktop/source/offacc/acceptor.hxx index 67dd66928669..17d3b8ac0d80 100644 --- a/desktop/source/offacc/acceptor.hxx +++ b/desktop/source/offacc/acceptor.hxx @@ -24,18 +24,13 @@ #include #include -#include #include -#include #include #include #include #include -#include #include -#include -#include #include #include #include diff --git a/desktop/source/pkgchk/unopkg/unopkg_app.cxx b/desktop/source/pkgchk/unopkg/unopkg_app.cxx index eba9c283f9d5..6ee96a9b7995 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_app.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_app.cxx @@ -18,19 +18,14 @@ */ -#include #include #include "unopkg_main.h" #include "unopkg_shared.h" #include #include -#include -#include #include -#include #include #include -#include #include #include #include @@ -48,10 +43,7 @@ #include #include #include -#include #include -#include -#include #if defined(UNX) #include #endif diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx index 26b14bbc6360..060d2918fb50 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx @@ -19,13 +19,12 @@ #include +#include #include #include "unopkg_shared.h" -#include -#include -#include +#include +#include #include -#include #include #include #include @@ -34,14 +33,12 @@ #include #include #include -#include #include #include #include #include #include -#include #include using namespace ::com::sun::star; diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index a76ea7dc5fc0..50b6c58d9190 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -19,17 +19,13 @@ #include -#include - #include #include #include -#include #include #include #include #include -#include #include #include #include @@ -42,6 +38,7 @@ #include #include "unopkg_shared.h" #include +#include #include #include diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h b/desktop/source/pkgchk/unopkg/unopkg_shared.h index 6d23b4c8f39e..04062a107e80 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_shared.h +++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h @@ -17,16 +17,14 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include #include #include #include #include #include -#include #include -#include -#include + +#include #define APP_NAME "unopkg" diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index c34673f3e881..53ca05497ee1 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -19,23 +19,18 @@ #include "splash.hxx" -#include #include -#include -#include #include #include #include #include #include -#include #include #include #include #include #include -#include #include #include @@ -43,7 +38,6 @@ #define NOT_LOADED_COLOR (Color(0xffffffff)) using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::registry; using namespace ::com::sun::star::task; using namespace ::com::sun::star::uno; diff --git a/desktop/source/splash/splash.hxx b/desktop/source/splash/splash.hxx index 1561308dbb90..94838d3ccd19 100644 --- a/desktop/source/splash/splash.hxx +++ b/desktop/source/splash/splash.hxx @@ -24,7 +24,6 @@ #include #include -#include namespace com { namespace sun { namespace star { namespace uno { diff --git a/desktop/source/splash/unxsplash.cxx b/desktop/source/splash/unxsplash.cxx index b068cfa28e5c..cf1c66144ea8 100644 --- a/desktop/source/splash/unxsplash.cxx +++ b/desktop/source/splash/unxsplash.cxx @@ -20,10 +20,7 @@ #include "unxsplash.hxx" #include #include -#include #include -#include -#include #include using namespace com::sun::star; diff --git a/desktop/source/splash/unxsplash.hxx b/desktop/source/splash/unxsplash.hxx index d4ca29fd1be4..baa612a0df10 100644 --- a/desktop/source/splash/unxsplash.hxx +++ b/desktop/source/splash/unxsplash.hxx @@ -13,18 +13,12 @@ #include #include -#include #include -#include #include -#include #include #include #include -#include -#include #include -#include namespace desktop {