sfx2/IwyuFilter_sfx2.yaml | 27 ++++++++++++++++++
sfx2/source/dialog/alienwarn.cxx | 3 --
sfx2/source/dialog/backingcomp.cxx | 18 ------------
sfx2/source/dialog/backingwindow.cxx | 10 ------
sfx2/source/dialog/basedlgs.cxx | 10 ------
sfx2/source/dialog/bluthsnd.cxx | 3 --
sfx2/source/dialog/charmappopup.cxx | 1
sfx2/source/dialog/dialoghelper.cxx | 5 ---
sfx2/source/dialog/dinfdlg.cxx | 10 ------
sfx2/source/dialog/dockwin.cxx | 7 ----
sfx2/source/dialog/filedlghelper.cxx | 17 -----------
sfx2/source/dialog/filtergrouping.cxx | 3 --
sfx2/source/dialog/infobar.cxx | 2 -
sfx2/source/dialog/inputdlg.cxx | 1
sfx2/source/dialog/mailmodel.cxx | 16 -----------
sfx2/source/dialog/mgetempl.cxx | 3 --
sfx2/source/dialog/navigat.cxx | 1
sfx2/source/dialog/partwnd.cxx | 10 ------
sfx2/source/dialog/passwd.cxx | 1
sfx2/source/dialog/printopt.cxx | 2 -
sfx2/source/dialog/recfloat.cxx | 2 -
sfx2/source/dialog/sfxdlg.cxx | 2 -
sfx2/source/dialog/splitwin.cxx | 5 ---
sfx2/source/dialog/srchdlg.cxx | 1
sfx2/source/dialog/styledlg.cxx | 1
sfx2/source/dialog/tabdlg.cxx | 11 -------
sfx2/source/dialog/templdlg.cxx | 9 ------
sfx2/source/dialog/tplcitem.cxx | 1
sfx2/source/dialog/versdlg.cxx | 2 -
sfx2/source/doc/DocumentMetadataAccess.cxx | 3 --
sfx2/source/doc/DocumentSigner.cxx | 4 --
sfx2/source/doc/Metadatable.cxx | 2 -
sfx2/source/doc/SfxDocumentMetaData.cxx | 4 --
sfx2/source/doc/SfxRedactionHelper.cxx | 4 --
sfx2/source/doc/autoredactdialog.cxx | 12 --------
sfx2/source/doc/docfac.cxx | 8 -----
sfx2/source/doc/docfile.cxx | 22 ---------------
sfx2/source/doc/docfilt.cxx | 4 --
sfx2/source/doc/docinsert.cxx | 1
sfx2/source/doc/docmacromode.cxx | 2 -
sfx2/source/doc/doctempl.cxx | 21 --------------
sfx2/source/doc/doctemplates.cxx | 5 ---
sfx2/source/doc/doctemplateslocal.cxx | 3 --
sfx2/source/doc/docundomanager.cxx | 2 -
sfx2/source/doc/frmdescr.cxx | 2 -
sfx2/source/doc/graphhelp.cxx | 9 ------
sfx2/source/doc/guisaveas.cxx | 23 ---------------
sfx2/source/doc/iframe.cxx | 3 --
sfx2/source/doc/new.cxx | 2 -
sfx2/source/doc/objcont.cxx | 23 ---------------
sfx2/source/doc/objembed.cxx | 9 ++----
sfx2/source/doc/objmisc.cxx | 23 +--------------
sfx2/source/doc/objserv.cxx | 32 ++--------------------
sfx2/source/doc/objstor.cxx | 24 ----------------
sfx2/source/doc/objxtor.cxx | 26 -----------------
sfx2/source/doc/oleprops.cxx | 2 -
sfx2/source/doc/ownsubfilterservice.cxx | 1
sfx2/source/doc/printhelper.cxx | 8 -----
sfx2/source/doc/sfxbasemodel.cxx | 15 ----------
sfx2/source/doc/templatedlg.cxx | 3 --
sfx2/source/doc/zoomitem.cxx | 3 --
sfx2/source/explorer/nochaos.cxx | 1
sfx2/source/inet/inettbc.cxx | 10 ------
sfx2/source/notebookbar/ContextVBox.cxx | 1
sfx2/source/notebookbar/DropdownBox.cxx | 2 -
sfx2/source/notebookbar/NotebookbarTabControl.cxx | 3 --
sfx2/source/notebookbar/PriorityHBox.cxx | 2 -
sfx2/source/notebookbar/PriorityMergedHBox.cxx | 3 --
sfx2/source/notebookbar/SfxNotebookBar.cxx | 3 --
sfx2/source/notify/eventsupplier.cxx | 4 --
sfx2/source/notify/globalevents.cxx | 3 --
sfx2/source/notify/hintpost.cxx | 3 --
sfx2/source/notify/openurlhint.cxx | 1
73 files changed, 46 insertions(+), 479 deletions(-)
New commits:
commit f7804fc28bc65de4938d67d6f8a19f1eacab3341
Author: Gabor Kelemen <kelemen.gab...@nisz.hu>
AuthorDate: Fri Jan 3 00:41:00 2020 +0100
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Mon Jan 13 11:50:28 2020 +0100
tdf#42949 Fix IWYU warnings in sfx2/source/[d-n]*/*cxx
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I9e5e767f916d317761ac9a19124c19b822226ff5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86152
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/sfx2/IwyuFilter_sfx2.yaml b/sfx2/IwyuFilter_sfx2.yaml
index fb36b9001a3c..0c07246d9a86 100644
--- a/sfx2/IwyuFilter_sfx2.yaml
+++ b/sfx2/IwyuFilter_sfx2.yaml
@@ -68,3 +68,30 @@ blacklist:
sfx2/source/control/sfxstatuslistener.cxx:
# Actually used
- com/sun/star/frame/XDispatchProvider.hpp
+ sfx2/source/doc/docinf.cxx:
+ # Actually used
+ - com/sun/star/document/XDocumentProperties.hpp
+ sfx2/source/doc/DocumentMetadataAccess.cxx:
+ # Actually used
+ - com/sun/star/embed/XStorage.hpp
+ sfx2/source/doc/graphhelp.cxx:
+ # Needed on WIN32
+ - o3tl/char16_t2wchar_t.hxx
+ sfx2/source/doc/guisaveas.cxx:
+ # Needed on WIN32
+ - o3tl/char16_t2wchar_t.hxx
+ sfx2/source/doc/objstor.cxx:
+ # Actually used
+ - com/sun/star/frame/XModel.hpp
+ sfx2/source/doc/syspath.cxx:
+ # Needed on WIN32
+ - syspathw32.hxx
+ sfx2/source/doc/syspathw32.cxx:
+ # Needed on WIN32
+ - o3tl/char16_t2wchar_t.hxx
+ sfx2/source/doc/printhelper.cxx:
+ # Don't propose hxx -> h change in URE libs
+ - cppuhelper/interfacecontainer.hxx
+ sfx2/source/doc/sfxbasemodel.cxx:
+ # Don't propose hxx -> h change in URE libs
+ - cppuhelper/interfacecontainer.hxx
diff --git a/sfx2/source/dialog/alienwarn.cxx b/sfx2/source/dialog/alienwarn.cxx
index 2b5328486e92..bce34556bcda 100644
--- a/sfx2/source/dialog/alienwarn.cxx
+++ b/sfx2/source/dialog/alienwarn.cxx
@@ -18,10 +18,7 @@
*/
-#include <sal/macros.h>
-#include <sfx2/sfxuno.hxx>
#include <unotools/saveopt.hxx>
-#include <vcl/svapp.hxx>
#include <alienwarn.hxx>
SfxAlienWarningDialog::SfxAlienWarningDialog(weld::Window* pParent, const
OUString& _rFormatName,
diff --git a/sfx2/source/dialog/backingcomp.cxx
b/sfx2/source/dialog/backingcomp.cxx
index eb29da210fcc..e1878f30bda6 100644
--- a/sfx2/source/dialog/backingcomp.cxx
+++ b/sfx2/source/dialog/backingcomp.cxx
@@ -19,18 +19,10 @@
#include "backingwindow.hxx"
-#include <helpids.h>
-
-#include <com/sun/star/beans/NamedValue.hpp>
-#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/awt/Toolkit.hpp>
-#include <com/sun/star/awt/XDataTransferProviderAccess.hpp>
#include <com/sun/star/awt/KeyEvent.hpp>
-#include <com/sun/star/awt/KeyModifier.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp>
-#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/awt/XWindow.hpp>
@@ -47,19 +39,9 @@
#include <cppuhelper/typeprovider.hxx>
#include <cppuhelper/weak.hxx>
#include <toolkit/helper/vclunohelper.hxx>
-#include <vcl/keycod.hxx>
#include <vcl/wrkwin.hxx>
#include <vcl/svapp.hxx>
#include <vcl/syswin.hxx>
-#include <rtl/ref.hxx>
-#include <rtl/ustrbuf.hxx>
-
-#include <svl/solar.hrc>
-#include <svl/urihelper.hxx>
-#include <osl/file.hxx>
-#include <unotools/configmgr.hxx>
-
-#include <unotools/bootstrap.hxx>
#include <sfx2/notebookbar/SfxNotebookBar.hxx>
diff --git a/sfx2/source/dialog/backingwindow.cxx
b/sfx2/source/dialog/backingwindow.cxx
index 91b333abc356..10e38a0d2b21 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -18,33 +18,26 @@
*/
#include "backingwindow.hxx"
-#include <sfx2/inputdlg.hxx>
-#include <sal/log.hxx>
#include <vcl/accel.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
+#include <vcl/syswin.hxx>
#include <vcl/virdev.hxx>
#include <vcl/fixed.hxx>
-#include <unotools/dynamicmenuoptions.hxx>
#include <unotools/historyoptions.hxx>
#include <unotools/moduleoptions.hxx>
#include <svtools/openfiledroptargetlistener.hxx>
#include <svtools/colorcfg.hxx>
#include <svtools/langhelp.hxx>
-#include <sfx2/filedlghelper.hxx>
-#include <sfx2/templatecontaineritem.hxx>
#include <sfx2/templateviewitem.hxx>
-#include <vcl/toolbox.hxx>
#include <vcl/menubtn.hxx>
#include <comphelper/processfactory.hxx>
-#include <comphelper/sequenceashashmap.hxx>
#include <comphelper/propertysequence.hxx>
-#include <toolkit/awt/vclxmenu.hxx>
#include <tools/diagnose_ex.h>
#include <com/sun/star/configuration/theDefaultProvider.hpp>
@@ -58,7 +51,6 @@
#include <com/sun/star/system/SystemShellExecuteFlags.hpp>
#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/task/InteractionHandler.hpp>
-#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <officecfg/Office/Common.hxx>
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 330109b7ce94..4bf16c55927e 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -17,27 +17,17 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <stdlib.h>
-
-#include <comphelper/lok.hxx>
-
-#include <osl/file.hxx>
#include <vcl/help.hxx>
#include <svl/eitem.hxx>
#include <unotools/viewoptions.hxx>
-#include <svtools/controldims.hxx>
#include <vcl/idle.hxx>
#include <sfx2/basedlgs.hxx>
-#include <sfx2/lokhelper.hxx>
-#include <sfx2/viewfrm.hxx>
#include <sfx2/tabdlg.hxx>
-#include <sfx2/app.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/childwin.hxx>
#include <sfx2/viewsh.hxx>
-#include <sfx2/sfxhelp.hxx>
#include <workwin.hxx>
using namespace ::com::sun::star::uno;
diff --git a/sfx2/source/dialog/bluthsnd.cxx b/sfx2/source/dialog/bluthsnd.cxx
index 2dcd87e4fc45..ded98ceb0a1e 100644
--- a/sfx2/source/dialog/bluthsnd.cxx
+++ b/sfx2/source/dialog/bluthsnd.cxx
@@ -7,10 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/XPropertyAccess.hpp>
#include <com/sun/star/frame/XFrame.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <stdio.h>
diff --git a/sfx2/source/dialog/charmappopup.cxx
b/sfx2/source/dialog/charmappopup.cxx
index 5332f2a6231f..bbe3ae77b413 100644
--- a/sfx2/source/dialog/charmappopup.cxx
+++ b/sfx2/source/dialog/charmappopup.cxx
@@ -18,7 +18,6 @@
*/
#include <sfx2/charmappopup.hxx>
#include <sfx2/charmapcontrol.hxx>
-#include <unotools/viewoptions.hxx>
#include <vcl/toolbox.hxx>
SFX_IMPL_TOOLBOX_CONTROL(CharmapPopup, SfxVoidItem);
diff --git a/sfx2/source/dialog/dialoghelper.cxx
b/sfx2/source/dialog/dialoghelper.cxx
index 4c7d63e23e0e..5668e9b2adee 100644
--- a/sfx2/source/dialog/dialoghelper.cxx
+++ b/sfx2/source/dialog/dialoghelper.cxx
@@ -10,10 +10,7 @@
#include <unotools/localedatawrapper.hxx>
#include <sfx2/dialoghelper.hxx>
#include <tools/datetime.hxx>
-#include <vcl/builder.hxx>
-#include <vcl/layout.hxx>
-#include <vcl/settings.hxx>
-#include <vector>
+#include <vcl/outdev.hxx>
Size getParagraphPreviewOptimalSize(const OutputDevice& rReference)
{
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index fb14c106db64..bb377b4f0ac0 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -18,11 +18,9 @@
*/
#include <svl/eitem.hxx>
-#include <svl/urihelper.hxx>
#include <tools/datetime.hxx>
#include <tools/debug.hxx>
#include <tools/urlobj.hxx>
-#include <vcl/mnemonic.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <unotools/datetime.hxx>
@@ -31,9 +29,7 @@
#include <comphelper/processfactory.hxx>
#include <comphelper/xmlsechelper.hxx>
#include <unotools/useroptions.hxx>
-#include <svtools/controldims.hxx>
#include <svtools/imagemgr.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <sal/log.hxx>
#include <osl/diagnose.h>
@@ -45,7 +41,6 @@
#include <com/sun/star/security/DocumentDigitalSignatures.hpp>
#include <unotools/syslocale.hxx>
#include <rtl/math.hxx>
-#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/XPropertyContainer.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
@@ -62,9 +57,6 @@
#include <sfx2/securitypage.hxx>
#include <sfx2/sfxresid.hxx>
#include <sfx2/frame.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/request.hxx>
-#include <sfx2/passwd.hxx>
#include <sfx2/filedlghelper.hxx>
#include <sfx2/dinfdlg.hxx>
#include <sfx2/sfxsids.hrc>
@@ -76,8 +68,6 @@
#include <dinfdlg.hrc>
#include <sfx2/strings.hrc>
#include <strings.hxx>
-#include <bitmaps.hlst>
-#include <vcl/help.hxx>
#include <tools/diagnose_ex.h>
#include <algorithm>
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index 5f23221a0020..f0661a95157e 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -18,8 +18,8 @@
*/
#include <svl/eitem.hxx>
+#include <svl/solar.hrc>
#include <vcl/event.hxx>
-#include <vcl/decoview.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
@@ -36,16 +36,11 @@
#include <sfx2/bindings.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/dispatch.hxx>
-#include <sfx2/sfxsids.hrc>
#include <workwin.hxx>
#include <splitwin.hxx>
#include <sfx2/viewsh.hxx>
-#include <sfx2/sfxhelp.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/msgpool.hxx>
#include <com/sun/star/beans/UnknownPropertyException.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/lang/XSingleComponentFactory.hpp>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
diff --git a/sfx2/source/dialog/filedlghelper.cxx
b/sfx2/source/dialog/filedlghelper.cxx
index f4bb29d89755..4561ff07a8f9 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -29,23 +29,19 @@
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <com/sun/star/ui/dialogs/XControlInformation.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
-#include <com/sun/star/ui/dialogs/XFilePickerNotifier.hpp>
#include <com/sun/star/ui/dialogs/XFilePreview.hpp>
#include <com/sun/star/ui/dialogs/XFilterManager.hpp>
-#include <com/sun/star/ui/dialogs/XFilterGroupManager.hpp>
#include <com/sun/star/ui/dialogs/XFilePicker3.hpp>
#include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/container/XEnumeration.hpp>
#include <com/sun/star/container/XContainerQuery.hpp>
#include <com/sun/star/task/InteractionHandler.hpp>
#include <com/sun/star/task/XInteractionRequest.hpp>
-#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp>
#include <com/sun/star/util/RevisionTag.hpp>
#include <comphelper/fileurl.hxx>
#include <comphelper/processfactory.hxx>
@@ -59,45 +55,32 @@
#include <unotools/ucbhelper.hxx>
#include <osl/file.hxx>
#include <osl/security.hxx>
-#include <osl/thread.hxx>
-#include <vcl/cvtgrf.hxx>
#include <vcl/mnemonic.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/window.hxx>
#include <unotools/pathoptions.hxx>
#include <unotools/saveopt.hxx>
#include <unotools/securityoptions.hxx>
#include <svl/itemset.hxx>
#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
-#include <svl/stritem.hxx>
#include <vcl/dibtools.hxx>
#include <vcl/graphicfilter.hxx>
#include <unotools/viewoptions.hxx>
-#include <unotools/moduleoptions.hxx>
#include <svtools/helpids.h>
#include <comphelper/docpasswordrequest.hxx>
#include <comphelper/docpasswordhelper.hxx>
#include <ucbhelper/content.hxx>
-#include <ucbhelper/commandenvironment.hxx>
#include <comphelper/storagehelper.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <sfx2/app.hxx>
#include <sfx2/frame.hxx>
#include <sfx2/docfile.hxx>
-#include <sfx2/docfac.hxx>
#include <sfx2/docfilt.hxx>
#include <sfx2/objsh.hxx>
-#include <openflag.hxx>
-#include <sfx2/passwd.hxx>
#include <sfx2/sfxresid.hxx>
#include <sfx2/sfxsids.hrc>
#include "filtergrouping.hxx"
-#include <sfx2/request.hxx>
#include "filedlgimpl.hxx"
-#include <helpids.h>
#include <sfx2/strings.hrc>
-#include <rtl/strbuf.hxx>
#include <sal/log.hxx>
#include <comphelper/sequence.hxx>
#include <tools/diagnose_ex.h>
diff --git a/sfx2/source/dialog/filtergrouping.cxx
b/sfx2/source/dialog/filtergrouping.cxx
index ea77aa764317..b68a624cdb3d 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -21,11 +21,8 @@
#include <sfx2/fcontnr.hxx>
#include <sfx2/filedlghelper.hxx>
#include <sfx2/strings.hrc>
-#include <sfx2/docfac.hxx>
#include <sfx2/docfilt.hxx>
#include <sfx2/sfxresid.hxx>
-#include <osl/thread.h>
-#include <rtl/strbuf.hxx>
#include <sal/log.hxx>
#include <com/sun/star/ui/dialogs/XFilterGroupManager.hpp>
#include <com/sun/star/beans/StringPair.hpp>
diff --git a/sfx2/source/dialog/infobar.cxx b/sfx2/source/dialog/infobar.cxx
index 37169c75fa40..b3a9611e92f4 100644
--- a/sfx2/source/dialog/infobar.cxx
+++ b/sfx2/source/dialog/infobar.cxx
@@ -17,10 +17,8 @@
#include <sfx2/dispatch.hxx>
#include <sfx2/infobar.hxx>
#include <sfx2/objface.hxx>
-#include <sfx2/objsh.hxx>
#include <sfx2/sfxsids.hrc>
#include <sfx2/viewfrm.hxx>
-#include <sfx2/viewsh.hxx>
#include <vcl/decoview.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
diff --git a/sfx2/source/dialog/inputdlg.cxx b/sfx2/source/dialog/inputdlg.cxx
index 7919e9ca6faf..57b620d45676 100644
--- a/sfx2/source/dialog/inputdlg.cxx
+++ b/sfx2/source/dialog/inputdlg.cxx
@@ -8,7 +8,6 @@
*/
#include <sfx2/inputdlg.hxx>
-#include <vcl/svapp.hxx>
InputDialog::InputDialog(weld::Widget* pParent, const OUString &rLabelText)
: GenericDialogController(pParent, "sfx/ui/inputdialog.ui", "InputDialog")
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index c208cf21153a..5aad8f3698a3 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -19,12 +19,9 @@
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/XPropertyAccess.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XContainerQuery.hpp>
#include <com/sun/star/document/XExporter.hpp>
#include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/embed/XTransactedObject.hpp>
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/XStatusListener.hpp>
@@ -34,42 +31,29 @@
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/io/IOException.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/security/CertificateValidity.hpp>
-#include <com/sun/star/security/DocumentSignatureInformation.hpp>
-#include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
#include <com/sun/star/system/SimpleSystemMail.hpp>
#include <com/sun/star/system/SimpleCommandMail.hpp>
#include <com/sun/star/system/XSimpleMailClientSupplier.hpp>
#include <com/sun/star/system/SimpleMailClientFlags.hpp>
#include <com/sun/star/ucb/CommandAbortedException.hpp>
-#include <com/sun/star/ucb/InsertCommandArgument.hpp>
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/util/XModifiable.hpp>
-#include <rtl/textenc.h>
-#include <rtl/uri.h>
-#include <rtl/uri.hxx>
-#include <rtl/ustrbuf.hxx>
#include <vcl/weld.hxx>
#include <osl/diagnose.h>
#include <sfx2/mailmodelapi.hxx>
-#include <sfxtypes.hxx>
#include <sfx2/sfxresid.hxx>
-#include <sfx2/sfxsids.hrc>
#include <sfx2/strings.hrc>
#include <unotools/tempfile.hxx>
-#include <unotools/configitem.hxx>
-#include <ucbhelper/content.hxx>
#include <tools/urlobj.hxx>
#include <unotools/useroptions.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <comphelper/string.hxx>
-#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/svapp.hxx>
#include <cppuhelper/implbase.hxx>
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 9ce69c407de6..978bea6cf437 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -31,13 +31,10 @@
#include <sfx2/app.hxx>
#include <sfx2/mgetempl.hxx>
#include <sfx2/objsh.hxx>
-#include <sfxtypes.hxx>
#include <sfx2/sfxresid.hxx>
#include <sfx2/module.hxx>
#include <sfx2/sfxsids.hrc>
-#include <sfx2/templdlg.hxx>
-#include <templdgi.hxx>
#include <sfx2/strings.hrc>
#include <svl/stritem.hxx>
diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx
index 8f5539250f7e..33456d7bd653 100644
--- a/sfx2/source/dialog/navigat.cxx
+++ b/sfx2/source/dialog/navigat.cxx
@@ -23,7 +23,6 @@
#include <sfx2/navigat.hxx>
#include <sfx2/sfxsids.hrc>
#include <sfx2/strings.hrc>
-#include <sfx2/app.hxx>
#include <sfx2/sfxresid.hxx>
#include <helpids.h>
#include <tools/debug.hxx>
diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx
index f97bc2d30445..367eb49e0d93 100644
--- a/sfx2/source/dialog/partwnd.cxx
+++ b/sfx2/source/dialog/partwnd.cxx
@@ -17,19 +17,10 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <com/sun/star/awt/XWindow.hpp>
-#include <com/sun/star/awt/PosSize.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/frame/Frame.hpp>
#include <com/sun/star/frame/XController.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
-#include <com/sun/star/lang/DisposedException.hpp>
-#include <com/sun/star/task/XStatusIndicator.hpp>
#include <com/sun/star/uno/Reference.h>
-#include <com/sun/star/util/URL.hpp>
-#include <com/sun/star/util/XCloseable.hpp>
-#include <com/sun/star/util/CloseVetoException.hpp>
#include <comphelper/processfactory.hxx>
#include <osl/diagnose.h>
@@ -42,7 +33,6 @@
#include <sfx2/dispatch.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/frame.hxx>
-#include <sfx2/sfxuno.hxx>
// SfxPartChildWnd_Impl
diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx
index 583e82e3c989..3cd59d8cb254 100644
--- a/sfx2/source/dialog/passwd.cxx
+++ b/sfx2/source/dialog/passwd.cxx
@@ -18,7 +18,6 @@
*/
#include <sfx2/passwd.hxx>
-#include <sfxtypes.hxx>
#include <sfx2/sfxresid.hxx>
#include <sfx2/strings.hrc>
#include <vcl/svapp.hxx>
diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx
index e6b37a7cd649..43f88786a292 100644
--- a/sfx2/source/dialog/printopt.cxx
+++ b/sfx2/source/dialog/printopt.cxx
@@ -22,11 +22,9 @@
#include <unotools/printwarningoptions.hxx>
#include <svtools/printoptions.hxx>
#include <svtools/restartdialog.hxx>
-#include <svl/flagitem.hxx>
#include <comphelper/processfactory.hxx>
-#include <sfx2/viewsh.hxx>
#include <sfx2/printopt.hxx>
static sal_uInt16 aDPIArray[] = { 72, 96, 150, 200, 300, 600 };
diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx
index ddefb1f6d572..28073a3130b9 100644
--- a/sfx2/source/dialog/recfloat.cxx
+++ b/sfx2/source/dialog/recfloat.cxx
@@ -22,13 +22,11 @@
#include <svl/eitem.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
-#include <vcl/weldutils.hxx>
#include <vcl/windowstate.hxx>
#include <recfloat.hxx>
#include <sfx2/strings.hrc>
#include <sfx2/sfxresid.hxx>
-#include <sfx2/app.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/sfxsids.hrc>
diff --git a/sfx2/source/dialog/sfxdlg.cxx b/sfx2/source/dialog/sfxdlg.cxx
index df2fd39026cc..734d00fcc446 100644
--- a/sfx2/source/dialog/sfxdlg.cxx
+++ b/sfx2/source/dialog/sfxdlg.cxx
@@ -20,8 +20,6 @@
#include <sfx2/sfxdlg.hxx>
-#include <osl/module.hxx>
-
SfxAbstractDialogFactory* SfxAbstractDialogFactory::Create()
{
return dynamic_cast <SfxAbstractDialogFactory*>(
VclAbstractDialogFactory::Create() );
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index 6e561a398dba..77d175c86215 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -21,8 +21,6 @@
#include <ctime>
#endif
-#include <string>
-
#include <unotools/viewoptions.hxx>
#include <sal/log.hxx>
#include <tools/debug.hxx>
@@ -35,9 +33,6 @@
#include <splitwin.hxx>
#include <workwin.hxx>
#include <sfx2/dockwin.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/msgpool.hxx>
-#include <sfx2/viewfrm.hxx>
#include <memory>
#include <vector>
diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx
index a9e0cfe08809..de5bde88d3c6 100644
--- a/sfx2/source/dialog/srchdlg.cxx
+++ b/sfx2/source/dialog/srchdlg.cxx
@@ -20,7 +20,6 @@
#include <srchdlg.hxx>
#include <comphelper/string.hxx>
-#include <sfx2/sfxuno.hxx>
#include <tools/debug.hxx>
#include <unotools/viewoptions.hxx>
diff --git a/sfx2/source/dialog/styledlg.cxx b/sfx2/source/dialog/styledlg.cxx
index f4b5acd01601..700f44e5e3ec 100644
--- a/sfx2/source/dialog/styledlg.cxx
+++ b/sfx2/source/dialog/styledlg.cxx
@@ -23,7 +23,6 @@
#include <sfx2/styledlg.hxx>
#include <sfx2/mgetempl.hxx>
#include <sfx2/sfxresid.hxx>
-#include <sfx2/sfxuno.hxx>
#include <sfx2/strings.hrc>
diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx
index e25c30baea5b..f21c4e50874b 100644
--- a/sfx2/source/dialog/tabdlg.cxx
+++ b/sfx2/source/dialog/tabdlg.cxx
@@ -18,26 +18,17 @@
*/
-#include <limits.h>
#include <stdlib.h>
#include <algorithm>
-#include <appdata.hxx>
-#include <sfxtypes.hxx>
#include <sfx2/tabdlg.hxx>
-#include <sfx2/viewfrm.hxx>
#include <sfx2/app.hxx>
#include <sfx2/sfxresid.hxx>
-#include <sfx2/sfxhelp.hxx>
-#include <sfx2/ctrlitem.hxx>
-#include <sfx2/bindings.hxx>
#include <sfx2/sfxdlg.hxx>
-#include <sfx2/viewsh.hxx>
#include <unotools/viewoptions.hxx>
-#include <vcl/IDialogRenderable.hxx>
#include <vcl/virdev.hxx>
#include <sal/log.hxx>
-#include <osl/diagnose.h>
+#include <tools/debug.hxx>
#include <comphelper/lok.hxx>
#include <sfx2/strings.hrc>
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index c8fda286ba17..25e9f0ffb918 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -21,6 +21,7 @@
#include <vcl/commandinfoprovider.hxx>
#include <vcl/event.hxx>
+#include <vcl/help.hxx>
#include <vcl/menu.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
@@ -31,8 +32,6 @@
#include <comphelper/sequenceashashmap.hxx>
#include <unotools/intlwrapper.hxx>
#include <unotools/collatorwrapper.hxx>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/frame/ModuleManager.hpp>
#include <com/sun/star/frame/UnknownModuleException.hpp>
@@ -40,14 +39,12 @@
#include <sal/log.hxx>
#include <osl/diagnose.h>
-#include <sfx2/sfxhelp.hxx>
#include <sfx2/app.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/templdlg.hxx>
#include <templdgi.hxx>
#include <tplcitem.hxx>
-#include <sfxtypes.hxx>
#include <sfx2/styfitem.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/viewsh.hxx>
@@ -57,14 +54,10 @@
#include <sfx2/sfxsids.hrc>
#include <sfx2/strings.hrc>
-#include <arrdecl.hxx>
-#include <sfx2/docfilt.hxx>
#include <sfx2/docfac.hxx>
-#include <sfx2/doctempl.hxx>
#include <sfx2/module.hxx>
#include <helpids.h>
#include <bitmaps.hlst>
-#include <appdata.hxx>
#include <sfx2/viewfrm.hxx>
#include <vcl/svlbitm.hxx>
diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx
index a797b6832831..fb4641914b58 100644
--- a/sfx2/source/dialog/tplcitem.cxx
+++ b/sfx2/source/dialog/tplcitem.cxx
@@ -21,7 +21,6 @@
#include <vcl/svapp.hxx>
#include <osl/diagnose.h>
-#include <sfx2/templdlg.hxx>
#include <sfx2/bindings.hxx>
#include <sfx2/tplpitem.hxx>
#include <sfx2/sfxsids.hrc>
diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx
index 1901ce9b2c29..900bdb50dd4b 100644
--- a/sfx2/source/dialog/versdlg.cxx
+++ b/sfx2/source/dialog/versdlg.cxx
@@ -24,7 +24,6 @@
#include <com/sun/star/beans/NamedValue.hpp>
#include <unotools/localedatawrapper.hxx>
-#include <svl/eitem.hxx>
#include <svl/intitem.hxx>
#include <svl/stritem.hxx>
#include <svl/itemset.hxx>
@@ -43,7 +42,6 @@
#include <sfx2/objsh.hxx>
#include <sfx2/sfxsids.hrc>
#include <sfx2/dispatch.hxx>
-#include <sfx2/request.hxx>
#include <sfx2/sfxuno.hxx>
#include <memory>
diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx
b/sfx2/source/doc/DocumentMetadataAccess.cxx
index 60862a0e887f..b1dc7f64d110 100644
--- a/sfx2/source/doc/DocumentMetadataAccess.cxx
+++ b/sfx2/source/doc/DocumentMetadataAccess.cxx
@@ -33,7 +33,6 @@
#include <com/sun/star/rdf/RepositoryException.hpp>
#include <com/sun/star/rdf/URIs.hpp>
#include <com/sun/star/rdf/Statement.hpp>
-#include <com/sun/star/rdf/Literal.hpp>
#include <com/sun/star/rdf/URI.hpp>
#include <com/sun/star/rdf/Repository.hpp>
@@ -57,9 +56,7 @@
#include <vector>
#include <set>
-#include <map>
-#include <unotools/ucbhelper.hxx>
#include <com/sun/star/uri/XUriReference.hpp>
#include <com/sun/star/uri/UriReferenceFactory.hpp>
diff --git a/sfx2/source/doc/DocumentSigner.cxx
b/sfx2/source/doc/DocumentSigner.cxx
index 519a66a40089..0106a64777c6 100644
--- a/sfx2/source/doc/DocumentSigner.cxx
+++ b/sfx2/source/doc/DocumentSigner.cxx
@@ -18,11 +18,9 @@
#include <comphelper/processfactory.hxx>
#include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/embed/StorageFormats.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp>
-#include <com/sun/star/security/DocumentSignatureInformation.hpp>
#include <com/sun/star/security/DocumentDigitalSignatures.hpp>
-#include <com/sun/star/io/WrongFormatException.hpp>
+#include <com/sun/star/io/IOException.hpp>
#include <com/sun/star/io/XStream.hpp>
using namespace css;
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index 4062fffba1b4..6eecf322ba43 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -20,7 +20,6 @@
#include <sal/config.h>
#include <sal/log.hxx>
-#include <rtl/ustrbuf.hxx>
#include <osl/diagnose.h>
#include <sfx2/Metadatable.hxx>
#include <sfx2/XmlIdRegistry.hxx>
@@ -30,7 +29,6 @@
#include <comphelper/random.hxx>
#include <algorithm>
-#include <list>
#include <memory>
#include <unordered_map>
#if OSL_DEBUG_LEVEL > 0
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx
b/sfx2/source/doc/SfxDocumentMetaData.cxx
index 0eaa44115f07..f995be2c56ee 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -42,8 +42,6 @@
#include <com/sun/star/embed/XTransactedObject.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/io/WrongFormatException.hpp>
-#include <com/sun/star/io/XActiveDataControl.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
#include <com/sun/star/io/XStream.hpp>
#include <com/sun/star/document/XImporter.hpp>
#include <com/sun/star/document/XExporter.hpp>
@@ -55,7 +53,6 @@
#include <com/sun/star/xml/dom/XDocument.hpp>
#include <com/sun/star/xml/dom/XElement.hpp>
#include <com/sun/star/xml/dom/DocumentBuilder.hpp>
-#include <com/sun/star/xml/dom/XSAXDocumentBuilder.hpp>
#include <com/sun/star/xml/dom/NodeType.hpp>
#include <com/sun/star/xml/xpath/XPathAPI.hpp>
#include <com/sun/star/util/Date.hpp>
@@ -64,7 +61,6 @@
#include <com/sun/star/util/DateTimeWithTimezone.hpp>
#include <com/sun/star/util/Duration.hpp>
-#include <rtl/ref.hxx>
#include <rtl/ustrbuf.hxx>
#include <tools/datetime.hxx>
#include <tools/diagnose_ex.h>
diff --git a/sfx2/source/doc/SfxRedactionHelper.cxx
b/sfx2/source/doc/SfxRedactionHelper.cxx
index 575035773cc4..bbcdeac79401 100644
--- a/sfx2/source/doc/SfxRedactionHelper.cxx
+++ b/sfx2/source/doc/SfxRedactionHelper.cxx
@@ -21,7 +21,6 @@
#include <com/sun/star/style/XStyle.hpp>
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
#include <com/sun/star/text/XPageCursor.hpp>
-#include <com/sun/star/text/XTextViewCursor.hpp>
#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
#include <com/sun/star/sheet/XSpreadsheetView.hpp>
@@ -30,8 +29,6 @@
#include <com/sun/star/util/SearchAlgorithms.hpp>
#include <com/sun/star/util/SearchAlgorithms2.hpp>
#include <com/sun/star/util/SearchFlags.hpp>
-#include <com/sun/star/util/SearchResult.hpp>
-#include <unotools/configmgr.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <i18nlangtag/languagetag.hxx>
@@ -54,7 +51,6 @@
#include <sal/log.hxx>
#include <vcl/wmf.hxx>
-#include <vcl/gdimetafiletools.hxx>
#include <vcl/metaact.hxx>
#include <vcl/outdev.hxx>
#include <vcl/vcllayout.hxx>
diff --git a/sfx2/source/doc/autoredactdialog.cxx
b/sfx2/source/doc/autoredactdialog.cxx
index 810952257c37..95780bde8320 100644
--- a/sfx2/source/doc/autoredactdialog.cxx
+++ b/sfx2/source/doc/autoredactdialog.cxx
@@ -9,26 +9,14 @@
#include <autoredactdialog.hxx>
-#include <preview.hxx>
-#include <sfx2/app.hxx>
-#include <sfx2/docfile.hxx>
#include <sfx2/filedlghelper.hxx>
-#include <sfx2/objsh.hxx>
#include <sfx2/sfxresid.hxx>
-#include <sfx2/sfxsids.hrc>
#include <sfx2/strings.hrc>
#include <osl/file.hxx>
#include <sal/log.hxx>
-#include <svl/eitem.hxx>
-#include <svl/itemset.hxx>
-#include <svtools/ehdl.hxx>
-#include <svtools/sfxecode.hxx>
#include <vcl/svapp.hxx>
-#include <vcl/idle.hxx>
#include <vcl/weld.hxx>
-#include <tools/debug.hxx>
-#include <tools/urlobj.hxx>
#include <unotools/viewoptions.hxx>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx
index 07631e90c76e..623b03fceacb 100644
--- a/sfx2/source/doc/docfac.cxx
+++ b/sfx2/source/doc/docfac.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <com/sun/star/registry/MergeConflictException.hpp>
-#include <com/sun/star/registry/XSimpleRegistry.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/ucb/SimpleFileAccess.hpp>
#include <com/sun/star/document/XTypeDetection.hpp>
@@ -27,7 +25,6 @@
#include <com/sun/star/frame/XStorable.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <comphelper/processfactory.hxx>
-#include <unotools/pathoptions.hxx>
#include <unotools/moduleoptions.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <comphelper/configurationhelper.hxx>
@@ -36,20 +33,15 @@
#include <sfx2/docfac.hxx>
#include <sfx2/viewfac.hxx>
#include <sfx2/fcontnr.hxx>
-#include <arrdecl.hxx>
-#include <sfx2/app.hxx>
#include <sfx2/module.hxx>
-#include <sfx2/sfxuno.hxx>
#include "syspath.hxx"
#include <osl/file.hxx>
#include <osl/security.hxx>
-#include <rtl/strbuf.hxx>
#include <sal/log.hxx>
#include <tools/debug.hxx>
#include <tools/globname.hxx>
-#include <assert.h>
#include <memory>
using namespace ::com::sun::star;
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 6d0088cec503..e7a6d8fbb5bd 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -26,7 +26,6 @@
#include <sfx2/docfile.hxx>
#include <sfx2/signaturestate.hxx>
-#include <uno/mapping.hxx>
#include <com/sun/star/task/InteractionHandler.hpp>
#include <com/sun/star/task/XStatusIndicator.hpp>
#include <com/sun/star/uno/Reference.h>
@@ -39,7 +38,6 @@
#include <com/sun/star/document/LockFileIgnoreRequest.hpp>
#include <com/sun/star/document/LockFileCorruptRequest.hpp>
#include <com/sun/star/document/ChangedByOthersRequest.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/embed/UseBackupException.hpp>
@@ -47,33 +45,22 @@
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/ucb/ContentCreationException.hpp>
#include <com/sun/star/ucb/InteractiveIOException.hpp>
-#include <com/sun/star/ucb/UnsupportedDataSinkException.hpp>
#include <com/sun/star/ucb/CommandFailedException.hpp>
#include <com/sun/star/ucb/CommandAbortedException.hpp>
#include <com/sun/star/ucb/InteractiveLockingLockedException.hpp>
#include <com/sun/star/ucb/InteractiveNetworkWriteException.hpp>
#include <com/sun/star/ucb/Lock.hpp>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
-#include <com/sun/star/ucb/XContentIdentifierFactory.hpp>
-#include <com/sun/star/ucb/XContentProvider.hpp>
#include <com/sun/star/ucb/XProgressHandler.hpp>
-#include <com/sun/star/ucb/XCommandInfo.hpp>
#include <com/sun/star/io/XOutputStream.hpp>
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/io/XTruncate.hpp>
-#include <com/sun/star/io/XStreamListener.hpp>
#include <com/sun/star/io/XSeekable.hpp>
-#include <com/sun/star/ucb/XSimpleFileAccess.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/ucb/InsertCommandArgument.hpp>
#include <com/sun/star/ucb/NameClash.hpp>
-#include <com/sun/star/ucb/TransferInfo.hpp>
-#include <com/sun/star/ucb/OpenCommandArgument2.hpp>
-#include <com/sun/star/ucb/OpenMode.hpp>
#include <com/sun/star/beans/NamedValue.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/security/DocumentSignatureInformation.hpp>
#include <com/sun/star/security/DocumentDigitalSignatures.hpp>
#include <com/sun/star/security/XCertificate.hpp>
#include <tools/urlobj.hxx>
@@ -86,17 +73,13 @@
#include <comphelper/sequence.hxx>
#include <comphelper/simplefileaccessinteraction.hxx>
#include <framework/interaction.hxx>
-#include <unotools/streamhelper.hxx>
-#include <unotools/localedatawrapper.hxx>
#include <utility>
#include <svl/stritem.hxx>
#include <svl/eitem.hxx>
-#include <svl/lckbitem.hxx>
#include <svtools/sfxecode.hxx>
#include <svl/itemset.hxx>
#include <svl/intitem.hxx>
#include <svtools/svparser.hxx>
-#include <cppuhelper/weakref.hxx>
#include <sal/log.hxx>
#include <unotools/streamwrap.hxx>
@@ -115,21 +98,16 @@
#include <unotools/progresshandlerwrap.hxx>
#include <ucbhelper/content.hxx>
#include <ucbhelper/interactionrequest.hxx>
-#include <sot/stg.hxx>
#include <sot/storage.hxx>
#include <unotools/saveopt.hxx>
#include <svl/documentlockfile.hxx>
#include <svl/msodocumentlockfile.hxx>
#include <com/sun/star/document/DocumentRevisionListPersistence.hpp>
-#include <helper.hxx>
-#include <sfx2/request.hxx>
#include <sfx2/app.hxx>
#include <sfx2/frame.hxx>
#include <sfx2/fcontnr.hxx>
#include <sfx2/docfilt.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/docfac.hxx>
#include <sfx2/sfxsids.hrc>
#include <sfx2/sfxuno.hxx>
#include <openflag.hxx>
diff --git a/sfx2/source/doc/docfilt.cxx b/sfx2/source/doc/docfilt.cxx
index 32c56d8f2b9f..953b60a5ec68 100644
--- a/sfx2/source/doc/docfilt.cxx
+++ b/sfx2/source/doc/docfilt.cxx
@@ -21,17 +21,13 @@
#include <ctime>
#endif
-#include <string>
#include <sot/exchange.hxx>
#include <sot/storage.hxx>
#include <comphelper/fileformat.h>
#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
-#include <sfx2/docfac.hxx>
#include <sfx2/docfilt.hxx>
#include <sfx2/fcontnr.hxx>
-#include <sfx2/sfxuno.hxx>
#include <sfx2/objsh.hxx>
using namespace ::com::sun::star;
diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx
index 7b7fa8516e95..4114f61f538e 100644
--- a/sfx2/source/doc/docinsert.cxx
+++ b/sfx2/source/doc/docinsert.cxx
@@ -29,7 +29,6 @@
#include <sfx2/sfxsids.hrc>
#include <com/sun/star/ui/dialogs/ControlActions.hpp>
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
-#include <com/sun/star/ui/dialogs/ListboxControlActions.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx
index 94d0f076d733..bfffdeac3e11 100644
--- a/sfx2/source/doc/docmacromode.cxx
+++ b/sfx2/source/doc/docmacromode.cxx
@@ -26,7 +26,6 @@
#include <com/sun/star/document/MacroExecMode.hpp>
#include <com/sun/star/task/ErrorCodeRequest.hpp>
#include <com/sun/star/task/DocumentMacroConfirmationRequest.hpp>
-#include <com/sun/star/task/InteractionClassification.hpp>
#include <com/sun/star/security/DocumentDigitalSignatures.hpp>
#include <com/sun/star/script/XLibraryContainer.hpp>
#include <com/sun/star/document/XEmbeddedScripts.hpp>
@@ -34,7 +33,6 @@
#include <comphelper/processfactory.hxx>
#include <framework/interaction.hxx>
#include <osl/file.hxx>
-#include <rtl/ref.hxx>
#include <unotools/securityoptions.hxx>
#include <svtools/sfxecode.hxx>
#include <tools/diagnose_ex.h>
diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx
index 24febe4f4aec..f0b8a28e3018 100644
--- a/sfx2/source/doc/doctempl.cxx
+++ b/sfx2/source/doc/doctempl.cxx
@@ -21,23 +21,15 @@
#include <limits.h>
#include <com/sun/star/uno/Any.h>
#include <osl/mutex.hxx>
-#include <osl/thread.hxx>
#include <sal/log.hxx>
-#include <vcl/svapp.hxx>
-#include <vcl/settings.hxx>
-#include <unotools/localedatawrapper.hxx>
#include <unotools/pathoptions.hxx>
#include <tools/urlobj.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
-#include <svtools/ehdl.hxx>
-#include <svtools/sfxecode.hxx>
#include <comphelper/processfactory.hxx>
#include <ucbhelper/content.hxx>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/beans/XPropertyContainer.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/document/XTypeDetection.hpp>
@@ -47,24 +39,17 @@
#include <com/sun/star/frame/DocumentTemplates.hpp>
#include <com/sun/star/frame/XDocumentTemplates.hpp>
#include <com/sun/star/io/IOException.hpp>
-#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/io/XPersist.hpp>
#include <com/sun/star/lang/XLocalizable.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
-#include <com/sun/star/ucb/ContentInfo.hpp>
#include <com/sun/star/ucb/ContentCreationException.hpp>
-#include <com/sun/star/ucb/InsertCommandArgument.hpp>
#include <com/sun/star/ucb/NameClash.hpp>
#include <com/sun/star/ucb/TransferInfo.hpp>
-#include <com/sun/star/ucb/XCommandProcessor.hpp>
#include <com/sun/star/ucb/XContent.hpp>
#include <com/sun/star/ucb/XContentAccess.hpp>
#include <com/sun/star/ucb/AnyCompareFactory.hpp>
-#include <com/sun/star/ucb/XAnyCompare.hpp>
#include <com/sun/star/ucb/NumberedSortingInfo.hpp>
-#include <com/sun/star/embed/ElementModes.hpp>
-#include <com/sun/star/embed/XTransactedObject.hpp>
#include "doctemplateslocal.hxx"
#include <sfxurlrelocator.hxx>
@@ -83,18 +68,12 @@ using namespace ::ucbhelper;
#include <sfx2/doctempl.hxx>
-#include <sfx2/docfac.hxx>
-#include <sfx2/docfile.hxx>
#include <sfx2/objsh.hxx>
-#include <sfxtypes.hxx>
-#include <sfx2/app.hxx>
#include <sfx2/sfxresid.hxx>
#include <sfx2/strings.hrc>
#include <strings.hxx>
-#include <sfx2/fcontnr.hxx>
#include <svtools/templatefoldercache.hxx>
-#include <unotools/ucbhelper.hxx>
#include <memory>
#include <vector>
diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx
index 167cb6f1a19f..aba17d40360b 100644
--- a/sfx2/source/doc/doctemplates.cxx
+++ b/sfx2/source/doc/doctemplates.cxx
@@ -21,7 +21,6 @@
#include <tools/diagnose_ex.h>
#include <tools/urlobj.hxx>
#include <rtl/ustring.hxx>
-#include <rtl/ustrbuf.hxx>
#include <sal/log.hxx>
#include <vcl/svapp.hxx>
#include <vcl/wrkwin.hxx>
@@ -43,7 +42,6 @@
#include <com/sun/star/util/theMacroExpander.hpp>
#include <com/sun/star/util/theOfficeInstallationDirectories.hpp>
#include <com/sun/star/configuration/theDefaultProvider.hpp>
-#include <com/sun/star/container/XContainerQuery.hpp>
#include <com/sun/star/document/XTypeDetection.hpp>
#include <com/sun/star/document/DocumentProperties.hpp>
#include <com/sun/star/io/TempFile.hpp>
@@ -52,7 +50,6 @@
#include <com/sun/star/ucb/ContentCreationException.hpp>
#include <com/sun/star/ucb/NameClash.hpp>
#include <com/sun/star/ucb/NameClashException.hpp>
-#include <com/sun/star/ucb/TransferInfo.hpp>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <com/sun/star/ucb/XContentAccess.hpp>
#include <com/sun/star/frame/ModuleManager.hpp>
@@ -72,7 +69,6 @@
#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/util/thePathSettings.hpp>
-#include <rtl/ref.hxx>
#include <svtools/templatefoldercache.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/ucbhelper.hxx>
@@ -83,7 +79,6 @@
#include <sfxurlrelocator.hxx>
#include "doctemplateslocal.hxx"
#include <sfx2/docfac.hxx>
-#include <sfx2/docfile.hxx>
#include <sfx2/strings.hrc>
#include <doctempl.hrc>
diff --git a/sfx2/source/doc/doctemplateslocal.cxx
b/sfx2/source/doc/doctemplateslocal.cxx
index 9f03ab68d21a..6243b913ad06 100644
--- a/sfx2/source/doc/doctemplateslocal.cxx
+++ b/sfx2/source/doc/doctemplateslocal.cxx
@@ -19,13 +19,10 @@
#include <com/sun/star/beans/StringPair.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/io/XActiveDataSource.hpp>
#include <com/sun/star/xml/sax/Parser.hpp>
#include <com/sun/star/xml/sax/SAXException.hpp>
#include <com/sun/star/xml/sax/Writer.hpp>
#include <com/sun/star/xml/sax/XDocumentHandler.hpp>
-#include <com/sun/star/lang/IllegalArgumentException.hpp>
#include <comphelper/attributelist.hxx>
diff --git a/sfx2/source/doc/docundomanager.cxx
b/sfx2/source/doc/docundomanager.cxx
index 0d4caadb10c4..e7d8ec80c887 100644
--- a/sfx2/source/doc/docundomanager.cxx
+++ b/sfx2/source/doc/docundomanager.cxx
@@ -32,8 +32,6 @@
#include <framework/undomanagerhelper.hxx>
#include <framework/imutex.hxx>
-#include <stack>
-
namespace sfx2
{
diff --git a/sfx2/source/doc/frmdescr.cxx b/sfx2/source/doc/frmdescr.cxx
index 09fb74c19da8..3df6a34e0ae2 100644
--- a/sfx2/source/doc/frmdescr.cxx
+++ b/sfx2/source/doc/frmdescr.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/stream.hxx>
-#include <vcl/splitwin.hxx>
#include <svl/itemset.hxx>
#include <sfx2/frmdescr.hxx>
diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx
index 4637f5f52ee3..e5abf0c6c6d9 100644
--- a/sfx2/source/doc/graphhelp.cxx
+++ b/sfx2/source/doc/graphhelp.cxx
@@ -24,28 +24,19 @@
#endif
#include <com/sun/star/uno/Exception.hpp>
-#include <com/sun/star/datatransfer/XTransferable.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/graphic/GraphicProvider.hpp>
#include <com/sun/star/graphic/XGraphicProvider.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
-#include <com/sun/star/io/XStream.hpp>
-#include <osl/thread.h>
#include <vcl/gdimtf.hxx>
#include <vcl/graph.hxx>
#include <vcl/cvtgrf.hxx>
-#include <vcl/outdev.hxx>
-#include <vcl/virdev.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/graphicfilter.hxx>
#include <tools/stream.hxx>
-#include <tools/helpers.hxx>
-#include <unotools/tempfile.hxx>
#include <unotools/ucbstreamhelper.hxx>
-#include <unotools/streamwrap.hxx>
#include <comphelper/processfactory.hxx>
#include <o3tl/char16_t2wchar_t.hxx>
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index 8235433d0177..6c06bfaea8b5 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -18,7 +18,6 @@
*/
#include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
-#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
#include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
@@ -34,7 +33,6 @@
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/task/ErrorCodeIOException.hpp>
#include <com/sun/star/task/InteractionHandler.hpp>
-#include <com/sun/star/util/DateTime.hpp>
#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/frame/ModuleManager.hpp>
@@ -43,13 +41,10 @@
#include <com/sun/star/frame/XDispatchProvider.hpp>
#include <com/sun/star/frame/XDispatch.hpp>
#include <com/sun/star/frame/XTitle.hpp>
-#include <com/sun/star/util/XModifyListener.hpp>
#include <com/sun/star/util/XModifiable.hpp>
-#include <com/sun/star/util/XModifyBroadcaster.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/util/XCloneable.hpp>
-#include <com/sun/star/io/IOException.hpp>
#include <guisaveas.hxx>
@@ -57,11 +52,7 @@
#include <unotools/pathoptions.hxx>
#include <svl/itemset.hxx>
#include <svl/eitem.hxx>
-#include <svl/stritem.hxx>
-#include <svl/intitem.hxx>
-#include <unotools/useroptions.hxx>
#include <unotools/saveopt.hxx>
-#include <svtools/miscopt.hxx>
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <tools/urlobj.hxx>
@@ -72,33 +63,19 @@
#include <comphelper/lok.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
-#include <vcl/window.hxx>
-#include <toolkit/awt/vclxwindow.hxx>
#include <o3tl/char16_t2wchar_t.hxx>
#include <sfx2/sfxsids.hrc>
#include <sfx2/strings.hrc>
#include <sfx2/sfxresid.hxx>
-#include <sfx2/docfilt.hxx>
#include <sfx2/filedlghelper.hxx>
#include <sfx2/asyncfunc.hxx>
#include <sfx2/app.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/request.hxx>
#include <sfx2/sfxuno.hxx>
-#include <sfxtypes.hxx>
#include <alienwarn.hxx>
-#include <sfx2/docmacromode.hxx>
-#include <com/sun/star/task/ErrorCodeRequest.hpp>
-#include <rtl/ref.hxx>
-#include <framework/interaction.hxx>
-#include <svtools/sfxecode.hxx>
-
#include <memory>
-#include <com/sun/star/frame/Desktop.hpp>
-
#include <officecfg/Office/Common.hxx>
#include <vcl/FilterConfigItem.hxx>
diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx
index 8b1271545dfb..e896b3843732 100644
--- a/sfx2/source/doc/iframe.cxx
+++ b/sfx2/source/doc/iframe.cxx
@@ -34,13 +34,10 @@
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include <rtl/ref.hxx>
#include <svtools/miscopt.hxx>
-#include <svl/ownlist.hxx>
#include <svl/itemprop.hxx>
#include <sfx2/frmdescr.hxx>
#include <sfx2/sfxdlg.hxx>
-#include <sfx2/sfxsids.hrc>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/window.hxx>
#include <tools/debug.hxx>
diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx
index 4223ce2d012c..ff892863dd0d 100644
--- a/sfx2/source/doc/new.cxx
+++ b/sfx2/source/doc/new.cxx
@@ -21,6 +21,7 @@
#include <sfx2/new.hxx>
#include <vcl/idle.hxx>
#include <vcl/gdimtf.hxx>
+#include <vcl/outdev.hxx>
#include <svl/itemset.hxx>
#include <svl/eitem.hxx>
#include <svtools/sfxecode.hxx>
@@ -35,7 +36,6 @@
#include <sfx2/sfxresid.hxx>
#include <sfx2/docfile.hxx>
#include <preview.hxx>
-#include <sfx2/printer.hxx>
#include <unotools/viewoptions.hxx>
void SfxPreviewWin_Impl::SetObjectShell(SfxObjectShell const * pObj)
diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx
index 4adfe5986c70..fc2fe9b1b726 100644
--- a/sfx2/source/doc/objcont.cxx
+++ b/sfx2/source/doc/objcont.cxx
@@ -23,32 +23,21 @@
#include <com/sun/star/document/DocumentProperties.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
#include <com/sun/star/document/UpdateDocMode.hpp>
-#include <com/sun/star/embed/ElementModes.hpp>
#include <comphelper/fileurl.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <svl/style.hxx>
-#include <svl/stritem.hxx>
#include <svl/intitem.hxx>
-#include <svl/rectitem.hxx>
-#include <svl/eitem.hxx>
-#include <svl/urihelper.hxx>
#include <svl/ctloptions.hxx>
#include <comphelper/processfactory.hxx>
#include <unotools/securityoptions.hxx>
-#include <svtools/sfxecode.hxx>
-#include <svtools/ehdl.hxx>
#include <tools/datetime.hxx>
#include <tools/diagnose_ex.h>
#include <rtl/uri.hxx>
-#include <math.h>
-#include <sal/log.hxx>
-#include <unotools/saveopt.hxx>
#include <unotools/useroptions.hxx>
#include <vcl/virdev.hxx>
-#include <vcl/oldprintadaptor.hxx>
#include <vcl/settings.hxx>
#include <vcl/gdimtf.hxx>
@@ -56,32 +45,20 @@
#include <sfx2/dinfdlg.hxx>
#include <sfx2/sfxresid.hxx>
#include <appdata.hxx>
-#include <sfx2/fcontnr.hxx>
#include <sfx2/docfac.hxx>
#include <sfx2/viewsh.hxx>
#include <sfx2/objsh.hxx>
#include <objshimp.hxx>
-#include <sfx2/evntconf.hxx>
-#include <sfx2/sfxhelp.hxx>
-#include <sfx2/dispatch.hxx>
#include <sfx2/printer.hxx>
-#include <basic/basmgr.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/doctempl.hxx>
#include <sfx2/sfxsids.hrc>
#include <sfx2/strings.hrc>
-#include <sfx2/sfxbasemodel.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/docfilt.hxx>
-#include <sfx2/request.hxx>
-#include <openflag.hxx>
#include <memory>
#include <helpids.h>
-#include <LibreOfficeKit/LibreOfficeKitTypes.h>
-
-#include <typeinfo>
-
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx
index 7d5cdb5cb21c..0436530b7d3b 100644
--- a/sfx2/source/doc/objembed.cxx
+++ b/sfx2/source/doc/objembed.cxx
@@ -18,11 +18,7 @@
*/
#include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/embed/XEmbedObjectCreator.hpp>
-#include <com/sun/star/embed/XComponentSupplier.hpp>
-#include <com/sun/star/embed/XEmbedPersist.hpp>
-#include <com/sun/star/util/XCloseable.hpp>
-#include <com/sun/star/embed/EmbedStates.hpp>
+#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <sfx2/objsh.hxx>
#include <sfx2/app.hxx>
@@ -30,8 +26,9 @@
#include <sfx2/event.hxx>
#include <comphelper/fileformat.h>
-#include <svtools/embedtransfer.hxx>
+#include <tools/globname.hxx>
#include <tools/fract.hxx>
+#include <vcl/transfer.hxx>
#include <vcl/outdev.hxx>
#include <vcl/gdimtf.hxx>
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 60bff6d9a0cd..0f155cc7e4f9 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -18,7 +18,6 @@
*/
#include <config_features.h>
-#include <config_folders.h>
#include <tools/inetmsg.hxx>
#include <tools/diagnose_ex.h>
@@ -33,28 +32,23 @@
#include <com/sun/star/container/XChild.hpp>
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
-#include <com/sun/star/document/UpdateDocMode.hpp>
#include <com/sun/star/document/MacroExecMode.hpp>
#include <com/sun/star/document/XScriptInvocationContext.hpp>
#include <com/sun/star/embed/EmbedStates.hpp>
-#include <com/sun/star/embed/XEmbedPersist.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/script/provider/theMasterScriptProviderFactory.hpp>
#include <com/sun/star/script/provider/XScript.hpp>
#include <com/sun/star/script/provider/XScriptProvider.hpp>
#include <com/sun/star/script/provider/XScriptProviderSupplier.hpp>
-#include <com/sun/star/ucb/SimpleFileAccess.hpp>
#include <com/sun/star/uri/UriReferenceFactory.hpp>
-#include <com/sun/star/uri/XVndSunStarScriptUrlReference.hpp>
+#include <com/sun/star/uri/XVndSunStarScriptUrl.hpp>
#include <com/sun/star/util/XModifiable.hpp>
#include <toolkit/helper/vclunohelper.hxx>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Any.h>
-#include <com/sun/star/ucb/XContent.hpp>
#include <com/sun/star/task/ErrorCodeRequest.hpp>
-#include <unotools/securityoptions.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/string.hxx>
@@ -62,25 +56,18 @@
#include <com/sun/star/security/DocumentDigitalSignatures.hpp>
#include <com/sun/star/task/DocumentMacroConfirmationRequest.hpp>
#include <com/sun/star/task/InteractionClassification.hpp>
+#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/frame/XModel.hpp>
-#include <basic/sbuno.hxx>
-#include <basic/sbstar.hxx>
#include <basic/basmgr.hxx>
#include <basic/sberrors.hxx>
#include <vcl/weld.hxx>
#include <basic/sbx.hxx>
#include <svtools/sfxecode.hxx>
-#include <svtools/ehdl.hxx>
-#include <unotools/pathoptions.hxx>
#include <unotools/ucbhelper.hxx>
-#include <tools/inetmime.hxx>
#include <tools/urlobj.hxx>
-#include <svl/inettype.hxx>
#include <svl/sharecontrolfile.hxx>
-#include <osl/file.hxx>
-#include <rtl/bootstrap.hxx>
#include <rtl/uri.hxx>
#include <vcl/svapp.hxx>
#include <framework/interaction.hxx>
@@ -100,21 +87,15 @@
#include <sfx2/objsh.hxx>
#include <objshimp.hxx>
#include <sfx2/event.hxx>
-#include <sfx2/dispatch.hxx>
#include <sfx2/viewfrm.hxx>
-#include <sfx2/viewsh.hxx>
-#include <sfx2/ctrlitem.hxx>
#include <sfx2/sfxuno.hxx>
-#include <arrdecl.hxx>
#include <sfx2/module.hxx>
#include <sfx2/docfac.hxx>
-#include <helper.hxx>
#include <sfx2/sfxsids.hrc>
#include <sfx2/strings.hrc>
#include <workwin.hxx>
#include <sfx2/sfxdlg.hxx>
#include <sfx2/infobar.hxx>
-#include <appbaslib.hxx>
#include <openflag.hxx>
#include "objstor.hxx"
#include <appopen.hxx>
diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx
index 231386d479ec..6b97b0befef7 100644
--- a/sfx2/source/doc/objserv.cxx
+++ b/sfx2/source/doc/objserv.cxx
@@ -19,20 +19,14 @@
#include <config_features.h>
-#include <sot/storage.hxx>
#include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
-#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
-#include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp>
-#include <com/sun/star/ui/dialogs/XControlAccess.hpp>
#include <com/sun/star/util/CloseVetoException.hpp>
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/beans/XPropertyAccess.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/container/XNameAccess.hpp>
#include <com/sun/star/document/XCmisDocument.hpp>
-#include <com/sun/star/document/XExporter.hpp>
+#include <com/sun/star/drawing/LineStyle.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/security/XCertificate.hpp>
#include <com/sun/star/task/ErrorCodeIOException.hpp>
#include <com/sun/star/task/InteractionHandler.hpp>
@@ -55,27 +49,20 @@
#include <sal/log.hxx>
#include <comphelper/string.hxx>
-#include <basic/sbx.hxx>
+#include <basic/sbxcore.hxx>
#include <basic/sberrors.hxx>
-#include <unotools/pathoptions.hxx>
-#include <unotools/useroptions.hxx>
#include <unotools/saveopt.hxx>
-#include <svtools/asynclink.hxx>
#include <svtools/DocumentToGraphicRenderer.hxx>
#include <vcl/gdimtf.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
-#include <comphelper/fileformat.h>
#include <comphelper/documentconstants.hxx>
-#include <comphelper/propertyvalue.hxx>
#include <comphelper/storagehelper.hxx>
#include <tools/link.hxx>
#include <sfx2/asyncfunc.hxx>
-#include <sfx2/app.hxx>
#include <sfx2/signaturestate.hxx>
#include <sfx2/sfxresid.hxx>
-#include <sfx2/event.hxx>
#include <sfx2/request.hxx>
#include <sfx2/printer.hxx>
#include <sfx2/viewsh.hxx>
@@ -86,14 +73,12 @@
#include <sfx2/objitem.hxx>
#include <sfx2/objsh.hxx>
#include <objshimp.hxx>
-#include <sfxtypes.hxx>
#include <sfx2/module.hxx>
#include <sfx2/viewfrm.hxx>
#include <versdlg.hxx>
#include <sfx2/strings.hrc>
#include <sfx2/docfac.hxx>
#include <sfx2/fcontnr.hxx>
-#include <sfx2/sfxhelp.hxx>
#include <sfx2/msgpool.hxx>
#include <sfx2/objface.hxx>
#include <sfx2/checkin.hxx>
@@ -102,19 +87,12 @@
#include <sfx2/sfxsids.hrc>
#include <SfxRedactionHelper.hxx>
-#include <com/sun/star/document/XDocumentSubStorageSupplier.hpp>
-#include <com/sun/star/embed/XTransactedObject.hpp>
-#include <com/sun/star/util/XCloneable.hpp>
#include <com/sun/star/util/XCloseable.hpp>
#include <com/sun/star/document/XDocumentProperties.hpp>
-#include <com/sun/star/text/XPageCursor.hpp>
-#include <com/sun/star/text/XTextViewCursorSupplier.hpp>
#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
-#include <com/sun/star/drawing/XDrawPageSupplier.hpp>
#include <com/sun/star/frame/XDesktop2.hpp>
#include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/frame/XLayoutManager.hpp>
#include <guisaveas.hxx>
#include <saveastemplatedlg.hxx>
@@ -123,10 +101,6 @@
#include <unotools/ucbstreamhelper.hxx>
#include <unotools/streamwrap.hxx>
-#include <svx/unoshape.hxx>
-#include <svx/xlineit0.hxx>
-#include <com/sun/star/util/Color.hpp>
-
#include <autoredactdialog.hxx>
using namespace ::com::sun::star;
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index ee0808ff9e80..5b7eb70d946a 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -32,32 +32,21 @@
#include <com/sun/star/document/XFilter.hpp>
#include <com/sun/star/document/XImporter.hpp>
#include <com/sun/star/document/XExporter.hpp>
-#include <com/sun/star/document/XInteractionFilterOptions.hpp>
#include <com/sun/star/packages/zip/ZipIOException.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
-#include <com/sun/star/task/XInteractionAskLater.hpp>
-#include <com/sun/star/task/InteractionClassification.hpp>
-#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/WrappedTargetRuntimeException.hpp>
#include <com/sun/star/document/MacroExecMode.hpp>
#include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp>
-#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
-#include <com/sun/star/ui/dialogs/XFilePicker.hpp>
#include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <com/sun/star/beans/XPropertyAccess.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/container/XNameAccess.hpp>
-#include <com/sun/star/container/XSet.hpp>
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/embed/EmbedStates.hpp>
-#include <com/sun/star/embed/Aspects.hpp>
#include <com/sun/star/embed/XTransactedObject.hpp>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/embed/XEmbedPersist.hpp>
-#include <com/sun/star/embed/XLinkageSupport.hpp>
-#include <com/sun/star/embed/EntryInitModes.hpp>
#include <com/sun/star/embed/XOptimizedStorage.hpp>
#include <com/sun/star/embed/XEncryptionProtectedStorage.hpp>
#include <com/sun/star/io/WrongFormatException.hpp>
@@ -76,12 +65,10 @@
#include <svtools/langtab.hxx>
#include <svtools/sfxecode.hxx>
#include <unotools/configmgr.hxx>
-#include <cppuhelper/weak.hxx>
#include <unotools/streamwrap.hxx>
#include <unotools/saveopt.hxx>
#include <unotools/useroptions.hxx>
-#include <unotools/pathoptions.hxx>
#include <unotools/securityoptions.hxx>
#include <tools/urlobj.hxx>
#include <tools/diagnose_ex.h>
@@ -90,16 +77,14 @@
#include <unotools/docinfohelper.hxx>
#include <ucbhelper/content.hxx>
#include <sot/storage.hxx>
-#include <sot/storinfo.hxx>
#include <sot/exchange.hxx>
#include <sot/formats.hxx>
#include <comphelper/storagehelper.hxx>
#include <comphelper/documentconstants.hxx>
#include <comphelper/string.hxx>
-#include <vcl/bitmapex.hxx>
+#include <vcl/errinf.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
-#include <svtools/embedhlp.hxx>
#include <basic/modsizeexceeded.hxx>
#include <officecfg/Office/Common.hxx>
#include <osl/file.hxx>
@@ -109,8 +94,6 @@
#include <sfx2/signaturestate.hxx>
#include <sfx2/app.hxx>
#include <sfx2/objsh.hxx>
-#include <sfx2/childwin.hxx>
-#include <sfx2/request.hxx>
#include <sfx2/sfxresid.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/fcontnr.hxx>
@@ -118,20 +101,15 @@
#include <sfx2/docfac.hxx>
#include <appopen.hxx>
#include <objshimp.hxx>
-#include <sfxtypes.hxx>
#include <sfx2/strings.hrc>
#include <sfx2/sfxsids.hrc>
-#include <sfx2/module.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/sfxuno.hxx>
-#include <openflag.hxx>
-#include <helper.hxx>
#include <sfx2/event.hxx>
#include <fltoptint.hxx>
#include <sfx2/viewfrm.hxx>
#include "graphhelp.hxx"
#include <appbaslib.hxx>
-#include <appdata.hxx>
#include "objstor.hxx"
#include "exoticfileloadexception.hxx"
diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx
index 0632d1c6305a..af6a722d24d9 100644
--- a/sfx2/source/doc/objxtor.cxx
+++ b/sfx2/source/doc/objxtor.cxx
@@ -19,7 +19,6 @@
#include <config_features.h>
-#include <arrdecl.hxx>
#include <map>
#include <cppuhelper/implbase.hxx>
@@ -28,9 +27,7 @@
#include <com/sun/star/util/XCloseable.hpp>
#include <com/sun/star/frame/XComponentLoader.hpp>
#include <com/sun/star/frame/Desktop.hpp>
-#include <com/sun/star/util/XCloseBroadcaster.hpp>
#include <com/sun/star/util/XCloseListener.hpp>
-#include <com/sun/star/util/XModifyBroadcaster.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/frame/XTitle.hpp>
#include <osl/file.hxx>
@@ -40,11 +37,8 @@
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <svl/eitem.hxx>
-#include <svl/lstner.hxx>
-#include <sfx2/sfxhelp.hxx>
#include <basic/sbstar.hxx>
#include <svl/stritem.hxx>
-#include <basic/sbx.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/eventcfg.hxx>
@@ -52,10 +46,6 @@
#include <sfx2/signaturestate.hxx>
#include <sfx2/sfxmodelfactory.hxx>
-#include <basic/sbuno.hxx>
-#include <svtools/sfxecode.hxx>
-#include <svtools/ehdl.hxx>
-#include <unotools/printwarningoptions.hxx>
#include <comphelper/processfactory.hxx>
#include <com/sun/star/document/XStorageBasedDocument.hpp>
@@ -66,34 +56,23 @@
#include <com/sun/star/ucb/ContentCreationException.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#include <svl/urihelper.hxx>
-#include <unotools/pathoptions.hxx>
-#include <svl/sharecontrolfile.hxx>
#include <unotools/ucbhelper.hxx>
-#include <svtools/asynclink.hxx>
#include <tools/diagnose_ex.h>
#include <tools/globname.hxx>
#include <tools/debug.hxx>
-#include <comphelper/classids.hxx>
#include <sfx2/app.hxx>
-#include <sfx2/docfac.hxx>
+#include <sfx2/bindings.hxx>
#include <sfx2/docfile.hxx>
#include <sfx2/event.hxx>
-#include <sfx2/dispatch.hxx>
#include <sfx2/viewsh.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/sfxresid.hxx>
#include <objshimp.hxx>
-#include <sfxtypes.hxx>
-#include <sfx2/evntconf.hxx>
-#include <sfx2/request.hxx>
#include <sfx2/strings.hrc>
-#include <appdata.hxx>
#include <sfx2/sfxsids.hrc>
#include <basic/basmgr.hxx>
#include <sfx2/QuerySaveDocument.hxx>
-#include <sfx2/msg.hxx>
#include <appbaslib.hxx>
#include <sfx2/sfxbasemodel.hxx>
#include <sfx2/sfxuno.hxx>
@@ -110,9 +89,6 @@ using namespace ::com::sun::star::frame;
using namespace ::com::sun::star::document;
using ::basic::BasicManagerRepository;
-#include <uno/mapping.hxx>
-
-#include <sfxslots.hxx>
namespace {
diff --git a/sfx2/source/doc/oleprops.cxx b/sfx2/source/doc/oleprops.cxx
index da6299168171..57ece53ea78d 100644
--- a/sfx2/source/doc/oleprops.cxx
+++ b/sfx2/source/doc/oleprops.cxx
@@ -22,10 +22,8 @@
#include <comphelper/types.hxx>
#include <o3tl/safeint.hxx>
-#include <tools/debug.hxx>
#include <tools/datetime.hxx>
#include <rtl/tencinfo.h>
-#include <rtl/strbuf.hxx>
#include <sal/log.hxx>
diff --git a/sfx2/source/doc/ownsubfilterservice.cxx
b/sfx2/source/doc/ownsubfilterservice.cxx
index 598ff03bc18e..af6a903e5460 100644
--- a/sfx2/source/doc/ownsubfilterservice.cxx
+++ b/sfx2/source/doc/ownsubfilterservice.cxx
@@ -28,7 +28,6 @@
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/supportsservice.hxx>
-#include <rtl/ref.hxx>
#include <sfx2/objsh.hxx>
#include <tools/globname.hxx>
diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx
index e8380efad5d7..47356ce61c3d 100644
--- a/sfx2/source/doc/printhelper.cxx
+++ b/sfx2/source/doc/printhelper.cxx
@@ -30,13 +30,10 @@
#include <com/sun/star/ucb/CommandAbortedException.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/frame/XModel.hpp>
-#include <com/sun/star/lang/EventObject.hpp>
#include <com/sun/star/view/DuplexMode.hpp>
#include <comphelper/processfactory.hxx>
+#include <svl/itemset.hxx>
#include <svl/lstner.hxx>
-#include <svl/stritem.hxx>
-#include <svl/intitem.hxx>
-#include <svl/eitem.hxx>
#include <unotools/tempfile.hxx>
#include <osl/file.hxx>
#include <osl/thread.hxx>
@@ -51,10 +48,7 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/viewsh.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/request.hxx>
#include <sfx2/printer.hxx>
-#include <sfx2/app.hxx>
#include <sfx2/objsh.hxx>
#include <sfx2/event.hxx>
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index 3d531a91ce90..aa19c4f3dcde 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -37,11 +37,8 @@
#include <com/sun/star/frame/IllegalArgumentIOException.hpp>
#include <com/sun/star/frame/XUntitledNumbers.hpp>
#include <com/sun/star/frame/DoubleInitializationException.hpp>
-#include <com/sun/star/embed/XTransactionBroadcaster.hpp>
#include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/embed/EmbedMapUnits.hpp>
#include <com/sun/star/document/XStorageChangeListener.hpp>
-#include <com/sun/star/document/XActionLockable.hpp>
#include <com/sun/star/document/IndexedPropertyValues.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/beans/XPropertySetInfo.hpp>
@@ -70,11 +67,9 @@
#include <svl/itemset.hxx>
#include <svl/stritem.hxx>
#include <svl/eitem.hxx>
-#include <svl/intitem.hxx>
#include <svl/grabbagitem.hxx>
-#include <basic/sbx.hxx>
-#include <basic/sbuno.hxx>
#include <tools/urlobj.hxx>
+#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <tools/svborder.hxx>
#include <unotools/tempfile.hxx>
@@ -82,18 +77,14 @@
#include <vcl/errcode.hxx>
#include <vcl/salctype.hxx>
#include <vcl/gdimtf.hxx>
-#include <comphelper/classids.hxx>
-#include <sot/storinfo.hxx>
#include <comphelper/fileformat.h>
#include <comphelper/storagehelper.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/transfer.hxx>
#include <svtools/ehdl.hxx>
#include <svtools/sfxecode.hxx>
-#include <rtl/strbuf.hxx>
#include <sal/log.hxx>
#include <framework/configimporter.hxx>
-#include <framework/interaction.hxx>
#include <framework/titlehelper.hxx>
#include <comphelper/numberedcollection.hxx>
#include <unotools/ucbhelper.hxx>
@@ -111,16 +102,12 @@
#include <sfx2/docfilt.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/module.hxx>
-#include <sfx2/request.hxx>
-#include <sfx2/printer.hxx>
#include <basic/basmgr.hxx>
#include <sfx2/event.hxx>
#include <eventsupplier.hxx>
-#include <sfx2/evntconf.hxx>
#include <sfx2/sfxsids.hrc>
#include <sfx2/strings.hrc>
#include <sfx2/app.hxx>
-#include <appdata.hxx>
#include <sfx2/docfac.hxx>
#include <sfx2/fcontnr.hxx>
#include <sfx2/docstoragemodifylistener.hxx>
diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx
index 0de62325ab66..c5e2d204e303 100644
--- a/sfx2/source/doc/templatedlg.cxx
+++ b/sfx2/source/doc/templatedlg.cxx
@@ -17,7 +17,6 @@
#include <comphelper/propertysequence.hxx>
#include <comphelper/string.hxx>
#include <comphelper/storagehelper.hxx>
-#include <officecfg/Office/Common.hxx>
#include <sfx2/app.hxx>
#include <sfx2/docfac.hxx>
#include <sfx2/docfilt.hxx>
@@ -32,7 +31,6 @@
#include <sot/storage.hxx>
#include <svtools/imagemgr.hxx>
#include <svtools/langhelp.hxx>
-#include <svtools/miscopt.hxx>
#include <tools/urlobj.hxx>
#include <unotools/moduleoptions.hxx>
#include <unotools/pathoptions.hxx>
@@ -50,7 +48,6 @@
#include <com/sun/star/embed/ElementModes.hpp>
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/frame/XStorable.hpp>
-#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp>
#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
diff --git a/sfx2/source/doc/zoomitem.cxx b/sfx2/source/doc/zoomitem.cxx
index 4724bf0060f1..54855aff8a80 100644
--- a/sfx2/source/doc/zoomitem.cxx
+++ b/sfx2/source/doc/zoomitem.cxx
@@ -17,9 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <tools/stream.hxx>
-#include <basic/sbxvar.hxx>
-
#include <sfx2/zoomitem.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <com/sun/star/beans/PropertyValue.hpp>
diff --git a/sfx2/source/explorer/nochaos.cxx b/sfx2/source/explorer/nochaos.cxx
index baa5bdf7658e..10e4c30bd0b4 100644
--- a/sfx2/source/explorer/nochaos.cxx
+++ b/sfx2/source/explorer/nochaos.cxx
@@ -23,7 +23,6 @@
#include <svl/itempool.hxx>
#include <svl/poolitem.hxx>
#include <svl/stritem.hxx>
-#include <sfx2/sfxuno.hxx>
#include <nochaos.hxx>
#include <memory>
diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx
index 8346fbeab06a..c97e9d59bedf 100644
--- a/sfx2/source/inet/inettbc.cxx
+++ b/sfx2/source/inet/inettbc.cxx
@@ -24,27 +24,17 @@
#include <com/sun/star/frame/Desktop.hpp>
#include <com/sun/star/task/XInteractionHandler.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
-#include <svl/eitem.hxx>
#include <svl/stritem.hxx>
#include <unotools/historyoptions.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/svapp.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <osl/file.hxx>
-#include <osl/thread.hxx>
#include <rtl/ustring.hxx>
-#include <svl/itemset.hxx>
-#include <svl/urihelper.hxx>
-#include <svtools/asynclink.hxx>
#include <svtools/inettbc.hxx>
-#include <sfx2/dispatch.hxx>
-#include <sfx2/viewfrm.hxx>
-#include <sfx2/objsh.hxx>
#include <sfx2/sfxsids.hrc>
-#include <sfxtypes.hxx>
-#include <helper.hxx>
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::beans;
diff --git a/sfx2/source/notebookbar/ContextVBox.cxx
b/sfx2/source/notebookbar/ContextVBox.cxx
index acd43c8af406..b1494340fdc8 100644
--- a/sfx2/source/notebookbar/ContextVBox.cxx
+++ b/sfx2/source/notebookbar/ContextVBox.cxx
@@ -23,7 +23,6 @@
#include <vcl/builderfactory.hxx>
#include <vcl/layout.hxx>
#include <sfx2/dllapi.h>
-#include <sfx2/viewfrm.hxx>
/*
* ContextVBox is a VclVBox which shows own children depending on current
context.
diff --git a/sfx2/source/notebookbar/DropdownBox.cxx
b/sfx2/source/notebookbar/DropdownBox.cxx
index 473e5c98be40..104bb31ecb5a 100644
--- a/sfx2/source/notebookbar/DropdownBox.cxx
+++ b/sfx2/source/notebookbar/DropdownBox.cxx
@@ -19,8 +19,6 @@
#include <vcl/builderfactory.hxx>
#include <vcl/layout.hxx>
-#include <sfx2/dllapi.h>
-#include <sfx2/viewfrm.hxx>
#include "DropdownBox.hxx"
#define NOTEBOOK_HEADER_HEIGHT 30
diff --git a/sfx2/source/notebookbar/NotebookbarTabControl.cxx
b/sfx2/source/notebookbar/NotebookbarTabControl.cxx
index 5aaacf1cb549..13d0c6da3983 100644
--- a/sfx2/source/notebookbar/NotebookbarTabControl.cxx
+++ b/sfx2/source/notebookbar/NotebookbarTabControl.cxx
@@ -24,19 +24,16 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/notebookbar/NotebookbarTabControl.hxx>
#include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp>
-#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp>
#include <com/sun/star/ui/ItemType.hpp>
#include <com/sun/star/frame/XModuleManager.hpp>
#include <com/sun/star/frame/ModuleManager.hpp>
#include <com/sun/star/frame/XFrame.hpp>
-#include <sfx2/notebookbar/SfxNotebookBar.hxx>
#include <com/sun/star/uno/Reference.h>
#include <toolkit/awt/vclxmenu.hxx>
#include <com/sun/star/frame/XPopupMenuController.hpp>
#include <comphelper/processfactory.hxx>
#include <comphelper/propertyvalue.hxx>
#include <sfx2/sidebar/SidebarToolBox.hxx>
-#include <cppuhelper/queryinterface.hxx>
#include <cppuhelper/implbase.hxx>
#define ICON_SIZE 25
diff --git a/sfx2/source/notebookbar/PriorityHBox.cxx
b/sfx2/source/notebookbar/PriorityHBox.cxx
index cb4a1be51d8c..763114c72932 100644
--- a/sfx2/source/notebookbar/PriorityHBox.cxx
+++ b/sfx2/source/notebookbar/PriorityHBox.cxx
@@ -19,9 +19,7 @@
#include <vcl/builderfactory.hxx>
#include <vcl/layout.hxx>
-#include <sfx2/dllapi.h>
#include <sfx2/viewfrm.hxx>
-#include "DropdownBox.hxx"
#include "PriorityHBox.hxx"
namespace
diff --git a/sfx2/source/notebookbar/PriorityMergedHBox.cxx
b/sfx2/source/notebookbar/PriorityMergedHBox.cxx
index 0ef63410f80c..faebfbcd4121 100644
--- a/sfx2/source/notebookbar/PriorityMergedHBox.cxx
+++ b/sfx2/source/notebookbar/PriorityMergedHBox.cxx
@@ -19,10 +19,7 @@
#include <vcl/builderfactory.hxx>
#include <vcl/layout.hxx>
-#include <sfx2/dllapi.h>
-#include <sfx2/viewfrm.hxx>
#include <bitmaps.hlst>
-#include <vcl/OptionalBox.hxx>
#include "PriorityHBox.hxx"
#include "NotebookbarPopup.hxx"
diff --git a/sfx2/source/notebookbar/SfxNotebookBar.cxx
b/sfx2/source/notebookbar/SfxNotebookBar.cxx
index a2d7f1f39b17..36c6b14826f4 100644
--- a/sfx2/source/notebookbar/SfxNotebookBar.cxx
+++ b/sfx2/source/notebookbar/SfxNotebookBar.cxx
@@ -11,8 +11,6 @@
#include <sfx2/viewsh.hxx>
#include <sfx2/dispatch.hxx>
#include <sfx2/notebookbar/SfxNotebookBar.hxx>
-#include <unotools/viewoptions.hxx>
-#include <toolkit/awt/vclxmenu.hxx>
#include <vcl/notebookbar.hxx>
#include <vcl/syswin.hxx>
#include <sfx2/viewfrm.hxx>
@@ -21,7 +19,6 @@
#include <com/sun/star/frame/UnknownModuleException.hpp>
#include <com/sun/star/ui/ContextChangeEventMultiplexer.hpp>
#include <com/sun/star/ui/XContextChangeEventMultiplexer.hpp>
-#include <com/sun/star/util/URLTransformer.hpp>
#include <com/sun/star/frame/XLayoutManager.hpp>
#include <officecfg/Office/UI/ToolbarMode.hxx>
#include <com/sun/star/frame/XModuleManager.hpp>
diff --git a/sfx2/source/notify/eventsupplier.cxx
b/sfx2/source/notify/eventsupplier.cxx
index e21130d6022c..a8a674d2f531 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -30,12 +30,10 @@
#include <tools/diagnose_ex.h>
#include <svl/macitem.hxx>
#include <sfx2/objsh.hxx>
-#include <sfx2/sfxbasemodel.hxx>
#include <sfx2/evntconf.hxx>
#include <unotools/eventcfg.hxx>
#include <sal/log.hxx>
-#include <unotools/securityoptions.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/sequence.hxx>
@@ -43,8 +41,6 @@
#include <sfx2/app.hxx>
-#include <sfx2/sfxsids.hrc>
-#include <sfx2/docfile.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/frame.hxx>
#include <macroloader.hxx>
diff --git a/sfx2/source/notify/globalevents.cxx
b/sfx2/source/notify/globalevents.cxx
index cfb994ac30f1..569ab3a98cb8 100644
--- a/sfx2/source/notify/globalevents.cxx
+++ b/sfx2/source/notify/globalevents.cxx
@@ -36,9 +36,6 @@
#include <rtl/ref.hxx>
#include <comphelper/enumhelper.hxx>
#include <sfx2/app.hxx>
-#include <sfx2/objsh.hxx>
-#include <sfx2/sfxbasemodel.hxx>
-#include <sfx2/evntconf.hxx>
#include <tools/diagnose_ex.h>
#include <unotools/eventcfg.hxx>
#include <eventsupplier.hxx>
diff --git a/sfx2/source/notify/hintpost.cxx b/sfx2/source/notify/hintpost.cxx
index 348ed172a871..54949d07efda 100644
--- a/sfx2/source/notify/hintpost.cxx
+++ b/sfx2/source/notify/hintpost.cxx
@@ -19,11 +19,8 @@
#include <sfx2/hintpost.hxx>
-#include <arrdecl.hxx>
-#include <sfx2/app.hxx>
#include <sfx2/request.hxx>
#include <vcl/svapp.hxx>
-#include <sfxtypes.hxx>
SfxHintPoster::SfxHintPoster(const std::function<void
(std::unique_ptr<SfxRequest>)>& rLink)
diff --git a/sfx2/source/notify/openurlhint.cxx
b/sfx2/source/notify/openurlhint.cxx
index 424c0d81b157..ca831a6f45bc 100644
--- a/sfx2/source/notify/openurlhint.cxx
+++ b/sfx2/source/notify/openurlhint.cxx
@@ -18,7 +18,6 @@
*/
#include <openurlhint.hxx>
-#include <sfx2/sfxsids.hrc>
SfxOpenUrlHint::SfxOpenUrlHint( const OUString& sDocumentURL ) :
msDocumentURL(sDocumentURL) { }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
