diff options
Diffstat (limited to 'include')
26 files changed, 89 insertions, 132 deletions
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index 71144952bc24..18363b93fbb3 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -677,3 +677,21 @@ blacklist: include/drawinglayer/primitive3d/baseprimitive3d.hxx: # base class has to be a complete type - com/sun/star/graphic/XPrimitive3D.hpp + include/sfx2/asyncfunc.hxx: + # base class has to be a complete type + - com/sun/star/lang/XUnoTunnel.hpp + include/sfx2/charwin.hxx: + # Needed for implicit dtor + - vcl/virdev.hxx + include/sfx2/dinfdlg.hxx: + # Needed for implicit dtor + - com/sun/star/document/CmisProperty.hpp + include/sfx2/docfile.hxx: + # Full type needed for template + - tools/link.hxx + include/sfx2/docstoragemodifylistener.hxx: + # base class has to be a complete type + - com/sun/star/util/XModifyListener.hpp + include/sfx2/DocumentMetadataAccess.hxx: + # base class has to be a complete type + - com/sun/star/rdf/XDocumentMetadataAccess.hpp diff --git a/include/sfx2/DocumentMetadataAccess.hxx b/include/sfx2/DocumentMetadataAccess.hxx index cf5a2ddbcbac..dd0881ad0a91 100644 --- a/include/sfx2/DocumentMetadataAccess.hxx +++ b/include/sfx2/DocumentMetadataAccess.hxx @@ -24,9 +24,7 @@ #include <sfx2/dllapi.h> -#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/rdf/XDocumentMetadataAccess.hpp> -#include <com/sun/star/rdf/XRepositorySupplier.hpp> #include <cppuhelper/implbase.hxx> @@ -47,6 +45,9 @@ namespace com { namespace sun { namespace star { namespace embed { namespace com { namespace sun { namespace star { namespace frame { class XModel; } } } } + +namespace com::sun::star::uno { class XComponentContext; } + class SfxObjectShell; namespace sfx2 { diff --git a/include/sfx2/DocumentSigner.hxx b/include/sfx2/DocumentSigner.hxx index 1f4326ef3976..8059cb9cbd24 100644 --- a/include/sfx2/DocumentSigner.hxx +++ b/include/sfx2/DocumentSigner.hxx @@ -13,10 +13,16 @@ #include <sal/config.h> #include <sfx2/dllapi.h> +#include <rtl/ustring.hxx> -#include <memory> - -#include <com/sun/star/security/XCertificate.hpp> +namespace com::sun::star::security +{ +class XCertificate; +} +namespace com::sun::star::uno +{ +template <typename> class Reference; +} namespace sfx2 { diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx index 2cbab66b9ec4..dce9f2c4de03 100644 --- a/include/sfx2/app.hxx +++ b/include/sfx2/app.hxx @@ -25,37 +25,23 @@ #include <sal/types.h> #include <vcl/errcode.hxx> #include <svl/poolitem.hxx> -#include <vcl/image.hxx> -#include <com/sun/star/script/XLibraryContainer.hpp> -#include <com/sun/star/task/XStatusIndicator.hpp> - -// too many files including sfx2/app.hxx use VCL Application class but don't include the -// header file because in former times SfxApplication was derived from it -#include <vcl/svapp.hxx> +#include <vcl/bitmapex.hxx> +#include <tools/link.hxx> #include <sfx2/shell.hxx> -class Timer; -class WorkWindow; -class ISfxTemplateCommon; +namespace com::sun::star::script { class XLibraryContainer; } + +namespace weld { class Window; } + class BasicManager; class DdeService; -class PrinterDialog; -class Point; -namespace tools { class Rectangle; } -class AppSettings; struct SfxChildWinContextFactory; class SfxAppData_Impl; -class SfxBindings; class SfxChildWinFactArr_Impl; -class SfxChildWindow; class SfxDispatcher; -class SfxEventConfiguration; class SfxEventHint; class SfxItemSet; -class SfxMedium; -class SfxMenuCtrlFactArr_Impl; -class SfxNewFileDialog; class SfxObjectShell; class SfxObjectShellArr_Impl; class SfxObjectShellLock; @@ -65,7 +51,6 @@ class SfxStbCtrlFactArr_Impl; class SfxTbxCtrlFactArr_Impl; class SfxViewFrame; class SfxViewFrameArr_Impl; -class SfxViewShell; class SfxViewShellArr_Impl; class StarBASIC; class SfxWorkWindow; @@ -75,13 +60,11 @@ namespace vcl { class Window; } struct SfxChildWinFactory; struct SfxStbCtrlFactory; struct SfxTbxCtrlFactory; -class ModalDialog; class SbxArray; class SbxValue; namespace sfx2 { - class SvLinkSource; namespace sidebar { class Theme; } diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx index 893481e2d4d5..f58feba3cba2 100644 --- a/include/sfx2/basedlgs.hxx +++ b/include/sfx2/basedlgs.hxx @@ -23,23 +23,20 @@ #include <sal/config.h> #include <sfx2/dllapi.h> #include <sal/types.h> -#include <vcl/builder.hxx> #include <vcl/dialog.hxx> #include <vcl/floatwin.hxx> -#include <vcl/timer.hxx> #include <vcl/weld.hxx> -class TabPage; class SfxTabPage; class SfxBindings; class SfxChildWindow; struct SfxChildWinInfo; class SfxItemSet; -class SfxItemPool; class OKButton; class CancelButton; class HelpButton; class Button; +class Timer; // class SfxModalDialog -------------------------------------------------- diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx index 89663708cd82..33b8e4a58cac 100644 --- a/include/sfx2/bindings.hxx +++ b/include/sfx2/bindings.hxx @@ -27,22 +27,24 @@ #include <o3tl/typed_flags_set.hxx> #include <sfx2/dllapi.h> #include <sal/types.h> -#include <rtl/strbuf.hxx> #include <tools/link.hxx> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> -#include <com/sun/star/frame/XDispatchRecorder.hpp> #include <com/sun/star/uno/Reference.h> -#include <sfx2/viewfrm.hxx> +#include <svl/poolitem.hxx> +#include <svl/SfxBroadcaster.hxx> +#include <sfx2/shell.hxx> + +namespace com::sun::star::frame { class XDispatch; } +namespace com::sun::star::frame { class XDispatchProvider; } +namespace com::sun::star::frame { class XDispatchRecorder; } +namespace com::sun::star::frame { class XFrame; } +namespace com::sun::star::util { struct URL; } -class SystemWindow; class SfxSlot; class SfxSlotServer; class SfxControllerItem; class SfxStateCache; class SfxItemSet; class SfxDispatcher; -class SfxBindings; class SfxBindings_Impl; class Timer; class SfxWorkWindow; diff --git a/include/sfx2/brokenpackageint.hxx b/include/sfx2/brokenpackageint.hxx index 64f624696bb3..5d822cba0084 100644 --- a/include/sfx2/brokenpackageint.hxx +++ b/include/sfx2/brokenpackageint.hxx @@ -23,9 +23,10 @@ #include <sal/config.h> #include <rtl/ref.hxx> #include <sfx2/dllapi.h> -#include <com/sun/star/document/BrokenPackageRequest.hpp> -#include <com/sun/star/task/XInteractionApprove.hpp> -#include <com/sun/star/task/XInteractionDisapprove.hpp> + +#include <com/sun/star/uno/Reference.hxx> + +namespace com::sun::star::task { class XInteractionRequest; } class RequestPackageReparation_Impl; class SFX2_DLLPUBLIC RequestPackageReparation diff --git a/include/sfx2/charmapcontrol.hxx b/include/sfx2/charmapcontrol.hxx index 970e3fa6d1d9..9b58bdd6a4da 100644 --- a/include/sfx2/charmapcontrol.hxx +++ b/include/sfx2/charmapcontrol.hxx @@ -23,12 +23,11 @@ #include <sal/config.h> #include <sfx2/dllapi.h> #include <sfx2/tbxctrl.hxx> -#include <com/sun/star/frame/XFrame.hpp> #include <sfx2/charwin.hxx> #include <vcl/button.hxx> #include <deque> -class SvxCharViewControl; +namespace com::sun::star::frame { class XFrame; } class SFX2_DLLPUBLIC SfxCharmapCtrl : public SfxPopupWindow { diff --git a/include/sfx2/charmappopup.hxx b/include/sfx2/charmappopup.hxx index 30b187030ab9..98c178534fa5 100644 --- a/include/sfx2/charmappopup.hxx +++ b/include/sfx2/charmappopup.hxx @@ -23,8 +23,6 @@ #include <sfx2/tbxctrl.hxx> #include <sfx2/dllapi.h> -#include <functional> - class SFX2_DLLPUBLIC CharmapPopup : public SfxToolBoxControl { public: diff --git a/include/sfx2/charwin.hxx b/include/sfx2/charwin.hxx index 2915c7b05ed1..9b5c070942b9 100644 --- a/include/sfx2/charwin.hxx +++ b/include/sfx2/charwin.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_SFX2_INC_CHARWIN_HXX #define INCLUDED_SFX2_INC_CHARWIN_HXX -#include <sfx2/tbxctrl.hxx> #include <sfx2/dllapi.h> +#include <vcl/ctrl.hxx> #include <vcl/customweld.hxx> #include <vcl/virdev.hxx> #include <vcl/weld.hxx> diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index 8d99f20642de..b6a81b6ec655 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -26,20 +26,17 @@ #include <sal/types.h> #include <o3tl/typed_flags_set.hxx> #include <vcl/window.hxx> -#include <com/sun/star/frame/XFrame.hpp> -#include <sfx2/shell.hxx> #include <sfx2/chalign.hxx> -#include <sfx2/bindings.hxx> - // complete SfxBindings for complete SfxChildWinCtor, SfxChildWinContextCtor - // under -fsanitize=function +namespace com::sun::star::frame { class XFrame; } class SfxWorkWindow; class SfxModule; -class SfxShell; class SfxChildWindow; class SfxChildWindowContext; +class SfxBindings; +class SfxModelessDialogController; enum class SfxChildWindowFlags { diff --git a/include/sfx2/classificationhelper.hxx b/include/sfx2/classificationhelper.hxx index 2be662aa1a9c..3f8c2d0b997c 100644 --- a/include/sfx2/classificationhelper.hxx +++ b/include/sfx2/classificationhelper.hxx @@ -13,18 +13,14 @@ #include <memory> #include <vector> -#include <com/sun/star/document/XDocumentProperties.hpp> - #include <rtl/ustring.hxx> #include <sfx2/dllapi.h> #include <sfx2/infobar.hxx> -class SfxObjectShell; +namespace com::sun::star::beans { class XPropertyContainer; } +namespace com::sun::star::document { class XDocumentProperties; } + class SfxViewFrame; -namespace basegfx -{ -class BColor; -} /// Return code of SfxClassificationHelper::CheckPaste(). enum class SfxClassificationCheckPasteResult diff --git a/include/sfx2/ctrlitem.hxx b/include/sfx2/ctrlitem.hxx index 78ac2d1a6fe2..7788baa952d4 100644 --- a/include/sfx2/ctrlitem.hxx +++ b/include/sfx2/ctrlitem.hxx @@ -24,13 +24,8 @@ #include <sal/types.h> #include <svl/poolitem.hxx> #include <tools/debug.hxx> -#if defined( DBG_UTIL ) -#include <sfx2/msg.hxx> -#endif -class SfxPoolItem; class SfxBindings; -class SvStream; class SFX2_DLLPUBLIC SfxControllerItem { diff --git a/include/sfx2/dialoghelper.hxx b/include/sfx2/dialoghelper.hxx index b0d9ae5b5cfe..e60c1293192c 100644 --- a/include/sfx2/dialoghelper.hxx +++ b/include/sfx2/dialoghelper.hxx @@ -18,7 +18,6 @@ class DateTime; class LocaleDataWrapper; namespace vcl { class Window; } class OutputDevice; -class VclBuilderContainer; //when two tab pages both have the same basic layout with a preview on the //right, get both of their non-preview areas to request the same size so that diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx index ee1d81c9c1cb..fbe01ba61311 100644 --- a/include/sfx2/dinfdlg.hxx +++ b/include/sfx2/dinfdlg.hxx @@ -30,9 +30,6 @@ #include <svl/zforlist.hxx> #include <vcl/headbar.hxx> -#include <svtools/svmedit.hxx> - -#include <unotools/syslocale.hxx> #include <vcl/edit.hxx> #include <vcl/field.hxx> diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx index 899957133024..14fa0a7aca2d 100644 --- a/include/sfx2/dispatch.hxx +++ b/include/sfx2/dispatch.hxx @@ -26,39 +26,19 @@ #include <sal/types.h> #include <sfx2/bindings.hxx> -#include <sfx2/viewfrm.hxx> -#include <vcl/menu.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/span.hxx> #include <initializer_list> class SfxSlotServer; -class SfxShell; class SfxRequest; -class SfxHintPoster; class SfxViewFrame; -class SfxBindings; class SfxItemSet; -class SfxPopupMenuManager; class SfxModule; +class Point; struct SfxDispatcher_Impl; -namespace com -{ - namespace sun - { - namespace star - { - namespace frame - { - class XDispatch; - } - } - } -} - - enum class SfxDispatcherPopFlags { NONE = 0, diff --git a/include/sfx2/docfac.hxx b/include/sfx2/docfac.hxx index 1efdc6f90578..84503fb0768a 100644 --- a/include/sfx2/docfac.hxx +++ b/include/sfx2/docfac.hxx @@ -23,19 +23,14 @@ #include <sfx2/dllapi.h> #include <sal/types.h> -// SFX_IMPL_MODULE_LIB -#include <osl/module.hxx> #include <rtl/ustring.hxx> - -#include <sfx2/objsh.hxx> +#include <sfx2/shell.hxx> #include <memory> -class SfxMedium; class SfxFilter; class SfxViewFactory; struct SfxObjectFactory_Impl; class SfxFilterContainer; -class SfxBindings; typedef void (*SfxVoidFunc)(); diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx index 64c18b05dcf8..a8fae8409bb9 100644 --- a/include/sfx2/docfile.hxx +++ b/include/sfx2/docfile.hxx @@ -21,41 +21,33 @@ #define INCLUDED_SFX2_DOCFILE_HXX #include <memory> -#include <com/sun/star/io/XSeekable.hpp> #include <sal/config.h> #include <sfx2/dllapi.h> #include <sfx2/signaturestate.hxx> #include <svl/lockfilecommon.hxx> #include <sal/types.h> -#include <com/sun/star/graphic/XGraphic.hpp> -#include <com/sun/star/util/RevisionTag.hpp> -#include <com/sun/star/util/DateTime.hpp> -#include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/ucb/XContent.hpp> -#include <com/sun/star/ucb/XCommandEnvironment.hpp> -#include <com/sun/star/security/XCertificate.hpp> -#include <com/sun/star/task/XInteractionHandler.hpp> -#include <com/sun/star/embed/XStorage.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> -#include <svl/lstner.hxx> #include <svl/itemset.hxx> #include <tools/link.hxx> #include <tools/stream.hxx> -#include <ucbhelper/content.hxx> + +namespace com::sun::star::beans { struct PropertyValue; } +namespace com::sun::star::embed { class XStorage; } +namespace com::sun::star::graphic { class XGraphic; } +namespace com::sun::star::io { class XInputStream; } +namespace com::sun::star::security { class XCertificate; } +namespace com::sun::star::task { class XInteractionHandler; } +namespace com::sun::star::ucb { class XCommandEnvironment; } +namespace com::sun::star::ucb { class XContent; } +namespace com::sun::star::util { struct DateTime; } +namespace com::sun::star::util { struct RevisionTag; } +namespace ucbhelper { class Content; } class SvKeyValueIterator; -class SfxObjectFactory; class SfxFilter; class SfxMedium_Impl; class INetURLObject; -class SfxObjectShell; class SfxFrame; -class Timer; class DateTime; namespace weld diff --git a/include/sfx2/docfilt.hxx b/include/sfx2/docfilt.hxx index 2cd8d5fa0fb2..393bc39e12c2 100644 --- a/include/sfx2/docfilt.hxx +++ b/include/sfx2/docfilt.hxx @@ -19,10 +19,6 @@ #ifndef INCLUDED_SFX2_DOCFILT_HXX #define INCLUDED_SFX2_DOCFILT_HXX -#include <com/sun/star/embed/XStorage.hpp> -#include <com/sun/star/beans/UnknownPropertyException.hpp> -#include <com/sun/star/lang/WrappedTargetException.hpp> -#include <com/sun/star/uno/RuntimeException.hpp> #include <comphelper/documentconstants.hxx> #include <rtl/ustring.hxx> #include <sal/config.h> @@ -33,7 +29,9 @@ #include <memory> -class SfxFilterContainer; +namespace com::sun::star::embed { class XStorage; } +namespace com::sun::star::uno { template <typename > class Reference; } + class SotStorage; class SFX2_DLLPUBLIC SfxFilter diff --git a/include/sfx2/docinf.hxx b/include/sfx2/docinf.hxx index e31c69756b75..23cca9ce1025 100644 --- a/include/sfx2/docinf.hxx +++ b/include/sfx2/docinf.hxx @@ -23,7 +23,6 @@ #include <sfx2/dllapi.h> #include <sal/types.h> #include <vcl/errcode.hxx> -#include <com/sun/star/uno/Reference.hxx> class GDIMetaFile; @@ -35,6 +34,9 @@ namespace com { namespace sun { namespace star { } } } } +namespace com::sun::star::uno { template <typename > class Reference; } +namespace com::sun::star::uno { template <typename > class Sequence; } + namespace sfx2 { diff --git a/include/sfx2/docinsert.hxx b/include/sfx2/docinsert.hxx index d7712fb4324e..56c16ac2653b 100644 --- a/include/sfx2/docinsert.hxx +++ b/include/sfx2/docinsert.hxx @@ -22,7 +22,6 @@ #include <rtl/ustring.hxx> #include <sfx2/dllapi.h> -#include <sfx2/docfile.hxx> #include <vcl/errcode.hxx> #include <tools/link.hxx> #include <memory> @@ -31,6 +30,7 @@ namespace sfx2 { class FileDialogHelper; } namespace weld { class Window; } class SfxItemSet; +class SfxMedium; enum class FileDialogFlags; typedef ::std::vector< std::unique_ptr<SfxMedium> > SfxMediumList; diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx index e75c043f0c19..95be9d6444dc 100644 --- a/include/sfx2/dockwin.hxx +++ b/include/sfx2/dockwin.hxx @@ -25,13 +25,12 @@ #include <vcl/dockwin.hxx> #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/awt/XWindow.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <sfx2/dllapi.h> #include <sfx2/childwin.hxx> -class SfxSplitWindow; +namespace com::sun::star::frame { class XFrame; } + class SfxDockingWindow_Impl; enum class SplitWindowItemFlags; diff --git a/include/sfx2/docmacromode.hxx b/include/sfx2/docmacromode.hxx index f043e36a26d3..a1991bcc0e20 100644 --- a/include/sfx2/docmacromode.hxx +++ b/include/sfx2/docmacromode.hxx @@ -23,13 +23,15 @@ #include <sfx2/dllapi.h> #include <sfx2/signaturestate.hxx> -#include <com/sun/star/task/XInteractionHandler.hpp> -#include <com/sun/star/embed/XStorage.hpp> -#include <com/sun/star/script/XLibraryContainer.hpp> -#include <com/sun/star/document/XEmbeddedScripts.hpp> +#include <com/sun/star/uno/Reference.hxx> #include <memory> +namespace com::sun::star::document { class XEmbeddedScripts; } +namespace com::sun::star::embed { class XStorage; } +namespace com::sun::star::script { class XLibraryContainer; } +namespace com::sun::star::task { class XInteractionHandler; } + namespace sfx2 { diff --git a/include/sfx2/doctempl.hxx b/include/sfx2/doctempl.hxx index 953cc05ce17b..6ad16ceb63c2 100644 --- a/include/sfx2/doctempl.hxx +++ b/include/sfx2/doctempl.hxx @@ -27,8 +27,6 @@ // CLASS ----------------------------------------------------------------- -class SfxObjectShell; - class SfxDocTemplate_Impl; // class SfxDocumentTemplates -------------------------------------------- diff --git a/include/svx/ClassificationCommon.hxx b/include/svx/ClassificationCommon.hxx index eea0df658ffb..75ab8682d34f 100644 --- a/include/svx/ClassificationCommon.hxx +++ b/include/svx/ClassificationCommon.hxx @@ -17,6 +17,7 @@ #include <vector> #include <sfx2/classificationhelper.hxx> #include <com/sun/star/beans/XPropertyContainer.hpp> +#include <com/sun/star/beans/Property.hpp> namespace svx { diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index aa995edbf04f..0db2bfd0e7a2 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -30,6 +30,7 @@ #include <sfx2/basedlgs.hxx> #include <svtools/svmedit.hxx> #include <svl/srchdefs.hxx> +#include <svl/itempool.hxx> #include <svx/svxdllapi.h> #include <memory> #include <vector> |