diff options
112 files changed, 158 insertions, 474 deletions
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 <o3tl/optional.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <sal/log.hxx> #include <vcl/svapp.hxx> #include <vcl/timer.hxx> #include <unotools/bootstrap.hxx> -#include <unotools/resmgr.hxx> #include <com/sun/star/frame/XDesktop2.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/uno/Reference.h> 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 <rtl/ustrbuf.hxx> -#include <rtl/instance.hxx> #include <osl/mutex.hxx> #include <osl/process.h> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/lang/DisposedException.hpp> -#include <com/sun/star/deployment/XPackageRegistry.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> -#include <com/sun/star/awt/XWindow.hpp> #include <dp_misc_api.hxx> 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 <osl/diagnose.h> #include <rtl/instance.hxx> #include <unotools/resmgr.hxx> 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 <memory> #include <mutex> +#include <boost/property_tree/ptree.hpp> #include <boost/variant.hpp> #include <osl/thread.h> 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 <sal/types.h> -#include <rtl/ustring.hxx> - 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 <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> -#include <rtl/ustring.h> #include <rtl/ustring.hxx> #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 <cstddef> #include <sal/types.h> #include <cppunit/TestAssert.h> #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> -#include <rtl/ustring.h> #include <rtl/ustring.hxx> #include <cppuhelper/bootstrap.hxx> #include <com/sun/star/uno/Reference.hxx> 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 <com/sun/star/awt/XReschedule.hpp> #include <com/sun/star/awt/Toolkit.hpp> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> -#include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/text/TextContentAnchorType.hpp> #include <boost/property_tree/json_parser.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/frame/XStorable.hpp> - #include <vcl/combobox.hxx> #include <vcl/scheduler.hxx> #include <vcl/svapp.hxx> @@ -30,7 +27,6 @@ #include <comphelper/processfactory.hxx> #include <rtl/uri.hxx> #include <sfx2/app.hxx> -#include <sfx2/objsh.hxx> #include <sfx2/lokhelper.hxx> #include <test/unoapi_test.hxx> #include <comphelper/lok.hxx> @@ -49,7 +45,6 @@ #include <comphelper/string.hxx> #include <comphelper/scopeguard.hxx> #include <cairo.h> -#include <ostream> #include <config_features.h> #include <config_mpl.h> 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 <sal/config.h> #include <test/screenshot_test.hxx> -#include <rtl/strbuf.hxx> -#include <osl/file.hxx> -#include <sfx2/app.hxx> #include <vcl/abstdlg.hxx> 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 <memory> -#include <boost/property_tree/json_parser.hpp> #include <cppunit/TestFixture.h> #include <cppunit/plugin/TestPlugIn.h> #include <cppunit/extensions/HelperMacros.h> #include <comphelper/anytostring.hxx> #include <comphelper/sequence.hxx> -#include <cstdlib> -#include <string> -#include <stdio.h> #include <tools/color.hxx> 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 <sal/config.h> #include <iostream> -#include <mutex> -#if defined UNX -#include <signal.h> -#endif #include <app.hxx> #include <dp_shared.hxx> #include <strings.hrc> #include "cmdlineargs.hxx" -#include "cmdlinehelp.hxx" -#include "dispatchwatcher.hxx" #include <lockfile.hxx> #include "userinstall.hxx" #include "desktopcontext.hxx" #include <migration.hxx> +#include "officeipcthread.hxx" #if HAVE_FEATURE_UPDATE_MAR #include "updater.hxx" #endif @@ -61,7 +56,6 @@ #include <com/sun/star/configuration/CorruptedConfigurationException.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/util/XFlushable.hpp> -#include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/system/SystemShellExecuteFlags.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/StartModule.hpp> @@ -79,8 +73,6 @@ #include <com/sun/star/task/OfficeRestartManager.hpp> #include <com/sun/star/task/XRestartManager.hpp> #include <com/sun/star/document/XDocumentEventListener.hpp> -#include <com/sun/star/ui/theUIElementFactoryManager.hpp> -#include <com/sun/star/ui/theWindowStateConfiguration.hpp> #include <com/sun/star/office/Quickstart.hpp> #include <com/sun/star/system/XSystemShellExecute.hpp> #include <com/sun/star/system/SystemShellExecute.hpp> @@ -93,6 +85,7 @@ #include <comphelper/threadpool.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/backupfilehelper.hxx> +#include <uno/current_context.hxx> #include <unotools/bootstrap.hxx> #include <unotools/configmgr.hxx> #include <unotools/moduleoptions.hxx> @@ -105,7 +98,6 @@ #include <osl/file.hxx> #include <osl/process.h> #include <rtl/byteseq.hxx> -#include <rtl/uri.hxx> #include <unotools/pathoptions.hxx> #include <svtools/miscopt.hxx> #include <svtools/menuoptions.hxx> 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 <algorithm> -#include <config_vclplug.h> - #include <app.hxx> #include <dp_shared.hxx> #include "cmdlineargs.hxx" #include <strings.hrc> #include <com/sun/star/registry/XSimpleRegistry.hpp> -#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/Exception.hpp> -#include <com/sun/star/uno/XCurrentContext.hpp> -#include <com/sun/star/packages/zip/ZipIOException.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/ucb/UniversalContentBroker.hpp> -#include <com/sun/star/ucb/XUniversalContentBroker.hpp> -#include <uno/current_context.hxx> #include <cppuhelper/bootstrap.hxx> #include <officecfg/Setup.hxx> #include <osl/file.hxx> -#include <osl/module.h> -#include <rtl/uri.hxx> -#include <rtl/ustrbuf.hxx> #include <rtl/bootstrap.hxx> #include <sal/log.hxx> #include <tools/diagnose_ex.h> @@ -52,7 +42,6 @@ #include <unotools/tempfile.hxx> #include <vcl/svapp.hxx> #include <unotools/pathoptions.hxx> -#include <sfx2/safemode.hxx> #include <map> 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 <config_folders.h> #include <config_features.h> -#include <osl/file.hxx> - #include <rtl/bootstrap.hxx> #include <rtl/ustring.hxx> #include <sal/log.hxx> #include <cppuhelper/implbase.hxx> -#include <vcl/timer.hxx> - -#include <unotools/configmgr.hxx> #include <tools/diagnose_ex.h> #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> -#include <cppuhelper/bootstrap.hxx> #include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/ucb/CommandAbortedException.hpp> @@ -50,7 +44,6 @@ #include <com/sun/star/deployment/LicenseException.hpp> #include <com/sun/star/deployment/ui/LicenseDialog.hpp> #include <com/sun/star/task/OfficeRestartManager.hpp> -#include <com/sun/star/task/XJob.hpp> #include <com/sun/star/task/XInteractionApprove.hpp> #include <com/sun/star/task/XInteractionAbort.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> 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 <osl/thread.hxx> #include <tools/stream.hxx> -#include <vcl/svapp.hxx> -#include <rtl/uri.hxx> #include <rtl/ustring.hxx> #include <rtl/process.h> #include <comphelper/lok.hxx> @@ -36,8 +35,6 @@ #include <com/sun/star/uri/ExternalUriReferenceTranslator.hpp> #include <unotools/bootstrap.hxx> -#include <svl/documentlockfile.hxx> - #include <rtl/strbuf.hxx> #include <osl/file.hxx> #include <sal/log.hxx> 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 <stdlib.h> #include <stdio.h> #include <comphelper/string.hxx> -#include <sal/types.h> #include <app.hxx> #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 <vcl/svapp.hxx> #include <svtools/javainteractionhandler.hxx> 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 <cppuhelper/implbase.hxx> -#include <uno/current_context.hxx> +#include <com/sun/star/uno/XCurrentContext.hpp> 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 <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/fcontnr.hxx> -#include <sfx2/app.hxx> #include <svl/fstathelper.hxx> #include <app.hxx> #include "dispatchwatcher.hxx" +#include "officeipcthread.hxx" #include <rtl/ustring.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/synchronousdispatch.hxx> @@ -49,8 +49,6 @@ #include <com/sun/star/document/XTypeDetection.hpp> #include <com/sun/star/document/UpdateDocMode.hpp> #include <com/sun/star/frame/XStorable.hpp> -#include <com/sun/star/script/ModuleInfo.hpp> -#include <com/sun/star/script/ModuleType.hpp> #include <com/sun/star/script/XLibraryContainer2.hpp> #include <com/sun/star/document/XEmbeddedScripts.hpp> @@ -60,11 +58,8 @@ #include <unotools/mediadescriptor.hxx> #include <unotools/tempfile.hxx> -#include <vector> #include <osl/thread.hxx> #include <osl/file.hxx> -#include <osl/file.h> -#include <rtl/byteseq.hxx> #include <iostream> 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 <cppuhelper/implbase.hxx> #include <com/sun/star/frame/XDispatchResultListener.hpp> +#include <o3tl/optional.hxx> -#include "officeipcthread.hxx" -#include <unordered_map> #include <vector> 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 <officecfg/Setup.hxx> #include <officecfg/System.hxx> #include <rtl/ustring.hxx> -#include <sal/log.hxx> -#include <sal/types.h> #include <svl/languageoptions.hxx> #include <svtools/langhelp.hxx> #include <tools/diagnose_ex.h> 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 <sal/config.h> -#include <rtl/ustring.hxx> - 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 <stdio.h> #include <com/sun/star/frame/TerminationVetoException.hpp> -#include <osl/process.h> +#include <salhelper/thread.hxx> #include <sal/log.hxx> #include <unotools/bootstrap.hxx> #include <vcl/svapp.hxx> -#include <vcl/help.hxx> #include <unotools/configmgr.hxx> -#include <osl/thread.hxx> +#include <osl/pipe.hxx> #include <rtl/digest.h> #include <rtl/ustrbuf.hxx> #include <rtl/instance.hxx> @@ -46,7 +44,6 @@ #include <osl/file.hxx> #include <rtl/process.h> -#include <algorithm> #include <cassert> #include <cstdlib> #include <memory> 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 <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> -#include <osl/pipe.hxx> -#include <osl/security.hxx> #include <osl/signal.h> #include <rtl/ref.hxx> #include <rtl/ustring.hxx> +#include <salhelper/simplereferenceobject.hxx> #include <cppuhelper/implbase.hxx> #include <osl/conditn.hxx> -#include <salhelper/thread.hxx> #include <o3tl/optional.hxx> 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 <sal/config.h> #include <config_features.h> -#include <config_version.h> -#include <config_folders.h> #include <desktop/dllapi.h> @@ -31,8 +29,6 @@ // needed before sal/main.h to avoid redefinition of macros #include <prewin.h> -#include <desktop/exithelper.h> -#include <osl/file.hxx> #include <rtl/bootstrap.hxx> #include <sal/log.hxx> #include <sal/main.h> @@ -40,10 +36,6 @@ #include <vcl/glxtestprocess.hxx> #include <vcl/svmain.hxx> -#include <com/sun/star/beans/NamedValue.hpp> -#include <cppuhelper/bootstrap.hxx> -#include <unotools/mediadescriptor.hxx> - #if HAVE_FEATURE_BREAKPAD #include <desktop/crashreport.hxx> #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 <officecfg/Setup.hxx> #include <osl/file.h> #include <osl/file.hxx> -#include <rtl/bootstrap.hxx> #include <rtl/ustring.hxx> -#include <sal/log.hxx> #include <tools/diagnose_ex.h> #include <unotools/bootstrap.hxx> 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 <dp_misc.h> #include <dp_services.hxx> -#include <rtl/strbuf.hxx> -#include <sal/log.hxx> -#include <osl/time.h> -#include <osl/thread.h> #include <cppuhelper/compbase.hxx> #include <comphelper/anytostring.hxx> #include <comphelper/servicedecl.hxx> -#include <comphelper/unwrapargs.hxx> #include <comphelper/logging.hxx> -#include <com/sun/star/deployment/DeploymentException.hpp> +#include <rtl/ustrbuf.hxx> #include <com/sun/star/logging/LogLevel.hpp> #include <com/sun/star/ucb/XProgressHandler.hpp> -#include <com/sun/star/ucb/SimpleFileAccess.hpp> -#include <com/sun/star/io/IOException.hpp> -#include <com/sun/star/io/XSeekable.hpp> -#include <stdio.h> -#include <o3tl/optional.hxx> 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 <dp_misc.h> #include <dp_xml.h> -#include <rtl/ustrbuf.hxx> #include <ucbhelper/content.hxx> #include <com/sun/star/xml/sax/Parser.hpp> 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 <dp_misc.h> -#include <rtl/ref.hxx> -#include <rtl/instance.hxx> -#include <osl/thread.hxx> -#include <salhelper/simplereferenceobject.hxx> -#include <com/sun/star/ucb/XContentEventListener.hpp> -#include <osl/mutex.hxx> - -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 <sal/config.h> -#include <algorithm> -#include <vector> - #include <rtl/ustring.hxx> #include <vcl/weld.hxx> 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 <sal/config.h> -#include <tools/gen.hxx> #include <vcl/weld.hxx> #include <vector> 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 <config_extensions.h> + #include <strings.hrc> #include <helpids.h> -#include <svtools/controldims.hxx> #include "dp_gui.h" #include "dp_gui_dialog2.hxx" @@ -28,10 +29,8 @@ #include "dp_gui_theextmgr.hxx" #include "dp_gui_extensioncmdqueue.hxx" #include <dp_misc.h> -#include <dp_ucb.h> #include <dp_update.hxx> #include <dp_identifier.hxx> -#include <dp_descriptioninfoset.hxx> #include <fpicker/strings.hrc> @@ -48,28 +47,19 @@ #include <comphelper/anytostring.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <cppuhelper/bootstrap.hxx> #include <comphelper/processfactory.hxx> #include <tools/diagnose_ex.h> -#include <ucbhelper/content.hxx> -#include <unotools/collatorwrapper.hxx> #include <unotools/configmgr.hxx> -#include <com/sun/star/beans/StringPair.hpp> #include <com/sun/star/deployment/DeploymentException.hpp> -#include <com/sun/star/i18n/CollatorOptions.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/system/SystemShellExecuteFlags.hpp> #include <com/sun/star/system/SystemShellExecute.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> -#include <com/sun/star/ui/dialogs/FilePicker.hpp> -#include <com/sun/star/ui/dialogs/XFilterManager.hpp> - -#include <com/sun/star/uno/Any.hxx> -#include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/ui/dialogs/XFilePicker3.hpp> #include <officecfg/Office/ExtensionManager.hxx> 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 <config_extensions.h> - #include <vcl/timer.hxx> #include <vcl/idle.hxx> #include <vcl/waitobj.hxx> #include <vcl/customweld.hxx> #include <vcl/weld.hxx> -#include <osl/conditn.hxx> #include <osl/mutex.hxx> -#include <rtl/ref.hxx> #include <rtl/ustring.hxx> #include <cppuhelper/implbase.hxx> -#include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/deployment/XPackage.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> -#include <com/sun/star/util/XModifyListener.hpp> - -#include <stack> -#include <vector> 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 <sal/config.h> -#include <cstddef> - #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/deployment/DependencyException.hpp> @@ -31,7 +29,6 @@ #include <com/sun/star/deployment/ui/LicenseDialog.hpp> #include <com/sun/star/deployment/DeploymentException.hpp> -#include <com/sun/star/deployment/UpdateInformationProvider.hpp> #include <com/sun/star/deployment/XPackage.hpp> #include <com/sun/star/task/InteractionHandler.hpp> @@ -46,15 +43,13 @@ #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/TypeClass.hpp> #include <o3tl/any.hxx> +#include <osl/conditn.hxx> #include <osl/diagnose.h> #include <osl/mutex.hxx> #include <rtl/ref.hxx> -#include <rtl/ustring.h> #include <rtl/ustring.hxx> #include <sal/types.h> #include <salhelper/thread.hxx> @@ -64,9 +59,7 @@ #include <comphelper/anytostring.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> -#include <toolkit/helper/vclunohelper.hxx> -#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 <dp_dependencies.hxx> +#include <dp_misc.h> #include <dp_identifier.hxx> #include <dp_version.hxx> 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 <svtools/controldims.hxx> - #include <dp_shared.hxx> #include <strings.hrc> #include "dp_gui.h" #include "dp_gui_extlistbox.hxx" #include "dp_gui_theextmgr.hxx" -#include "dp_gui_dialog2.hxx" #include <dp_dependencies.hxx> #include <bitmaps.hlst> @@ -38,7 +35,7 @@ #include <com/sun/star/system/SystemShellExecute.hpp> #include <cppuhelper/weakref.hxx> #include <i18nlangtag/languagetag.hxx> -#include <vcl/commandevent.hxx> +#include <osl/diagnose.h> #include <vcl/event.hxx> #include <vcl/ptrstyle.hxx> #include <vcl/svapp.hxx> 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 <memory> +#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 <memory> -#include "dp_gui.h" #include "dp_gui_theextmgr.hxx" #include <osl/diagnose.h> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/implementationentry.hxx> #include <unotools/configmgr.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/servicedecl.hxx> @@ -31,8 +29,6 @@ #include <unotools/resmgr.hxx> #include <vcl/weld.hxx> #include <vcl/svapp.hxx> -#include <vcl/settings.hxx> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/task/XJobExecutor.hpp> #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp> @@ -40,6 +36,7 @@ #include "license_dialog.hxx" #include "dp_gui_dialog2.hxx" #include "dp_gui_extensioncmdqueue.hxx" +#include <dp_misc.h> 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 <vcl/svapp.hxx> -#include <toolkit/helper/vclunohelper.hxx> - #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/deployment/DeploymentException.hpp> +#include <com/sun/star/deployment/ExtensionManager.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/TerminationVetoException.hpp> @@ -31,14 +30,13 @@ #include <com/sun/star/ucb/CommandFailedException.hpp> #include <comphelper/propertysequence.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <sal/log.hxx> #include <osl/diagnose.h> #include <tools/diagnose_ex.h> #include "dp_gui_dialog2.hxx" #include "dp_gui_extensioncmdqueue.hxx" #include "dp_gui_theextmgr.hxx" -#include <dp_identifier.hxx> +#include <dp_misc.h> #include <dp_update.hxx> #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 <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/deployment/XExtensionManager.hpp> -#include <com/sun/star/deployment/ExtensionManager.hpp> #include <com/sun/star/frame/XDesktop2.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> #include <com/sun/star/uno/XComponentContext.hpp> @@ -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 <sal/config.h> -#include <cstddef> -#include <limits> -#include <map> #include <utility> #include <vector> #include <o3tl/optional.hxx> -#include <com/sun/star/awt/Rectangle.hpp> -#include <com/sun/star/awt/WindowAttribute.hpp> -#include <com/sun/star/awt/WindowClass.hpp> -#include <com/sun/star/awt/WindowDescriptor.hpp> -#include <com/sun/star/awt/XWindow.hpp> -#include <com/sun/star/awt/XWindowPeer.hpp> #include <com/sun/star/beans/NamedValue.hpp> -#include <com/sun/star/beans/Optional.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/deployment/DeploymentException.hpp> #include <com/sun/star/deployment/UpdateInformationProvider.hpp> -#include <com/sun/star/deployment/XPackage.hpp> -#include <com/sun/star/deployment/XExtensionManager.hpp> #include <com/sun/star/deployment/ExtensionManager.hpp> #include <com/sun/star/deployment/XUpdateInformationProvider.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> -#include <com/sun/star/lang/XMultiComponentFactory.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/task/InteractionHandler.hpp> -#include <com/sun/star/task/XAbortChannel.hpp> -#include <com/sun/star/task/XJob.hpp> -#include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/ucb/CommandFailedException.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/util/URL.hpp> -#include <com/sun/star/util/XChangesBatch.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/xml/dom/XElement.hpp> -#include <com/sun/star/xml/dom/XNode.hpp> #include <osl/diagnose.h> #include <rtl/ref.hxx> -#include <rtl/string.h> #include <rtl/ustrbuf.hxx> -#include <rtl/ustring.h> #include <rtl/ustring.hxx> #include <sal/types.h> #include <salhelper/thread.hxx> -#include <svtools/controldims.hxx> #include <tools/gen.hxx> #include <tools/link.hxx> -#include <tools/solar.h> #include <unotools/configmgr.hxx> #include <vcl/svapp.hxx> #include <comphelper/processfactory.hxx> -#include <cppuhelper/exc_hlp.hxx> #include <dp_dependencies.hxx> #include <dp_descriptioninfoset.hxx> #include <dp_identifier.hxx> -#include <dp_version.hxx> #include <dp_misc.h> #include <dp_update.hxx> -#include "dp_gui.h" #include <strings.hrc> -#include <bitmaps.hlst> #include "dp_gui_updatedata.hxx" #include "dp_gui_updatedialog.hxx" #include <dp_shared.hxx> 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 <sal/config.h> #include <osl/file.hxx> -#include <osl/conditn.hxx> #include <cppuhelper/exc_hlp.hxx> #include <vcl/svapp.hxx> #include <cppuhelper/implbase.hxx> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/NamedValue.hpp> -#include <com/sun/star/xml/dom/XElement.hpp> -#include <com/sun/star/xml/dom/XNode.hpp> -#include <com/sun/star/xml/dom/XNodeList.hpp> +#include <com/sun/star/lang/WrappedTargetException.hpp> #include <com/sun/star/ucb/NameClash.hpp> -#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/ucb/XProgressHandler.hpp> #include <com/sun/star/deployment/DeploymentException.hpp> -#include <com/sun/star/deployment/XExtensionManager.hpp> #include <com/sun/star/deployment/ExtensionManager.hpp> -#include <com/sun/star/deployment/XUpdateInformationProvider.hpp> -#include <com/sun/star/deployment/DependencyException.hpp> #include <com/sun/star/deployment/LicenseException.hpp> #include <com/sun/star/deployment/VersionException.hpp> -#include <com/sun/star/deployment/ui/LicenseDialog.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> -#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> -#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> -#include <com/sun/star/task/XInteractionAbort.hpp> #include <com/sun/star/task/XInteractionApprove.hpp> #include <dp_descriptioninfoset.hxx> @@ -56,7 +44,6 @@ #include <dp_shared.hxx> #include <dp_ucb.h> #include <dp_misc.h> -#include <dp_version.hxx> #include "dp_gui_extensioncmdqueue.hxx" #include <ucbhelper/content.hxx> #include <rtl/ref.hxx> 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 <cppuhelper/implementationentry.hxx> -#include <unotools/configmgr.hxx> #include <comphelper/unwrapargs.hxx> -#include <i18nlangtag/mslangid.hxx> -#include <toolkit/helper/vclunohelper.hxx> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <svl/lstner.hxx> #include <vcl/event.hxx> #include <vcl/idle.hxx> #include <vcl/svapp.hxx> @@ -35,7 +29,6 @@ #include <functional> -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 <cppuhelper/implbase.hxx> -#include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/awt/XWindow.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> 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 <rtl/ref.hxx> #include <cppuhelper/implbase.hxx> -#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/task/XAbortChannel.hpp> #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 <i18nlangtag/languagetag.hxx> -#include <dp_misc.h> #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 <vector> -#include <rtl/byteseq.hxx> -#include <rtl/instance.hxx> #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> #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 <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/xml/dom/XNode.hpp> -#include <rtl/ustrbuf.hxx> #include "dp_misc_api.hxx" #include <map> 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 <sal/config.h> + +#include <rtl/ustring.hxx> #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 <rtl/ref.hxx> -#include <rtl/ustrbuf.hxx> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/xml/input/XRoot.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> 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 <sal/types.h> -#include <rtl/string.hxx> #include <rtl/ustring.hxx> #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 <config_features.h> +#include <config_extensions.h> #include <sal/config.h> -#include <cstddef> #include <utility> -#include <vector> #include <osl/diagnose.h> -#include <rtl/strbuf.hxx> #include <rtl/string.hxx> #include <rtl/textenc.h> -#include <rtl/uri.h> -#include <rtl/uri.hxx> #include <rtl/ustring.hxx> #include <dp_identifier.hxx> 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 <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/XInteractionAbort.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include "dp_commandenvironments.hxx" #include <osl/diagnose.h> 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 <cppuhelper/implbase.hxx> -#include <ucbhelper/content.hxx> +#include <com/sun/star/task/XInteractionHandler.hpp> +#include <com/sun/star/task/XInteractionRequest.hpp> +#include <com/sun/star/ucb/XProgressHandler.hpp> +#include <com/sun/star/ucb/XCommandEnvironment.hpp> + 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 <cppuhelper/exc_hlp.hxx> #include <rtl/bootstrap.hxx> #include <com/sun/star/deployment/DeploymentException.hpp> -#include <com/sun/star/deployment/ExtensionManager.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/XPackageManagerFactory.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/deployment/LicenseException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/beans/Optional.hpp> #include <com/sun/star/task/XInteractionApprove.hpp> #include <com/sun/star/beans/Ambiguous.hpp> @@ -47,9 +42,7 @@ #include <comphelper/sequence.hxx> #include <xmlscript/xml_helper.hxx> #include <osl/diagnose.h> -#include <vcl/svapp.hxx> #include <dp_interact.h> -#include <dp_resource.h> #include <dp_services.hxx> #include <dp_ucb.h> #include <dp_identifier.hxx> 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 <strings.hrc> #include <dp_misc.h> #include <dp_shared.hxx> -#include <dp_interact.h> -#include "dp_activepackages.hxx" -#include <rtl/ref.hxx> #include <cppuhelper/compbase.hxx> -#include <ucbhelper/content.hxx> -#include <com/sun/star/deployment/XPackageRegistry.hpp> +#include <com/sun/star/deployment/XExtensionManager.hpp> #include <com/sun/star/deployment/XPackageManager.hpp> +#include <com/sun/star/deployment/XPackageManagerFactory.hpp> #include <osl/mutex.hxx> #include <vector> #include <unordered_map> 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 <com/sun/star/deployment/ExtensionManager.hpp> #include <com/sun/star/deployment/XUpdateInformationProvider.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/task/XAbortChannel.hpp> #include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/xml/dom/XElement.hpp> -#include <com/sun/star/xml/dom/XNode.hpp> #include <com/sun/star/uno/Reference.hxx> #include <osl/diagnose.h> -#include <sal/log.hxx> #include <rtl/ustring.hxx> #include <tools/diagnose_ex.h> #include <ucbhelper/content.hxx> @@ -47,7 +43,6 @@ #include <dp_identifier.hxx> #include <dp_services.hxx> #include <dp_version.hxx> -#include <dp_misc.h> #include <dp_update.hxx> 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 <config_features.h> +#include <dp_interact.h> #include <dp_registry.hxx> #include <dp_shared.hxx> #include <strings.hrc> #include <dp_ucb.h> -#include <dp_resource.h> #include <dp_platform.hxx> #include "dp_manager.h" #include <dp_identifier.hxx> @@ -37,15 +37,12 @@ #include <osl/diagnose.h> #include <osl/file.hxx> #include <osl/security.hxx> -#include <cppuhelper/weakref.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <cppuhelper/interfacecontainer.hxx> #include <comphelper/logging.hxx> #include <comphelper/servicedecl.hxx> #include <comphelper/sequence.hxx> #include <xmlscript/xml_helper.hxx> #include <svl/inettype.hxx> -#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/beans/UnknownPropertyException.hpp> @@ -63,10 +60,7 @@ #include <com/sun/star/ucb/NameClash.hpp> #include <com/sun/star/deployment/DeploymentException.hpp> #include <com/sun/star/deployment/InvalidRemovedParameterException.hpp> -#include <com/sun/star/deployment/VersionException.hpp> -#include <com/sun/star/deployment/InstallException.hpp> #include <com/sun/star/deployment/Prerequisites.hpp> -#include <com/sun/star/task/XInteractionApprove.hpp> #include <com/sun/star/ucb/UnsupportedCommandException.hpp> #include <unotools/tempfile.hxx> @@ -75,7 +69,6 @@ #include "dp_properties.hxx" #include <vector> -#include <list> #include <algorithm> 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 <dp_misc.h> -#include <dp_interact.h> #include "dp_activepackages.hxx" -#include <rtl/ref.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/implbase.hxx> #include <ucbhelper/content.hxx> 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 <dp_resource.h> #include <dp_services.hxx> #include <cppuhelper/compbase.hxx> #include <comphelper/servicedecl.hxx> -#include <com/sun/star/deployment/thePackageManagerFactory.hpp> +#include <com/sun/star/deployment/XPackageManagerFactory.hpp> #include <unordered_map> 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 <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <o3tl/optional.hxx> 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 <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/xml/dom/XElement.hpp> #include <com/sun/star/xml/dom/XNodeList.hpp> +#include <osl/diagnose.h> #include <rtl/bootstrap.hxx> -#include <rtl/string.h> -#include <rtl/ustring.h> #include <rtl/ustring.hxx> #include <sal/types.h> #include <unotools/configmgr.hxx> #include <strings.hrc> -#include <dp_resource.h> #include <dp_shared.hxx> #include <dp_dependencies.hxx> 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 <sal/config.h> #include <comphelper/sequence.hxx> -#include <comphelper/seqstream.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propertysequence.hxx> #include <o3tl/optional.hxx> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/deployment/DeploymentException.hpp> -#include <com/sun/star/beans/Optional.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/io/SequenceInputStream.hpp> #include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> +#include <com/sun/star/task/XInteractionHandler.hpp> +#include <com/sun/star/ucb/XCommandEnvironment.hpp> +#include <com/sun/star/ucb/XProgressHandler.hpp> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/xml/dom/DOMException.hpp> #include <com/sun/star/xml/dom/XNode.hpp> @@ -51,7 +50,6 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <rtl/ustring.h> #include <rtl/ustring.hxx> #include <sal/types.h> #include <ucbhelper/content.hxx> 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 <com/sun/star/deployment/XPackage.hpp> #include <com/sun/star/uno/Reference.hxx> #include <osl/diagnose.h> -#include <rtl/string.h> -#include <rtl/ustrbuf.hxx> #include <rtl/ustring.hxx> #include <dp_identifier.hxx> 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 <comphelper/interaction.hxx> -#include <cppuhelper/exc_hlp.hxx> -#include <cppuhelper/implbase.hxx> #include <com/sun/star/task/XInteractionAbort.hpp> #include <osl/diagnose.h> 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 <chrono> #include <dp_misc.h> -#include <dp_version.hxx> #include <dp_interact.h> #include <rtl/uri.hxx> #include <rtl/digest.h> #include <rtl/random.h> #include <rtl/bootstrap.hxx> +#include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <unotools/bootstrap.hxx> #include <osl/file.hxx> @@ -40,6 +40,7 @@ #include <com/sun/star/bridge/UnoUrlResolver.hpp> #include <com/sun/star/bridge/XUnoUrlResolver.hpp> #include <com/sun/star/deployment/ExtensionManager.hpp> +#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/task/OfficeRestartManager.hpp> #include <memory> #include <string_view> 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 <dp_misc.h> #include <dp_platform.hxx> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> 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 <dp_misc.h> #include <dp_resource.h> -#include <osl/module.hxx> -#include <osl/mutex.hxx> -#include <unotools/resmgr.hxx> -#include <rtl/ustring.h> #include <unotools/configmgr.hxx> #include <i18nlangtag/languagetag.hxx> 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 <rtl/ustrbuf.hxx> #include <ucbhelper/content.hxx> #include <xmlscript/xml_helper.hxx> -#include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/ucb/CommandFailedException.hpp> #include <com/sun/star/ucb/ContentInfo.hpp> #include <com/sun/star/ucb/ContentInfoAttribute.hpp> 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 <sal/config.h> -#include <com/sun/star/deployment/XPackage.hpp> #include <rtl/ustring.hxx> #include <dp_version.hxx> 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 <memory> -#include <stdlib.h> #include <time.h> #ifndef _WIN32 #include <unistd.h> @@ -34,7 +33,6 @@ #include <comphelper/random.hxx> #include <sal/types.h> #include <osl/file.hxx> -#include <osl/socket.hxx> #include <osl/security.hxx> #include <unotools/bootstrap.hxx> #include <tools/config.hxx> 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 <rtl/string.h> -#include <rtl/bootstrap.hxx> #include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/deployment/DeploymentException.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/xml/dom/XDocumentBuilder.hpp> -#include <com/sun/star/xml/xpath/XXPathAPI.hpp> -#include <dp_misc.h> #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 <xmlscript/xml_helper.hxx> #include <svl/inettype.hxx> #include <tools/diagnose_ex.h> +#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/deployment/DeploymentException.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/container/XNameContainer.hpp> 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 <rtl/string.hxx> #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> -#include <rtl/uri.hxx> -#include <osl/file.hxx> #include <cppuhelper/exc_hlp.hxx> #include <ucbhelper/content.hxx> #include <unotools/ucbhelper.hxx> @@ -41,11 +39,8 @@ #include <comphelper/lok.hxx> #include <svl/inettype.hxx> #include <com/sun/star/configuration/Update.hpp> -#include <com/sun/star/ucb/NameClash.hpp> -#include <com/sun/star/io/XActiveDataSink.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> -#include <com/sun/star/util/XRefreshable.hpp> #include <deque> #include <memory> #include <utility> 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 <rtl/string.h> -#include <rtl/bootstrap.hxx> #include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/deployment/DeploymentException.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/xml/dom/XDocumentBuilder.hpp> #include <com/sun/star/xml/xpath/XXPathAPI.hpp> -#include <dp_misc.h> #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 <dp_backend.h> #include <dp_ucb.h> #include <rtl/ustring.hxx> -#include <rtl/uri.hxx> #include <rtl/bootstrap.hxx> #include <sal/log.hxx> -#include <osl/file.hxx> #include <cppuhelper/exc_hlp.hxx> #include <comphelper/unwrapargs.hxx> #include <ucbhelper/content.hxx> @@ -35,7 +33,6 @@ #include <com/sun/star/deployment/DeploymentException.hpp> #include <com/sun/star/deployment/ExtensionRemovedException.hpp> #include <com/sun/star/deployment/InvalidRemovedParameterException.hpp> -#include <com/sun/star/deployment/thePackageManagerFactory.hpp> #include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/ucb/CommandFailedException.hpp> 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 <rtl/string.h> -#include <rtl/strbuf.hxx> -#include <rtl/bootstrap.hxx> #include <cppuhelper/exc_hlp.hxx> #include <osl/file.hxx> #include <com/sun/star/deployment/DeploymentException.hpp> @@ -29,7 +26,6 @@ #include <com/sun/star/xml/xpath/XPathAPI.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/io/XActiveDataControl.hpp> -#include <dp_ucb.h> #include <dp_misc.h> #include <ucbhelper/content.hxx> #include <xmlscript/xml_helper.hxx> 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 <strings.hrc> #include <dp_registry.hxx> #include <dp_misc.h> -#include <dp_resource.h> -#include <dp_interact.h> #include <dp_ucb.h> #include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <rtl/uri.hxx> #include <cppuhelper/compbase.hxx> -#include <cppuhelper/exc_hlp.hxx> #include <comphelper/sequence.hxx> #include <ucbhelper/content.hxx> #include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/uno/DeploymentException.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/util/XUpdatable.hpp> #include <com/sun/star/container/XContentEnumerationAccess.hpp> -#include <com/sun/star/deployment/PackageRegistryBackend.hpp> +#include <com/sun/star/deployment/XPackageTypeInfo.hpp> +#include <com/sun/star/deployment/XPackageRegistry.hpp> #include <set> #include <unordered_map> #include <unordered_set> 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 <dp_ucb.h> #include <dp_interact.h> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <rtl/string.hxx> #include <osl/file.hxx> #include <ucbhelper/content.hxx> #include <comphelper/servicedecl.hxx> 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 <rtl/string.h> #include <com/sun/star/uno/XComponentContext.hpp> -#include <dp_misc.h> #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 <dp_ucb.h> #include <rtl/uri.hxx> #include <osl/file.hxx> -#include <rtl/bootstrap.hxx> #include <ucbhelper/content.hxx> #include <comphelper/servicedecl.hxx> #include <svl/inettype.hxx> -#include <uno/current_context.hxx> #include <unotools/pathoptions.hxx> #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 <rtl/string.h> -#include <rtl/bootstrap.hxx> #include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/deployment/DeploymentException.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/xml/dom/XDocumentBuilder.hpp> -#include <com/sun/star/xml/xpath/XXPathAPI.hpp> -#include <dp_misc.h> #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 <dp_misc.h> -#include <dp_resource.h> #include <dp_shared.hxx> #include <dp_interact.h> #include <rtl/ref.hxx> -#include <cppuhelper/weakref.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/compbase.hxx> #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/deployment/XPackageRegistry.hpp> -#include <com/sun/star/deployment/XPackageManager.hpp> -#include <com/sun/star/deployment/InvalidRemovedParameterException.hpp> #include <unordered_map> #include <strings.hrc> 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 <com/sun/star/uno/Reference.hxx> #include <rtl/ustring.hxx> #include <deque> #include <vector> 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 <rtl/bootstrap.hxx> #include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/deployment/DeploymentException.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/xml/dom/XDocumentBuilder.hpp> -#include <com/sun/star/xml/xpath/XXPathAPI.hpp> -#include <dp_misc.h> #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 <dp_platform.hxx> #include <dp_descriptioninfoset.hxx> #include <dp_identifier.hxx> +#include <dp_resource.h> #include <rtl/uri.hxx> +#include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <ucbhelper/content.hxx> #include <svl/inettype.hxx> -#include <comphelper/anytostring.hxx> #include <comphelper/sequence.hxx> #include <com/sun/star/lang/WrappedTargetException.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/beans/UnknownPropertyException.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/graphic/GraphicProvider.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> @@ -65,9 +65,6 @@ #include <com/sun/star/deployment/LicenseException.hpp> #include <com/sun/star/deployment/PlatformException.hpp> #include <com/sun/star/deployment/Prerequisites.hpp> -#include <com/sun/star/xml/dom/XDocumentBuilder.hpp> -#include <com/sun/star/xml/xpath/XXPathAPI.hpp> -#include <com/sun/star/deployment/XPackageManager.hpp> #include <o3tl/optional.hxx> #include <tools/diagnose_ex.h> 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 <dp_backend.h> #include <dp_ucb.h> -#include <rtl/uri.hxx> #include <ucbhelper/content.hxx> -#include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/servicedecl.hxx> #include <svl/inettype.hxx> #include <com/sun/star/util/XUpdatable.hpp> #include <com/sun/star/script/XLibraryContainer3.hpp> -#include <com/sun/star/util/XMacroExpander.hpp> #include <memory> #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 <rtl/string.h> -#include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/xml/dom/XDocument.hpp> -#include <com/sun/star/xml/xpath/XXPathAPI.hpp> -#include <dp_misc.h> #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 <cppuhelper/implbase.hxx> #include <com/sun/star/xml/sax/XAttributeList.hpp> -#include <com/sun/star/xml/sax/SAXException.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> -#include <com/sun/star/xml/sax/XParser.hpp> -#include <com/sun/star/lang/NoSupportException.hpp> -#include <com/sun/star/lang/XMultiComponentFactory.hpp> 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 <rtl/uri.hxx> #include <ucbhelper/content.hxx> -#include <cppuhelper/exc_hlp.hxx> #include <comphelper/servicedecl.hxx> #include <svl/inettype.hxx> #include <com/sun/star/container/XNameContainer.hpp> 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 <config_features.h> -#include <config_folders.h> #include <stdio.h> #include <string.h> @@ -75,8 +74,6 @@ #include <com/sun/star/reflection/XIdlClass.hpp> #include <com/sun/star/reflection/XIdlReflection.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> -#include <com/sun/star/ucb/XContentProvider.hpp> -#include <com/sun/star/ucb/XUniversalContentBroker.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/datatransfer/UnsupportedFlavorException.hpp> @@ -89,8 +86,6 @@ #include <com/sun/star/xml/crypto/XSEInitializer.hpp> #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> #include <com/sun/star/xml/crypto/XCertificateCreator.hpp> -#include <com/sun/star/security/DocumentDigitalSignatures.hpp> -#include <com/sun/star/security/XDocumentDigitalSignatures.hpp> #include <com/sun/star/security/XCertificate.hpp> #include <com/sun/star/linguistic2/LinguServiceManager.hpp> @@ -98,9 +93,7 @@ #include <com/sun/star/i18n/ScriptType.hpp> #include <com/sun/star/lang/DisposedException.hpp> -#include <editeng/fontitem.hxx> #include <editeng/flstitem.hxx> -#include <sfx2/app.hxx> #include <sfx2/objsh.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/viewfrm.hxx> @@ -108,12 +101,9 @@ #include <sfx2/dispatch.hxx> #include <sfx2/lokcharthelper.hxx> #include <sfx2/DocumentSigner.hxx> -#include <sfx2/sidebar/SidebarChildWindow.hxx> #include <sfx2/sidebar/SidebarDockingWindow.hxx> #include <svx/dialmgr.hxx> -#include <svx/dialogs.hrc> #include <svx/strings.hrc> -#include <svx/ruler.hxx> #include <svx/svdview.hxx> #include <svx/svxids.hrc> #include <svx/ucsubset.hxx> @@ -127,15 +117,11 @@ #include <vcl/floatwin.hxx> #include <vcl/fontcharmap.hxx> #include <vcl/graphicfilter.hxx> -#include <vcl/ptrstyle.hxx> -#include <vcl/sysdata.hxx> #include <vcl/virdev.hxx> #include <vcl/ImageTree.hxx> #include <vcl/ITiledRenderable.hxx> -#include <vcl/IDialogRenderable.hxx> #include <vcl/dialog.hxx> #include <unicode/uchar.h> -#include <unotools/configmgr.hxx> #include <unotools/syslocaleoptions.hxx> #include <unotools/mediadescriptor.hxx> #include <unotools/pathoptions.hxx> @@ -144,7 +130,6 @@ #include <osl/module.hxx> #include <comphelper/sequence.hxx> #include <sfx2/sfxbasemodel.hxx> -#include <svl/eitem.hxx> #include <svl/undo.hxx> #include <unotools/datetime.hxx> #include <i18nlangtag/mslangid.hxx> 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 <boost/property_tree/json_parser.hpp> -#include <rtl/ref.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/task/XInteractionAbort.hpp> 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 <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/task/DocumentPasswordRequest2.hpp> -#include <com/sun/star/task/InteractionHandler.hpp> -#include <com/sun/star/ucb/InteractiveNetworkException.hpp> +#include <com/sun/star/task/InteractionClassification.hpp> +#include <com/sun/star/task/XInteractionHandler2.hpp> 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 <algorithm> #include <iterator> #include <map> -#include <new> #include <set> #include <migration.hxx> @@ -33,7 +32,6 @@ #include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> #include <unotools/bootstrap.hxx> -#include <rtl/bootstrap.hxx> #include <rtl/uri.hxx> #include <i18nlangtag/lang.h> #include <tools/diagnose_ex.h> @@ -44,21 +42,17 @@ #include <com/sun/star/configuration/Update.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> -#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/task/XJob.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/util/XRefreshable.hpp> #include <com/sun/star/util/XChangesBatch.hpp> -#include <com/sun/star/util/XStringSubstitution.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/FileSystemStorageFactory.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/frame/theUICommandDescription.hpp> #include <com/sun/star/ui/UIConfigurationManager.hpp> -#include <com/sun/star/ui/XUIConfiguration.hpp> -#include <com/sun/star/ui/XUIConfigurationStorage.hpp> #include <com/sun/star/ui/XUIConfigurationPersistence.hpp> 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 <algorithm> #include <memory> #include <unordered_map> #include <vector> -#include <migration.hxx> - #include <sal/types.h> -#include <rtl/string.hxx> #include <rtl/ustring.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XIndexContainer.hpp> -#include <com/sun/star/lang/XSingleComponentFactory.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/XUIConfigurationManager.hpp> -#include <com/sun/star/ui/XUIConfigurationPersistence.hpp> 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 <tools/urlobj.hxx> #include <unotools/bootstrap.hxx> #include <sal/log.hxx> +#include <osl/file.hxx> 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 <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> #include <osl/mutex.hxx> -#include <osl/file.hxx> 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 <cppuhelper/implbase.hxx> -#include <cppuhelper/implementationentry.hxx> #include <cppuhelper/supportsservice.hxx> -#include <rtl/ustrbuf.hxx> -#include <rtl/ustring.h> #include <rtl/ustring.hxx> #include <rtl/bootstrap.hxx> #include <sal/types.h> @@ -41,7 +38,6 @@ #include <stack> #include <stdio.h> -#include <osl/thread.hxx> #include <osl/diagnose.h> #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 <cppuhelper/implementationentry.hxx> -#include <rtl/ustrbuf.hxx> -#include <rtl/ustring.h> #include <rtl/ustring.hxx> -#include <sal/types.h> -#include <memory> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/task/XJob.hpp> +#include <com/sun/star/uno/Sequence.hxx> 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 <rtl/instance.hxx> #include <sal/log.hxx> #include <osl/file.hxx> -#include <osl/thread.h> #include <tools/diagnose_ex.h> -#include <tools/urlobj.hxx> #include <unotools/bootstrap.hxx> #include <unotools/textsearch.hxx> #include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> -#include <ucbhelper/content.hxx> #include <com/sun/star/task/XInteractionApprove.hpp> -#include <com/sun/star/task/XInteractionAbort.hpp> #include <com/sun/star/ucb/CommandAbortedException.hpp> -#include <com/sun/star/ucb/XCommandInfo.hpp> -#include <com/sun/star/ucb/TransferInfo.hpp> -#include <com/sun/star/ucb/NameClash.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> #include <com/sun/star/xml/dom/DOMException.hpp> 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 <com/sun/star/task/XJob.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/xml/dom/XDocumentBuilder.hpp> -#include <com/sun/star/ucb/SimpleFileAccess.hpp> +#include <com/sun/star/ucb/XSimpleFileAccess3.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/ucb/XProgressHandler.hpp> #include <osl/mutex.hxx> -#include <osl/file.hxx> #include <cppuhelper/implbase.hxx> -#include <ucbhelper/content.hxx> 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 <unotools/bootstrap.hxx> #include <unotools/ucbstreamhelper.hxx> #include <sal/log.hxx> +#include <osl/file.hxx> 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 <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> #include <osl/mutex.hxx> -#include <osl/file.hxx> 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 <desktop/minidump.hxx> #include <map> -#include <memory> #include <fstream> #include <sstream> #include <string> 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 <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/uno/Reference.h> -#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/connection/XAcceptor.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/bridge/XInstanceProvider.hpp> #include <com/sun/star/bridge/XBridgeFactory2.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/interfacecontainer.h> -#include <com/sun/star/registry/XRegistryKey.hpp> #include <comphelper/weakbag.hxx> #include <osl/mutex.hxx> #include <osl/conditn.hxx> 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 <desktop/dllapi.h> #include <dp_misc.h> #include "unopkg_main.h" #include "unopkg_shared.h" #include <dp_identifier.hxx> #include <tools/extendapplicationenvironment.hxx> -#include <rtl/ustrbuf.hxx> -#include <rtl/uri.hxx> #include <rtl/bootstrap.hxx> -#include <osl/thread.h> #include <osl/process.h> #include <osl/conditn.hxx> -#include <osl/file.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/exc_hlp.hxx> #include <comphelper/anytostring.hxx> @@ -48,10 +43,7 @@ #include <com/sun/star/logging/XLogger.hpp> #include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/ucb/CommandFailedException.hpp> -#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/ui/dialogs/XDialogClosedListener.hpp> -#include <com/sun/star/bridge/BridgeFactory.hpp> -#include <stdio.h> #if defined(UNX) #include <unistd.h> #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 <strings.hrc> +#include <dp_misc.h> #include <dp_shared.hxx> #include "unopkg_shared.h" -#include <osl/thread.h> -#include <sal/log.hxx> -#include <unotools/resmgr.hxx> +#include <i18nlangtag/languagetag.hxx> +#include <rtl/ustrbuf.hxx> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/exc_hlp.hxx> #include <comphelper/anytostring.hxx> #include <tools/diagnose_ex.h> #include <unotools/configmgr.hxx> @@ -34,14 +33,12 @@ #include <com/sun/star/task/XInteractionApprove.hpp> #include <com/sun/star/deployment/DeploymentException.hpp> #include <com/sun/star/deployment/InstallException.hpp> -#include <com/sun/star/container/ElementExistException.hpp> #include <com/sun/star/deployment/LicenseException.hpp> #include <com/sun/star/deployment/VersionException.hpp> #include <com/sun/star/deployment/PlatformException.hpp> #include <com/sun/star/i18n/Collator.hpp> #include <com/sun/star/i18n/CollatorOptions.hpp> -#include <stdio.h> #include <dp_version.hxx> 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 <config_folders.h> -#include <stdio.h> - #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <rtl/bootstrap.hxx> -#include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <osl/process.h> #include <osl/file.hxx> -#include <osl/thread.hxx> #include <unotools/configmgr.hxx> #include <unotools/bootstrap.hxx> #include <cppuhelper/bootstrap.hxx> @@ -42,6 +38,7 @@ #include <strings.hrc> #include "unopkg_shared.h" #include <dp_identifier.hxx> +#include <dp_misc.h> #include <dp_shared.hxx> #include <lockfile.hxx> 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 <dp_misc.h> #include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/deployment/XPackage.hpp> #include <osl/diagnose.h> -#include <unotools/resmgr.hxx> #include <rtl/ustring.hxx> -#include <unotools/configmgr.hxx> -#include <i18nlangtag/languagetag.hxx> + +#include <vector> #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 <stdio.h> #include <sal/log.hxx> -#include <unotools/bootstrap.hxx> -#include <tools/stream.hxx> #include <vcl/bitmapex.hxx> #include <vcl/svapp.hxx> #include <vcl/salnativewidgets.hxx> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> #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> @@ -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 <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <sal/types.h> 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 <stdio.h> #include <osl/process.h> -#include <cppuhelper/implementationentry.hxx> #include <cppuhelper/supportsservice.hxx> -#include <rtl/ustrbuf.hxx> -#include <rtl/math.hxx> #include <sal/log.hxx> 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 <stdio.h> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/uno/Reference.h> -#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/interfacecontainer.h> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <osl/mutex.hxx> -#include <rtl/bootstrap.hxx> namespace desktop { |