Recheck modules [e-f]* with IWYU

See tdf#42949 for motivation

Change-Id: I49a3ce10dee4b03f99156f5b641f69448e1d5617
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128479
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens <thorsten.behrens@allotropia.de>

34 files changed, 45 insertions, 13 deletions

diff --git a/forms/source/component/Button.cxx b/forms/source/component/Button.cxx
index 6ab64ec1798c..c3597da7d070 100644
--- a/forms/source/component/Button.cxx
+++ b/forms/source/component/Button.cxx
@@ -23,6 +23,7 @@
 #include <services.hxx>
 
 #include <com/sun/star/awt/XVclWindowPeer.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 
 #include <comphelper/streamsection.hxx>
diff --git a/forms/source/component/CheckBox.cxx b/forms/source/component/CheckBox.cxx
index f82a49f7042c..fcfdabc53ae1 100644
--- a/forms/source/component/CheckBox.cxx
+++ b/forms/source/component/CheckBox.cxx
@@ -21,6 +21,8 @@
 #include <property.hxx>
 #include <services.hxx>
 #include <comphelper/basicio.hxx>
+#include <tools/debug.hxx>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 
 namespace frm
diff --git a/forms/source/component/Columns.cxx b/forms/source/component/Columns.cxx
index 190af02c15c0..3453b15169ed 100644
--- a/forms/source/component/Columns.cxx
+++ b/forms/source/component/Columns.cxx
@@ -21,6 +21,7 @@
 #include <property.hxx>
 #include <componenttools.hxx>
 #include "findpos.hxx"
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/io/XPersistObject.hpp>
 #include <com/sun/star/io/XMarkableStream.hpp>
 #include <com/sun/star/form/XFormComponent.hpp>
diff --git a/forms/source/component/ComboBox.cxx b/forms/source/component/ComboBox.cxx
index c26b90f04778..7bf52797a98a 100644
--- a/forms/source/component/ComboBox.cxx
+++ b/forms/source/component/ComboBox.cxx
@@ -26,6 +26,7 @@
 #include <strings.hrc>
 #include "BaseListBox.hxx"
 
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/sdbc/XRowSet.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
@@ -34,7 +35,6 @@
 #include <comphelper/basicio.hxx>
 #include <comphelper/property.hxx>
 #include <connectivity/dbtools.hxx>
-#include <rtl/ustrbuf.hxx>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <unotools/sharedunocomponent.hxx>
diff --git a/forms/source/component/Currency.cxx b/forms/source/component/Currency.cxx
index fe3018659df8..e0eb2bddd19f 100644
--- a/forms/source/component/Currency.cxx
+++ b/forms/source/component/Currency.cxx
@@ -23,7 +23,9 @@
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/syslocale.hxx>
 #include <comphelper/types.hxx>
+#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 
 
diff --git a/forms/source/component/DatabaseForm.cxx b/forms/source/component/DatabaseForm.cxx
index 873781f580ce..6ba5a380ee9c 100644
--- a/forms/source/component/DatabaseForm.cxx
+++ b/forms/source/component/DatabaseForm.cxx
@@ -32,6 +32,7 @@
 
 #include <com/sun/star/awt/XControlContainer.hpp>
 #include <com/sun/star/awt/XTextComponent.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/form/DataSelectionType.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/form/TabulatorCycle.hpp>
diff --git a/forms/source/component/Date.cxx b/forms/source/component/Date.cxx
index 35b2f3f7424b..764b9f732ecc 100644
--- a/forms/source/component/Date.cxx
+++ b/forms/source/component/Date.cxx
@@ -20,9 +20,11 @@
 #include "Date.hxx"
 #include <property.hxx>
 #include <services.hxx>
+#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <connectivity/dbconversion.hxx>
 #include <com/sun/star/sdbc/DataType.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 
 using namespace dbtools;
diff --git a/forms/source/component/Edit.cxx b/forms/source/component/Edit.cxx
index 32d90aa7d87c..00b22a797b92 100644
--- a/forms/source/component/Edit.cxx
+++ b/forms/source/component/Edit.cxx
@@ -22,6 +22,7 @@
 #include <property.hxx>
 #include <services.hxx>
 
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/uno/Type.hxx>
 #include <com/sun/star/awt/XWindow.hpp>
@@ -36,6 +37,7 @@
 
 #include <comphelper/property.hxx>
 #include <comphelper/types.hxx>
+#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
 
