tdf#42949 Fix IWYU warnings in include/sfx2/[n-r]*

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: Ia2bea9bd4775f4ed5ef0133971106a6c0bfdd1c0
Reviewed-on: https://gerrit.libreoffice.org/69896
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

15 files changed, 54 insertions, 66 deletions

diff --git a/include/sfx2/new.hxx b/include/sfx2/new.hxx
index bdc0a9b8de99..9792fc503ee8 100644
--- a/include/sfx2/new.hxx
+++ b/include/sfx2/new.hxx
@@ -26,14 +26,17 @@
 #include <sfx2/objsh.hxx>
 
 #include <vcl/idle.hxx>
-#include <vcl/customweld.hxx>
-#include <vcl/weld.hxx>
 #include <sfx2/doctempl.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
+namespace weld { class Button; }
+namespace weld { class CheckButton; }
+namespace weld { class CustomWeld; }
+namespace weld { class Expander; }
+namespace weld { class Label; }
+namespace weld { class TreeView; }
+namespace weld { class Window; }
 
-class SfxObjectShellLock;
-class SfxObjectShell;
 class SfxPreviewWin_Impl;
 
 enum class SfxNewFileDialogMode {
diff --git a/include/sfx2/notebookbar/NotebookbarTabControl.hxx b/include/sfx2/notebookbar/NotebookbarTabControl.hxx
index f3411d769b71..68d7b4ef252d 100644
--- a/include/sfx2/notebookbar/NotebookbarTabControl.hxx
+++ b/include/sfx2/notebookbar/NotebookbarTabControl.hxx
@@ -10,14 +10,13 @@
 #ifndef INCLUDED_SFX2_NOTEBOOKBAR_NOTEBOOKBARTABCONTROL_HXX
 #define INCLUDED_SFX2_NOTEBOOKBAR_NOTEBOOKBARTABCONTROL_HXX
 
-#include <vcl/toolbox.hxx>
 #include <sfx2/dllapi.h>
 #include <vcl/tabctrl.hxx>
 
-class ChangedUIEventListener;
 namespace com { namespace sun { namespace star { namespace ui {
     class XUIConfigurationListener;
 } } } }
+namespace com::sun::star::uno { class XComponentContext; }
 
 class SFX2_DLLPUBLIC NotebookbarTabControl final : public NotebookbarTabControlBase
 {
diff --git a/include/sfx2/notebookbar/SfxNotebookBar.hxx b/include/sfx2/notebookbar/SfxNotebookBar.hxx
index eeff0015a775..9eb76e9c3ba5 100644
--- a/include/sfx2/notebookbar/SfxNotebookBar.hxx
+++ b/include/sfx2/notebookbar/SfxNotebookBar.hxx
@@ -11,10 +11,14 @@
 #define INCLUDED_SFX2_NOTEBOOKBAR_SFXNOTEBOOKBAR_HXX
 
 #include <sfx2/dllapi.h>
-#include <sfx2/viewfrm.hxx>
-#include <vcl/notebookbar.hxx>
+#include <rtl/ustring.hxx>
+
+namespace com::sun::star::frame { class XFrame; }
+namespace com::sun::star::uno { template <typename > class Reference; }
 
 class SfxBindings;
+class SfxViewFrame;
+class SystemWindow;
 
 namespace sfx2 {
 
diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index bfda103a48ff..32f23200afbd 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
@@ -28,9 +28,7 @@
 #include <sfx2/toolbarids.hxx>
 
 struct SfxInterface_Impl;
-class  SfxConfigItem;
 class  SfxModule;
-class  SvStream;
 
 #define SFX_OBJECTBAR_APPLICATION       0
 #define SFX_OBJECTBAR_OBJECT            1
diff --git a/include/sfx2/objitem.hxx b/include/sfx2/objitem.hxx
index b8d4f72ea844..5aa6b989b611 100644
--- a/include/sfx2/objitem.hxx
+++ b/include/sfx2/objitem.hxx
@@ -23,8 +23,7 @@
 #include <sfx2/dllapi.h>
 #include <svl/poolitem.hxx>
 
-#include <sfx2/shell.hxx>
-
+class SfxShell;
 
 class SFX2_DLLPUBLIC SfxObjectItem: public SfxPoolItem
 {
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 4a0175776032..c44db6f90a58 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -26,61 +26,43 @@
 #include <vcl/errcode.hxx>
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/script/XLibraryContainer.hpp>
-#include <com/sun/star/embed/XStorage.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/graphic/XGraphic.hpp>
-#include <com/sun/star/security/DocumentSignatureInformation.hpp>
-#include <com/sun/star/security/XDocumentDigitalSignatures.hpp>
-#include <com/sun/star/task/XInteractionHandler.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/document/CmisVersion.hpp>
 
 #include <vcl/vclptr.hxx>
-#include <vcl/button.hxx>
 #include <svl/poolitem.hxx>
-#include <vcl/bitmap.hxx>
 #include <sot/formats.hxx>
 #include <sot/object.hxx>
-#include <svl/style.hxx>
+#include <tools/gen.hxx>
+#include <tools/link.hxx>
 
-#include <sfx2/XmlIdRegistry.hxx>
 #include <sfx2/shell.hxx>
 #include <comphelper/embeddedobjectcontainer.hxx>
-#include <com/sun/star/frame/XModel.hpp>
 #include <memory>
 #include <set>
 #include <o3tl/typed_flags_set.hxx>
 #include <functional>
 
-#include <LibreOfficeKit/LibreOfficeKitTypes.h>
-
 class SbxValue;
-class SvxMacro;
 class SbxArray;
 class BasicManager;
 class SfxMedium;
 class SfxObjectFactory;
 class SfxDocumentInfoDialog;
 class SfxStyleSheetBasePool;
-class INote;
-class SfxStyleSheetPool;
-class SfxFrame;
-class SbMethod;
 class StarBASIC;
 class Printer;
 class SvKeyValueIterator;
 class SfxBaseModel;
 class SfxModule;
-class SvData;
 class SfxProgress;
 class GDIMetaFile;
-class Bitmap;
 class INetURLObject;
 class IndexBitSet;
 class JobSetup;
-class Size;
-class Point;
+class Button;
+class OutputDevice;
+class Color;
+class Fraction;
+
 enum class SfxModelFlags;
 enum class SfxEventHintId;
 
@@ -99,7 +81,17 @@ namespace sfx2
     class StyleManager;
 }
 
-namespace com { namespace sun { namespace star { namespace datatransfer { class XTransferable; } } } }
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::document { struct CmisVersion; }
+namespace com::sun::star::embed { class XStorage; }
+namespace com::sun::star::frame { class XModel; }
+namespace com::sun::star::graphic { class XGraphic; }
+namespace com::sun::star::io { class XStream; }
+namespace com::sun::star::script { class XLibraryContainer; }
+namespace com::sun::star::security { class XCertificate; }
+namespace com::sun::star::security { class XDocumentDigitalSignatures; }
+namespace com::sun::star::security { struct DocumentSignatureInformation; }
+namespace com::sun::star::task { class XInteractionHandler; }
 
 namespace com { namespace sun { namespace star {
     namespace document {
@@ -113,6 +105,8 @@ namespace com { namespace sun { namespace star {
     }
 } } }
 
+namespace sfx2 { class IXmlIdRegistry; }
+
 #define SFX_TITLE_TITLE    0
 #define SFX_TITLE_FILENAME 1
 #define SFX_TITLE_FULLNAME 2
@@ -171,7 +165,6 @@ enum class SfxObjectCreateMode
     into foreign objects.
 */
 
-class SfxToolBoxConfig;
 struct TransferableObjectDescriptor;
 template<class T> bool checkSfxObjectShell(const SfxObjectShell* pShell)
 {
diff --git a/include/sfx2/opengrf.hxx b/include/sfx2/opengrf.hxx
index ef36e01dad73..ca70b955a017 100644
--- a/include/sfx2/opengrf.hxx
+++ b/include/sfx2/opengrf.hxx
@@ -20,13 +20,15 @@
 #define INCLUDED_SFX2_OPENGRF_HXX
 
 #include <memory>
-#include <vcl/graphicfilter.hxx>
-#include <vcl/weld.hxx>
 #include <sfx2/dllapi.h>
+#include <rtl/ustring.hxx>
+#include <vcl/errcode.hxx>
 
-#include <com/sun/star/ui/dialogs/TemplateDescription.hpp>
-#include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp>
+namespace com::sun::star::ui::dialogs { class XFilePickerControlAccess; }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
+namespace weld { class Window; }
 
+class Graphic;
 struct  SvxOpenGrf_Impl;
 
 class SFX2_DLLPUBLIC SvxOpenGraphicDialog
diff --git a/include/sfx2/passwd.hxx b/include/sfx2/passwd.hxx
index e9b3eef8a957..6b6248962879 100644
--- a/include/sfx2/passwd.hxx
+++ b/include/sfx2/passwd.hxx
@@ -21,7 +21,6 @@
 
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
-#include <sfx2/app.hxx>
 #include <vcl/weld.hxx>
 #include <o3tl/typed_flags_set.hxx>
 
diff --git a/include/sfx2/printer.hxx b/include/sfx2/printer.hxx
index 4231baee4fa8..89056caae2a7 100644
--- a/include/sfx2/printer.hxx
+++ b/include/sfx2/printer.hxx
@@ -22,10 +22,8 @@
 #include <memory>
 #include <sal/config.h>
 #include <sfx2/dllapi.h>
-#include <sal/types.h>
 #include <vcl/print.hxx>
 
-class SfxTabPage;
 class SfxItemSet;
 
 // class SfxPrinter ------------------------------------------------------
diff --git a/include/sfx2/printopt.hxx b/include/sfx2/printopt.hxx
index cd8a43c97546..996a32e45c27 100644
--- a/include/sfx2/printopt.hxx
+++ b/include/sfx2/printopt.hxx
@@ -25,15 +25,12 @@
 #include <sal/types.h>
 #include <vcl/button.hxx>
 #include <vcl/field.hxx>
-#include <vcl/fixed.hxx>
 #include <vcl/lstbox.hxx>
 #include <vcl/print.hxx>
 
 #include <sfx2/tabdlg.hxx>
 
 
-class SvtBasePrintOptions;
-
 class SFX2_DLLPUBLIC SfxCommonPrintOptionsTabPage : public SfxTabPage
 {
 private:
diff --git a/include/sfx2/prnmon.hxx b/include/sfx2/prnmon.hxx
index 1408ac776a95..5e877532ef43 100644
--- a/include/sfx2/prnmon.hxx
+++ b/include/sfx2/prnmon.hxx
@@ -21,12 +21,13 @@
 
 #include <memory>
 #include <sal/config.h>
-#include <sfx2/dllapi.h>
-#include <sfx2/printer.hxx>
+#include <vcl/vclptr.hxx>
 #include <vcl/weld.hxx>
 
 
 class SfxViewShell;
+class SfxTabPage;
+class SfxItemSet;
 
 
 struct SfxPrintOptDlg_Impl;
diff --git a/include/sfx2/progress.hxx b/include/sfx2/progress.hxx
index 2a62bf6da44c..ceee49b6c5e7 100644
--- a/include/sfx2/progress.hxx
+++ b/include/sfx2/progress.hxx
@@ -23,16 +23,11 @@
 #include <sal/config.h>
 #include <sal/types.h>
 #include <sfx2/dllapi.h>
-#include <tools/link.hxx>
 #include <memory>
 
-namespace rtl {
-    class OUString;
-};
+
 class SfxObjectShell;
 struct SfxProgress_Impl;
-struct PlugInLoadStatus;
-struct SvProgressArg;
 
 class SFX2_DLLPUBLIC SfxProgress
 {
diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx
index 3210d47c651f..516c650d2b60 100644
--- a/include/sfx2/recentdocsview.hxx
+++ b/include/sfx2/recentdocsview.hxx
@@ -11,12 +11,13 @@
 #define INCLUDED_SFX2_RECENTDOCSVIEW_HXX
 
 #include <sfx2/thumbnailview.hxx>
-#include <sfx2/recentdocsviewitem.hxx>
 #include <vcl/image.hxx>
 
 #include <o3tl/typed_flags_set.hxx>
 
-#include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/util/URL.hpp>
+
+namespace com::sun::star::frame { class XDispatch; }
 
 namespace sfx2
 {
diff --git a/include/sfx2/recentdocsviewitem.hxx b/include/sfx2/recentdocsviewitem.hxx
index 2ee90de19f03..5f88f4170cae 100644
--- a/include/sfx2/recentdocsviewitem.hxx
+++ b/include/sfx2/recentdocsviewitem.hxx
@@ -10,7 +10,9 @@
 #ifndef INCLUDED_SFX2_RECENTDOCSVIEWITEM_HXX
 #define INCLUDED_SFX2_RECENTDOCSVIEWITEM_HXX
 
-#include <sfx2/thumbnailview.hxx>
+#include <sfx2/thumbnailviewitem.hxx>
+
+class ThumbnailView;
 
 namespace sfx2
 {
diff --git a/include/sfx2/request.hxx b/include/sfx2/request.hxx
index 27895abc6fe7..7987bdb25323 100644
--- a/include/sfx2/request.hxx
+++ b/include/sfx2/request.hxx
@@ -24,16 +24,10 @@
 #include <sal/types.h>
 #include <svl/itemset.hxx>
 #include <svl/hint.hxx>
-#include <functional>
 
-#include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/frame/XDispatchRecorder.hpp>
 #include <memory>
 
 class SfxPoolItem;
-class SfxAllItemSet;
-class SfxItemSet;
 class SfxItemPool;
 class SfxShell;
 class SfxSlot;
@@ -41,6 +35,9 @@ class SfxViewFrame;
 struct SfxRequest_Impl;
 enum class SfxCallMode : sal_uInt16;
 
+namespace com::sun::star::beans { struct PropertyValue; }
+namespace com::sun::star::frame { class XDispatchRecorder; }
+namespace com::sun::star::uno { template <class E> class Sequence; }
 namespace vcl { class Window; }
 namespace weld { class Window; }