From e3206e67402f623bac17ca94a20dfb45391dcb48 Mon Sep 17 00:00:00 2001
From: Gabor Kelemen <kelemeng@ubuntu.com>
Date: Sun, 16 Jan 2022 15:29:00 +0100
Subject: 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>
---
 extensions/IwyuFilter_extensions.yaml             |  6 ++++++
 extensions/inc/helpids.h                          |  2 ++
 extensions/inc/propctrlr.h                        |  2 ++
 extensions/inc/showhide.hrc                       |  2 ++
 extensions/inc/stringarrays.hrc                   |  2 ++
 extensions/source/bibliography/bibview.cxx        |  2 --
 extensions/source/bibliography/general.cxx        | 10 +---------
 extensions/source/bibliography/general.hxx        |  8 --------
 extensions/source/bibliography/toolbar.cxx        |  2 --
 extensions/source/logging/logger.cxx              |  1 -
 extensions/source/logging/simpletextformatter.cxx |  2 --
 extensions/source/propctrlr/controlfontdialog.cxx |  1 -
 extensions/source/propctrlr/eformshelper.cxx      |  1 -
 extensions/source/propctrlr/pcrcommon.hxx         |  3 ---
 extensions/source/propctrlr/pcrstrings.hxx        |  1 +
 extensions/source/propctrlr/propertyinfo.hxx      |  1 -
 extensions/source/propctrlr/selectlabeldialog.cxx |  3 ---
 extensions/source/update/ui/updatecheckui.cxx     |  2 --
 18 files changed, 16 insertions(+), 35 deletions(-)

(limited to 'extensions')

diff --git a/extensions/IwyuFilter_extensions.yaml b/extensions/IwyuFilter_extensions.yaml
index 4dd6ee91c36e..0e0ba4c9c16c 100644
--- a/extensions/IwyuFilter_extensions.yaml
+++ b/extensions/IwyuFilter_extensions.yaml
@@ -1,6 +1,9 @@
 ---
 assumeFilename: extensions/source/propctrlr/formcomponenthandler.cxx
 excludelist:
+    extensions/inc/strings.hrc:
+    # Needed for TranslateId macro
+    - unotools/resmgr.hxx
     extensions/source/logging/loghandler.hxx:
     # Don't propose hxx -> h change in URE libs
     - cppuhelper/interfacecontainer.hxx
@@ -80,3 +83,6 @@ excludelist:
     extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx:
     # Actually used
     - com/sun/star/inspection/XObjectInspectorUI.hpp
+    extensions/source/scanner/grid.cxx:
+    # Needed for rtl::math::expm1
+    - rtl/math.hxx
diff --git a/extensions/inc/helpids.h b/extensions/inc/helpids.h
index 30a8736db9fe..48a623dd1319 100644
--- a/extensions/inc/helpids.h
+++ b/extensions/inc/helpids.h
@@ -20,6 +20,8 @@
 #ifndef EXTENSIONS_HELPIDS_H
 #define EXTENSIONS_HELPIDS_H
 
+#include <rtl/ustring.hxx>
+
 inline constexpr OStringLiteral HID_ABSPILOT_PREVIOUS = "EXTENSIONS_HID_ABSPILOT_PREVIOUS";
 inline constexpr OStringLiteral HID_ABSPILOT_NEXT = "EXTENSIONS_HID_ABSPILOT_NEXT";
 inline constexpr OStringLiteral HID_ABSPILOT_CANCEL = "EXTENSIONS_HID_ABSPILOT_CANCEL";
diff --git a/extensions/inc/propctrlr.h b/extensions/inc/propctrlr.h
index 5c0eb956f471..bad3d082de98 100644
--- a/extensions/inc/propctrlr.h
+++ b/extensions/inc/propctrlr.h
@@ -20,6 +20,8 @@
 #ifndef EXTENSIONS_PROPCTRLR_H
 #define EXTENSIONS_PROPCTRLR_H
 
+#include <rtl/ustring.hxx>
+
 inline constexpr OUStringLiteral UID_PROP_DLG_FONT_TYPE = u"EXTENSIONS_UID_PROP_DLG_FONT_TYPE";
 inline constexpr OUStringLiteral UID_PROP_DLG_IMAGE_URL = u"EXTENSIONS_UID_PROP_DLG_IMAGE_URL";
 inline constexpr OUStringLiteral UID_PROP_DLG_BACKGROUNDCOLOR = u"EXTENSIONS_UID_PROP_DLG_BACKGROUNDCOLOR";
