Recheck modules [a-c]* with IWYU

See tdf#42949 for motivation

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

30 files changed, 14 insertions, 40 deletions

diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index e083d4bd438e..8531907e805c 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -90,7 +90,6 @@
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/propertyvalue.hxx>
 #include <comphelper/processfactory.hxx>
-#include <officecfg/Office/Common.hxx>
 
 namespace uno = com::sun::star::uno;
 namespace frame = com::sun::star::frame;
diff --git a/cui/source/dialogs/AdditionsDialog.cxx b/cui/source/dialogs/AdditionsDialog.cxx
index d2337d7333a5..425de0230ff6 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -12,7 +12,6 @@
 
 #include <algorithm>
 #include <cmath>
-#include <string_view>
 
 #include <config_folders.h>
 
diff --git a/cui/source/dialogs/FontFeaturesDialog.cxx b/cui/source/dialogs/FontFeaturesDialog.cxx
index 4735de194255..8b01de6711f0 100644
--- a/cui/source/dialogs/FontFeaturesDialog.cxx
+++ b/cui/source/dialogs/FontFeaturesDialog.cxx
@@ -12,7 +12,6 @@
 #include <rtl/ustrbuf.hxx>
 #include <vcl/font/FeatureParser.hxx>
 #include <FontFeatures.hxx>
-#include <svtools/colorcfg.hxx>
 #include <unordered_set>
 
 using namespace css;
diff --git a/cui/source/dialogs/GraphicTestsDialog.cxx b/cui/source/dialogs/GraphicTestsDialog.cxx
index c6232c2e8868..ad0c25aab1f5 100644
--- a/cui/source/dialogs/GraphicTestsDialog.cxx
+++ b/cui/source/dialogs/GraphicTestsDialog.cxx
@@ -11,14 +11,17 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/DirectoryHelper.hxx>
 #include <osl/file.hxx>
+#include <svx/FileExportedDialog.hxx>
 #include <unotools/ZipPackageHelper.hxx>
 #include <GraphicsTestsDialog.hxx>
 #include <vcl/test/GraphicsRenderTests.hxx>
 #include <svl/svlresid.hxx>
 #include <svl/svl.hrc>
+#include <vcl/svapp.hxx>
 
 #include <dialmgr.hxx>
 #include <strings.hrc>
+#include <ImageViewerDialog.hxx>
 
 GraphicTestEntry::GraphicTestEntry(weld::Container* pParent, weld::Dialog* pDialog,
                                    OUString aTestName, OUString aTestStatus, Bitmap aTestBitmap)
diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx b/cui/source/dialogs/SignSignatureLineDialog.cxx
index 0174cee0b178..1f1bd4551080 100644
--- a/cui/source/dialogs/SignSignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignSignatureLineDialog.cxx
@@ -33,7 +33,6 @@
 #include <com/sun/star/graphic/XGraphicProvider.hpp>
 #include <com/sun/star/security/CertificateKind.hpp>
 #include <com/sun/star/security/XCertificate.hpp>
-#include <com/sun/star/ui/dialogs/FilePicker.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
 
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 4cfd57d988af..559e878ce25c 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -46,7 +46,6 @@
 #include <com/sun/star/sdbc/XRow.hpp>
 #include <com/sun/star/ucb/ContentCreationException.hpp>
 #include <com/sun/star/ucb/XContentAccess.hpp>
-#include <com/sun/star/ui/dialogs/FolderPicker.hpp>
 #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
 #include <dialmgr.hxx>
 #include <strings.hrc>
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 114a2f07649c..cb1778329974 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -28,7 +28,6 @@
 #include <osl/diagnose.h>
 #include <tools/debug.hxx>
 #include <i18nlangtag/languagetag.hxx>
-#include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/weldutils.hxx>
 #include <unotools/lingucfg.hxx>
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 980a10d8c225..93921c0bd302 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -25,8 +25,6 @@
 #include <svl/stritem.hxx>
 #include <com/sun/star/awt/XTopWindow.hpp>
 #include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/uno/Sequence.h>
-#include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/uno/Exception.hpp>
 #include <vcl/svapp.hxx>
 #include <vcl/weld.hxx>
@@ -37,7 +35,7 @@
 #include <unotools/ucbhelper.hxx>
 
 #include <comphelper/processfactory.hxx>