diff --git a/forms/source/component/File.cxx b/forms/source/component/File.cxx
index c18282a09d73..3f20bc90cc82 100644
--- a/forms/source/component/File.cxx
+++ b/forms/source/component/File.cxx
@@ -19,6 +19,7 @@
 
 #include "File.hxx"
 
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 
 #include <property.hxx>
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index 9c6459a0dd04..cc57cecf027a 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -22,8 +22,6 @@
 #include <config_features.h>
 #include <config_fuzzers.h>
 
-#include <string_view>
-
 #include "Filter.hxx"
 #include <strings.hrc>
 #include <frm_resource.hxx>
diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx
index 46b1f52f828f..673c62d851d0 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -25,6 +25,7 @@
 
 #include <com/sun/star/awt/XTextComponent.hpp>
 #include <com/sun/star/awt/XWindow.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/form/XForm.hpp>
 #include <com/sun/star/form/XLoadable.hpp>
@@ -43,7 +44,6 @@
 
 #include <comphelper/basicio.hxx>
 #include <comphelper/guarding.hxx>
-#include <comphelper/interfacecontainer2.hxx>
 #include <comphelper/property.hxx>
 #include <connectivity/dbtools.hxx>
 #include <cppuhelper/exc_hlp.hxx>
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index 432456802c4c..3ede69a641a0 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -28,13 +28,13 @@
 #include <connectivity/dbconversion.hxx>
 #include <o3tl/any.hxx>
 #include <svl/numformat.hxx>
-#include <svl/zforlist.hxx>
 #include <svl/numuno.hxx>
 #include <vcl/keycodes.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <tools/debug.hxx>
 #include <i18nlangtag/languagetag.hxx>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/util/NumberFormat.hpp>
 #include <com/sun/star/util/Date.hpp>
diff --git a/forms/source/component/Grid.cxx b/forms/source/component/Grid.cxx
index d09f03b4adfc..d3a0f3f68e5d 100644
--- a/forms/source/component/Grid.cxx
+++ b/forms/source/component/Grid.cxx
@@ -22,6 +22,7 @@
 #include "Grid.hxx"
 #include <property.hxx>
 #include <services.hxx>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/io/XMarkableStream.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
@@ -31,6 +32,7 @@
 #include <comphelper/types.hxx>
 #include <vcl/unohelp.hxx>
 #include <vcl/svapp.hxx>
+#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 
 using namespace ::com::sun::star::uno;
diff --git a/forms/source/component/Hidden.cxx b/forms/source/component/Hidden.cxx
index 092eeb773fe4..2bef53ca494f 100644
--- a/forms/source/component/Hidden.cxx
+++ b/forms/source/component/Hidden.cxx
@@ -23,6 +23,7 @@
 #include <tools/debug.hxx>
 #include <comphelper/basicio.hxx>
 #include <comphelper/property.hxx>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 
 
diff --git a/forms/source/component/ImageButton.cxx b/forms/source/component/ImageButton.cxx
index 27c152035b41..57bbe396965d 100644
--- a/forms/source/component/ImageButton.cxx
+++ b/forms/source/component/ImageButton.cxx
@@ -18,11 +18,13 @@
  */
 
 #include "ImageButton.hxx"
+#include <tools/debug.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/mutex.hxx>
 #include <comphelper/basicio.hxx>
 #include <com/sun/star/awt/MouseButton.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <property.hxx>
 #include <services.hxx>
diff --git a/forms/source/component/ImageControl.cxx b/forms/source/component/ImageControl.cxx
index af4c1e32f979..9f56265bee00 100644
--- a/forms/source/component/ImageControl.cxx
+++ b/forms/source/component/ImageControl.cxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/awt/PopupMenu.hpp>
 #include <com/sun/star/awt/XPopupMenu.hpp>
 #include <com/sun/star/awt/PopupMenuDirection.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 12cd2be5f887..a4d579e92d42 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -28,6 +28,7 @@
 #include "BaseListBox.hxx"
 #include <componenttools.hxx>
 
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/sdbc/XRow.hpp>
diff --git a/forms/source/component/Numeric.cxx b/forms/source/component/Numeric.cxx
index 41dea5c47e29..7ef40864787c 100644
--- a/forms/source/component/Numeric.cxx
+++ b/forms/source/component/Numeric.cxx
@@ -21,6 +21,8 @@
 #include <services.hxx>
 #include <property.hxx>
 #include <comphelper/types.hxx>