diff --git a/extensions/inc/showhide.hrc b/extensions/inc/showhide.hrc
index 5f96170a71f9..226f8b48e8fd 100644
--- a/extensions/inc/showhide.hrc
+++ b/extensions/inc/showhide.hrc
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_EXTENSIONS_INC_SHOWHIDE_HRC
 #define INCLUDED_EXTENSIONS_INC_SHOWHIDE_HRC
 
+#include <unotools/resmgr.hxx>
+
 #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String))
 
 namespace {
diff --git a/extensions/inc/stringarrays.hrc b/extensions/inc/stringarrays.hrc
index 2de092317cac..4c5a6ed75aca 100644
--- a/extensions/inc/stringarrays.hrc
+++ b/extensions/inc/stringarrays.hrc
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_EXTENSIONS_INC_STRINGARRAYS_HRC
 #define INCLUDED_EXTENSIONS_INC_STRINGARRAYS_HRC
 
+#include <unotools/resmgr.hxx>
+
 #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String))
 
 const TranslateId RID_RSC_ENUM_VERTICAL_ALIGN[] =
diff --git a/extensions/source/bibliography/bibview.cxx b/extensions/source/bibliography/bibview.cxx
index 09925e6c4ca4..b175fb78a5f9 100644
--- a/extensions/source/bibliography/bibview.cxx
+++ b/extensions/source/bibliography/bibview.cxx
@@ -28,9 +28,7 @@
 
 
 #include <vcl/svapp.hxx>
-#include <com/sun/star/sdbc/XResultSetUpdate.hpp>
 #include <vcl/weld.hxx>
-#include <tools/debug.hxx>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::form;
diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx
index b5447af165ec..a6e6b20beeed 100644
--- a/extensions/source/bibliography/general.cxx
+++ b/extensions/source/bibliography/general.cxx
@@ -19,22 +19,18 @@
 
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
+#include <com/sun/star/form/XBoundComponent.hpp>
 #include <com/sun/star/sdbc/XRowSet.hpp>
 #include <com/sun/star/sdb/XColumn.hpp>
 #include <com/sun/star/sdb/CommandType.hpp>
-#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/uri/UriReferenceFactory.hpp>
 
 #include <o3tl/safeint.hxx>
 #include <sal/log.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <vcl/event.hxx>
 #include <vcl/mnemonic.hxx>
-#include <vcl/settings.hxx>
 #include "general.hxx"
 #include "bibresid.hxx"
 #include "datman.hxx"
@@ -42,11 +38,7 @@
 #include <strings.hrc>
 #include "bibmod.hxx"
 #include <helpids.h>
-#include <tools/debug.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/i18nhelp.hxx>
 #include <algorithm>
-#include <tools/urlobj.hxx>
 #include <sfx2/filedlghelper.hxx>
 #include <sfx2/objsh.hxx>
 
diff --git a/extensions/source/bibliography/general.hxx b/extensions/source/bibliography/general.hxx
index ae8d587886ab..b4d981955891 100644
--- a/extensions/source/bibliography/general.hxx
+++ b/extensions/source/bibliography/general.hxx
@@ -21,15 +21,7 @@
 
 #include <sal/config.h>
 
-#include <string_view>
-
-#include <com/sun/star/awt/XFocusListener.hpp>
-#include <com/sun/star/awt/XControlContainer.hpp>
-#include <com/sun/star/form/XBoundComponent.hpp>
-#include <com/sun/star/sdbc/XRowSetListener.hpp>
-
 #include <vcl/InterimItemWindow.hxx>
-#include <cppuhelper/implbase1.hxx>
 #include "bibshortcuthandler.hxx"
 
 
diff --git a/extensions/source/bibliography/toolbar.cxx b/extensions/source/bibliography/toolbar.cxx
index ef6c8b8559a1..8d32a1f4d205 100644
--- a/extensions/source/bibliography/toolbar.cxx
+++ b/extensions/source/bibliography/toolbar.cxx
@@ -19,8 +19,6 @@
 
 #include <sal/config.h>
 
-#include <string_view>
-
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx
index a49f8de87c93..322ad7ab9ec7 100644
--- a/extensions/source/logging/logger.cxx
+++ b/extensions/source/logging/logger.cxx
@@ -32,7 +32,6 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <cppuhelper/weakref.hxx>
-#include <rtl/ref.hxx>
 #include <map>
 
 
diff --git a/extensions/source/logging/simpletextformatter.cxx b/extensions/source/logging/simpletextformatter.cxx
index 71e40a362562..b54fea5a645b 100644
--- a/extensions/source/logging/simpletextformatter.cxx
+++ b/extensions/source/logging/simpletextformatter.cxx
@@ -27,8 +27,6 @@
 #include <cppuhelper/implbase.hxx>
 #include <cppuhelper/supportsservice.hxx>
 
-#include <rtl/ustrbuf.hxx>
-
 namespace logging
 {
 using css::logging::LogRecord;
diff --git a/extensions/source/propctrlr/controlfontdialog.cxx b/extensions/source/propctrlr/controlfontdialog.cxx
index a4fa97881085..08088e074f76 100644
--- a/extensions/source/propctrlr/controlfontdialog.cxx
+++ b/extensions/source/propctrlr/controlfontdialog.cxx
@@ -19,7 +19,6 @@
 
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include "controlfontdialog.hxx"
 
 #include <comphelper/propertyvalue.hxx>
diff --git a/extensions/source/propctrlr/eformshelper.cxx b/extensions/source/propctrlr/eformshelper.cxx
index c880f096b4b2..95d9eeb6aa99 100644
--- a/extensions/source/propctrlr/eformshelper.cxx
+++ b/extensions/source/propctrlr/eformshelper.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <memory>
 #include <string_view>
 
 #include "eformshelper.hxx"
diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx
index 2ab06e8668de..4d9b68d8e974 100644
--- a/extensions/source/propctrlr/pcrcommon.hxx
+++ b/extensions/source/propctrlr/pcrcommon.hxx
@@ -24,11 +24,8 @@
 
 #include <sal/config.h>
 
-#include <string_view>
-
 #include <com/sun/star/uno/Sequence.hxx>
 #include <com/sun/star/beans/XPropertyChangeListener.hpp>
-#include <com/sun/star/beans/PropertyChangeEvent.hpp>
 #include <comphelper/interfacecontainer3.hxx>
 
 namespace pcr
diff --git a/extensions/source/propctrlr/pcrstrings.hxx b/extensions/source/propctrlr/pcrstrings.hxx
index 56e7bbbcde7f..3bb0a888c954 100644
--- a/extensions/source/propctrlr/pcrstrings.hxx
+++ b/extensions/source/propctrlr/pcrstrings.hxx
@@ -19,6 +19,7 @@
 
 #pragma once
 
+#include <rtl/ustring.hxx>
 
 namespace pcr
 {
diff --git a/extensions/source/propctrlr/propertyinfo.hxx b/extensions/source/propctrlr/propertyinfo.hxx
index 5687d7a3861b..592557c2a315 100644
--- a/extensions/source/propctrlr/propertyinfo.hxx
+++ b/extensions/source/propctrlr/propertyinfo.hxx
@@ -21,7 +21,6 @@
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
-#include <rtl/string.hxx>
 #include <vector>
 
 
diff --git a/extensions/source/propctrlr/selectlabeldialog.cxx b/extensions/source/propctrlr/selectlabeldialog.cxx
index bd36d4994eb4..fabef68abf43 100644
--- a/extensions/source/propctrlr/selectlabeldialog.cxx
+++ b/extensions/source/propctrlr/selectlabeldialog.cxx
@@ -19,8 +19,6 @@
 
 #include <sal/config.h>
 
-#include <string_view>
-
 #include "selectlabeldialog.hxx"
 #include <strings.hrc>
 #include <bitmaps.hlst>
@@ -37,7 +35,6 @@
 #include <comphelper/types.hxx>
 #include <sal/log.hxx>
 #include <tools/debug.hxx>
-#include <rtl/ustrbuf.hxx>
 
 
 namespace pcr
diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx
index 6f7443700ec1..6a4462669090 100644
--- a/extensions/source/update/ui/updatecheckui.cxx
+++ b/extensions/source/update/ui/updatecheckui.cxx
@@ -33,11 +33,9 @@
 #include <unotools/resmgr.hxx>
 #include <vcl/image.hxx>
 #include <vcl/menubarupdateicon.hxx>
-#include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
 #include <sfx2/strings.hrc>
-#include <rtl/ustrbuf.hxx>
 
 #include <bitmaps.hlst>
 
-- 
cgit