From f0c8312bc6630ed64f174acc6f65bb5172765951 Mon Sep 17 00:00:00 2001
From: Gabor Kelemen <kelemen.gabor2@nisz.hu>
Date: Sat, 1 Feb 2020 22:47:11 +0100
Subject: tdf#42949 Fix IWYU warnings in forms/

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

Change-Id: I4afb3616c4f93155c187da11b2981b84d0984e9f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87943
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
---
 forms/source/inc/FormComponent.hxx              | 12 ++----------
 forms/source/inc/InterfaceContainer.hxx         |  5 -----
 forms/source/inc/controlfeatureinterception.hxx |  3 ++-
 forms/source/inc/featuredispatcher.hxx          |  1 +
 forms/source/inc/formcontrolfont.hxx            |  2 --
 forms/source/inc/formnavigation.hxx             |  2 --
 forms/source/inc/frm_strings.hxx                |  3 ---
 forms/source/inc/property.hxx                   |  5 ++---
 forms/source/inc/services.hxx                   |  3 ---
 forms/source/inc/urltransformer.hxx             |  1 -
 10 files changed, 7 insertions(+), 30 deletions(-)

(limited to 'forms/source/inc')

diff --git a/forms/source/inc/FormComponent.hxx b/forms/source/inc/FormComponent.hxx
index 66ec3aed8aff..09fdb0658c3b 100644
--- a/forms/source/inc/FormComponent.hxx
+++ b/forms/source/inc/FormComponent.hxx
@@ -21,19 +21,15 @@
 #define INCLUDED_FORMS_SOURCE_INC_FORMCOMPONENT_HXX
 
 #include "cloneable.hxx"
-#include "property.hxx"
 #include "propertybaghelper.hxx"
 #include "resettable.hxx"
-#include "services.hxx"
 #include "windowstateguard.hxx"
 
 #include <com/sun/star/awt/XControl.hpp>
 #include <com/sun/star/beans/XPropertyAccess.hpp>
 #include <com/sun/star/beans/XPropertyContainer.hpp>
-#include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/form/binding/XBindableValue.hpp>
-#include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/form/validation/XValidatableFormComponent.hpp>
 #include <com/sun/star/form/validation/XValidityConstraintListener.hpp>
 #include <com/sun/star/form/XBoundComponent.hpp>
@@ -41,17 +37,13 @@
 #include <com/sun/star/form/XFormComponent.hpp>
 #include <com/sun/star/form/XLoadListener.hpp>
 #include <com/sun/star/form/XReset.hpp>
-#include <com/sun/star/io/XMarkableStream.hpp>
 #include <com/sun/star/io/XPersistObject.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/sdb/XColumn.hpp>
 #include <com/sun/star/sdb/XColumnUpdate.hpp>
 #include <com/sun/star/sdb/XRowSetChangeListener.hpp>
 #include <com/sun/star/sdbc/XRowSet.hpp>
-#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
 #include <com/sun/star/uno/XAggregation.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
@@ -59,7 +51,6 @@
 #include <com/sun/star/form/XLoadable.hpp>
 
 #include <comphelper/propagg.hxx>
-#include <comphelper/propertybag.hxx>
 #include <comphelper/propmultiplex.hxx>
 #include <comphelper/uno3.hxx>
 #include <cppuhelper/component.hxx>
@@ -68,6 +59,7 @@
 #include <cppuhelper/implbase3.hxx>
 #include <cppuhelper/implbase4.hxx>
 #include <cppuhelper/implbase7.hxx>
+#include <cppuhelper/propshlp.hxx>
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
 
@@ -311,7 +303,7 @@ typedef ::cppu::ImplHelper7 <   css::form::XFormComponent
                             >   OControlModel_BASE;
 
 class OControlModel :public ::cppu::OComponentHelper
-                    ,public OPropertySetAggregationHelper
+                    ,public comphelper::OPropertySetAggregationHelper
                     ,public OControlModel_BASE
                     ,public OCloneableAggregation
                     ,public IPropertyBagHelperContext
diff --git a/forms/source/inc/InterfaceContainer.hxx b/forms/source/inc/InterfaceContainer.hxx
index 4266d74bdb4c..4e3c1326ca72 100644
--- a/forms/source/inc/InterfaceContainer.hxx
+++ b/forms/source/inc/InterfaceContainer.hxx
@@ -21,10 +21,7 @@
 #define INCLUDED_FORMS_SOURCE_INC_INTERFACECONTAINER_HXX
 
 #include <comphelper/uno3.hxx>
-#include <com/sun/star/container/XNameReplace.hpp>
-#include <com/sun/star/container/XIndexReplace.hpp>
 #include <com/sun/star/container/XNameContainer.hpp>
-#include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/lang/EventObject.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/io/XPersistObject.hpp>
@@ -32,11 +29,9 @@
 #include <com/sun/star/beans/PropertyChangeEvent.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/script/XEventAttacherManager.hpp>
-#include <com/sun/star/script/ScriptEvent.hpp>
 #include <com/sun/star/script/ScriptEventDescriptor.hpp>
 #include <com/sun/star/container/XContainer.hpp>
 #include <com/sun/star/container/XIndexContainer.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/form/XFormComponent.hpp>
 #include <com/sun/star/util/XCloneable.hpp>
 #include <osl/mutex.hxx>