+#include <tools/debug.hxx>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 
 namespace frm
diff --git a/forms/source/component/Pattern.cxx b/forms/source/component/Pattern.cxx
index 24e9ac10585d..6f315aa7b60d 100644
--- a/forms/source/component/Pattern.cxx
+++ b/forms/source/component/Pattern.cxx
@@ -20,6 +20,8 @@
 #include "Pattern.hxx"
 #include <property.hxx>
 #include <services.hxx>
+#include <tools/debug.hxx>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 
 using ::com::sun::star::uno::Reference;
diff --git a/forms/source/component/RadioButton.cxx b/forms/source/component/RadioButton.cxx
index e7829c39bc4c..8e686e10fda6 100644
--- a/forms/source/component/RadioButton.cxx
+++ b/forms/source/component/RadioButton.cxx
@@ -23,6 +23,8 @@
 #include <services.hxx>
 #include <comphelper/basicio.hxx>
 #include <comphelper/property.hxx>
+#include <tools/debug.hxx>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 
diff --git a/forms/source/component/Time.cxx b/forms/source/component/Time.cxx
index fffcbd5466ed..fffccb83afbd 100644
--- a/forms/source/component/Time.cxx
+++ b/forms/source/component/Time.cxx
@@ -21,6 +21,8 @@
 #include <property.hxx>
 #include <services.hxx>
 #include <connectivity/dbconversion.hxx>
+#include <tools/debug.hxx>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/sdbc/DataType.hpp>
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
diff --git a/forms/source/component/clickableimage.cxx b/forms/source/component/clickableimage.cxx
index 3b9c1dd12499..c84ba34cfb95 100644
--- a/forms/source/component/clickableimage.cxx
+++ b/forms/source/component/clickableimage.cxx
@@ -41,7 +41,7 @@
 #include <osl/mutex.hxx>
 #include <property.hxx>
 #include <services.hxx>
-#include <comphelper/interfacecontainer2.hxx>
+#include <comphelper/interfacecontainer3.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/propertyvalue.hxx>
 #include <comphelper/types.hxx>
diff --git a/forms/source/component/formcontrolfont.cxx b/forms/source/component/formcontrolfont.cxx
index 13abbf286423..96be7f44c642 100644
--- a/forms/source/component/formcontrolfont.cxx
+++ b/forms/source/component/formcontrolfont.cxx
@@ -28,6 +28,7 @@
 #include <toolkit/helper/emptyfontdescriptor.hxx>
 #include <com/sun/star/awt/FontRelief.hpp>
 #include <com/sun/star/awt/FontEmphasisMark.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 
 
 namespace frm
diff --git a/forms/source/component/navigationbar.cxx b/forms/source/component/navigationbar.cxx
index ba564141ab23..6209952b6a77 100644
--- a/forms/source/component/navigationbar.cxx
+++ b/forms/source/component/navigationbar.cxx
@@ -21,11 +21,13 @@
 #include <property.hxx>
 #include <services.hxx>
 
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
 
 #include <comphelper/streamsection.hxx>
 #include <comphelper/basicio.hxx>
+#include <tools/debug.hxx>
 
 using namespace comphelper;
 
diff --git a/forms/source/component/propertybaghelper.cxx b/forms/source/component/propertybaghelper.cxx
index f5c77c707a99..af19ae139506 100644
--- a/forms/source/component/propertybaghelper.cxx
+++ b/forms/source/component/propertybaghelper.cxx
@@ -22,6 +22,7 @@
 #include <property.hxx>
 
 #include <com/sun/star/lang/DisposedException.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/PropertyExistException.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
 #include <com/sun/star/beans/NotRemoveableException.hpp>
diff --git a/forms/source/component/refvaluecomponent.cxx b/forms/source/component/refvaluecomponent.cxx
index afca400a78e3..85a6dd2ee765 100644
--- a/forms/source/component/refvaluecomponent.cxx
+++ b/forms/source/component/refvaluecomponent.cxx
@@ -21,8 +21,11 @@
 #include <property.hxx>
 
 #include <comphelper/property.hxx>
+#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 
+#include <com/sun/star/beans/PropertyAttribute.hpp>
+
 #include <vector>
 
 
