diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-03-30 09:40:28 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-04-01 10:39:44 +0200 |
| commit | 80152c8c5e3482c1dc29ef1a8fbb1aea4399c39e (patch) | |
| tree | 61530f38e0967e9f947364220aac4923902ff794 | |
| parent | e296468412ee9640572103d1e6a932f8528fe83b (diff) | |
tdf#42949 Fix IWYU warnings in include/sfx2/[sS]*
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I4a3baffa8944b522b16b50975185759081662020
Reviewed-on: https://gerrit.libreoffice.org/69945
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
118 files changed, 247 insertions, 101 deletions
diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx index 5bfe9e1c5b91..8647cbd399ff 100644 --- a/basctl/source/basicide/unomodel.cxx +++ b/basctl/source/basicide/unomodel.cxx @@ -22,6 +22,8 @@ #include <iderdll.hxx> #include <com/sun/star/io/IOException.hpp> #include <comphelper/sequence.hxx> +#include <cppuhelper/queryinterface.hxx> +#include <cppuhelper/supportsservice.hxx> #include <sfx2/objsh.hxx> #include <vcl/svapp.hxx> diff --git a/basctl/source/basicide/unomodel.hxx b/basctl/source/basicide/unomodel.hxx index b73fa5fa0814..d75f40ca84f4 100644 --- a/basctl/source/basicide/unomodel.hxx +++ b/basctl/source/basicide/unomodel.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_BASCTL_SOURCE_BASICIDE_UNOMODEL_HXX #define INCLUDED_BASCTL_SOURCE_BASICIDE_UNOMODEL_HXX +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <sfx2/sfxbasemodel.hxx> diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index 408c8f36f9b7..cada8bde7494 100644 --- a/cui/source/dialogs/hlmarkwn.cxx +++ b/cui/source/dialogs/hlmarkwn.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> +#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/document/XLinkTargetSupplier.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/dbaccess/source/ui/misc/linkeddocuments.cxx b/dbaccess/source/ui/misc/linkeddocuments.cxx index e7fcd53ecb11..e315c8b81b35 100644 --- a/dbaccess/source/ui/misc/linkeddocuments.cxx +++ b/dbaccess/source/ui/misc/linkeddocuments.cxx @@ -25,6 +25,7 @@ #include <stringconstants.hxx> #include <comphelper/classids.hxx> #include <comphelper/namedvaluecollection.hxx> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/util/URL.hpp> diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index ff31e39c2c48..69597b3a8b05 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -118,6 +118,7 @@ #include <com/sun/star/table/XMergeableCellRange.hpp> #include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/table/BorderLineStyle.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <vcl/virdev.hxx> #include <svtools/embedhlp.hxx> #include <o3tl/enumrange.hxx> diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index a66056a04972..3595286db9e2 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -698,3 +698,66 @@ blacklist: include/sfx2/mieclip.hxx: # Needed for implicit dtor - tools/stream.hxx + include/sfx2/sfxbasecontroller.hxx: + # base class has to be a complete type + - com/sun/star/frame/XController2.hpp + - com/sun/star/frame/XControllerBorder.hpp + - com/sun/star/frame/XDispatchProvider.hpp + - com/sun/star/task/XStatusIndicatorSupplier.hpp + - com/sun/star/ui/XContextMenuInterception.hpp + - com/sun/star/awt/XUserInputInterception.hpp + - com/sun/star/frame/XDispatchInformationProvider.hpp + - com/sun/star/frame/XTitle.hpp + - com/sun/star/frame/XTitleChangeBroadcaster.hpp + - com/sun/star/lang/XInitialization.hpp + include/sfx2/sfxbasemodel.hxx: + # base class has to be a complete type + - com/sun/star/container/XChild.hpp + - com/sun/star/document/XDocumentPropertiesSupplier.hpp + - com/sun/star/document/XCmisDocument.hpp + - com/sun/star/rdf/XDocumentMetadataAccess.hpp + - com/sun/star/document/XDocumentRecovery.hpp + - com/sun/star/document/XUndoManagerSupplier.hpp + - com/sun/star/document/XEventBroadcaster.hpp + - com/sun/star/document/XDocumentEventBroadcaster.hpp + - com/sun/star/lang/XEventListener.hpp + - com/sun/star/document/XEventsSupplier.hpp + - com/sun/star/document/XEmbeddedScripts.hpp + - com/sun/star/document/XScriptInvocationContext.hpp + - com/sun/star/frame/XModel2.hpp + - com/sun/star/util/XModifiable2.hpp + - com/sun/star/view/XPrintable.hpp + - com/sun/star/view/XPrintJobBroadcaster.hpp + - com/sun/star/frame/XStorable2.hpp + - com/sun/star/frame/XLoadable.hpp + - com/sun/star/script/XStarBasicAccess.hpp + - com/sun/star/document/XViewDataSupplier.hpp + - com/sun/star/util/XCloseable.hpp + - com/sun/star/datatransfer/XTransferable.hpp + - com/sun/star/document/XDocumentSubStorageSupplier.hpp + - com/sun/star/document/XStorageBasedDocument.hpp + - com/sun/star/script/provider/XScriptProviderSupplier.hpp + - com/sun/star/ui/XUIConfigurationManagerSupplier.hpp + - com/sun/star/embed/XVisualObject.hpp + - com/sun/star/lang/XUnoTunnel.hpp + - com/sun/star/frame/XModule.hpp + - com/sun/star/frame/XTitle.hpp + - com/sun/star/frame/XTitleChangeBroadcaster.hpp + - com/sun/star/frame/XUntitledNumbers.hpp + include/sfx2/sfxsids.hrc: + # Needed for sfxitems.sdi to build + - svl/memberid.h + # Needed for TypedWhichId defines + - svl/typedwhich.hxx + - class SvxZoomItem + - class SfxUInt16Item + - class SvxHyperlinkItem + - class SfxDocumentInfoItem + - class SvxSearchItem + include/sfx2/shell.hxx: + # Used in macro define + - class SfxModule + include/sfx2/sfxstatuslistener.hxx: + # base class has to be a complete type + - com/sun/star/frame/XStatusListener.hpp + - com/sun/star/lang/XComponent.hpp diff --git a/include/sfx2/StyleManager.hxx b/include/sfx2/StyleManager.hxx index 593da26d7f4c..625c9350b03c 100644 --- a/include/sfx2/StyleManager.hxx +++ b/include/sfx2/StyleManager.hxx @@ -12,14 +12,14 @@ #include <sfx2/dllapi.h> -#include <vcl/outdev.hxx> - -#include <sfx2/StylePreviewRenderer.hxx> #include <svl/style.hxx> -#include <sfx2/objsh.hxx> #include <memory> +class OutputDevice; +class SfxObjectShell; +namespace sfx2 { class StylePreviewRenderer; } + namespace sfx2 { diff --git a/include/sfx2/StylePreviewRenderer.hxx b/include/sfx2/StylePreviewRenderer.hxx index 9843cf00e529..0a1c67063776 100644 --- a/include/sfx2/StylePreviewRenderer.hxx +++ b/include/sfx2/StylePreviewRenderer.hxx @@ -11,10 +11,11 @@ #define INCLUDED_SFX2_STYLEPREVIEWRENDERER_HXX #include <sfx2/dllapi.h> -#include <vcl/outdev.hxx> -#include <svl/style.hxx> #include <sfx2/objsh.hxx> +class OutputDevice; +class SfxStyleSheetBase; + namespace sfx2 { diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx index 14fa0a7aca2d..97f5dae19ecf 100644 --- a/include/sfx2/dispatch.hxx +++ b/include/sfx2/dispatch.hxx @@ -39,6 +39,8 @@ class SfxModule; class Point; struct SfxDispatcher_Impl; +namespace vcl { class Window; } + enum class SfxDispatcherPopFlags { NONE = 0, diff --git a/include/sfx2/docfac.hxx b/include/sfx2/docfac.hxx index 84503fb0768a..38716ea34f7d 100644 --- a/include/sfx2/docfac.hxx +++ b/include/sfx2/docfac.hxx @@ -31,6 +31,8 @@ class SfxFilter; class SfxViewFactory; struct SfxObjectFactory_Impl; class SfxFilterContainer; +class SvGlobalName; +class SfxModule; typedef void (*SfxVoidFunc)(); diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index c44db6f90a58..d16eb2e1c95b 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -62,6 +62,7 @@ class Button; class OutputDevice; class Color; class Fraction; +class SvGlobalName; enum class SfxModelFlags; enum class SfxEventHintId; @@ -81,6 +82,7 @@ namespace sfx2 class StyleManager; } +namespace vcl { class Window; } namespace com::sun::star::beans { struct PropertyValue; } namespace com::sun::star::document { struct CmisVersion; } namespace com::sun::star::embed { class XStorage; } diff --git a/include/sfx2/sfxbasecontroller.hxx b/include/sfx2/sfxbasecontroller.hxx index 1f834835602a..e15d53e4ab53 100644 --- a/include/sfx2/sfxbasecontroller.hxx +++ b/include/sfx2/sfxbasecontroller.hxx @@ -24,39 +24,38 @@ #include <sal/config.h> #include <sfx2/dllapi.h> #include <sal/types.h> -#include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> -#include <com/sun/star/frame/DispatchDescriptor.hpp> #include <com/sun/star/frame/XDispatchInformationProvider.hpp> #include <com/sun/star/frame/XController2.hpp> #include <com/sun/star/frame/XControllerBorder.hpp> -#include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XTitle.hpp> #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp> -#include <com/sun/star/util/URL.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <cppuhelper/implbase.hxx> #include <cppuhelper/basemutex.hxx> #include <com/sun/star/task/XStatusIndicatorSupplier.hpp> #include <com/sun/star/ui/XContextMenuInterception.hpp> -#include <com/sun/star/ui/XContextMenuInterceptor.hpp> -#include <com/sun/star/awt/XMouseClickHandler.hpp> -#include <com/sun/star/awt/XKeyHandler.hpp> #include <com/sun/star/awt/XUserInputInterception.hpp> #include <tools/link.hxx> -#include <vcl/button.hxx> -#include <com/sun/star/ui/XSidebarProvider.hpp> - -#include <sfx2/viewsh.hxx> -#include <sfx2/sfxuno.hxx> #include <sfx2/groupid.hxx> +namespace com::sun::star::awt { class XKeyHandler; } +namespace com::sun::star::awt { class XMouseClickHandler; } +namespace com::sun::star::frame { class XDispatch; } +namespace com::sun::star::frame { class XFrame; } +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::frame { struct DispatchDescriptor; } +namespace com::sun::star::ui { class XContextMenuInterceptor; } +namespace com::sun::star::ui { class XSidebarProvider; } +namespace com::sun::star::util { struct URL; } + struct IMPL_SfxBaseController_DataContainer ; // impl. struct to hold member of class SfxBaseController +class Button; +class NotifyEvent; class SfxViewFrame; +class SfxViewShell; sal_Int16 MapGroupIDToCommandGroup( SfxGroupId nGroupID ); diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx index 0f93d8652b6c..9dcba7e68542 100644 --- a/include/sfx2/sfxbasemodel.hxx +++ b/include/sfx2/sfxbasemodel.hxx @@ -23,65 +23,44 @@ #include <sal/config.h> #include <sfx2/dllapi.h> #include <sal/types.h> -#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XModule.hpp> #include <com/sun/star/frame/XTitle.hpp> #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp> #include <com/sun/star/frame/XUntitledNumbers.hpp> #include <com/sun/star/container/XChild.hpp> -#include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/container/XNameReplace.hpp> -#include <com/sun/star/frame/XController2.hpp> #include <com/sun/star/document/XCmisDocument.hpp> -#include <com/sun/star/document/CmisVersion.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/document/XDocumentRecovery.hpp> #include <com/sun/star/document/XUndoManagerSupplier.hpp> #include <com/sun/star/rdf/XDocumentMetadataAccess.hpp> #include <com/sun/star/document/XEventBroadcaster.hpp> #include <com/sun/star/document/XDocumentEventBroadcaster.hpp> -#include <com/sun/star/document/XEventListener.hpp> #include <com/sun/star/document/XEventsSupplier.hpp> #include <com/sun/star/document/XEmbeddedScripts.hpp> -#include <com/sun/star/document/EventObject.hpp> #include <com/sun/star/document/XDocumentSubStorageSupplier.hpp> #include <com/sun/star/document/XStorageBasedDocument.hpp> #include <com/sun/star/document/XScriptInvocationContext.hpp> #include <com/sun/star/lang/XEventListener.hpp> -#include <com/sun/star/lang/NotInitializedException.hpp> -#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/frame/XModel2.hpp> -#include <com/sun/star/frame/DoubleInitializationException.hpp> #include <com/sun/star/util/XModifiable2.hpp> -#include <com/sun/star/util/XModifyListener.hpp> #include <com/sun/star/util/XCloseable.hpp> -#include <com/sun/star/util/XCloseBroadcaster.hpp> -#include <com/sun/star/util/XCloseListener.hpp> -#include <com/sun/star/util/CloseVetoException.hpp> #include <com/sun/star/view/XPrintable.hpp> #include <com/sun/star/view/XPrintJobBroadcaster.hpp> #include <com/sun/star/frame/XStorable2.hpp> #include <com/sun/star/frame/XLoadable.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/document/CmisProperty.hpp> #include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/datatransfer/XTransferable.hpp> #include <com/sun/star/script/provider/XScriptProviderSupplier.hpp> -#include <com/sun/star/ui/XUIConfigurationManager2.hpp> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/embed/XVisualObject.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Any.hxx> -#include <cppuhelper/weak.hxx> #include <cppuhelper/basemutex.hxx> -#include <cppuhelper/typeprovider.hxx> #include <com/sun/star/script/XStarBasicAccess.hpp> -#include <vcl/svapp.hxx> #include <com/sun/star/document/XViewDataSupplier.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -#include <com/sun/star/task/XInteractionHandler.hpp> #include <cppuhelper/implbase.hxx> #include <svl/lstner.hxx> @@ -89,10 +68,7 @@ class ErrCode; class SfxMedium; -class SfxPrinter; -class SfxViewShell; class SfxObjectShell ; -class SfxEventHint; class SfxViewFrame; struct IMPL_SfxBaseModel_DataContainer ; // impl. struct to hold member of class SfxBaseModel @@ -100,6 +76,19 @@ namespace sfx { namespace intern { class ViewCreationGuard; } } +namespace com::sun::star::beans { struct PropertyValue; } +namespace com::sun::star::container { class XNameContainer; } +namespace com::sun::star::container { class XNameReplace; } +namespace com::sun::star::document { class XEventListener; } +namespace com::sun::star::document { struct CmisProperty; } +namespace com::sun::star::document { struct CmisVersion; } +namespace com::sun::star::document { struct EventObject; } +namespace com::sun::star::frame { class XController2; } +namespace com::sun::star::task { class XInteractionHandler; } +namespace com::sun::star::ui { class XUIConfigurationManager2; } +namespace com::sun::star::util { class XCloseListener; } +namespace com::sun::star::util { class XModifyListener; } + // class declarations diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx index 26d978d3b13d..2250bd07bf96 100644 --- a/include/sfx2/sfxdlg.hxx +++ b/include/sfx2/sfxdlg.hxx @@ -23,37 +23,28 @@ #include <sfx2/dllapi.h> #include <vcl/abstdlg.hxx> -#include <com/sun/star/embed/XEmbeddedObject.hpp> -#include <com/sun/star/embed/XStorage.hpp> -#include <com/sun/star/frame/XFrame.hpp> -#include <sot/exchange.hxx> -#include <sfx2/lnkbase.hxx> +#include <sot/formats.hxx> #include <sfx2/tabdlg.hxx> -#include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.h> -class SfxTabPage; -class SfxViewFrame; -class SfxBindings; class SfxItemSet; namespace vcl { class Window; } -namespace rtl { - class OUString; -}; class SfxItemPool; class SvObjectServerList; class TransferableDataHelper; -struct TransferableObjectDescriptor; +class SvGlobalName; namespace sfx2 { class LinkManager; + class SvBaseLink; } -namespace com { namespace sun { namespace star { namespace frame { - class XModel; -} } } } +namespace com::sun::star::embed { class XEmbeddedObject; } +namespace com::sun::star::embed { class XStorage; } +namespace com::sun::star::io { class XInputStream; } +namespace com::sun::star::uno { class Any; } class SfxAbstractDialog : virtual public VclAbstractDialog { @@ -119,7 +110,7 @@ public: virtual void SetRunLabel() = 0; }; -namespace com { namespace sun { namespace star { namespace frame { class XFrame; } } } } +namespace com::sun::star::frame { class XFrame; } class SFX2_DLLPUBLIC SfxAbstractDialogFactory : virtual public VclAbstractDialogFactory { diff --git a/include/sfx2/sfxhelp.hxx b/include/sfx2/sfxhelp.hxx index d7afeb2b9af0..5dd0a81fc1e9 100644 --- a/include/sfx2/sfxhelp.hxx +++ b/include/sfx2/sfxhelp.hxx @@ -24,9 +24,6 @@ #include <sfx2/dllapi.h> #include <sal/types.h> #include <vcl/help.hxx> -#include <memory> - -class SfxFrame; class SFX2_DLLPUBLIC SfxHelp : public Help { diff --git a/include/sfx2/sfxhtml.hxx b/include/sfx2/sfxhtml.hxx index 5a140f59f0cf..ab7070c79af2 100644 --- a/include/sfx2/sfxhtml.hxx +++ b/include/sfx2/sfxhtml.hxx @@ -31,7 +31,6 @@ class ImageMap; class SfxMedium; -class SfxObjectShell; class SvNumberFormatter; class SFX2_DLLPUBLIC SfxHTMLParser : public HTMLParser diff --git a/include/sfx2/sfxmodelfactory.hxx b/include/sfx2/sfxmodelfactory.hxx index f7b000b548e4..1010fc0e3453 100644 --- a/include/sfx2/sfxmodelfactory.hxx +++ b/include/sfx2/sfxmodelfactory.hxx @@ -22,10 +22,14 @@ #include <sfx2/dllapi.h> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> +#include <com/sun/star/uno/Reference.hxx> #include <o3tl/typed_flags_set.hxx> +namespace com::sun::star::lang { class XMultiServiceFactory; } +namespace com::sun::star::lang { class XSingleServiceFactory; } +namespace com::sun::star::uno { class XInterface; } +namespace com::sun::star::uno { template <class E> class Sequence; } + enum class SfxModelFlags { NONE = 0x00, diff --git a/include/sfx2/sfxresid.hxx b/include/sfx2/sfxresid.hxx index 5557f652c57b..922c59941738 100644 --- a/include/sfx2/sfxresid.hxx +++ b/include/sfx2/sfxresid.hxx @@ -21,7 +21,6 @@ #include <sfx2/dllapi.h> #include <rtl/ustring.hxx> -#include <locale> SFX2_DLLPUBLIC OUString SfxResId(const char* pId); diff --git a/include/sfx2/sfxstatuslistener.hxx b/include/sfx2/sfxstatuslistener.hxx index f612da5f4755..56ea2d57b11d 100644 --- a/include/sfx2/sfxstatuslistener.hxx +++ b/include/sfx2/sfxstatuslistener.hxx @@ -23,15 +23,15 @@ #include <sal/config.h> #include <sfx2/dllapi.h> #include <svl/poolitem.hxx> -#include <cppuhelper/weak.hxx> -#include <osl/conditn.hxx> -#include <com/sun/star/frame/FeatureStateEvent.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <cppuhelper/implbase.hxx> +namespace com::sun::star::frame { class XDispatch; } +namespace com::sun::star::frame { class XDispatchProvider; } +namespace com::sun::star::frame { struct FeatureStateEvent; } + class SFX2_DLLPUBLIC SfxStatusListener : public cppu::WeakImplHelper< css::frame::XStatusListener, css::lang::XComponent> diff --git a/include/sfx2/sfxuno.hxx b/include/sfx2/sfxuno.hxx index 9b968dff5d5c..6c6253f37f76 100644 --- a/include/sfx2/sfxuno.hxx +++ b/include/sfx2/sfxuno.hxx @@ -22,21 +22,10 @@ #include <sal/config.h> #include <sfx2/dllapi.h> -#include <com/sun/star/uno/Exception.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/util/URL.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/beans/NamedValue.hpp> - -#include <com/sun/star/uno/Sequence.hxx> -#include <cppuhelper/typeprovider.hxx> -#include <cppuhelper/queryinterface.hxx> -#include <cppuhelper/factory.hxx> -#include <cppuhelper/supportsservice.hxx> -#include <rtl/ustring.hxx> +namespace com::sun::star::beans { struct NamedValue; } +namespace com::sun::star::beans { struct PropertyValue; } +namespace com::sun::star::uno { template <class E> class Sequence; } class SfxAllItemSet ; class SfxItemSet ; diff --git a/include/sfx2/shell.hxx b/include/sfx2/shell.hxx index 17bbcf3d9229..b4bd938a379d 100644 --- a/include/sfx2/shell.hxx +++ b/include/sfx2/shell.hxx @@ -20,41 +20,32 @@ #define INCLUDED_SFX2_SHELL_HXX #include <memory> -#include <com/sun/star/embed/VerbDescriptor.hpp> #include <rtl/ustring.hxx> #include <sal/config.h> #include <sal/types.h> #include <svl/typedwhich.hxx> #include <sfx2/dllapi.h> -#include <sfx2/sfxuno.hxx> #include <svl/SfxBroadcaster.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/strong_int.hxx> -namespace vcl { class Window; } -class ToolBox; +namespace com::sun::star::embed { struct VerbDescriptor; } +namespace com::sun::star::uno { template <class E> class Sequence; } + class SfxItemPool; class SfxPoolItem; class SfxRequest; class SfxItemSet; -struct SfxFormalArgument; -class StatusBar; class SfxInterface; class SfxViewShell; class SfxObjectShell; -class SfxSlotPool; -class SvGlobalName; -class SfxShellObject; class SfxShell; struct SfxShell_Impl; -class SfxShellObject; class SfxDispatcher; class SfxViewFrame; class SfxSlot; class SfxRepeatTarget; -class SbxVariable; -class SbxBase; class SfxBindings; class SfxModule; class SfxUndoManager; diff --git a/include/sfx2/stbitem.hxx b/include/sfx2/stbitem.hxx index 5abab5b9f6b3..4531d0a23b81 100644 --- a/include/sfx2/stbitem.hxx +++ b/include/sfx2/stbitem.hxx @@ -28,7 +28,6 @@ class SfxModule; class SfxStatusBarControl; -class SfxBindings; svt::StatusbarController* SfxStatusBarControllerFactory( const css::uno::Reference< css::frame::XFrame >& rFrame, diff --git a/include/sfx2/styfitem.hxx b/include/sfx2/styfitem.hxx index 88a69fe40c72..b144c840cd8e 100644 --- a/include/sfx2/styfitem.hxx +++ b/include/sfx2/styfitem.hxx @@ -22,7 +22,6 @@ #include <rtl/ustring.hxx> #include <sal/config.h> #include <sfx2/dllapi.h> -#include <vcl/bitmap.hxx> #include <vcl/image.hxx> #include <svl/style.hxx> #include <vector> diff --git a/sc/inc/funcuno.hxx b/sc/inc/funcuno.hxx index 5efbbffd5878..4e466ced30b7 100644 --- a/sc/inc/funcuno.hxx +++ b/sc/inc/funcuno.hxx @@ -24,6 +24,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/sheet/XFunctionAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/implbase.hxx> #include <svl/lstner.hxx> #include "document.hxx" diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index 75c2cf21e015..78104c11ef2e 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -27,6 +27,7 @@ #include <osl/diagnose.h> #include <com/sun/star/container/XContentEnumerationAccess.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceName.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> @@ -35,6 +36,7 @@ #include <com/sun/star/beans/theIntrospection.hpp> #include <com/sun/star/beans/MethodConcept.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/table/XCellRange.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/sheet/XCompatibilityNames.hpp> diff --git a/sc/source/filter/excel/xeroot.cxx b/sc/source/filter/excel/xeroot.cxx index 5b0e65d27dee..cdc562a40e59 100644 --- a/sc/source/filter/excel/xeroot.cxx +++ b/sc/source/filter/excel/xeroot.cxx @@ -46,6 +46,7 @@ #include <formulabase.hxx> #include <com/sun/star/sheet/FormulaOpCodeMapEntry.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> using namespace ::com::sun::star; diff --git a/sc/source/filter/ftools/fapihelper.cxx b/sc/source/filter/ftools/fapihelper.cxx index 91e1730c7665..ca2aecfa499f 100644 --- a/sc/source/filter/ftools/fapihelper.cxx +++ b/sc/source/filter/ftools/fapihelper.cxx @@ -22,6 +22,7 @@ #include <algorithm> #include <com/sun/star/lang/XServiceName.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/beans/XPropertySetOption.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 144fc4470e32..189d0a707ede 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -115,6 +115,7 @@ #include <svx/svdobj.hxx> #include <svx/svdocapt.hxx> #include <svtools/miscopt.hxx> +#include <vcl/svapp.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx index 0a30c9c8fcc3..1b08297580b9 100644 --- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx +++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx @@ -40,6 +40,7 @@ #include <svx/svdmodel.hxx> #include <vcl/svapp.hxx> #include <sfx2/objsh.hxx> +#include <cppuhelper/queryinterface.hxx> #include <unonames.hxx> #include <document.hxx> diff --git a/sc/source/ui/unoobj/appluno.cxx b/sc/source/ui/unoobj/appluno.cxx index c7f20cf96eb4..4a3ad5221412 100644 --- a/sc/source/ui/unoobj/appluno.cxx +++ b/sc/source/ui/unoobj/appluno.cxx @@ -40,6 +40,7 @@ #include <unonames.hxx> #include <funcdesc.hxx> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/sheet/FunctionArgument.hpp> #include <memory> diff --git a/sc/source/ui/unoobj/exceldetect.cxx b/sc/source/ui/unoobj/exceldetect.cxx index 9ab0890c977e..7d3d817f708e 100644 --- a/sc/source/ui/unoobj/exceldetect.cxx +++ b/sc/source/ui/unoobj/exceldetect.cxx @@ -12,6 +12,7 @@ #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/ucb/XContent.hpp> #include <com/sun/star/ucb/ContentCreationException.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/supportsservice.hxx> #include <svl/itemset.hxx> diff --git a/sc/source/ui/unoobj/funcuno.cxx b/sc/source/ui/unoobj/funcuno.cxx index f68edf8cf196..5d9495b3199e 100644 --- a/sc/source/ui/unoobj/funcuno.cxx +++ b/sc/source/ui/unoobj/funcuno.cxx @@ -23,6 +23,7 @@ #include <svl/sharedstringpool.hxx> #include <unotools/charclass.hxx> #include <osl/diagnose.h> +#include <vcl/svapp.hxx> #include <scitems.hxx> #include <funcuno.hxx> diff --git a/sc/source/ui/unoobj/optuno.cxx b/sc/source/ui/unoobj/optuno.cxx index e74b9471618a..df61a43db0dc 100644 --- a/sc/source/ui/unoobj/optuno.cxx +++ b/sc/source/ui/unoobj/optuno.cxx @@ -18,6 +18,7 @@ */ #include <svl/itemprop.hxx> +#include <vcl/svapp.hxx> #include <com/sun/star/util/Date.hpp> diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index b44b9c87acb6..512f0f2e8027 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -69,6 +69,7 @@ #include <com/sun/star/script/XScriptListener.hpp> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/supportsservice.hxx> #include <comphelper/evtmethodhelper.hxx> #include <list> diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml index a2dad7346275..bd08f4f7fd75 100644 --- a/sd/IwyuFilter_sd.yaml +++ b/sd/IwyuFilter_sd.yaml @@ -176,6 +176,7 @@ blacklist: - com/sun/star/drawing/XDrawView.hpp - com/sun/star/drawing/framework/XControllerManager.hpp - com/sun/star/lang/XServiceInfo.hpp + - com/sun/star/lang/XUnoTunnel.hpp - com/sun/star/view/XFormLayerAccess.hpp - com/sun/star/view/XSelectionSupplier.hpp - sfx2/sfxbasecontroller.hxx diff --git a/sd/source/filter/grf/sdgrffilter.cxx b/sd/source/filter/grf/sdgrffilter.cxx index 7c6a9a1f5dce..e529d63713b1 100644 --- a/sd/source/filter/grf/sdgrffilter.cxx +++ b/sd/source/filter/grf/sdgrffilter.cxx @@ -24,6 +24,7 @@ #include <sfx2/sfxsids.hrc> #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> +#include <sfx2/sfxuno.hxx> #include <svx/svdograf.hxx> #include <strings.hrc> diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx index 8609f758c46a..9e3c9c579689 100644 --- a/sd/source/filter/xml/sdxmlwrp.cxx +++ b/sd/source/filter/xml/sdxmlwrp.cxx @@ -49,6 +49,7 @@ #include <com/sun/star/document/XExporter.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/packages/WrongPasswordException.hpp> #include <com/sun/star/packages/zip/ZipIOException.hpp> diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index 7c755100198a..ff99f940c8bf 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <sfx2/objsh.hxx> +#include <cppuhelper/queryinterface.hxx> #include <svx/svdobj.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <Window.hxx> diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index 0998aec4d612..da7b9d0c8d1e 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <cppuhelper/queryinterface.hxx> #include <comphelper/processfactory.hxx> #include <sal/log.hxx> diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx index 29e85fa9d2e7..327bfd8e731f 100644 --- a/sd/source/ui/app/sdxfer.cxx +++ b/sd/source/ui/app/sdxfer.cxx @@ -58,6 +58,7 @@ #include <sdxfer.hxx> #include <unomodel.hxx> #include <vcl/virdev.hxx> +#include <vcl/svapp.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::lang; diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx index 57d28207ea50..c2088a207092 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/drawing/framework/ConfigurationChangeEvent.hpp> #include <com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.hpp> #include <comphelper/sequence.hxx> +#include <cppuhelper/supportsservice.hxx> #include <facreg.hxx> #include <sal/log.hxx> diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index c6c961a2a6f8..84d97c18963f 100644 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <comphelper/processfactory.hxx> +#include <cppuhelper/supportsservice.hxx> #include <rtl/ref.hxx> #include <facreg.hxx> diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx index d77df9057d6d..8486a14e63cf 100644 --- a/sd/source/ui/inc/DrawController.hxx +++ b/sd/source/ui/inc/DrawController.hxx @@ -27,9 +27,11 @@ #include <com/sun/star/drawing/XDrawView.hpp> #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/XUnoTunnel.hpp> #include <comphelper/uno3.hxx> #include <cppuhelper/implbase.hxx> #include <tools/weakbase.h> +#include <tools/gen.hxx> #include <memory> #include <vector> diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx index dfc923a01c6b..dd6b65cef5d6 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.cxx +++ b/sd/source/ui/sidebar/MasterPageContainer.cxx @@ -42,6 +42,7 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/util/XCloseable.hpp> +#include <com/sun/star/util/CloseVetoException.hpp> #include <comphelper/processfactory.hxx> #include <sfx2/app.hxx> #include <svx/svdpage.hxx> diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx index cabb628a42d7..353bd6e2fe5a 100644 --- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx +++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx @@ -36,6 +36,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/PropertyState.hpp> #include <unotools/confignode.hxx> diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index 1acea57a3cb3..44ae57e10545 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -34,6 +34,7 @@ #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/bootstrap.hxx> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/typeprovider.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/drawing/framework/ConfigurationController.hpp> diff --git a/sd/source/ui/unoidl/facreg.cxx b/sd/source/ui/unoidl/facreg.cxx index d4dc0533bfcf..b6268254dfff 100644 --- a/sd/source/ui/unoidl/facreg.cxx +++ b/sd/source/ui/unoidl/facreg.cxx @@ -19,6 +19,7 @@ #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <facreg.hxx> #include <sddll.hxx> diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index 0c5288289098..ec7aa6e80612 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -19,6 +19,7 @@ #include <com/sun/star/uno/Reference.h> #include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/util/XCloseable.hpp> @@ -39,6 +40,7 @@ #include <com/sun/star/packages/WrongPasswordException.hpp> #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <rtl/ustring.hxx> #include <comphelper/processfactory.hxx> diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index bfe3fb24abc3..b26578c5ea52 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -128,6 +128,7 @@ #include <sfx2/notebookbar/SfxNotebookBar.hxx> #include <sfx2/sidebar/SidebarController.hxx> #include <sfx2/safemode.hxx> +#include <sfx2/sfxuno.hxx> #include <comphelper/types.hxx> #include <officecfg/Office/Common.hxx> diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index fcd971dcc0a5..f272a938775d 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -75,7 +75,6 @@ using namespace ::com::sun::star; using namespace ::com::sun::star::ucb; using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::registry; using namespace ::com::sun::star::frame; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::io; diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index 4dc55e2a126d..cd5686e8154a 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/util/XCloseable.hpp> +#include <com/sun/star/beans/NamedValue.hpp> #include <comphelper/string.hxx> #include <cppuhelper/implbase.hxx> #include <sal/log.hxx> diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index 13ddc3db1f5f..41af9a85031e 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -34,6 +34,7 @@ #include <sfx2/docfac.hxx> #include <com/sun/star/document/XTypeDetection.hpp> #include <com/sun/star/container/XNameAccess.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <unotools/mediadescriptor.hxx> #include <comphelper/processfactory.hxx> #include <sfx2/linkmgr.hxx> diff --git a/sfx2/source/appl/shutdownicon.hxx b/sfx2/source/appl/shutdownicon.hxx index eafeb9e25149..af3a0c17a9bd 100644 --- a/sfx2/source/appl/shutdownicon.hxx +++ b/sfx2/source/appl/shutdownicon.hxx @@ -26,6 +26,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/beans/XFastPropertySet.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <rtl/string.hxx> #include <rtl/ustring.hxx> #include <osl/mutex.hxx> diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 3767e57d768d..271584a0ceff 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/container/XContainerQuery.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/sequenceashashmap.hxx> diff --git a/sfx2/source/control/charwin.cxx b/sfx2/source/control/charwin.cxx index a2c8626c45bd..695047c11fe9 100644 --- a/sfx2/source/control/charwin.cxx +++ b/sfx2/source/control/charwin.cxx @@ -30,6 +30,8 @@ #include <sfx2/sfxresid.hxx> #include <sfx2/strings.hrc> +#include <com/sun/star/beans/PropertyValue.hpp> + using namespace com::sun::star; SvxCharView::SvxCharView(const VclPtr<VirtualDevice>& rVirDev) diff --git a/sfx2/source/control/request.cxx b/sfx2/source/control/request.cxx index 830579b306cb..dfab1b879eda 100644 --- a/sfx2/source/control/request.cxx +++ b/sfx2/source/control/request.cxx @@ -43,6 +43,7 @@ #include <sfx2/msg.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/objface.hxx> +#include <sfx2/sfxuno.hxx> #include <rtl/strbuf.hxx> diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx index cdb943f24d34..79263071914d 100644 --- a/sfx2/source/control/sfxstatuslistener.cxx +++ b/sfx2/source/control/sfxstatuslistener.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/frame/status/ItemStatus.hpp> #include <com/sun/star/frame/status/ItemState.hpp> #include <com/sun/star/frame/status/Visibility.hpp> +#include <com/sun/star/frame/XDispatchProvider.hpp> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> diff --git a/sfx2/source/dialog/documentfontsdialog.cxx b/sfx2/source/dialog/documentfontsdialog.cxx index d0515007b296..73e9aad8471d 100644 --- a/sfx2/source/dialog/documentfontsdialog.cxx +++ b/sfx2/source/dialog/documentfontsdialog.cxx @@ -22,6 +22,7 @@ #include <sfx2/objsh.hxx> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> using namespace ::com::sun::star; diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 361e66f688b3..a39fb30f51cd 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -36,6 +36,8 @@ #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> diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index 5114b033d7a0..d9ebd67973f1 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/document/XCmisDocument.hpp> #include <com/sun/star/util/RevisionTag.hpp> +#include <com/sun/star/beans/NamedValue.hpp> #include <unotools/localedatawrapper.hxx> #include <svl/eitem.hxx> diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index 17ccf55e2db5..313065b3cab5 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/frame/XLoadable.hpp> #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> diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 81df58aa2e40..a389396caf56 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -64,11 +64,13 @@ #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> @@ -127,6 +129,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/docfac.hxx> #include <sfx2/sfxsids.hrc> +#include <sfx2/sfxuno.hxx> #include <openflag.hxx> #include <officecfg/Office/Common.hxx> #include <comphelper/propertysequence.hxx> diff --git a/sfx2/source/doc/docundomanager.cxx b/sfx2/source/doc/docundomanager.cxx index 9d08efcfd6a4..33498cfd666b 100644 --- a/sfx2/source/doc/docundomanager.cxx +++ b/sfx2/source/doc/docundomanager.cxx @@ -25,6 +25,7 @@ #include <sfx2/viewsh.hxx> #include <sfx2/bindings.hxx> #include <com/sun/star/lang/NoSupportException.hpp> +#include <com/sun/star/lang/NotInitializedException.hpp> #include <svl/undo.hxx> #include <tools/diagnose_ex.h> #include <framework/undomanagerhelper.hxx> diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index f925d71bfa17..5c8b57234319 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -46,6 +46,7 @@ #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> @@ -82,6 +83,7 @@ #include <sfx2/app.hxx> #include <sfx2/objsh.hxx> #include <sfx2/request.hxx> +#include <sfx2/sfxuno.hxx> #include <sfxtypes.hxx> #include <alienwarn.hxx> diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 1a13ff4d60e7..882908f3fc82 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -99,6 +99,7 @@ #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> diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 97e3734835a9..3f59ecb9a3e3 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -97,6 +97,7 @@ #include <sfx2/objface.hxx> #include <sfx2/checkin.hxx> #include <sfx2/infobar.hxx> +#include <sfx2/sfxuno.hxx> #include <SfxRedactionHelper.hxx> #include <com/sun/star/document/XDocumentSubStorageSupplier.hpp> diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index c3c4a0cd4259..c2429a78a6b2 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -123,6 +123,7 @@ #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> diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index dc99a84414a8..96c1584bc193 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -63,6 +63,7 @@ #include <com/sun/star/document/XEmbeddedScripts.hpp> #include <com/sun/star/document/XScriptInvocationContext.hpp> #include <com/sun/star/ucb/ContentCreationException.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <svl/urihelper.hxx> #include <unotools/pathoptions.hxx> @@ -93,6 +94,7 @@ #include <sfx2/msg.hxx> #include <appbaslib.hxx> #include <sfx2/sfxbasemodel.hxx> +#include <sfx2/sfxuno.hxx> #include <shellimpl.hxx> #include <sfx2/notebookbar/SfxNotebookBar.hxx> diff --git a/sfx2/source/doc/ownsubfilterservice.cxx b/sfx2/source/doc/ownsubfilterservice.cxx index 7edb7dc777b7..ee002aacfd93 100644 --- a/sfx2/source/doc/ownsubfilterservice.cxx +++ b/sfx2/source/doc/ownsubfilterservice.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/io/XStream.hpp> diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 8537b43de933..67c6a009f090 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -32,9 +32,11 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/NoSupportException.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> +#include <com/sun/star/lang/NotInitializedException.hpp> #include <com/sun/star/frame/Desktop.hpp> #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> @@ -56,6 +58,7 @@ #include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/util/InvalidStateException.hpp> +#include <com/sun/star/util/CloseVetoException.hpp> #include <comphelper/enumhelper.hxx> #include <cppuhelper/implbase.hxx> diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx index 1cd797b8f6b8..292e2fd480a2 100644 --- a/sfx2/source/doc/sfxmodelfactory.cxx +++ b/sfx2/source/doc/sfxmodelfactory.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <comphelper/namedvaluecollection.hxx> #include <cppuhelper/implbase.hxx> diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index f713b4966b5e..5d29aab49869 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -44,6 +44,7 @@ #include <vcl/svapp.hxx> #include <vcl/weld.hxx> +#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/document/MacroExecMode.hpp> diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx index 51b564e6e683..580a865c8a8f 100644 --- a/sfx2/source/inc/docundomanager.hxx +++ b/sfx2/source/inc/docundomanager.hxx @@ -25,6 +25,7 @@ #include <com/sun/star/document/XUndoManager.hpp> #include <cppuhelper/implbase.hxx> +#include <vcl/svapp.hxx> #include <memory> diff --git a/sfx2/source/styles/StyleManager.cxx b/sfx2/source/styles/StyleManager.cxx index 346c0e5235ee..6a78c09af54c 100644 --- a/sfx2/source/styles/StyleManager.cxx +++ b/sfx2/source/styles/StyleManager.cxx @@ -8,6 +8,7 @@ */ #include <sfx2/StyleManager.hxx> +#include <sfx2/objsh.hxx> namespace sfx2 { diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 7bedde6eb23e..8cf03f6daffc 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -49,6 +49,7 @@ #include <sfx2/docfile.hxx> #include <sfx2/docfilt.hxx> #include <sfx2/strings.hrc> +#include <sfx2/sfxuno.hxx> #include <toolkit/awt/vclxdevice.hxx> diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 47fbfd7afbf7..029f12d15765 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -38,6 +38,7 @@ #include <com/sun/star/container/XContainerQuery.hpp> #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/implbase.hxx> #include <osl/file.hxx> diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx index 48760e0f046e..fb43b5ce5bee 100644 --- a/starmath/source/cfgitem.cxx +++ b/starmath/source/cfgitem.cxx @@ -33,6 +33,8 @@ #include <osl/diagnose.h> #include <i18nlangtag/languagetag.hxx> +#include <com/sun/star/beans/PropertyValue.hpp> + #include <officecfg/Office/Math.hxx> #include "cfgitem.hxx" diff --git a/starmath/source/register.cxx b/starmath/source/register.cxx index da5ac3630982..304fb8fba2fa 100644 --- a/starmath/source/register.cxx +++ b/starmath/source/register.cxx @@ -21,6 +21,8 @@ #include <sfx2/sfxmodelfactory.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> + #include "register.hxx" using namespace ::com::sun::star; diff --git a/starmath/source/unofilter.cxx b/starmath/source/unofilter.cxx index 2379158cad8f..8c142e8f7274 100644 --- a/starmath/source/unofilter.cxx +++ b/starmath/source/unofilter.cxx @@ -12,6 +12,7 @@ #include <unotools/mediadescriptor.hxx> #include <unotools/ucbstreamhelper.hxx> #include <sot/storage.hxx> +#include <cppuhelper/supportsservice.hxx> #include <document.hxx> #include "mathtype.hxx" diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx index f033b79e435c..56d422f5d268 100644 --- a/starmath/source/unomodel.cxx +++ b/starmath/source/unomodel.cxx @@ -35,6 +35,7 @@ #include <comphelper/propertysetinfo.hxx> #include <comphelper/sequence.hxx> #include <comphelper/servicehelper.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <unotools/moduleoptions.hxx> #include <tools/mapunit.hxx> diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index c8f41b1a8da4..00b0d6ec95ac 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -37,6 +37,7 @@ #include <tools/debug.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/compbase.hxx> +#include <cppuhelper/supportsservice.hxx> #include <comphelper/processfactory.hxx> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index b6118c7bb2d2..227465c4da99 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -27,6 +27,7 @@ #include <comphelper/fileformat.h> #include <comphelper/processfactory.hxx> #include <osl/file.hxx> +#include <osl/thread.hxx> #include <tools/urlobj.hxx> #include <tools/vcompat.hxx> #include <unotools/streamwrap.hxx> diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx index 7ad11da8922b..fbfc077c32ae 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.cxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.cxx @@ -31,6 +31,8 @@ #include <svl/itempool.hxx> #include <helpids.h> +#include <com/sun/star/beans/NamedValue.hpp> + #define SPACING_VERY_TIGHT -30 #define SPACING_TIGHT -15 #define SPACING_NORMAL 0 diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index 80a94a589730..474ca2c81f0d 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -49,6 +49,7 @@ #include <bitmaps.hlst> #include <unotools/localedatawrapper.hxx> +#include <com/sun/star/beans/PropertyValue.hpp> /* [Description] diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx index 50c55e93e85f..1e97e160f289 100644 --- a/svx/source/stbctrls/selctrl.cxx +++ b/svx/source/stbctrls/selctrl.cxx @@ -30,6 +30,8 @@ #include "stbctrls.h" #include <bitmaps.hlst> +#include <com/sun/star/beans/PropertyValue.hpp> + SFX_IMPL_STATUSBAR_CONTROL(SvxSelectionModeControl, SfxUInt16Item); /// Popup menu to select the selection type diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index deb717dacaf9..92807494e8e0 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -42,6 +42,8 @@ #include <bitmaps.hlst> #include <sal/log.hxx> +#include <com/sun/star/beans/PropertyValue.hpp> + SFX_IMPL_STATUSBAR_CONTROL( XmlSecStatusBarControl, SfxUInt16Item ); struct XmlSecStatusBarControl::XmlSecStatusBarControl_Impl diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index 3cf48cf01800..34e0b26c5495 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -39,6 +39,8 @@ #include "modctrl_internal.hxx" #include <bitmaps.hlst> +#include <com/sun/star/beans/PropertyValue.hpp> + SFX_IMPL_STATUSBAR_CONTROL(SvxZoomStatusBarControl,SvxZoomItem); class ZoomPopup_Impl diff --git a/svx/source/styles/CommonStylePreviewRenderer.cxx b/svx/source/styles/CommonStylePreviewRenderer.cxx index f56d6fed9513..886200571d74 100644 --- a/svx/source/styles/CommonStylePreviewRenderer.cxx +++ b/svx/source/styles/CommonStylePreviewRenderer.cxx @@ -14,6 +14,7 @@ #include <sfx2/objsh.hxx> #include <svl/style.hxx> #include <svl/itemset.hxx> +#include <vcl/outdev.hxx> #include <com/sun/star/drawing/FillStyle.hpp> #include <svx/xdef.hxx> diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index b605925a33eb..8cc934e5aefd 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -42,6 +42,8 @@ #include <vcl/svapp.hxx> #include <vcl/virdev.hxx> +#include <com/sun/star/beans/NamedValue.hpp> + using namespace com::sun::star; diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 52de39344894..bebcbd8b36d0 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -104,6 +104,7 @@ #include <svl/currencytable.hxx> #include <svtools/langtab.hxx> #include <cppu/unotype.hxx> +#include <cppuhelper/supportsservice.hxx> #include <officecfg/Office/Common.hxx> #include <o3tl/typed_flags_set.hxx> #include <bitmaps.hlst> diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index edc1b77f2a92..9e9fe4071a59 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -67,6 +67,7 @@ #include <sfx2/app.hxx> #include <sfx2/fcontnr.hxx> #include <sal/log.hxx> +#include <cppuhelper/queryinterface.hxx> #include <memory> diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx index f3f6657af420..ea856f80d9c4 100644 --- a/sw/inc/docsh.hxx +++ b/sw/inc/docsh.hxx @@ -20,6 +20,7 @@ #define INCLUDED_SW_INC_DOCSH_HXX #include <memory> +#include <vector> #include <rtl/ref.hxx> #include <com/sun/star/uno/Sequence.h> #include <sfx2/docfac.hxx> diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 0ceb70b3f888..7c956e374492 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -77,6 +77,7 @@ class SwXDrawPage; class SwUnoCursor; class SwXDocumentPropertyHelper; class SfxViewFrame; +class SfxViewShell; class SwPrintUIOptions; class SwPrintData; class SwRenderData; diff --git a/sw/source/core/access/acccell.cxx b/sw/source/core/access/acccell.cxx index ac80522b1cb0..b229b466ff78 100644 --- a/sw/source/core/access/acccell.cxx +++ b/sw/source/core/access/acccell.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <unotools/accessiblestatesethelper.hxx> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/typeprovider.hxx> #include <vcl/svapp.hxx> #include <cellfrm.hxx> #include <tabfrm.hxx> diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index a88b9ee4fdba..933806e084e0 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <unotools/accessiblestatesethelper.hxx> +#include <cppuhelper/typeprovider.hxx> #include <sfx2/viewsh.hxx> #include <vcl/svapp.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/sw/source/core/access/accembedded.cxx b/sw/source/core/access/accembedded.cxx index 7f0278c85a20..a9ee92d26531 100644 --- a/sw/source/core/access/accembedded.cxx +++ b/sw/source/core/access/accembedded.cxx @@ -20,6 +20,7 @@ #include <vcl/svapp.hxx> #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/uno/RuntimeException.hpp> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <flyfrm.hxx> #include "accembedded.hxx" diff --git a/sw/source/core/access/accnotextframe.cxx b/sw/source/core/access/accnotextframe.cxx index b78e534ab4e0..48abb68cacfb 100644 --- a/sw/source/core/access/accnotextframe.cxx +++ b/sw/source/core/access/accnotextframe.cxx @@ -20,6 +20,7 @@ #include <vcl/svapp.hxx> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <unotools/accessiblestatesethelper.hxx> +#include <cppuhelper/typeprovider.hxx> #include <frmfmt.hxx> #include <ndnotxt.hxx> #include <flyfrm.hxx> diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 3abbd7a60826..350458840bcb 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -87,6 +87,7 @@ #include "parachangetrackinginfo.hxx" #include <com/sun/star/text/TextMarkupType.hpp> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/typeprovider.hxx> #include <svx/colorwindow.hxx> #include <editeng/editids.hrc> diff --git a/sw/source/core/access/acctextframe.cxx b/sw/source/core/access/acctextframe.cxx index 11a4043c314d..22f7c6b917dd 100644 --- a/sw/source/core/access/acctextframe.cxx +++ b/sw/source/core/access/acctextframe.cxx @@ -18,6 +18,7 @@ */ #include <com/sun/star/accessibility/XAccessibleContext.hpp> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <vcl/svapp.hxx> #include <sal/log.hxx> diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index 1cc1d4ba1237..e8cd7792a1a2 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -58,6 +58,8 @@ #include <IDocumentStylePoolAccess.hxx> #include <IDocumentState.hxx> +#include <com/sun/star/beans/PropertyValue.hpp> + using namespace ::com::sun::star; sal_uInt16 SwNumRule::mnRefCount = 0; diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx index 2c7f54651237..b908b4d31a6f 100644 --- a/sw/source/core/edit/edfcol.cxx +++ b/sw/source/core/edit/edfcol.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp> #include <com/sun/star/drawing/XShapes.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/text/RelOrientation.hpp> diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx index 1e9f868f1fb1..61f0f3500c74 100644 --- a/sw/source/core/unocore/unocrsrhelper.cxx +++ b/sw/source/core/unocore/unocrsrhelper.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/text/XTextSection.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <svx/svxids.hrc> #include <svx/unoshape.hxx> diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx index b3f0f71d60de..ef8226d511b4 100644 --- a/sw/source/core/unocore/unoredline.cxx +++ b/sw/source/core/unocore/unoredline.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/text/XTextTable.hpp> +#include <cppuhelper/typeprovider.hxx> #include <vcl/svapp.hxx> #include <pagedesc.hxx> diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index 9d0f3ed3c344..9c71b4f816ad 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -82,6 +82,7 @@ #include <comphelper/servicehelper.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/typeprovider.hxx> #include <comphelper/sequence.hxx> #include <sal/log.hxx> diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx index dc141851a29a..47bef0ee7fa5 100644 --- a/sw/source/filter/rtf/swparrtf.cxx +++ b/sw/source/filter/rtf/swparrtf.cxx @@ -35,6 +35,7 @@ #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/document/XImporter.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> using namespace ::com::sun::star; diff --git a/sw/source/filter/ww8/docxtablestyleexport.cxx b/sw/source/filter/ww8/docxtablestyleexport.cxx index dea7b0209bca..2e3aa4892cdd 100644 --- a/sw/source/filter/ww8/docxtablestyleexport.cxx +++ b/sw/source/filter/ww8/docxtablestyleexport.cxx @@ -18,6 +18,7 @@ #include <boost/optional.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> using namespace com::sun::star; using namespace oox; diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx index bd32d7db8864..0cc938391fab 100644 --- a/sw/source/filter/ww8/ww8par.cxx +++ b/sw/source/filter/ww8/ww8par.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/frame/XModel.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <i18nlangtag/languagetag.hxx> diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx index f6b0032dea00..5c21ff3a4309 100644 --- a/sw/source/filter/xml/xmlexp.cxx +++ b/sw/source/filter/xml/xmlexp.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/document/IndexedPropertyValues.hpp> #include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/xforms/XFormsSupplier.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <o3tl/any.hxx> #include <officecfg/Office/Common.hxx> diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index 5355627160e6..5828a4997eff 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -37,6 +37,8 @@ #include <cmdid.h> #include <helpids.h> #include <wrtsh.hxx> +#include <cppuhelper/queryinterface.hxx> +#include <cppuhelper/supportsservice.hxx> #include <svl/imageitm.hxx> #include <vcl/lstbox.hxx> #include <vcl/settings.hxx> diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx index 2083966a01d2..a42ede147425 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.cxx +++ b/sw/source/uibase/sidebar/PageMarginControl.cxx @@ -38,6 +38,7 @@ #include <cmdid.h> #include <com/sun/star/document/XUndoManagerSupplier.hpp> +#include <com/sun/star/beans/NamedValue.hpp> #include <vcl/settings.hxx> diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx b/sw/source/uibase/sidebar/StylePresetsPanel.cxx index e55712fdbe18..659df9f73d6a 100644 --- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx +++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx @@ -26,6 +26,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/objsh.hxx> +#include <sfx2/StylePreviewRenderer.hxx> #include <com/sun/star/frame/DocumentTemplates.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx index 20feb24d8e46..1e7bb75f04a5 100644 --- a/sw/source/uibase/uno/SwXDocumentSettings.cxx +++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx @@ -28,6 +28,7 @@ #include <sfx2/sfxbasecontroller.hxx> #include "SwXDocumentSettings.hxx" #include <comphelper/MasterPropertySetInfo.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/i18n/XForbiddenCharacters.hpp> diff --git a/sw/source/uibase/uno/SwXDocumentSettings.hxx b/sw/source/uibase/uno/SwXDocumentSettings.hxx index 6f4adc542f2f..ab4cc5f2311c 100644 --- a/sw/source/uibase/uno/SwXDocumentSettings.hxx +++ b/sw/source/uibase/uno/SwXDocumentSettings.hxx @@ -25,6 +25,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <cppuhelper/weak.hxx> +#include <vcl/vclptr.hxx> class SwXTextDocument; class SwDocShell; diff --git a/sw/source/uibase/uno/unofreg.cxx b/sw/source/uibase/uno/unofreg.cxx index 74620c241033..eed079f6801a 100644 --- a/sw/source/uibase/uno/unofreg.cxx +++ b/sw/source/uibase/uno/unofreg.cxx @@ -28,6 +28,8 @@ #include <sfx2/sfxmodelfactory.hxx> #include <vcl/svapp.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> + #include <string.h> using namespace ::com::sun::star; diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx index 51c0c9243970..dd4b8c148d32 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -77,6 +77,7 @@ #include <comphelper/profilezone.hxx> #include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/typeprovider.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx index 29f698df0a0d..ce935fb17ead 100644 --- a/sw/source/uibase/utlui/unotools.cxx +++ b/sw/source/uibase/utlui/unotools.cxx @@ -38,6 +38,7 @@ #include <com/sun/star/view/XViewSettingsSupplier.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/propertysequence.hxx> #include <sfx2/dispatch.hxx> diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index c9947af27758..c5c549f92a2d 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -43,6 +43,7 @@ #include <vcl/wmfexternal.hxx> #include <vcl/graph.hxx> #include <vcl/settings.hxx> +#include <vcl/svapp.hxx> #include "rtfsdrimport.hxx" #include "rtfreferenceproperties.hxx" #include "rtfskipdestination.hxx" diff --git a/xmlsecurity/qa/unit/signing/signing.cxx b/xmlsecurity/qa/unit/signing/signing.cxx index 82890b2b8808..a3ad4cb6ad5a 100644 --- a/xmlsecurity/qa/unit/signing/signing.cxx +++ b/xmlsecurity/qa/unit/signing/signing.cxx @@ -37,6 +37,7 @@ #include <sfx2/objsh.hxx> #include <osl/file.hxx> #include <osl/process.h> +#include <osl/thread.hxx> #include <comphelper/ofopxmlhelper.hxx> #include <unotools/streamwrap.hxx> |