-#include <com/sun/star/ui/dialogs/FolderPicker.hpp>
+#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 
 #include <cuihyperdlg.hxx>
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 01026742da15..ffee53198b39 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -37,7 +37,7 @@
 #include <sfx2/objsh.hxx>
 
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-#include <com/sun/star/ui/dialogs/FolderPicker.hpp>
+#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
 #include <comphelper/processfactory.hxx>
 
 #include <dialmgr.hxx>
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index aba063eb7b13..545fb594ef9b 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -30,7 +30,7 @@
 
 #include <strings.hrc>
 #include <comphelper/processfactory.hxx>
-#include <com/sun/star/ui/dialogs/FolderPicker.hpp>
+#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 
 #include <unotools/pathoptions.hxx>
diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx
index b089f5f8e14b..1e8485513f16 100644
--- a/cui/source/dialogs/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -19,7 +19,6 @@
 
 #include <showcols.hxx>
 
-#include <osl/diagnose.h>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <comphelper/types.hxx>
 #include <tools/debug.hxx>
diff --git a/cui/source/dialogs/tipofthedaydlg.cxx b/cui/source/dialogs/tipofthedaydlg.cxx
index 34193bff90de..8e609122de50 100644
--- a/cui/source/dialogs/tipofthedaydlg.cxx
+++ b/cui/source/dialogs/tipofthedaydlg.cxx
@@ -27,7 +27,6 @@
 #include <vcl/help.hxx>
 #include <vcl/window.hxx>
 
-#include <com/sun/star/frame/XDesktop2.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/util/URL.hpp>
diff --git a/cui/source/inc/GraphicsTestsDialog.hxx b/cui/source/inc/GraphicsTestsDialog.hxx
index 3f8a151f8080..2bf18de5dde7 100644
--- a/cui/source/inc/GraphicsTestsDialog.hxx
+++ b/cui/source/inc/GraphicsTestsDialog.hxx
@@ -8,13 +8,9 @@
  */
 #pragma once
 
-#include <vcl/bitmapex.hxx>
-#include <vcl/svapp.hxx>
+#include <vcl/bitmap.hxx>
 #include <vcl/weld.hxx>
 #include <tools/link.hxx>
-#include <svx/FileExportedDialog.hxx>
-
-#include "ImageViewerDialog.hxx"
 
 #include <vector>
 
diff --git a/cui/source/inc/helpids.h b/cui/source/inc/helpids.h
index 2ac2fbd0b02c..f82e0a1c8166 100644
--- a/cui/source/inc/helpids.h
+++ b/cui/source/inc/helpids.h
@@ -18,6 +18,8 @@
  */
 #pragma once
 
+#include <rtl/string.hxx>
+
 inline constexpr OStringLiteral HID_OPTIONS_COLORCONFIG_SAVE_SCHEME
     = "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME";
 inline constexpr OStringLiteral HID_OFA_FONT_SUBST_CLB = "CUI_HID_OFA_FONT_SUBST_CLB";
diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx
index d48e87b7d759..a6a7f2bd6f46 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -19,7 +19,7 @@
 #pragma once
 
 #include <svx/dlgctrl.hxx>
-#include <svx/svdobj.hxx>
+#include <svx/svdobjkind.hxx>
 
 class SdrView;
 
diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx
index 0932ac2e7a84..3aff94b3217e 100644
--- a/cui/source/options/certpath.cxx
+++ b/cui/source/options/certpath.cxx
@@ -16,7 +16,7 @@
 
 #include <com/sun/star/xml/crypto/NSSInitializer.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
-#include <com/sun/star/ui/dialogs/FolderPicker.hpp>
+#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
 #include <comphelper/processfactory.hxx>
 
 using namespace ::com::sun::star;
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 94a192cfddc7..50dce2c1cb8e 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -20,7 +20,6 @@
 #include <memory>
 #include <map>
 #include <optasian.hxx>
-#include <osl/diagnose.h>
 #include <tools/debug.hxx>
 #include <tools/diagnose_ex.h>
 #include <o3tl/any.hxx>
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 9c657176527f..91e8cf911e99 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -30,7 +30,6 @@
 #include <i18nlangtag/mslangid.hxx>
 #include <o3tl/safeint.hxx>
 #include <vcl/svapp.hxx>
-#include <unotools/saveopt.hxx>
 #include <svl/intitem.hxx>
 #include <vcl/settings.hxx>
 
diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx
index 7fed385e595b..69302982214e 100644
--- a/cui/source/options/optjava.cxx
+++ b/cui/source/options/optjava.cxx
@@ -50,8 +50,6 @@
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <com/sun/star/ui/dialogs/FolderPicker.hpp>
-#include <com/sun/star/ucb/XContentProvider.hpp>
 #if HAVE_FEATURE_JAVA
 #include <jvmfwk/framework.hxx>
 #endif
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 39c9b69fd392..d6ccbf113e25 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -36,8 +36,8 @@
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
-#include <com/sun/star/ui/dialogs/FolderPicker.hpp>
-#include <com/sun/star/ui/dialogs/FilePicker.hpp>
+#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
+#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
 #include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
 #include <com/sun/star/util/thePathSettings.hpp>
 #include <tools/diagnose_ex.h>
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index 6b0dbe2cd2cd..754fb5fdce27 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -25,7 +25,7 @@
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/configuration/theDefaultProvider.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/ui/dialogs/FolderPicker.hpp>
+#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
 #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
 #include <com/sun/star/deployment/UpdateInformationProvider.hpp>
 #include <com/sun/star/ucb/XWebDAVCommandEnvironment.hpp>
diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx
index f5c94edf1029..4b00176ab490 100644
--- a/cui/source/options/securityoptions.cxx
+++ b/cui/source/options/securityoptions.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include <tools/debug.hxx>
 #include <unotools/securityoptions.hxx>
 #include "securityoptions.hxx"
 
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index c96b80b47dd9..ae9f8b8e422f 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -29,7 +29,6 @@
 
 #include <svx/dialogs.hrc>
 #include <svx/svxids.hrc>
-#include <unotools/resmgr.hxx>
 
 #include <treeopt.hrc>
 #include <helpids.h>
@@ -90,7 +89,6 @@
 #include <sfx2/viewfrm.hxx>
 #include <svl/flagitem.hxx>
 #include <svl/intitem.hxx>
-#include <svl/languageoptions.hxx>
 #include <svl/cjkoptions.hxx>
 #include <svl/ctloptions.hxx>
 #include <svx/databaseregistrationui.hxx>
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 95a75d877271..e7a0883dc267 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -29,11 +29,9 @@
 #include <unotools/charclass.hxx>
 #include <unotools/collatorwrapper.hxx>
 #include <comphelper/processfactory.hxx>
-#include <comphelper/string.hxx>
 #include <vcl/svapp.hxx>
 #include <sfx2/module.hxx>
 #include <svl/eitem.hxx>
-#include <svl/languageoptions.hxx>
 #include <svl/cjkoptions.hxx>
 #include <svl/ctloptions.hxx>
 #include <svx/SmartTagMgr.hxx>
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index a3bd26d371b1..725ab44da0ee 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -19,8 +19,6 @@
 
 #include <sal/config.h>
 
-#include <string_view>
-
 #include <sfx2/objsh.hxx>
 #include <svx/strings.hrc>
 #include <svx/svxids.hrc>
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 550213c99eff..4c190180e8c2 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -23,7 +23,6 @@
 #include <sfx2/objsh.hxx>
 #include <svx/svxids.hrc>
 #include <svtools/unitconv.hxx>
-#include <svl/languageoptions.hxx>
 #include <svl/cjkoptions.hxx>
 #include <svl/ctloptions.hxx>
 #include <chardlg.hxx>
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index c445345c9e72..b79d2f5de7db 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -24,8 +24,6 @@
 #include <svl/intitem.hxx>
 #include <sfx2/objsh.hxx>
 #include <vcl/outdev.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
 #include <i18nlangtag/lang.h>
 #include <svx/svxids.hrc>
 #include <svtools/colorcfg.hxx>
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 0e29feaaeae6..f78cda0ee602 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -22,7 +22,6 @@
 #include <sfx2/objsh.hxx>
 #include <sfx2/printer.hxx>
 #include <sfx2/viewsh.hxx>
-#include <svl/languageoptions.hxx>
 #include <svl/cjkoptions.hxx>
 #include <svl/ctloptions.hxx>
 #include <svtools/unitconv.hxx>
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index a7075bd862e7..427e2bdc5708 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -26,7 +26,6 @@
 #include <svx/flagsdef.hxx>
 #include <svx/svxids.hrc>
 
-#include <svl/languageoptions.hxx>
 #include <svl/cjkoptions.hxx>
 #include <editeng/pgrditem.hxx>
 #include <svx/strings.hrc>
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index 0f4a33bba4fa..f773be6b8cb1 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -24,7 +24,6 @@
 #include <svx/sdtaitm.hxx>
 #include <svx/sdtfsitm.hxx>
 #include <svx/sdtcfitm.hxx>
-#include <svx/svdobj.hxx>
 #include <svx/svxids.hrc>
 
 #include <textattr.hxx>