diff --git a/forms/source/component/scrollbar.cxx b/forms/source/component/scrollbar.cxx
index 0bc5e0240900..897a1b9c806e 100644
--- a/forms/source/component/scrollbar.cxx
+++ b/forms/source/component/scrollbar.cxx
@@ -24,6 +24,8 @@
 #include <comphelper/streamsection.hxx>
 #include <comphelper/basicio.hxx>
 #include <rtl/math.hxx>
+#include <tools/debug.hxx>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 
 namespace frm
diff --git a/forms/source/component/spinbutton.cxx b/forms/source/component/spinbutton.cxx
index 197497671860..3ae981350356 100644
--- a/forms/source/component/spinbutton.cxx
+++ b/forms/source/component/spinbutton.cxx
@@ -22,6 +22,8 @@
 #include <comphelper/property.hxx>
 #include <comphelper/streamsection.hxx>
 #include <comphelper/basicio.hxx>
+#include <tools/debug.hxx>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <property.hxx>
 #include <services.hxx>
diff --git a/forms/source/inc/property.hxx b/forms/source/inc/property.hxx
index b99e4715c51d..e6879950a18b 100644
--- a/forms/source/inc/property.hxx
+++ b/forms/source/inc/property.hxx
@@ -23,9 +23,7 @@
 
 #include <unordered_map>
 
-#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <comphelper/propagg.hxx>
-#include <tools/debug.hxx>
 
 #include "frm_strings.hxx"
 
diff --git a/forms/source/inc/services.hxx b/forms/source/inc/services.hxx
index 3bc9fab75cdb..82a18ad6fb42 100644
--- a/forms/source/inc/services.hxx
+++ b/forms/source/inc/services.hxx
@@ -19,6 +19,7 @@
 
 #pragma once
 
+#include <rtl/ustring.hxx>
 
 inline constexpr OUStringLiteral VCL_CONTROL_LISTBOX = u"stardiv.vcl.control.ListBox";
 inline constexpr OUStringLiteral VCL_CONTROL_COMBOBOX = u"stardiv.vcl.control.ComboBox";
diff --git a/forms/source/richtext/richtextmodel.cxx b/forms/source/richtext/richtextmodel.cxx
index 2dcfd7a18587..1f5037b62d71 100644
--- a/forms/source/richtext/richtextmodel.cxx
+++ b/forms/source/richtext/richtextmodel.cxx
@@ -25,15 +25,16 @@
 #include <services.hxx>
 
 #include <com/sun/star/awt/LineEndFormat.hpp>
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/form/FormComponentType.hpp>
 #include <com/sun/star/text/WritingMode2.hpp>
 #include <com/sun/star/style/VerticalAlignment.hpp>
 
 #include <comphelper/guarding.hxx>
 #include <comphelper/servicehelper.hxx>
-#include <svl/itempool.hxx>
 #include <toolkit/awt/vclxdevice.hxx>
 #include <toolkit/helper/vclunohelper.hxx>
+#include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <editeng/editstat.hxx>
 #include <vcl/outdev.hxx>
diff --git a/forms/source/xforms/convert.cxx b/forms/source/xforms/convert.cxx
index 948d526930f8..2dfab2d97eaa 100644
--- a/forms/source/xforms/convert.cxx
+++ b/forms/source/xforms/convert.cxx
@@ -21,7 +21,6 @@
 #include "convert.hxx"
 
 #include <sstream>
-#include <rtl/math.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
 #include <tools/date.hxx>
diff --git a/forms/source/xforms/submission/submission_get.cxx b/forms/source/xforms/submission/submission_get.cxx
index 72a9ffc1eee2..6114daeaf3dc 100644
--- a/forms/source/xforms/submission/submission_get.cxx
+++ b/forms/source/xforms/submission/submission_get.cxx
@@ -28,8 +28,6 @@
 #include <com/sun/star/task/InteractionHandler.hpp>
 #include <tools/diagnose_ex.h>
 
-#include <memory>
-
 using namespace css::uno;
 using namespace css::ucb;
 using namespace css::task;
diff --git a/forms/source/xforms/submission/submission_put.cxx b/forms/source/xforms/submission/submission_put.cxx
index 071e527ea226..f49f6680451c 100644
--- a/forms/source/xforms/submission/submission_put.cxx
+++ b/forms/source/xforms/submission/submission_put.cxx
@@ -23,7 +23,6 @@
 #include "submission_put.hxx"
 
 #include <comphelper/processfactory.hxx>
-#include <osl/diagnose.h>
 #include <ucbhelper/content.hxx>
 #include <tools/diagnose_ex.h>