tdf#42949 Fix IWYU warnings in desktop/

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: If72377cb352be71050a5b0a471bbe3b02d9c0f74
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87117
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

15 files changed, 14 insertions, 130 deletions

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>