cui/inc/dlgname.hxx | 1 -
cui/inc/widgettestdlg.hxx | 1 -
cui/source/customize/SvxToolbarConfigPage.cxx | 1 -
cui/source/customize/acccfg.cxx | 5 ++---
cui/source/customize/cfgutil.cxx | 2 --
cui/source/customize/macropg.cxx | 2 +-
cui/source/dialogs/AdditionsDialog.cxx | 2 --
cui/source/dialogs/MacroManagerDialog.cxx | 15 +++------------
cui/source/dialogs/QrCodeGenDialog.cxx | 1 -
cui/source/dialogs/SignSignatureLineDialog.cxx | 1 -
cui/source/dialogs/SpellDialog.cxx | 1 -
cui/source/dialogs/colorpicker.cxx | 17 +----------------
cui/source/dialogs/cuigrfflt.cxx | 1 -
cui/source/dialogs/hlinettp.cxx | 2 --
cui/source/dialogs/hltpbase.cxx | 4 ----
cui/source/dialogs/postdlg.cxx | 1 -
cui/source/dialogs/scriptdlg.cxx | 1 -
cui/source/dialogs/whatsnewtabpage.cxx | 6 +-----
cui/source/dialogs/zoom.cxx | 1 -
cui/source/factory/dlgfact.cxx | 1 -
cui/source/inc/MacroManagerDialog.hxx | 3 +--
cui/source/inc/SpellDialog.hxx | 1 +
cui/source/inc/SvxMenuConfigPage.hxx | 1 -
cui/source/inc/SvxNotebookbarConfigPage.hxx | 1 -
cui/source/inc/SvxToolbarConfigPage.hxx | 1 -
cui/source/inc/acccfg.hxx | 2 +-
cui/source/inc/border.hxx | 1 -
cui/source/inc/colorpicker.hxx | 2 --
cui/source/inc/dbregister.hxx | 1 -
cui/source/inc/hltpbase.hxx | 1 -
cui/source/inc/macropg.hxx | 2 --
cui/source/inc/optlingu.hxx | 2 +-
cui/source/options/appearance.cxx | 7 +------
cui/source/options/appearance.hxx | 6 ------
cui/source/options/connpooloptions.cxx | 1 +
cui/source/options/connpooloptions.hxx | 2 +-
cui/source/options/doclinkdialog.cxx | 1 +
cui/source/options/doclinkdialog.hxx | 2 +-
cui/source/options/optaboutconfig.cxx | 3 ---
cui/source/options/optaccessibility.cxx | 2 --
cui/source/options/optdict.cxx | 1 -
cui/source/options/optgdlg.cxx | 6 ------
cui/source/options/optgdlg.hxx | 4 ----
cui/source/options/optgenrl.cxx | 5 -----
cui/source/options/opthtml.hxx | 1 -
cui/source/options/optlanguagetool.cxx | 1 -
cui/source/options/optlingu.cxx | 3 +--
cui/source/options/optpath.cxx | 1 -
cui/source/options/optupdt.cxx | 4 +++-
cui/source/options/treeopt.cxx | 2 --
cui/source/options/treeopthelper.cxx | 4 +---
cui/source/tabpages/autocdlg.cxx | 2 +-
cui/source/tabpages/border.cxx | 1 -
cui/source/tabpages/macroass.cxx | 2 +-
cui/source/tabpages/numpages.cxx | 3 ---
cui/source/tabpages/page.cxx | 1 -
cui/source/tabpages/swpossizetabpage.cxx | 1 -
cui/source/tabpages/tabarea.cxx | 1 -
cui/source/tabpages/tparea.cxx | 1 -
cui/source/tabpages/tpgradnt.cxx | 1 -
cui/source/tabpages/tplneend.cxx | 1 -
61 files changed, 24 insertions(+), 130 deletions(-)
New commits:
commit 9b8daf901566eda4eea87acc629621969b999482
Author: Gabor Kelemen <gabor.kele...@collabora.com>
AuthorDate: Thu Aug 7 13:53:24 2025 +0200
Commit: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
CommitDate: Tue Aug 19 09:48:18 2025 +0200
tdf#146619 Run IWYU on cui/
Change-Id: Ibeb01d88bedd47b0e9ea37a4390a0f16cec32bb1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/189786
Reviewed-by: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de>
Tested-by: Jenkins
diff --git a/cui/inc/dlgname.hxx b/cui/inc/dlgname.hxx
index 531f2e0f9de9..9a6e95558f0a 100644
--- a/cui/inc/dlgname.hxx
+++ b/cui/inc/dlgname.hxx
@@ -20,7 +20,6 @@
#include <vcl/formatter.hxx>
#include <vcl/weld.hxx>
-#include <sal/log.hxx>
/// Dialog for editing a name
class SvxNameDialog final : public weld::GenericDialogController
diff --git a/cui/inc/widgettestdlg.hxx b/cui/inc/widgettestdlg.hxx
index 02ab7f317894..ef0d67bfdd85 100644
--- a/cui/inc/widgettestdlg.hxx
+++ b/cui/inc/widgettestdlg.hxx
@@ -11,7 +11,6 @@
#include <tools/link.hxx>
#include <vcl/weld.hxx>
-#include <vcl/weldutils.hxx>
class WidgetTestDialog final : public weld::GenericDialogController
{
diff --git a/cui/source/customize/SvxToolbarConfigPage.cxx
b/cui/source/customize/SvxToolbarConfigPage.cxx
index 8e5197ea6a0e..bf506d4dbb43 100644
--- a/cui/source/customize/SvxToolbarConfigPage.cxx
+++ b/cui/source/customize/SvxToolbarConfigPage.cxx
@@ -29,7 +29,6 @@
#include <svl/stritem.hxx>
#include <comphelper/diagnose_ex.hxx>
-#include <algorithm>
#include <helpids.h>
#include <strings.hrc>
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 1edeade8b593..cde9d1795251 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -27,12 +27,11 @@
#include <sfx2/minfitem.hxx>
#include <sfx2/sfxresid.hxx>
-#include <sal/macros.h>
#include <vcl/event.hxx>
#include <strings.hrc>
#include <sfx2/strings.hrc>
-#include <svx/svxids.hrc>
+#include <sfx2/sfxsids.hrc>
// include interface declarations
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -63,7 +62,7 @@
#include <comphelper/sequenceashashmap.hxx>
#include <config_features.h>
-#include <com/sun/star/frame/LayoutManager.hpp>
+#include <com/sun/star/frame/XLayoutManager.hpp>
// namespaces
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 5b1a9c9ced70..c6562f705a7c 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -35,7 +35,6 @@
#include <com/sun/star/uno/RuntimeException.hpp>
#include <com/sun/star/ui/theUICategoryDescription.hpp>
-#include <basic/basmgr.hxx>
#include <tools/urlobj.hxx>
#include <strings.hrc>
#include <bitmaps.hlst>
@@ -54,7 +53,6 @@
#include <vcl/commandinfoprovider.hxx>
#include <vcl/help.hxx>
#include <vcl/svapp.hxx>
-#include <o3tl/string_view.hxx>
#include <sfx2/sidebar/ResourceManager.hxx>
#include <sfx2/sidebar/Context.hxx>
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 5fe30041a155..737884da0c68 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -29,7 +29,7 @@
#include "macropg_impl.hxx"
#include <o3tl/safeint.hxx>
#include <svl/macitem.hxx>
-#include <svx/svxids.hrc>
+#include <sfx2/sfxsids.hrc>
#include <strings.hrc>
#include <comphelper/namedvaluecollection.hxx>
#include <o3tl/string_view.hxx>
diff --git a/cui/source/dialogs/AdditionsDialog.cxx
b/cui/source/dialogs/AdditionsDialog.cxx
index ccc13b742f8a..f2a81c1abaef 100644
--- a/cui/source/dialogs/AdditionsDialog.cxx
+++ b/cui/source/dialogs/AdditionsDialog.cxx
@@ -22,8 +22,6 @@
#include <o3tl/test_info.hxx>
#include <sal/log.hxx>
-#include <com/sun/star/graphic/GraphicProvider.hpp>
-#include <com/sun/star/graphic/XGraphicProvider.hpp>
#include <com/sun/star/ucb/NameClash.hpp>
#include <com/sun/star/ucb/SimpleFileAccess.hpp>
#include <osl/file.hxx>
diff --git a/cui/source/dialogs/MacroManagerDialog.cxx
b/cui/source/dialogs/MacroManagerDialog.cxx
index 92df3aed89ce..9c70b622fba5 100644
--- a/cui/source/dialogs/MacroManagerDialog.cxx
+++ b/cui/source/dialogs/MacroManagerDialog.cxx
@@ -19,36 +19,27 @@
#include <basctl/basctldllpublic.hxx>
#include <basctl/sbxitem.hxx>
#include <basctl/scriptdocument.hxx>
-#include <basic/basmgr.hxx>
#include <comphelper/SetFlagContextHelper.hxx>
#include <comphelper/diagnose_ex.hxx>
#include <comphelper/documentinfo.hxx>
-#include <comphelper/lok.hxx>
#include <comphelper/processfactory.hxx>
#include <osl/file.hxx>
+#include <rtl/ustrbuf.hxx>
#include <sfx2/app.hxx>
#include <sfx2/dispatch.hxx>
+#include <sfx2/frame.hxx>
#include <sfx2/minfitem.hxx>
#include <sfx2/request.hxx>
#include <sfx2/sfxsids.hrc>
-#include <sfx2/viewfrm.hxx>
#include <svl/itemset.hxx>
#include <svl/stritem.hxx>
-#include <svtools/imagemgr.hxx>
#include <svx/passwd.hxx>
-#include <tools/urlobj.hxx>
#include <unotools/viewoptions.hxx>
#include <vcl/commandevent.hxx>
-#include <vcl/weldutils.hxx>
+#include <vcl/svapp.hxx>
#include <dlgname.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/container/XEnumerationAccess.hpp>
-#include <com/sun/star/container/XEnumeration.hpp>
-#include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/document/XEmbeddedScripts.hpp>
-#include <com/sun/star/document/XScriptInvocationContext.hpp>
-#include <com/sun/star/frame/ModuleManager.hpp>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XModel.hpp>
#include <com/sun/star/script/browse/XBrowseNode.hpp>
diff --git a/cui/source/dialogs/QrCodeGenDialog.cxx
b/cui/source/dialogs/QrCodeGenDialog.cxx
index 1d8928bcb7a8..fec9d7b47adb 100644
--- a/cui/source/dialogs/QrCodeGenDialog.cxx
+++ b/cui/source/dialogs/QrCodeGenDialog.cxx
@@ -24,7 +24,6 @@
#else
#include <ZXVersion.h>
#endif
-#include <rtl/strbuf.hxx>
#ifdef __GNUC__
#pragma GCC diagnostic push
diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx
b/cui/source/dialogs/SignSignatureLineDialog.cxx
index 52a5e5486cf7..2a1bbc937c76 100644
--- a/cui/source/dialogs/SignSignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignSignatureLineDialog.cxx
@@ -31,7 +31,6 @@
#include <com/sun/star/graphic/GraphicProvider.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
#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/TemplateDescription.hpp>
#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
diff --git a/cui/source/dialogs/SpellDialog.cxx
b/cui/source/dialogs/SpellDialog.cxx
index 2986c60af2d1..05a554134793 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -44,7 +44,6 @@
#include <rtl/ustrbuf.hxx>
#include <vcl/specialchars.hxx>
#include <vcl/event.hxx>
-#include <vcl/svapp.hxx>
#include <vcl/texteng.hxx>
#include <vcl/weld.hxx>
#include <svx/SpellDialogChildWindow.hxx>
diff --git a/cui/source/dialogs/colorpicker.cxx
b/cui/source/dialogs/colorpicker.cxx
index 1478ff5f250a..55e6500577d2 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -19,27 +19,12 @@
#include <colorpicker.hxx>
-#include <com/sun/star/uno/XComponentContext.hpp>
-#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-#include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
-#include <com/sun/star/beans/XPropertyAccess.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
-#include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/awt/XWindow.hpp>
-
-#include <comphelper/propertyvalue.hxx>
-#include <comphelper/compbase.hxx>
-#include <cppuhelper/supportsservice.hxx>
#include <vcl/ColorDialog.hxx>
-#include <vcl/svapp.hxx>
+#include <vcl/event.hxx>
#include <basegfx/color/bcolortools.hxx>
#include <cmath>
#include <o3tl/typed_flags_set.hxx>
-using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::lang;
-using namespace ::com::sun::star::ui::dialogs;
-using namespace ::com::sun::star::beans;
using namespace ::basegfx;
// color space conversion helpers
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 9f9d9273b5f2..fbd1360c5fe3 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -27,7 +27,6 @@
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
#include <osl/diagnose.h>
-#include <tools/helpers.hxx>
#include <cuigrfflt.hxx>
CuiGraphicPreviewWindow::CuiGraphicPreviewWindow()
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index c712bf2bb5f1..596243b9bfbc 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -18,8 +18,6 @@
*/
#include <o3tl/string_view.hxx>
-#include <unotools/useroptions.hxx>
-#include <svl/adrparse.hxx>
#include <hlinettp.hxx>
#include <hlmarkwn_def.hxx>
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 41b3d9cef40c..a5c0125e8892 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -24,16 +24,12 @@
#include <osl/file.hxx>
#include <sfx2/app.hxx>
#include <sfx2/event.hxx>
-#include <sfx2/frame.hxx>
-#include <sfx2/viewfrm.hxx>
#include <sot/formats.hxx>
#include <sfx2/sfxsids.hrc>
#include <svl/macitem.hxx>
-#include <ucbhelper/content.hxx>
#include <cuihyperdlg.hxx>
#include <hltpbase.hxx>
#include <macroass.hxx>
-#include <svx/svxdlg.hxx>
#include <strings.hrc>
#include <dialmgr.hxx>
#include <bitmaps.hlst>
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index a4fddee5f4dc..d43be0fed9d7 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -22,7 +22,6 @@
#include <tools/time.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
-#include <svl/itempool.hxx>
#include <svl/itemset.hxx>
#include <unotools/useroptions.hxx>
#include <unotools/localedatawrapper.hxx>
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index c67be62cc6b8..c382c4264b0f 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -46,7 +46,6 @@
#include <com/sun/star/script/XInvocation.hpp>
#include <com/sun/star/document/XEmbeddedScripts.hpp>
-#include <comphelper/lok.hxx>
#include <comphelper/SetFlagContextHelper.hxx>
#include <comphelper/documentinfo.hxx>
#include <comphelper/processfactory.hxx>
diff --git a/cui/source/dialogs/whatsnewtabpage.cxx
b/cui/source/dialogs/whatsnewtabpage.cxx
index 2afaa3e18efd..3fc87ef9c7b9 100644
--- a/cui/source/dialogs/whatsnewtabpage.cxx
+++ b/cui/source/dialogs/whatsnewtabpage.cxx
@@ -9,14 +9,10 @@
#include <whatsnewtabpage.hxx>
-#include <config_folders.h>
-#include <rtl/bootstrap.hxx>
#include <sfx2/app.hxx>
#include <sfx2/sfxresid.hxx>
#include <sfx2/strings.hrc>
-#include <sfx2/viewfrm.hxx>
-#include <svx/dlgctrl.hxx>
-#include <vcl/graphicfilter.hxx>
+#include <vcl/outdev.hxx>
WhatsNewTabPage::WhatsNewTabPage(weld::Container* pPage,
weld::DialogController* pController,
const SfxItemSet& rAttr)
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index 0fe135d3c49c..15c8bdc44687 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -19,7 +19,6 @@
#include <osl/diagnose.h>
#include <svl/itemset.hxx>
-#include <svl/itempool.hxx>
#include <sfx2/objsh.hxx>
#include <zoom.hxx>
#include <sfx2/zoomitem.hxx>
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index d7e58ebac577..b996d12324fe 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -30,7 +30,6 @@
#include <securityoptions.hxx>
#include <AdditionsDialog.hxx>
#include <sfx2/app.hxx>
-#include <sfx2/basedlgs.hxx>
#include <sfx2/pageids.hxx>
#include <svx/dialogs.hrc>
#include <svx/svxids.hrc>
diff --git a/cui/source/inc/MacroManagerDialog.hxx
b/cui/source/inc/MacroManagerDialog.hxx
index 48e1ca9ce579..03f92685bac9 100644
--- a/cui/source/inc/MacroManagerDialog.hxx
+++ b/cui/source/inc/MacroManagerDialog.hxx
@@ -17,9 +17,8 @@
#include <svl/lstner.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/frame/DispatchInformation.hpp>
#include <com/sun/star/script/browse/XBrowseNode.hpp>
-#include <com/sun/star/task/InteractionHandler.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
struct ScriptContainerInfo
{
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index f868f42a70cb..fae28d10ceac 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -33,6 +33,7 @@
namespace svx{ class SpellUndoAction_Impl;}
class UndoChangeGroupGuard;
+struct ImplSVEvent;
// forward ---------------------------------------------------------------
diff --git a/cui/source/inc/SvxMenuConfigPage.hxx
b/cui/source/inc/SvxMenuConfigPage.hxx
index 36fee041de76..975c6de21eb6 100644
--- a/cui/source/inc/SvxMenuConfigPage.hxx
+++ b/cui/source/inc/SvxMenuConfigPage.hxx
@@ -20,7 +20,6 @@
#pragma once
#include <vcl/weld.hxx>
-#include <com/sun/star/ui/XUIConfigurationManager.hpp>
#include "cfg.hxx" //for SvxConfigPage and SaveInData
diff --git a/cui/source/inc/SvxNotebookbarConfigPage.hxx
b/cui/source/inc/SvxNotebookbarConfigPage.hxx
index 672d2e8299e4..338fa5a22175 100644
--- a/cui/source/inc/SvxNotebookbarConfigPage.hxx
+++ b/cui/source/inc/SvxNotebookbarConfigPage.hxx
@@ -21,7 +21,6 @@
#include <libxml/parser.h>
#include <vcl/weld.hxx>
-#include <com/sun/star/ui/XUIConfigurationManager.hpp>
#include <memory>
#include <vector>
diff --git a/cui/source/inc/SvxToolbarConfigPage.hxx
b/cui/source/inc/SvxToolbarConfigPage.hxx
index 28fe658f2cca..1637d7c0619a 100644
--- a/cui/source/inc/SvxToolbarConfigPage.hxx
+++ b/cui/source/inc/SvxToolbarConfigPage.hxx
@@ -20,7 +20,6 @@
#pragma once
#include <vcl/weld.hxx>
-#include <com/sun/star/ui/XUIConfigurationManager.hpp>
#include <memory>
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 4349ef89dd1c..773981113759 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -25,7 +25,7 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <sfx2/tabdlg.hxx>
-#include <vcl/idle.hxx>
+#include <vcl/timer.hxx>
#include <vcl/keycod.hxx>
#include <i18nutil/searchopt.hxx>
#include <config_features.h>
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 98c4acba7b2c..53ae3b991b60 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -26,7 +26,6 @@
#include <svx/colorbox.hxx>
#include <svx/frmsel.hxx>
#include <svx/flagsdef.hxx>
-#include <unotools/resmgr.hxx>
#include <set>
diff --git a/cui/source/inc/colorpicker.hxx b/cui/source/inc/colorpicker.hxx
index 8dfcdd700ad5..104bd1cbab79 100644
--- a/cui/source/inc/colorpicker.hxx
+++ b/cui/source/inc/colorpicker.hxx
@@ -21,8 +21,6 @@
#include <vcl/ColorDialog.hxx>
#include <vcl/customweld.hxx>
-#include <vcl/event.hxx>
-#include <vcl/svapp.hxx>
#include <vcl/virdev.hxx>
#include <vcl/weld.hxx>
#include <sfx2/basedlgs.hxx>
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index 3b26e5190cb0..55c5952bd413 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -20,7 +20,6 @@
#pragma once
#include <rtl/ustring.hxx>
-#include <tools/solar.h>
#include <sfx2/basedlgs.hxx>
#include <sfx2/tabdlg.hxx>
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index 39666c633eee..7e74e1ec0202 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -18,7 +18,6 @@
*/
#pragma once
-#include <sfx2/tabdlg.hxx>
#include <vcl/transfer.hxx>
#include <sfx2/dispatch.hxx>
#include <svtools/inettbc.hxx>
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index 02d10e1fd879..738fbe71740c 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -25,10 +25,8 @@
#include <com/sun/star/util/XModifiable.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <rtl/ustring.hxx>
-#include <unotools/resmgr.hxx>
#include <unordered_map>
-#include <vector>
typedef std::pair<OUString, OUString> EventPair;
typedef std::unordered_map<OUString, EventPair> EventsHash;
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 706413cec106..e41f1ce67cf0 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -22,7 +22,7 @@
#include <svx/langbox.hxx>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/configuration/ReadWriteAccess.hpp>
+#include <com/sun/star/configuration/XReadWriteAccess.hpp>
namespace com::sun::star{
namespace linguistic2{
diff --git a/cui/source/options/appearance.cxx
b/cui/source/options/appearance.cxx
index 388b2c836c32..db2cc37e2d2f 100644
--- a/cui/source/options/appearance.cxx
+++ b/cui/source/options/appearance.cxx
@@ -10,18 +10,13 @@
#include "appearance.hxx"
#include <com/sun/star/uno/Sequence.hxx>
#include <dialmgr.hxx>
-#include <helpids.h>
+#include <editeng/editids.hrc>
#include <officecfg/Office/Common.hxx>
-#include <sfx2/objsh.hxx>
#include <strings.hrc>
#include <svtools/colorcfg.hxx>
#include <svtools/imgdef.hxx>
#include <svtools/miscopt.hxx>
#include <svtools/restartdialog.hxx>
-#include <svx/itemwin.hxx>
-#include <svx/svxids.hrc>
-#include <tools/debug.hxx>
-#include <unotools/resmgr.hxx>
#include <vcl/svapp.hxx>
#include <vcl/themecolors.hxx>
#include <comphelper/dispatchcommand.hxx>
diff --git a/cui/source/options/appearance.hxx
b/cui/source/options/appearance.hxx
index cb1d65faef0e..e98d529b2759 100644
--- a/cui/source/options/appearance.hxx
+++ b/cui/source/options/appearance.hxx
@@ -12,14 +12,8 @@
#include <vcl/weld.hxx>
#include <sfx2/tabdlg.hxx>
#include <svx/colorbox.hxx>
-#include <svx/xflasit.hxx>
-#include <svx/svxdlg.hxx>
#include <svtools/colorcfg.hxx>
-#include <sfx2/app.hxx>
-#include <vcl/graph.hxx>
#include <vcl/IconThemeInfo.hxx>
-#include <vcl/ptrstyle.hxx>
-#include <vcl/svapp.hxx>
using namespace svtools;
class SvxAppearanceTabPage : public SfxTabPage
diff --git a/cui/source/options/connpooloptions.cxx
b/cui/source/options/connpooloptions.cxx
index 2fe1a6982bc5..a0f3bafa0426 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -27,6 +27,7 @@
#include <dialmgr.hxx>
#include <officecfg/Office/DataAccess.hxx>
#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/configuration/ReadWriteAccess.hpp>
namespace offapp
{
diff --git a/cui/source/options/connpooloptions.hxx
b/cui/source/options/connpooloptions.hxx
index 2413f0d16de3..55e345b34adf 100644
--- a/cui/source/options/connpooloptions.hxx
+++ b/cui/source/options/connpooloptions.hxx
@@ -20,7 +20,7 @@
#pragma once
#include <sfx2/tabdlg.hxx>
-#include <com/sun/star/configuration/ReadWriteAccess.hpp>
+#include <com/sun/star/configuration/XReadWriteAccess.hpp>
#include "connpoolsettings.hxx"
diff --git a/cui/source/options/doclinkdialog.cxx
b/cui/source/options/doclinkdialog.cxx
index 76d8126a9b50..4f7bf495d53f 100644
--- a/cui/source/options/doclinkdialog.cxx
+++ b/cui/source/options/doclinkdialog.cxx
@@ -21,6 +21,7 @@
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <com/sun/star/configuration/ReadWriteAccess.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <comphelper/processfactory.hxx>
diff --git a/cui/source/options/doclinkdialog.hxx
b/cui/source/options/doclinkdialog.hxx
index 3ea0d5027d0f..ff2027d25ea2 100644
--- a/cui/source/options/doclinkdialog.hxx
+++ b/cui/source/options/doclinkdialog.hxx
@@ -21,7 +21,7 @@
#include <vcl/weld.hxx>
#include <svtools/inettbc.hxx>
-#include <com/sun/star/configuration/ReadWriteAccess.hpp>
+#include <com/sun/star/configuration/XReadWriteAccess.hpp>
namespace svx
{
diff --git a/cui/source/options/optaboutconfig.cxx
b/cui/source/options/optaboutconfig.cxx
index 9480b2de5e8f..99bfb45cc38b 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -14,7 +14,6 @@
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/UnknownPropertyException.hpp>
-#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/configuration/ReadWriteAccess.hpp>
#include <com/sun/star/configuration/XDocumentation.hpp>
#include <com/sun/star/configuration/theDefaultProvider.hpp>
@@ -24,7 +23,6 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Type.hxx>
-#include <com/sun/star/uno/TypeClass.hpp>
#include <com/sun/star/util/InvalidStateException.hpp>
#include <com/sun/star/util/SearchAlgorithms2.hpp>
#include <com/sun/star/util/SearchFlags.hpp>
@@ -37,7 +35,6 @@
#include <sal/log.hxx>
#include <unotools/textsearch.hxx>
#include <utility>
-#include <vcl/event.hxx>
#include <dialmgr.hxx>
#include <strings.hrc>
diff --git a/cui/source/options/optaccessibility.cxx
b/cui/source/options/optaccessibility.cxx
index 79bbccde8e6c..57f2312674d6 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -19,8 +19,6 @@
#include "optaccessibility.hxx"
#include <strings.hrc>
-#include <vcl/settings.hxx>
-#include <vcl/svapp.hxx>
#include <officecfg/Office/Common.hxx>
#include <unotools/resmgr.hxx>
#include <dialmgr.hxx>
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 0b24752691f3..00e4d2b1ef4c 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -19,7 +19,6 @@
#include <editeng/unolingu.hxx>
#include <o3tl/safeint.hxx>
-#include <svx/dialmgr.hxx>
#include <svx/ehdl.hxx>
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/linguistic2/XDictionary.hpp>
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index ad3accd5f1f3..75ef55baf597 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -37,7 +37,6 @@
#include <unotools/syslocaleoptions.hxx>
#include <sfx2/objsh.hxx>
#include <comphelper/propertysequence.hxx>
-#include <comphelper/propertyvalue.hxx>
#include <svtools/langtab.hxx>
#include <editeng/unolingu.hxx>
#include <editeng/langitem.hxx>
@@ -62,10 +61,8 @@
#include <com/sun/star/configuration/theDefaultProvider.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XNameReplace.hpp>
#include <com/sun/star/container/XHierarchicalNameAccess.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/util/XChangesBatch.hpp>
#include <com/sun/star/uno/Any.hxx>
@@ -74,13 +71,11 @@
#include <com/sun/star/i18n/ScriptType.hpp>
#include <com/sun/star/office/Quickstart.hpp>
#include <com/sun/star/linguistic2/XLinguProperties.hpp>
-#include <comphelper/dispatchcommand.hxx>
#include <vcl/vclenum.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <vcl/window.hxx>
-#include <vcl/IconThemeInfo.hxx>
#include <vcl/skia/SkiaHelper.hxx>
#include <bitmaps.hlst>
@@ -88,7 +83,6 @@
#include <svtools/apearcfg.hxx>
#include <svtools/optionsdrawinglayer.hxx>
#include <svtools/restartdialog.hxx>
-#include <svtools/imgdef.hxx>
#include <com/sun/star/datatransfer/clipboard/SystemClipboard.hpp>
#include <vcl/unohelp2.hxx>
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 4f764506b2c2..c73dddab1e5b 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -24,10 +24,6 @@
class CanvasSettings;
-namespace vcl {
- class IconThemeInfo;
-}
-
class OfaMiscTabPage : public SfxTabPage
{
private:
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index 015ecf63181b..770b94c94482 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -22,11 +22,6 @@
#include <comphelper/processfactory.hxx>
#include <config_gpgme.h>
-#if HAVE_FEATURE_GPGME
-# include <com/sun/star/xml/crypto/GPGSEInitializer.hpp>
-# include <com/sun/star/xml/crypto/XXMLSecurityContext.hpp>
-#endif
-#include <com/sun/star/xml/crypto/SEInitializer.hpp>
#include <comphelper/xmlsechelper.hxx>
#include <com/sun/star/security/DocumentDigitalSignatures.hpp>
diff --git a/cui/source/options/opthtml.hxx b/cui/source/options/opthtml.hxx
index 2f389a7af571..496b567a0b91 100644
--- a/cui/source/options/opthtml.hxx
+++ b/cui/source/options/opthtml.hxx
@@ -19,7 +19,6 @@
#pragma once
#include <sfx2/tabdlg.hxx>
-#include <svx/txencbox.hxx>
class OfaHtmlTabPage : public SfxTabPage
{
diff --git a/cui/source/options/optlanguagetool.cxx
b/cui/source/options/optlanguagetool.cxx
index b7f6327324dc..db4e89092386 100644
--- a/cui/source/options/optlanguagetool.cxx
+++ b/cui/source/options/optlanguagetool.cxx
@@ -19,7 +19,6 @@
#include "optlanguagetool.hxx"
#include <officecfg/Office/Linguistic.hxx>
-#include <sal/log.hxx>
#include <dialmgr.hxx>
#include <strings.hrc>
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index d08bee0fde3d..ee525f381267 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -36,6 +36,7 @@
#include <comphelper/dispatchcommand.hxx>
#include <comphelper/lok.hxx>
#include <comphelper/processfactory.hxx>
+#include <com/sun/star/configuration/ReadWriteAccess.hpp>
#include <com/sun/star/linguistic2/LinguServiceManager.hpp>
#include <com/sun/star/linguistic2/XSearchableDictionaryList.hpp>
#include <com/sun/star/linguistic2/XSpellChecker.hpp>
@@ -47,13 +48,11 @@
#include <com/sun/star/linguistic2/XLinguProperties.hpp>
#include <com/sun/star/lang/XServiceDisplayName.hpp>
#include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <unotools/extendedsecurityoptions.hxx>
#include <svl/eitem.hxx>
#include <vcl/svapp.hxx>
#include <sal/log.hxx>
-#include <osl/diagnose.h>
#include <svx/svxdlg.hxx>
#include <editeng/optitems.hxx>
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 6f1276d45940..ceaca3d2cd23 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -19,7 +19,6 @@
#include <svx/svxdlg.hxx>
#include <sfx2/filedlghelper.hxx>
-#include <sfx2/app.hxx>
#include <tools/urlobj.hxx>
#include <unotools/defaultoptions.hxx>
#include <unotools/pathoptions.hxx>
diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx
index fbc32dcf7b94..a2e0839b0416 100644
--- a/cui/source/options/optupdt.cxx
+++ b/cui/source/options/optupdt.cxx
@@ -18,15 +18,17 @@
*/
#include <config_features.h>
+#if HAVE_FEATURE_UPDATE_MAR
#include <config_folders.h>
#include <rtl/bootstrap.hxx>
+#include <comphelper/DirectoryHelper.hxx>
+#endif
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <svl/numformat.hxx>
#include <svl/zforlist.hxx>
#include "optupdt.hxx"
#include <comphelper/processfactory.hxx>
-#include <comphelper/DirectoryHelper.hxx>
#include <com/sun/star/configuration/theDefaultProvider.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp>
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index f959109783d0..2635f2247c20 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -23,7 +23,6 @@
#include <config_features.h>
#include <config_feature_opencl.h>
#include <config_feature_desktop.h>
-#include <config_gpgme.h>
#include <officecfg/Office/Common.hxx>
#include <officecfg/Office/Writer.hxx>
@@ -109,7 +108,6 @@
#include <utility>
#include <vcl/help.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/weldutils.hxx>
#include <vcl/window.hxx>
#include <sal/log.hxx>
diff --git a/cui/source/options/treeopthelper.cxx
b/cui/source/options/treeopthelper.cxx
index 5b15603929bb..a8dd2102f505 100644
--- a/cui/source/options/treeopthelper.cxx
+++ b/cui/source/options/treeopthelper.cxx
@@ -17,11 +17,9 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <fstream>
#include <treeopt.hxx>
-#include <treeopt.hrc>
-#include <helpids.h>
+#include <sfx2/pageids.hxx>
#include <svx/dialogs.hrc>
#include <svx/svxids.hrc>
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index c5c271fdec0e..563fde2dc06a 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -50,7 +50,7 @@
#include <svx/cuicharmap.hxx>
#include <strings.hrc>
#include <dialmgr.hxx>
-#include <svx/svxids.hrc>
+#include <sfx2/sfxsids.hrc>
#include <vcl/tabs.hrc>
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 7e7d21c4819d..bfd8532f153d 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -41,7 +41,6 @@
#include <svl/intitem.hxx>
#include <svl/ilstitem.hxx>
#include <svl/int64item.hxx>
-#include <sal/macros.h>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <comphelper/lok.hxx>
#include <svtools/unitconv.hxx>
diff --git a/cui/source/tabpages/macroass.cxx b/cui/source/tabpages/macroass.cxx
index 5ef2cf81021e..f327bd8a9240 100644
--- a/cui/source/tabpages/macroass.cxx
+++ b/cui/source/tabpages/macroass.cxx
@@ -23,8 +23,8 @@
#include <osl/diagnose.h>
#include <comphelper/string.hxx>
#include <comphelper/processfactory.hxx>
+#include <sfx2/sfxsids.hrc>
#include <svl/macitem.hxx>
-#include <svx/svxids.hrc>
#include <tools/debug.hxx>
#include <vcl/idle.hxx>
#include <cfgutil.hxx>
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index fb07ffa14652..7494bb858bdd 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -23,7 +23,6 @@
#include <dialmgr.hxx>
#include <tools/mapunit.hxx>
#include <i18nlangtag/languagetag.hxx>
-#include <i18nlangtag/mslangid.hxx>
#include <editeng/numitem.hxx>
#include <svl/eitem.hxx>
#include <vcl/svapp.hxx>
@@ -43,8 +42,6 @@
#include <unotools/pathoptions.hxx>
#include <svtools/ctrltool.hxx>
#include <svtools/unitconv.hxx>
-#include <svtools/colorcfg.hxx>
-#include <com/sun/star/style/NumberingType.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/container/XIndexAccess.hpp>
#include <com/sun/star/text/XDefaultNumberingProvider.hpp>
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 961fff4c4077..77e34c8a3da8 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -28,7 +28,6 @@
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <sfx2/htmlmode.hxx>
-#include <sal/macros.h>
#include <osl/diagnose.h>
#include <svx/strings.hrc>
diff --git a/cui/source/tabpages/swpossizetabpage.cxx
b/cui/source/tabpages/swpossizetabpage.cxx
index a88640beed12..baf69df3257b 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -30,7 +30,6 @@
#include <svx/svdpagv.hxx>
#include <svx/swframeposstrings.hxx>
#include <svx/rectenum.hxx>
-#include <sal/macros.h>
#include <com/sun/star/text/HoriOrientation.hpp>
#include <com/sun/star/text/VertOrientation.hpp>
#include <com/sun/star/text/RelOrientation.hpp>
diff --git a/cui/source/tabpages/tabarea.cxx b/cui/source/tabpages/tabarea.cxx
index 67fb1d00e42d..ceda68ca59da 100644
--- a/cui/source/tabpages/tabarea.cxx
+++ b/cui/source/tabpages/tabarea.cxx
@@ -18,7 +18,6 @@
*/
#include <sfx2/objsh.hxx>
-#include <unotools/pathoptions.hxx>
#include <svx/svxids.hrc>
#include <svx/xtable.hxx>
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 271f6b8e36e7..cf34950444df 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -20,7 +20,6 @@
#include <svx/svxids.hrc>
#include <svx/xfillit0.hxx>
#include <svx/xfilluseslidebackgrounditem.hxx>
-#include <svx/xflbckit.hxx>
#include <svx/drawitem.hxx>
#include <svx/xflclit.hxx>
#include <svx/xflgrit.hxx>
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 40522652fa32..3ffec08f41d1 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -37,7 +37,6 @@
#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
#include <svx/svxids.hrc>
-#include <basegfx/utils/gradienttools.hxx>
#include <sal/log.hxx>
using namespace com::sun::star;
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 62edad474f97..bd7a0d09c7dc 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -43,7 +43,6 @@
#include <dialmgr.hxx>
#include <basegfx/range/b2drange.hxx>
#include <basegfx/polygon/b2dpolypolygontools.hxx>
-#include <basegfx/matrix/b2dhommatrixtools.hxx>
#include <svx/strings.hrc>
#include <osl/diagnose.h>