diff --git a/forms/source/inc/controlfeatureinterception.hxx b/forms/source/inc/controlfeatureinterception.hxx
index 3c9bce2ac4d9..294d777dc0d4 100644
--- a/forms/source/inc/controlfeatureinterception.hxx
+++ b/forms/source/inc/controlfeatureinterception.hxx
@@ -20,12 +20,13 @@
 #ifndef INCLUDED_FORMS_SOURCE_INC_CONTROLFEATUREINTERCEPTION_HXX
 #define INCLUDED_FORMS_SOURCE_INC_CONTROLFEATUREINTERCEPTION_HXX
 
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 
 #include <memory>
 
+#include "urltransformer.hxx"
+
 
 namespace frm
 {
diff --git a/forms/source/inc/featuredispatcher.hxx b/forms/source/inc/featuredispatcher.hxx
index 9ab1d74e858b..12fbe44ff5fd 100644
--- a/forms/source/inc/featuredispatcher.hxx
+++ b/forms/source/inc/featuredispatcher.hxx
@@ -21,6 +21,7 @@
 #define INCLUDED_FORMS_SOURCE_INC_FEATUREDISPATCHER_HXX
 
 #include <rtl/ustring.hxx>
+#include <com/sun/star/uno/Any.hxx>
 
 
 namespace frm
diff --git a/forms/source/inc/formcontrolfont.hxx b/forms/source/inc/formcontrolfont.hxx
index 5e4a49aae5a8..b6d9ea55d1a2 100644
--- a/forms/source/inc/formcontrolfont.hxx
+++ b/forms/source/inc/formcontrolfont.hxx
@@ -20,10 +20,8 @@
 #ifndef INCLUDED_FORMS_SOURCE_INC_FORMCONTROLFONT_HXX
 #define INCLUDED_FORMS_SOURCE_INC_FORMCONTROLFONT_HXX
 
-#include <com/sun/star/io/XObjectOutputStream.hpp>
 #include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/beans/Property.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
 #include <tools/color.hxx>
 
 namespace cppu {
diff --git a/forms/source/inc/formnavigation.hxx b/forms/source/inc/formnavigation.hxx
index c052473deb76..5a25dd89667e 100644
--- a/forms/source/inc/formnavigation.hxx
+++ b/forms/source/inc/formnavigation.hxx
@@ -22,9 +22,7 @@
 
 #include <com/sun/star/frame/XDispatchProviderInterception.hpp>
 #include <com/sun/star/frame/XStatusListener.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
 #include <cppuhelper/implbase2.hxx>
 #include "featuredispatcher.hxx"
 #include <vector>
diff --git a/forms/source/inc/frm_strings.hxx b/forms/source/inc/frm_strings.hxx
index 2910c01ef17b..9e20636fc2ae 100644
--- a/forms/source/inc/frm_strings.hxx
+++ b/forms/source/inc/frm_strings.hxx
@@ -20,9 +20,6 @@
 #ifndef INCLUDED_FORMS_SOURCE_INC_FRM_STRINGS_HXX
 #define INCLUDED_FORMS_SOURCE_INC_FRM_STRINGS_HXX
 
-#include <sal/types.h>
-#include <rtl/ustring.hxx>
-
 
 namespace frm
 {
diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx
index 430d574833f1..d4d3aecd2231 100644
--- a/forms/source/inc/property.hxx
+++ b/forms/source/inc/property.hxx
@@ -24,13 +24,12 @@
 
 #include <unordered_map>
 
-#include <com/sun/star/uno/XAggregation.hpp>
-#include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <cppuhelper/propshlp.hxx>
 #include <comphelper/propagg.hxx>
 #include <tools/debug.hxx>
 
+#include "frm_strings.hxx"
+
 using namespace comphelper;
 
 //= property helper classes
diff --git a/forms/source/inc/services.hxx b/forms/source/inc/services.hxx
index 25cc3822c2f9..8a3312b30fae 100644
--- a/forms/source/inc/services.hxx
+++ b/forms/source/inc/services.hxx
@@ -20,9 +20,6 @@
 #ifndef INCLUDED_FORMS_SOURCE_INC_SERVICES_HXX
 #define INCLUDED_FORMS_SOURCE_INC_SERVICES_HXX
 
-#include <rtl/ustring.hxx>
-#include "frm_strings.hxx"
-
 #define AWT_CONTROL_TEXTFIELD "com.sun.star.awt.TextField"
 
 #define VCL_CONTROL_EDIT "stardiv.vcl.control.Edit"
diff --git a/forms/source/inc/urltransformer.hxx b/forms/source/inc/urltransformer.hxx
index 18a872ea9d93..3db4d79ca560 100644
--- a/forms/source/inc/urltransformer.hxx
+++ b/forms/source/inc/urltransformer.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_FORMS_SOURCE_INC_URLTRANSFORMER_HXX
 
 #include <com/sun/star/util/XURLTransformer.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/util/URL.hpp>
 
-- 
cgit