diff options
| author | Gabor Kelemen <kelemeng@ubuntu.com> | 2018-09-09 23:32:59 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-09-13 09:04:55 +0200 |
| commit | 9784934cb9054e7aa7b1574f926a555b107a31c8 (patch) | |
| tree | 9274df9080e681431cc61e8052579b2d4f3e39b4 | |
| parent | fb7c57aa0fbe1e1b627fc3e6616b5bb8ed0a92b0 (diff) | |
tdf#42949 Fix IWYU warnings in include/ucbhelper/*
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I7bfeef47abaf94cfb355db95c0fdb928ce36c0a6
Reviewed-on: https://gerrit.libreoffice.org/60232
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
127 files changed, 209 insertions, 49 deletions
diff --git a/basctl/source/basicide/scriptdocument.cxx b/basctl/source/basicide/scriptdocument.cxx index c7223ed72d5d..9a2a040a3a5d 100644 --- a/basctl/source/basicide/scriptdocument.cxx +++ b/basctl/source/basicide/scriptdocument.cxx @@ -26,6 +26,7 @@ #include <doceventnotifier.hxx> #include "documentenumeration.hxx" +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/uri/UriReferenceFactory.hpp> #include <com/sun/star/util/theMacroExpander.hpp> #include <com/sun/star/document/MacroExecMode.hpp> diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx index 2ad26d567268..369fd6d61bd5 100644 --- a/chart2/source/model/main/ChartModel_Persistence.cxx +++ b/chart2/source/model/main/ChartModel_Persistence.cxx @@ -45,6 +45,7 @@ #include <com/sun/star/io/TempFile.hpp> #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/ucb/CommandFailedException.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp> diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index a21ac9a5ebef..9d06cb8628d4 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -35,6 +35,7 @@ #include <unotools/syslocale.hxx> #include <rtl/math.hxx> #include <ucbhelper/content.hxx> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <connectivity/dbexception.hxx> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx index a109c6fa6645..c7ca89eec114 100644 --- a/connectivity/source/drivers/file/FConnection.cxx +++ b/connectivity/source/drivers/file/FConnection.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/container/XChild.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ucb/XContent.hpp> #include <com/sun/star/ucb/XContentIdentifier.hpp> #include <tools/urlobj.hxx> diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 046aa4a5f26a..e842fed7d5c9 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -41,6 +41,7 @@ #include <comphelper/processfactory.hxx> #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/XRow.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> #include <com/sun/star/ui/dialogs/FolderPicker.hpp> #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp> diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index 0c93fed3d6db..99d3d52bee24 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -39,6 +39,7 @@ #include <com/sun/star/beans/Optional.hpp> #include <com/sun/star/task/XInteractionApprove.hpp> #include <com/sun/star/beans/Ambiguous.hpp> +#include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/ucb/CommandFailedException.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/io/XInputStream.hpp> diff --git a/desktop/source/deployment/manager/dp_informationprovider.cxx b/desktop/source/deployment/manager/dp_informationprovider.cxx index 5088c2e63e95..93329cc07c29 100644 --- a/desktop/source/deployment/manager/dp_informationprovider.cxx +++ b/desktop/source/deployment/manager/dp_informationprovider.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/task/XAbortChannel.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/xml/dom/XElement.hpp> diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index 3b6e66598c81..4a010a6ce6e6 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -52,6 +52,7 @@ #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/ucb/CommandFailedException.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> #include <com/sun/star/ucb/NameClash.hpp> #include <com/sun/star/deployment/DeploymentException.hpp> diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx index 10e696a0a745..017aad657279 100644 --- a/desktop/source/deployment/misc/dp_ucb.cxx +++ b/desktop/source/deployment/misc/dp_ucb.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/ucb/CommandFailedException.hpp> #include <com/sun/star/ucb/ContentInfo.hpp> #include <com/sun/star/ucb/ContentInfoAttribute.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <comphelper/processfactory.hxx> using namespace ::com::sun::star; diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index c036e613da04..f6108abab34c 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -36,6 +36,7 @@ #include <com/sun/star/deployment/ExtensionRemovedException.hpp> #include <com/sun/star/deployment/InvalidRemovedParameterException.hpp> #include <com/sun/star/deployment/thePackageManagerFactory.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/ucb/CommandFailedException.hpp> #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp> diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index 54d84f2ad106..3514a0815d2d 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -35,6 +35,7 @@ #include <cppuhelper/exc_hlp.hxx> #include <comphelper/sequence.hxx> #include <ucbhelper/content.hxx> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/uno/DeploymentException.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index efe49cdb50fb..cbf91bca647d 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -47,7 +47,9 @@ #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/task/InteractionClassification.hpp> #include <com/sun/star/task/XInteractionApprove.hpp> +#include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/ucb/CommandFailedException.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ucb/XInteractionReplaceExistingData.hpp> #include <com/sun/star/ucb/NameClashResolveRequest.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> diff --git a/desktop/source/migration/services/oo3extensionmigration.cxx b/desktop/source/migration/services/oo3extensionmigration.cxx index d52137aa7c5d..8681d47875d0 100644 --- a/desktop/source/migration/services/oo3extensionmigration.cxx +++ b/desktop/source/migration/services/oo3extensionmigration.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/task/XInteractionApprove.hpp> #include <com/sun/star/task/XInteractionAbort.hpp> +#include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/ucb/XCommandInfo.hpp> #include <com/sun/star/ucb/TransferInfo.hpp> #include <com/sun/star/ucb/NameClash.hpp> diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 32bd3dc37833..20e64bbadf1c 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -66,6 +66,7 @@ #include "SvXMLAutoCorrectExport.hxx" #include "SvXMLAutoCorrectTokenHandler.hxx" #include <ucbhelper/content.hxx> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/ucb/TransferInfo.hpp> #include <com/sun/star/ucb/NameClash.hpp> diff --git a/fpicker/source/office/fpsmartcontent.cxx b/fpicker/source/office/fpsmartcontent.cxx index 5ef2d13a62cd..4151753cf6f8 100644 --- a/fpicker/source/office/fpsmartcontent.cxx +++ b/fpicker/source/office/fpsmartcontent.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/task/InteractionHandler.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ucb/ContentInfo.hpp> #include <com/sun/star/ucb/ContentInfoAttribute.hpp> #include <com/sun/star/ucb/XContent.hpp> diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 24b09128ee7e..514260d359b2 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -54,6 +54,8 @@ #include <rtl/ustring.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ucb/UniversalContentBroker.hpp> +#include <com/sun/star/ucb/CommandAbortedException.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ui/dialogs/CommonFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/ControlActions.hpp> diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index 9717b10d9754..f88b608591a8 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -94,3 +94,15 @@ blacklist: include/cppuhelper/interfacecontainer.h: #Needed for implicit destructor - com/sun/star/uno/Sequence.hxx + include/ucbhelper/fd_inputstream.hxx: + # Needed for typedef + - com/sun/star/io/XInputStream.hpp + - com/sun/star/io/XSeekable.hpp + include/ucbhelper/macros.hxx: + # Used in macros defined here + - cppuhelper/typeprovider.hxx + - cppuhelper/supportsservice.hxx + - cppuhelper/factory.hxx + include/ucbhelper/simpleinteractionrequest.hxx: + # Needed for template + - o3tl/typed_flags_set.hxx diff --git a/include/ucbhelper/authenticationfallback.hxx b/include/ucbhelper/authenticationfallback.hxx index 5e7bb4732e2f..10280441a05e 100644 --- a/include/ucbhelper/authenticationfallback.hxx +++ b/include/ucbhelper/authenticationfallback.hxx @@ -13,7 +13,6 @@ #include <rtl/ref.hxx> #include <ucbhelper/interactionrequest.hxx> #include <ucbhelper/ucbhelperdllapi.h> -#include <com/sun/star/ucb/AuthenticationFallbackRequest.hpp> namespace ucbhelper { diff --git a/include/ucbhelper/cancelcommandexecution.hxx b/include/ucbhelper/cancelcommandexecution.hxx index eeb8b5ba7c2e..fcc1011502b6 100644 --- a/include/ucbhelper/cancelcommandexecution.hxx +++ b/include/ucbhelper/cancelcommandexecution.hxx @@ -21,14 +21,13 @@ #define INCLUDED_UCBHELPER_CANCELCOMMANDEXECUTION_HXX #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/ucb/IOErrorCode.hpp> -#include <com/sun/star/ucb/XCommandProcessor.hpp> #include <ucbhelper/ucbhelperdllapi.h> namespace com { namespace sun { namespace star { namespace uno { class Any; } namespace ucb { class XCommandEnvironment; } + namespace ucb { class XCommandProcessor; } } } } namespace ucbhelper diff --git a/include/ucbhelper/content.hxx b/include/ucbhelper/content.hxx index 363cd45a61f1..6ec7148f1e51 100644 --- a/include/ucbhelper/content.hxx +++ b/include/ucbhelper/content.hxx @@ -20,11 +20,8 @@ #define INCLUDED_UCBHELPER_CONTENT_HXX #include <rtl/ref.hxx> -#include <com/sun/star/ucb/ContentCreationException.hpp> -#include <com/sun/star/ucb/CommandAbortedException.hpp> -#include <com/sun/star/io/XStream.hpp> -#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/uno/Reference.h> +#include <com/sun/star/uno/Sequence.h> #include <ucbhelper/ucbhelperdllapi.h> namespace com { namespace sun { namespace star { namespace beans { @@ -35,6 +32,7 @@ namespace com { namespace sun { namespace star { namespace io { class XActiveDataSink; class XOutputStream; class XInputStream; + class XStream; } } } } namespace com { namespace sun { namespace star { namespace sdbc { @@ -46,7 +44,6 @@ namespace com { namespace sun { namespace star { namespace ucb { class XCommandEnvironment; class XCommandInfo; class XContent; - class XContentIdentifier; class XDynamicResultSet; class XAnyCompareFactory; struct ContentInfo; @@ -57,6 +54,8 @@ namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com { namespace sun { namespace star { namespace uno { class Any; } } } } + namespace ucbhelper { diff --git a/include/ucbhelper/contenthelper.hxx b/include/ucbhelper/contenthelper.hxx index 7d773b33259f..957ff4353b7e 100644 --- a/include/ucbhelper/contenthelper.hxx +++ b/include/ucbhelper/contenthelper.hxx @@ -27,15 +27,12 @@ #include <com/sun/star/beans/XPropertySetInfoChangeNotifier.hpp> #include <com/sun/star/ucb/XCommandInfoChangeNotifier.hpp> #include <com/sun/star/container/XChild.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/ucb/CommandAbortedException.hpp> #include <cppuhelper/weak.hxx> #include <rtl/ref.hxx> -#include <ucbhelper/macros.hxx> #include <ucbhelper/ucbhelperdllapi.h> #include <memory> @@ -51,6 +48,8 @@ namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } + namespace ucbhelper_impl { struct ContentImplHelper_Impl; } namespace ucbhelper diff --git a/include/ucbhelper/contentinfo.hxx b/include/ucbhelper/contentinfo.hxx index b69f75d1e8b5..b6d2bad87e65 100644 --- a/include/ucbhelper/contentinfo.hxx +++ b/include/ucbhelper/contentinfo.hxx @@ -22,13 +22,13 @@ #include <memory> #include <com/sun/star/ucb/XCommandInfo.hpp> -#include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <cppuhelper/weak.hxx> #include <osl/mutex.hxx> -#include <ucbhelper/macros.hxx> + +namespace com { namespace sun { namespace star { namespace ucb { class XCommandEnvironment; } } } } namespace ucbhelper { diff --git a/include/ucbhelper/fd_inputstream.hxx b/include/ucbhelper/fd_inputstream.hxx index 4b098160721d..8c259cf26be4 100644 --- a/include/ucbhelper/fd_inputstream.hxx +++ b/include/ucbhelper/fd_inputstream.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_UCBHELPER_FD_INPUTSTREAM_HXX #define INCLUDED_UCBHELPER_FD_INPUTSTREAM_HXX -#include <rtl/ustring.hxx> #include <osl/file.h> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XSeekable.hpp> diff --git a/include/ucbhelper/getcomponentcontext.hxx b/include/ucbhelper/getcomponentcontext.hxx index 7cdffd09bc8b..a37ea97d2c65 100644 --- a/include/ucbhelper/getcomponentcontext.hxx +++ b/include/ucbhelper/getcomponentcontext.hxx @@ -22,7 +22,7 @@ #include <sal/config.h> -#include <com/sun/star/uno/Reference.hxx> +#include <com/sun/star/uno/Reference.h> #include <ucbhelper/ucbhelperdllapi.h> namespace com { namespace sun { namespace star { diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx index 1645b81089f0..4ee4e93715f8 100644 --- a/include/ucbhelper/interactionrequest.hxx +++ b/include/ucbhelper/interactionrequest.hxx @@ -29,11 +29,12 @@ #include <com/sun/star/ucb/XInteractionAuthFallback.hpp> #include <com/sun/star/ucb/XInteractionReplaceExistingData.hpp> #include <com/sun/star/ucb/XInteractionSupplyAuthentication2.hpp> -#include <rtl/ref.hxx> #include <cppuhelper/weak.hxx> #include <ucbhelper/ucbhelperdllapi.h> #include <memory> +namespace rtl { template <class reference_type> class Reference; } + namespace ucbhelper { class InteractionContinuation; diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx index 36cf524f1fda..831f856dc876 100644 --- a/include/ucbhelper/macros.hxx +++ b/include/ucbhelper/macros.hxx @@ -21,15 +21,10 @@ #define INCLUDED_UCBHELPER_MACROS_HXX #include <sal/types.h> -#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/factory.hxx> -#include <cppuhelper/weakref.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> -#include <ucbhelper/getcomponentcontext.hxx> - - #define CPPU_TYPE( T ) cppu::UnoType<T>::get() #define CPPU_TYPE_REF( T ) CPPU_TYPE( T ) diff --git a/include/ucbhelper/propertyvalueset.hxx b/include/ucbhelper/propertyvalueset.hxx index dcc48170e8a4..a0ecaf0df86d 100644 --- a/include/ucbhelper/propertyvalueset.hxx +++ b/include/ucbhelper/propertyvalueset.hxx @@ -27,7 +27,6 @@ #include <cppuhelper/weak.hxx> #include <osl/mutex.hxx> -#include <ucbhelper/macros.hxx> #include <ucbhelper/ucbhelperdllapi.h> #include <memory> @@ -36,10 +35,11 @@ namespace com { namespace sun { namespace star { namespace script { } } } } namespace com { namespace sun { namespace star { namespace beans { - struct PropertyValue; class XPropertySet; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } + namespace ucbhelper { class PropertyValues; diff --git a/include/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx index 8d3508784d10..95a7369bedd1 100644 --- a/include/ucbhelper/providerhelper.hxx +++ b/include/ucbhelper/providerhelper.hxx @@ -24,12 +24,10 @@ #include <memory> #include <com/sun/star/ucb/XContentProvider.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <cppuhelper/weak.hxx> #include <rtl/ref.hxx> -#include <ucbhelper/macros.hxx> #include <ucbhelper/ucbhelperdllapi.h> @@ -38,6 +36,8 @@ namespace com { namespace sun { namespace star { namespace ucb { class XPersistentPropertySet; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } + namespace ucbhelper_impl { struct ContentProviderImplHelper_Impl; } namespace ucbhelper { diff --git a/include/ucbhelper/proxydecider.hxx b/include/ucbhelper/proxydecider.hxx index 3c873e2fe193..511f04166386 100644 --- a/include/ucbhelper/proxydecider.hxx +++ b/include/ucbhelper/proxydecider.hxx @@ -22,13 +22,10 @@ #include <rtl/ustring.hxx> #include <rtl/ref.hxx> -#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/XComponentContext.hpp> #include <ucbhelper/ucbhelperdllapi.h> -namespace com { namespace sun { namespace star { namespace lang { - class XMultiServiceFactory; -} } } } +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } } namespace ucbhelper { diff --git a/include/ucbhelper/registerucb.hxx b/include/ucbhelper/registerucb.hxx index 7164fa99019c..c05d3729b9cc 100644 --- a/include/ucbhelper/registerucb.hxx +++ b/include/ucbhelper/registerucb.hxx @@ -20,16 +20,16 @@ #ifndef INCLUDED_UCBHELPER_REGISTERUCB_HXX #define INCLUDED_UCBHELPER_REGISTERUCB_HXX -#include <com/sun/star/uno/RuntimeException.hpp> -#include <com/sun/star/uno/Reference.h> -#include <com/sun/star/ucb/XContentProviderManager.hpp> +#include <rtl/ustring.hxx> #include <vector> #include <ucbhelper/ucbhelperdllapi.h> +namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } } + namespace com { namespace sun { namespace star { - namespace lang { class XMultiServiceFactory; } namespace uno { class XComponentContext; } + namespace ucb { class XContentProviderManager; } } } } diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx index 906b7c9af103..7dcdce8cb8d4 100644 --- a/include/ucbhelper/resultset.hxx +++ b/include/ucbhelper/resultset.hxx @@ -23,8 +23,6 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/ucb/ResultSetException.hpp> -#include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> @@ -35,10 +33,12 @@ #include <rtl/ref.hxx> #include <salhelper/simplereferenceobject.hxx> #include <cppuhelper/weak.hxx> -#include <ucbhelper/macros.hxx> #include <ucbhelper/ucbhelperdllapi.h> #include <memory> +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com { namespace sun { namespace star { namespace ucb { class XCommandEnvironment; } } } } + namespace ucbhelper { diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx index 7f6b48487006..7c9452b8407b 100644 --- a/include/ucbhelper/resultsethelper.hxx +++ b/include/ucbhelper/resultsethelper.hxx @@ -25,13 +25,12 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/ucb/XDynamicResultSet.hpp> -#include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/ucb/OpenCommandArgument2.hpp> #include <cppuhelper/weak.hxx> -#include <ucbhelper/macros.hxx> -#include <ucbhelper/contenthelper.hxx> #include <ucbhelper/ucbhelperdllapi.h> +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } + namespace cppu { class OInterfaceContainerHelper; } diff --git a/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx index b30fd3735587..2e410a88a83a 100644 --- a/include/ucbhelper/resultsetmetadata.hxx +++ b/include/ucbhelper/resultsetmetadata.hxx @@ -22,18 +22,16 @@ #include <vector> #include <memory> -#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/uno/Reference.h> +#include <com/sun/star/uno/Sequence.h> #include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/XResultSetMetaData.hpp> #include <cppuhelper/weak.hxx> -#include <ucbhelper/macros.hxx> #include <ucbhelper/ucbhelperdllapi.h> namespace com { namespace sun { namespace star { - namespace lang { class XMultiServiceFactory; } namespace beans { struct Property; } + namespace uno { class XComponentContext; } } } } namespace ucbhelper_impl { diff --git a/include/ucbhelper/simplecertificatevalidationrequest.hxx b/include/ucbhelper/simplecertificatevalidationrequest.hxx index d1d2d4573e82..748a01edffce 100644 --- a/include/ucbhelper/simplecertificatevalidationrequest.hxx +++ b/include/ucbhelper/simplecertificatevalidationrequest.hxx @@ -20,10 +20,11 @@ #ifndef INCLUDED_UCBHELPER_SIMPLECERTIFICATEVALIDATIONREQUEST_HXX #define INCLUDED_UCBHELPER_SIMPLECERTIFICATEVALIDATIONREQUEST_HXX -#include <rtl/ref.hxx> #include <ucbhelper/interactionrequest.hxx> #include <ucbhelper/ucbhelperdllapi.h> -#include <com/sun/star/security/XCertificate.hpp> + +namespace com { namespace sun { namespace star { namespace uno { template <class interface_type> class Reference; } } } } +namespace com { namespace sun { namespace star { namespace security { class XCertificate; } } } } namespace ucbhelper { diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 5351e795b2e6..58b7b8bc4a02 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/util/XFlushable.hpp> +#include <com/sun/star/ucb/CommandAbortedException.hpp> #include <cppuhelper/factory.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/processfactory.hxx> diff --git a/package/source/zippackage/ZipPackage.cxx b/package/source/zippackage/ZipPackage.cxx index f9193aaff7c1..83ec8bcbcc72 100644 --- a/package/source/zippackage/ZipPackage.cxx +++ b/package/source/zippackage/ZipPackage.cxx @@ -45,6 +45,7 @@ #include <ucbhelper/content.hxx> #include <cppuhelper/factory.hxx> #include <cppuhelper/exc_hlp.hxx> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ucb/TransferInfo.hpp> #include <com/sun/star/ucb/NameClash.hpp> #include <com/sun/star/ucb/OpenCommandArgument2.hpp> diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx index cd09f365b844..46c95034aa31 100644 --- a/sc/source/filter/excel/excel.cxx +++ b/sc/source/filter/excel/excel.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/document/XImporter.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <scitems.hxx> #include <svl/stritem.hxx> #include <unotools/streamwrap.hxx> diff --git a/sc/source/ui/unoobj/exceldetect.cxx b/sc/source/ui/unoobj/exceldetect.cxx index 474c9ce96548..6d5ccd796ab6 100644 --- a/sc/source/ui/unoobj/exceldetect.cxx +++ b/sc/source/ui/unoobj/exceldetect.cxx @@ -11,6 +11,7 @@ #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/ucb/XContent.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <cppuhelper/supportsservice.hxx> #include <svl/itemset.hxx> diff --git a/scripting/source/inc/util/MiscUtils.hxx b/scripting/source/inc/util/MiscUtils.hxx index 5e0b1c8848e4..f40a51499834 100644 --- a/scripting/source/inc/util/MiscUtils.hxx +++ b/scripting/source/inc/util/MiscUtils.hxx @@ -30,6 +30,7 @@ #include <com/sun/star/frame/XTransientDocumentsDocumentContentFactory.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XContentEnumerationAccess.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx index 2c4a2dbc62a2..93b45a6955e8 100644 --- a/sd/source/ui/unoidl/sddetect.cxx +++ b/sd/source/ui/unoidl/sddetect.cxx @@ -24,6 +24,7 @@ #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/io/XInputStream.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <vcl/graphicfilter.hxx> #include <rtl/ustring.h> #include <sfx2/docfile.hxx> diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx index 92021f283ec5..a35339e2784b 100644 --- a/sfx2/source/appl/appdde.cxx +++ b/sfx2/source/appl/appdde.cxx @@ -45,6 +45,7 @@ #include <sfx2/docfile.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/ucb/IllegalIdentifierException.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #if defined(_WIN32) diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index bff1b39081f7..8da6f3a6e7b8 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -44,6 +44,7 @@ #include <com/sun/star/embed/UseBackupException.hpp> #include <com/sun/star/embed/XOptimizedStorage.hpp> #include <com/sun/star/graphic/XGraphic.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ucb/InteractiveIOException.hpp> #include <com/sun/star/ucb/UnsupportedDataSinkException.hpp> #include <com/sun/star/ucb/CommandFailedException.hpp> diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index 37c54bdbf397..3d7245bf4470 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -51,6 +51,7 @@ #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/ucb/ContentInfo.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ucb/InsertCommandArgument.hpp> #include <com/sun/star/ucb/NameClash.hpp> #include <com/sun/star/ucb/TransferInfo.hpp> diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index b30844eb346b..94f0175a4dc1 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -49,6 +49,7 @@ #include <com/sun/star/io/TempFile.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/XRow.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ucb/NameClash.hpp> #include <com/sun/star/ucb/NameClashException.hpp> #include <com/sun/star/ucb/TransferInfo.hpp> diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 6c557f541ea5..8eef03e8d5cc 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -62,6 +62,7 @@ #include <com/sun/star/script/DocumentScriptLibraryContainer.hpp> #include <com/sun/star/document/XEmbeddedScripts.hpp> #include <com/sun/star/document/XScriptInvocationContext.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <svl/urihelper.hxx> #include <unotools/pathoptions.hxx> diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index 5092712f799e..1bdf74f8f4e0 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -26,6 +26,8 @@ #include <com/sun/star/view/PaperFormat.hpp> #include <com/sun/star/view/PaperOrientation.hpp> #include <com/sun/star/ucb/NameClash.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> +#include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/lang/EventObject.hpp> diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 0cc27bb9a231..3c6e2ae18737 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -52,6 +52,8 @@ #include <com/sun/star/document/DocumentProperties.hpp> #include <com/sun/star/frame/XTransientDocumentsDocumentContentFactory.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> +#include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/util/XCloneable.hpp> #include <comphelper/enumhelper.hxx> diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index fe66ddd809fc..d36381c5b8eb 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -42,6 +42,7 @@ #include <com/sun/star/packages/manifest/ManifestWriter.hpp> #include <com/sun/star/packages/manifest/ManifestReader.hpp> #include <com/sun/star/ucb/InteractiveIOException.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <memory> #include <rtl/digest.h> diff --git a/starmath/source/smdetect.cxx b/starmath/source/smdetect.cxx index 532cca0d574d..8cff53e43e95 100644 --- a/starmath/source/smdetect.cxx +++ b/starmath/source/smdetect.cxx @@ -20,6 +20,7 @@ #include "smdetect.hxx" #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/io/XInputStream.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <sfx2/docfile.hxx> #include <unotools/mediadescriptor.hxx> #include <sal/log.hxx> diff --git a/svtools/source/contnr/contentenumeration.cxx b/svtools/source/contnr/contentenumeration.cxx index e65ffa291635..17bd7ba2eeb0 100644 --- a/svtools/source/contnr/contentenumeration.cxx +++ b/svtools/source/contnr/contentenumeration.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/XRow.hpp> +#include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/ucb/XDynamicResultSet.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> #include <com/sun/star/util/DateTime.hpp> diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index 477de6016cac..88496840a93f 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/document/XTypeDetection.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <ucbhelper/content.hxx> #include <unotools/configmgr.hxx> diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 2acefbc6e3cf..f812640956d6 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/ucb/XDynamicResultSet.hpp> #include <com/sun/star/sdbc/XRow.hpp> +#include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/theOfficeInstallationDirectories.hpp> diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index be279c7d4b9a..cfb835f2b0b5 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -26,6 +26,7 @@ #include <vcl/svapp.hxx> #include <vcl/weld.hxx> #include <ucbhelper/content.hxx> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <sfx2/app.hxx> #include <helpids.h> #include <svx/gallery1.hxx> diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 813eff0a563e..9ae7ed92c2a5 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -33,6 +33,7 @@ #include <tools/vcompat.hxx> #include <vcl/lstbox.hxx> #include <ucbhelper/content.hxx> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <unotools/configmgr.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/pathoptions.hxx> diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index ce1bde8461f9..1fc01185bad8 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -24,6 +24,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> #include <ucbhelper/content.hxx> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <unotools/resmgr.hxx> #include <tools/urlobj.hxx> #include <svl/solar.hrc> diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 02d8d07a7236..651fb49cfcc9 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -33,6 +33,7 @@ #include <unotools/ucbstreamhelper.hxx> #include <unotools/tempfile.hxx> #include <ucbhelper/content.hxx> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <sot/storage.hxx> #include <sot/formats.hxx> #include <sot/filelist.hxx> diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index 5130e081bd48..e0e619841e40 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/ucb/CommandFailedException.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <vcl/virdev.hxx> #include <svx/svdoole2.hxx> diff --git a/sw/source/filter/basflt/iodetect.cxx b/sw/source/filter/basflt/iodetect.cxx index 6d532748af4a..1fd8e3efeb66 100644 --- a/sw/source/filter/basflt/iodetect.cxx +++ b/sw/source/filter/basflt/iodetect.cxx @@ -27,7 +27,7 @@ #include <sfx2/docfilt.hxx> #include <sfx2/fcontnr.hxx> #include <sfx2/docfile.hxx> - +#include <com/sun/star/ucb/ContentCreationException.hpp> using namespace ::com::sun::star; diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx index 6b6b2284be0b..cd8450fbe033 100644 --- a/sw/source/filter/writer/writer.cxx +++ b/sw/source/filter/writer/writer.cxx @@ -36,6 +36,7 @@ #include <IDocumentMarkAccess.hxx> #include <numrule.hxx> #include <swerror.h> +#include <com/sun/star/ucb/ContentCreationException.hpp> using namespace css; diff --git a/ucb/source/cacher/cachedcontentresultset.cxx b/ucb/source/cacher/cachedcontentresultset.cxx index 5bd39fde2637..bcdc5a189b27 100644 --- a/ucb/source/cacher/cachedcontentresultset.cxx +++ b/ucb/source/cacher/cachedcontentresultset.cxx @@ -32,6 +32,8 @@ #include <osl/diagnose.h> #include <comphelper/processfactory.hxx> #include <cppuhelper/exc_hlp.hxx> +#include <cppuhelper/queryinterface.hxx> +#include <ucbhelper/getcomponentcontext.hxx> #include <memory> using namespace com::sun::star::beans; diff --git a/ucb/source/cacher/cachedcontentresultsetstub.cxx b/ucb/source/cacher/cachedcontentresultsetstub.cxx index 2dfa3d816936..8642e53a7cfa 100644 --- a/ucb/source/cacher/cachedcontentresultsetstub.cxx +++ b/ucb/source/cacher/cachedcontentresultsetstub.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/ucb/FetchError.hpp> #include <osl/diagnose.h> +#include <cppuhelper/queryinterface.hxx> using namespace com::sun::star::beans; using namespace com::sun::star::lang; diff --git a/ucb/source/cacher/cacheddynamicresultset.cxx b/ucb/source/cacher/cacheddynamicresultset.cxx index ec2f15f7b7a7..9f7f5e438b70 100644 --- a/ucb/source/cacher/cacheddynamicresultset.cxx +++ b/ucb/source/cacher/cacheddynamicresultset.cxx @@ -22,7 +22,9 @@ #include <com/sun/star/sdbc/XResultSet.hpp> #include "cachedcontentresultset.hxx" #include <osl/diagnose.h> +#include <cppuhelper/queryinterface.hxx> #include <comphelper/processfactory.hxx> +#include <ucbhelper/getcomponentcontext.hxx> using namespace com::sun::star::lang; using namespace com::sun::star::sdbc; diff --git a/ucb/source/cacher/cacheddynamicresultsetstub.cxx b/ucb/source/cacher/cacheddynamicresultsetstub.cxx index a73c28235883..679ddbc0823a 100644 --- a/ucb/source/cacher/cacheddynamicresultsetstub.cxx +++ b/ucb/source/cacher/cacheddynamicresultsetstub.cxx @@ -25,6 +25,8 @@ #include <com/sun/star/ucb/SortedDynamicResultSetFactory.hpp> #include <osl/diagnose.h> #include <comphelper/processfactory.hxx> +#include <ucbhelper/getcomponentcontext.hxx> +#include <cppuhelper/queryinterface.hxx> using namespace com::sun::star::lang; using namespace com::sun::star::sdbc; diff --git a/ucb/source/cacher/contentresultsetwrapper.cxx b/ucb/source/cacher/contentresultsetwrapper.cxx index e7f264ee9b0c..8cf5c5b07f8c 100644 --- a/ucb/source/cacher/contentresultsetwrapper.cxx +++ b/ucb/source/cacher/contentresultsetwrapper.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <rtl/ustring.hxx> #include <osl/diagnose.h> +#include <cppuhelper/queryinterface.hxx> using namespace com::sun::star::beans; using namespace com::sun::star::lang; diff --git a/ucb/source/cacher/dynamicresultsetwrapper.cxx b/ucb/source/cacher/dynamicresultsetwrapper.cxx index b52806fd76ee..c7aa27949429 100644 --- a/ucb/source/cacher/dynamicresultsetwrapper.cxx +++ b/ucb/source/cacher/dynamicresultsetwrapper.cxx @@ -20,6 +20,7 @@ #include "dynamicresultsetwrapper.hxx" #include <ucbhelper/macros.hxx> +#include <cppuhelper/queryinterface.hxx> #include <osl/diagnose.h> #include <rtl/ustring.hxx> #include <com/sun/star/ucb/AlreadyInitializedException.hpp> diff --git a/ucb/source/core/FileAccess.cxx b/ucb/source/core/FileAccess.cxx index 803eb520981c..649234bfca2c 100644 --- a/ucb/source/core/FileAccess.cxx +++ b/ucb/source/core/FileAccess.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ucb/CommandFailedException.hpp> #include <com/sun/star/ucb/ContentInfo.hpp> #include <com/sun/star/ucb/ContentInfoAttribute.hpp> diff --git a/ucb/source/core/provprox.cxx b/ucb/source/core/provprox.cxx index 05b59093daac..38b4d679153a 100644 --- a/ucb/source/core/provprox.cxx +++ b/ucb/source/core/provprox.cxx @@ -24,6 +24,7 @@ #include "provprox.hxx" #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/ucb/IllegalIdentifierException.hpp> +#include <cppuhelper/queryinterface.hxx> using namespace com::sun::star::lang; using namespace com::sun::star::ucb; diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx index b60f0fd28c98..8672fa26a7a0 100644 --- a/ucb/source/core/ucb.cxx +++ b/ucb/source/core/ucb.cxx @@ -28,6 +28,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/interfacecontainer2.hxx> #include <comphelper/propertysequence.hxx> +#include <cppuhelper/queryinterface.hxx> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/ucb/DuplicateProviderException.hpp> #include <com/sun/star/ucb/GlobalTransferCommandArgument2.hpp> @@ -43,6 +44,7 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/uno/Any.hxx> #include <ucbhelper/cancelcommandexecution.hxx> +#include <ucbhelper/getcomponentcontext.hxx> #include "identify.hxx" #include "ucbcmds.hxx" diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx index f40e7008456b..fa123e6c9c65 100644 --- a/ucb/source/core/ucbstore.cxx +++ b/ucb/source/core/ucbstore.cxx @@ -47,6 +47,7 @@ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <comphelper/processfactory.hxx> #include <cppuhelper/implbase.hxx> +#include <ucbhelper/getcomponentcontext.hxx> #include "ucbstore.hxx" using namespace com::sun::star::beans; diff --git a/ucb/source/ucp/cmis/certvalidation_handler.cxx b/ucb/source/ucp/cmis/certvalidation_handler.cxx index f13c75bc6924..9d580bf6546c 100644 --- a/ucb/source/ucp/cmis/certvalidation_handler.cxx +++ b/ucb/source/ucp/cmis/certvalidation_handler.cxx @@ -17,6 +17,7 @@ #include <com/sun/star/xml/crypto/SEInitializer.hpp> #include <com/sun/star/xml/crypto/XSecurityEnvironment.hpp> +#include <rtl/ref.hxx> #include <comphelper/sequence.hxx> #include <ucbhelper/simplecertificatevalidationrequest.hxx> diff --git a/ucb/source/ucp/cmis/cmis_content.cxx b/ucb/source/ucp/cmis/cmis_content.cxx index 9188a5bb3e11..65cb142f67bd 100644 --- a/ucb/source/ucp/cmis/cmis_content.cxx +++ b/ucb/source/ucp/cmis/cmis_content.cxx @@ -53,6 +53,7 @@ #include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/propertyvalueset.hxx> #include <ucbhelper/proxydecider.hxx> +#include <ucbhelper/macros.hxx> #include <sax/tools/converter.hxx> #include "auth_provider.hxx" diff --git a/ucb/source/ucp/cmis/cmis_provider.cxx b/ucb/source/ucp/cmis/cmis_provider.cxx index 24810bf949cc..eb36fac64232 100644 --- a/ucb/source/ucp/cmis/cmis_provider.cxx +++ b/ucb/source/ucp/cmis/cmis_provider.cxx @@ -8,9 +8,12 @@ */ #include <comphelper/processfactory.hxx> +#include <cppuhelper/queryinterface.hxx> #include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/contenthelper.hxx> #include <com/sun/star/lang/XSingleServiceFactory.hpp> +#include <ucbhelper/getcomponentcontext.hxx> +#include <ucbhelper/macros.hxx> #include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ucb/IllegalIdentifierException.hpp> diff --git a/ucb/source/ucp/cmis/cmis_provider.hxx b/ucb/source/ucp/cmis/cmis_provider.hxx index cfca2923de13..081c7f411a1f 100644 --- a/ucb/source/ucp/cmis/cmis_provider.hxx +++ b/ucb/source/ucp/cmis/cmis_provider.hxx @@ -11,6 +11,8 @@ #define INCLUDED_UCB_SOURCE_UCP_CMIS_CMIS_PROVIDER_HXX #include <com/sun/star/beans/Property.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <ucbhelper/providerhelper.hxx> #include <libcmis/libcmis.hxx> diff --git a/ucb/source/ucp/cmis/cmis_repo_content.cxx b/ucb/source/ucp/cmis/cmis_repo_content.cxx index 4e9ad24b6f72..ca5333493c54 100644 --- a/ucb/source/ucp/cmis/cmis_repo_content.cxx +++ b/ucb/source/ucp/cmis/cmis_repo_content.cxx @@ -31,6 +31,7 @@ #include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/propertyvalueset.hxx> #include <ucbhelper/proxydecider.hxx> +#include <ucbhelper/macros.hxx> #include "auth_provider.hxx" #include "certvalidation_handler.hxx" diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index 58fbb8d507db..6ba10687a970 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/beans/XPropertyAccess.hpp> #include <com/sun/star/lang/IllegalAccessException.hpp> #include <com/sun/star/sdbc/XRow.hpp> +#include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/ucb/XCommandInfo.hpp> #include <com/sun/star/ucb/XPersistentPropertySet.hpp> #include <com/sun/star/ucb/OpenCommandArgument2.hpp> diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx index 765cdbcf3c86..cc8ac22b9f04 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/deployment/PackageInformationProvider.hpp> #include <com/sun/star/ucb/IllegalIdentifierException.hpp> +#include <com/sun/star/ucb/ResultSetException.hpp> #include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/providerhelper.hxx> #include <ucbhelper/content.hxx> diff --git a/ucb/source/ucp/ext/ucpext_resultset.hxx b/ucb/source/ucp/ext/ucpext_resultset.hxx index ad48b4d7b94d..6fc963b4c31c 100644 --- a/ucb/source/ucp/ext/ucpext_resultset.hxx +++ b/ucb/source/ucp/ext/ucpext_resultset.hxx @@ -22,6 +22,7 @@ #include <rtl/ref.hxx> #include <ucbhelper/resultsethelper.hxx> +#include <com/sun/star/ucb/XCommandEnvironment.hpp> namespace ucb { namespace ucp { namespace ext diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index d9771cfcb6d6..579c9c8cd308 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -41,6 +41,7 @@ #include <com/sun/star/ucb/NameClash.hpp> #include <comphelper/fileurl.hxx> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/queryinterface.hxx> #include "filglob.hxx" #include "filid.hxx" #include "filrow.hxx" diff --git a/ucb/source/ucp/file/filcmd.cxx b/ucb/source/ucp/file/filcmd.cxx index c1de260e86be..5ab934799df7 100644 --- a/ucb/source/ucp/file/filcmd.cxx +++ b/ucb/source/ucp/file/filcmd.cxx @@ -19,6 +19,7 @@ #include <sal/config.h> #include <sal/log.hxx> +#include <cppuhelper/queryinterface.hxx> #include <com/sun/star/ucb/UnsupportedCommandException.hpp> diff --git a/ucb/source/ucp/file/filinpstr.cxx b/ucb/source/ucp/file/filinpstr.cxx index 632758ea794c..1f1fa2e76bf2 100644 --- a/ucb/source/ucp/file/filinpstr.cxx +++ b/ucb/source/ucp/file/filinpstr.cxx @@ -19,6 +19,7 @@ #include <sal/config.h> #include <sal/log.hxx> +#include <cppuhelper/queryinterface.hxx> #include <com/sun/star/io/IOException.hpp> diff --git a/ucb/source/ucp/file/prov.cxx b/ucb/source/ucp/file/prov.cxx index ad1b0c6443e8..22b77d8fadaf 100644 --- a/ucb/source/ucp/file/prov.cxx +++ b/ucb/source/ucp/file/prov.cxx @@ -21,6 +21,7 @@ #include <osl/file.hxx> #include <osl/socket.h> #include <sal/log.hxx> +#include <cppuhelper/queryinterface.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/ucb/FileSystemNotation.hpp> diff --git a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx index 85f6386c8bd0..67fc59604623 100644 --- a/ucb/source/ucp/ftp/ftpcontentidentifier.cxx +++ b/ucb/source/ucp/ftp/ftpcontentidentifier.cxx @@ -25,6 +25,8 @@ *************************************************************************/ #include "ftpcontentidentifier.hxx" #include "ftpcontentprovider.hxx" +#include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/supportsservice.hxx> using namespace ftp; using namespace com::sun::star::uno; diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.cxx b/ucb/source/ucp/ftp/ftpcontentprovider.cxx index 2133ae6fa087..c68fbe32dc0a 100644 --- a/ucb/source/ucp/ftp/ftpcontentprovider.cxx +++ b/ucb/source/ucp/ftp/ftpcontentprovider.cxx @@ -24,6 +24,11 @@ #include <com/sun/star/ucb/UniversalContentBroker.hpp> #include <comphelper/processfactory.hxx> #include <cppuhelper/exc_hlp.hxx> +#include <cppuhelper/queryinterface.hxx> +#include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/factory.hxx> +#include <ucbhelper/getcomponentcontext.hxx> #include <osl/socket.hxx> #include "ftpcontentprovider.hxx" #include "ftpcontent.hxx" diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.hxx b/ucb/source/ucp/ftp/ftpcontentprovider.hxx index 61ab7ca64c0f..ca05cbc9d355 100644 --- a/ucb/source/ucp/ftp/ftpcontentprovider.hxx +++ b/ucb/source/ucp/ftp/ftpcontentprovider.hxx @@ -24,6 +24,8 @@ #include <ucbhelper/proxydecider.hxx> #include <ucbhelper/providerhelper.hxx> #include <com/sun/star/ucb/XContentProviderManager.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include "ftpurl.hxx" // UNO service name for the provider. This name will be used by the UCB to diff --git a/ucb/source/ucp/ftp/ftpresultsetbase.cxx b/ucb/source/ucp/ftp/ftpresultsetbase.cxx index ec26c8624e17..83aa79ea82e3 100644 --- a/ucb/source/ucp/ftp/ftpresultsetbase.cxx +++ b/ucb/source/ucp/ftp/ftpresultsetbase.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/ucb/ListActionType.hpp> #include <com/sun/star/ucb/XSourceInitialization.hpp> #include <ucbhelper/resultsetmetadata.hxx> +#include <cppuhelper/queryinterface.hxx> #include "ftpresultsetbase.hxx" using namespace ftp; diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx index 2b17281d25ab..9a701013f06f 100644 --- a/ucb/source/ucp/gio/gio_content.cxx +++ b/ucb/source/ucp/gio/gio_content.cxx @@ -60,10 +60,12 @@ #include <comphelper/seekableinput.hxx> #include <cppuhelper/exc_hlp.hxx> +#include <cppuhelper/queryinterface.hxx> #include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/propertyvalueset.hxx> #include <ucbhelper/interactionrequest.hxx> #include <ucbhelper/cancelcommandexecution.hxx> +#include <ucbhelper/macros.hxx> #include <vcl/svapp.hxx> #include <osl/conditn.hxx> diff --git a/ucb/source/ucp/gio/gio_outputstream.cxx b/ucb/source/ucp/gio/gio_outputstream.cxx index 80c910ba1e20..1a1f2b5e9fb6 100644 --- a/ucb/source/ucp/gio/gio_outputstream.cxx +++ b/ucb/source/ucp/gio/gio_outputstream.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/io/NotConnectedException.hpp> #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp> #include <ucbhelper/cancelcommandexecution.hxx> +#include <cppuhelper/queryinterface.hxx> #include <string.h> #include "gio_outputstream.hxx" diff --git a/ucb/source/ucp/gio/gio_provider.cxx b/ucb/source/ucp/gio/gio_provider.cxx index 17184ddb51bd..d68a3bc59984 100644 --- a/ucb/source/ucp/gio/gio_provider.cxx +++ b/ucb/source/ucp/gio/gio_provider.cxx @@ -20,6 +20,9 @@ #include <sal/log.hxx> #include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/contenthelper.hxx> +#include <ucbhelper/getcomponentcontext.hxx> +#include <ucbhelper/macros.hxx> +#include <cppuhelper/queryinterface.hxx> #include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ucb/IllegalIdentifierException.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> diff --git a/ucb/source/ucp/gio/gio_provider.hxx b/ucb/source/ucp/gio/gio_provider.hxx index d6ebed7047b2..699f0bbbe458 100644 --- a/ucb/source/ucp/gio/gio_provider.hxx +++ b/ucb/source/ucp/gio/gio_provider.hxx @@ -21,6 +21,8 @@ #define INCLUDED_UCB_SOURCE_UCP_GIO_GIO_PROVIDER_HXX #include <com/sun/star/beans/Property.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <ucbhelper/providerhelper.hxx> diff --git a/ucb/source/ucp/gio/gio_seekable.cxx b/ucb/source/ucp/gio/gio_seekable.cxx index 41b8c4aeb7bc..c9a1e03cab46 100644 --- a/ucb/source/ucp/gio/gio_seekable.cxx +++ b/ucb/source/ucp/gio/gio_seekable.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/io/NotConnectedException.hpp> #include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp> #include <ucbhelper/cancelcommandexecution.hxx> +#include <cppuhelper/queryinterface.hxx> #include <string.h> #include "gio_seekable.hxx" diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx index c0eb49e30aa6..954a89d7abe9 100644 --- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx +++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx @@ -63,9 +63,11 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <comphelper/propertysequence.hxx> +#include <cppuhelper/queryinterface.hxx> #include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/propertyvalueset.hxx> #include <ucbhelper/cancelcommandexecution.hxx> +#include <ucbhelper/macros.hxx> #include "hierarchycontent.hxx" #include "hierarchyprovider.hxx" #include "dynamicresultset.hxx" diff --git a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx index c19f2075597c..1c031261323a 100644 --- a/ucb/source/ucp/hierarchy/hierarchydatasource.cxx +++ b/ucb/source/ucp/hierarchy/hierarchydatasource.cxx @@ -31,6 +31,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/interfacecontainer2.hxx> +#include <cppuhelper/queryinterface.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> @@ -38,6 +39,7 @@ #include <com/sun/star/util/XChangesBatch.hpp> #include <com/sun/star/util/XChangesNotifier.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> +#include <ucbhelper/getcomponentcontext.hxx> using namespace com::sun::star; using namespace hierarchy_ucp; diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx index ecaa9d7d4971..8dc85b8706ad 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.cxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.cxx @@ -31,7 +31,10 @@ #include <com/sun/star/ucb/IllegalIdentifierException.hpp> #include <com/sun/star/util/theOfficeInstallationDirectories.hpp> #include <comphelper/processfactory.hxx> +#include <cppuhelper/queryinterface.hxx> #include <ucbhelper/contentidentifier.hxx> +#include <ucbhelper/getcomponentcontext.hxx> +#include <ucbhelper/macros.hxx> #include "hierarchyprovider.hxx" #include "hierarchycontent.hxx" #include "hierarchyuri.hxx" diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx index 5f4878bd4388..debf126fcaaf 100644 --- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx +++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx @@ -22,6 +22,8 @@ #include <ucbhelper/providerhelper.hxx> #include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <unordered_map> namespace com { namespace sun { namespace star { diff --git a/ucb/source/ucp/package/pkgcontent.cxx b/ucb/source/ucp/package/pkgcontent.cxx index c16927966c91..8158c13783ff 100644 --- a/ucb/source/ucp/package/pkgcontent.cxx +++ b/ucb/source/ucp/package/pkgcontent.cxx @@ -64,9 +64,11 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <comphelper/propertysequence.hxx> +#include <cppuhelper/queryinterface.hxx> #include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/propertyvalueset.hxx> #include <ucbhelper/cancelcommandexecution.hxx> +#include <ucbhelper/macros.hxx> #include "pkgcontent.hxx" #include "pkgprovider.hxx" #include "pkgresultset.hxx" diff --git a/ucb/source/ucp/package/pkgdatasupplier.cxx b/ucb/source/ucp/package/pkgdatasupplier.cxx index dff19828ceed..29711cb97414 100644 --- a/ucb/source/ucp/package/pkgdatasupplier.cxx +++ b/ucb/source/ucp/package/pkgdatasupplier.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/ucb/IllegalIdentifierException.hpp> +#include <com/sun/star/ucb/ResultSetException.hpp> #include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/providerhelper.hxx> #include "pkgdatasupplier.hxx" diff --git a/ucb/source/ucp/package/pkgprovider.cxx b/ucb/source/ucp/package/pkgprovider.cxx index 9adc171f6c76..74bb18639b44 100644 --- a/ucb/source/ucp/package/pkgprovider.cxx +++ b/ucb/source/ucp/package/pkgprovider.cxx @@ -27,7 +27,10 @@ #include <comphelper/processfactory.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/weak.hxx> +#include <cppuhelper/queryinterface.hxx> #include <ucbhelper/contentidentifier.hxx> +#include <ucbhelper/getcomponentcontext.hxx> +#include <ucbhelper/macros.hxx> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/ucb/IllegalIdentifierException.hpp> diff --git a/ucb/source/ucp/package/pkgprovider.hxx b/ucb/source/ucp/package/pkgprovider.hxx index 92bb3ba36967..072f33783614 100644 --- a/ucb/source/ucp/package/pkgprovider.hxx +++ b/ucb/source/ucp/package/pkgprovider.hxx @@ -22,6 +22,8 @@ #include <memory> #include <ucbhelper/providerhelper.hxx> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include "pkguri.hxx" namespace com { namespace sun { namespace star { namespace container { diff --git a/ucb/source/ucp/tdoc/tdoc_content.cxx b/ucb/source/ucp/tdoc/tdoc_content.cxx index dc7316cba376..50ff16e044f5 100644 --- a/ucb/source/ucp/tdoc/tdoc_content.cxx +++ b/ucb/source/ucp/tdoc/tdoc_content.cxx @@ -62,9 +62,11 @@ #include <com/sun/star/ucb/XPersistentPropertySet.hpp> #include <comphelper/propertysequence.hxx> +#include <cppuhelper/queryinterface.hxx> #include <ucbhelper/cancelcommandexecution.hxx> #include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/propertyvalueset.hxx> +#include <ucbhelper/macros.hxx> #include "tdoc_content.hxx" #include "tdoc_resultset.hxx" diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx index e446092b4ac2..307eda58dca7 100644 --- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx +++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx @@ -27,6 +27,7 @@ #include <vector> #include <com/sun/star/ucb/IllegalIdentifierException.hpp> +#include <com/sun/star/ucb/ResultSetException.hpp> #include <osl/diagnose.h> #include <ucbhelper/contentidentifier.hxx> diff --git a/ucb/source/ucp/tdoc/tdoc_provider.cxx b/ucb/source/ucp/tdoc/tdoc_provider.cxx index 58f2652a4dc0..c73b99e804dd 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.cxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.cxx @@ -34,7 +34,10 @@ #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/ucb/IllegalIdentifierException.hpp> #include <comphelper/processfactory.hxx> +#include <cppuhelper/queryinterface.hxx> #include <ucbhelper/contentidentifier.hxx> +#include <ucbhelper/getcomponentcontext.hxx> +#include <ucbhelper/macros.hxx> #include "tdoc_provider.hxx" #include "tdoc_content.hxx" diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx index 3501bd4d8ec9..2f308bf3ff5c 100644 --- a/ucb/source/ucp/tdoc/tdoc_provider.hxx +++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx @@ -23,6 +23,8 @@ #include <rtl/ref.hxx> #include <com/sun/star/frame/XTransientDocumentsDocumentContentFactory.hpp> #include <com/sun/star/packages/WrongPasswordException.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <ucbhelper/providerhelper.hxx> #include "tdoc_uri.hxx" #include "tdoc_docmgr.hxx" diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx index 4c72986a0be4..e386f1bd435d 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx @@ -38,6 +38,7 @@ #include <rtl/uri.hxx> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> +#include <cppuhelper/queryinterface.hxx> #include <officecfg/Inet.hxx> #include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/propertyvalueset.hxx> @@ -85,6 +86,8 @@ #include <com/sun/star/ucb/XCommandInfo.hpp> #include <com/sun/star/ucb/XPersistentPropertySet.hpp> #include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/ucb/ResultSetException.hpp> +#include <ucbhelper/macros.hxx> #include "webdavcontent.hxx" #include "webdavprovider.hxx" diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx index dcb159e9e8be..0daa26265611 100644 --- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx +++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx @@ -37,6 +37,7 @@ #include <o3tl/make_unique.hxx> #include <com/sun/star/ucb/IllegalIdentifierException.hpp> #include <com/sun/star/ucb/OpenMode.hpp> +#include <com/sun/star/ucb/ResultSetException.hpp> #include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/providerhelper.hxx> #include <memory> diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.cxx b/ucb/source/ucp/webdav-neon/webdavprovider.cxx index 2466c281e9c2..d79818d79f44 100644 --- a/ucb/source/ucp/webdav-neon/webdavprovider.cxx +++ b/ucb/source/ucp/webdav-neon/webdavprovider.cxx @@ -31,6 +31,9 @@ #include <com/sun/star/ucb/IllegalIdentifierException.hpp> #include <comphelper/processfactory.hxx> #include <ucbhelper/contentidentifier.hxx> +#include <ucbhelper/getcomponentcontext.hxx> +#include <ucbhelper/macros.hxx> +#include <cppuhelper/queryinterface.hxx> #include "webdavprovider.hxx" #include "webdavcontent.hxx" diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.hxx b/ucb/source/ucp/webdav-neon/webdavprovider.hxx index 06639ff3ba62..80556ab23447 100644 --- a/ucb/source/ucp/webdav-neon/webdavprovider.hxx +++ b/ucb/source/ucp/webdav-neon/webdavprovider.hxx @@ -33,6 +33,7 @@ #include <config_lgpl.h> #include <rtl/ref.hxx> #include <com/sun/star/beans/Property.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include "DAVSessionFactory.hxx" #include <ucbhelper/providerhelper.hxx> #include "PropertyMap.hxx" diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx index d0479ecfa81d..3308ac3b892e 100644 --- a/ucbhelper/source/client/content.cxx +++ b/ucbhelper/source/client/content.cxx @@ -26,10 +26,12 @@ #include <sal/log.hxx> #include <salhelper/simplereferenceobject.hxx> #include <cppuhelper/weak.hxx> +#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/implbase.hxx> #include <com/sun/star/ucb/CheckinArgument.hpp> #include <com/sun/star/ucb/ContentCreationError.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ucb/IllegalIdentifierException.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/ucb/XCommandInfo.hpp> diff --git a/ucbhelper/source/provider/authenticationfallback.cxx b/ucbhelper/source/provider/authenticationfallback.cxx index 5d8d0e275894..eee4b04b39e7 100644 --- a/ucbhelper/source/provider/authenticationfallback.cxx +++ b/ucbhelper/source/provider/authenticationfallback.cxx @@ -8,6 +8,7 @@ */ #include <ucbhelper/authenticationfallback.hxx> +#include <com/sun/star/ucb/AuthenticationFallbackRequest.hpp> using namespace com::sun::star; using namespace ucbhelper; diff --git a/ucbhelper/source/provider/cancelcommandexecution.cxx b/ucbhelper/source/provider/cancelcommandexecution.cxx index 4fe2b8d4a490..b55c50fd4f80 100644 --- a/ucbhelper/source/provider/cancelcommandexecution.cxx +++ b/ucbhelper/source/provider/cancelcommandexecution.cxx @@ -24,6 +24,7 @@ *************************************************************************/ #include <osl/diagnose.h> +#include <rtl/ref.hxx> #include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/ucb/CommandFailedException.hpp> diff --git a/ucbhelper/source/provider/contenthelper.cxx b/ucbhelper/source/provider/contenthelper.cxx index f031df08a7a9..4119d91690e5 100644 --- a/ucbhelper/source/provider/contenthelper.cxx +++ b/ucbhelper/source/provider/contenthelper.cxx @@ -31,10 +31,12 @@ #include <com/sun/star/beans/PropertySetInfoChange.hpp> #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/queryinterface.hxx> #include <ucbhelper/contenthelper.hxx> #include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/contentinfo.hxx> #include <ucbhelper/providerhelper.hxx> +#include <ucbhelper/macros.hxx> #include <osl/diagnose.h> #include <osl/mutex.hxx> diff --git a/ucbhelper/source/provider/contentinfo.cxx b/ucbhelper/source/provider/contentinfo.cxx index 339f927db18f..1d52bdf3cc11 100644 --- a/ucbhelper/source/provider/contentinfo.cxx +++ b/ucbhelper/source/provider/contentinfo.cxx @@ -25,10 +25,14 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/ucb/UnsupportedCommandException.hpp> #include <com/sun/star/ucb/XPropertySetRegistry.hpp> +#include <com/sun/star/beans/XPropertySetInfo.hpp> +#include <com/sun/star/ucb/XCommandInfo.hpp> +#include <cppuhelper/queryinterface.hxx> #include <osl/mutex.hxx> #include <ucbhelper/contenthelper.hxx> #include <ucbhelper/contentinfo.hxx> +#include <ucbhelper/macros.hxx> using namespace com::sun::star; diff --git a/ucbhelper/source/provider/interactionrequest.cxx b/ucbhelper/source/provider/interactionrequest.cxx index 7dce22ba52ab..b0684c2f8357 100644 --- a/ucbhelper/source/provider/interactionrequest.cxx +++ b/ucbhelper/source/provider/interactionrequest.cxx @@ -25,6 +25,7 @@ *************************************************************************/ #include <ucbhelper/interactionrequest.hxx> +#include <rtl/ref.hxx> #include <osl/diagnose.h> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> diff --git a/ucbhelper/source/provider/propertyvalueset.cxx b/ucbhelper/source/provider/propertyvalueset.cxx index 0ac8509ab60c..bf1e019a7fef 100644 --- a/ucbhelper/source/provider/propertyvalueset.cxx +++ b/ucbhelper/source/provider/propertyvalueset.cxx @@ -35,7 +35,9 @@ #include <osl/diagnose.h> #include <osl/mutex.hxx> #include <ucbhelper/propertyvalueset.hxx> +#include <ucbhelper/macros.hxx> #include <o3tl/typed_flags_set.hxx> +#include <cppuhelper/queryinterface.hxx> using namespace com::sun::star::beans; using namespace com::sun::star::container; diff --git a/ucbhelper/source/provider/providerhelper.cxx b/ucbhelper/source/provider/providerhelper.cxx index 21d4a96fc2af..903587b95e74 100644 --- a/ucbhelper/source/provider/providerhelper.cxx +++ b/ucbhelper/source/provider/providerhelper.cxx @@ -28,9 +28,11 @@ #include <com/sun/star/ucb/XPropertySetRegistry.hpp> #include <com/sun/star/ucb/XPropertySetRegistryFactory.hpp> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/queryinterface.hxx> #include <ucbhelper/contenthelper.hxx> #include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/providerhelper.hxx> +#include <ucbhelper/macros.hxx> #include <osl/diagnose.h> #include <osl/mutex.hxx> diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx index b0031741f56c..c482332909c4 100644 --- a/ucbhelper/source/provider/resultset.cxx +++ b/ucbhelper/source/provider/resultset.cxx @@ -25,10 +25,13 @@ *************************************************************************/ #include <memory> #include <cppuhelper/interfacecontainer.hxx> +#include <cppuhelper/queryinterface.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> +#include <com/sun/star/ucb/ResultSetException.hpp> #include <ucbhelper/getcomponentcontext.hxx> #include <ucbhelper/resultset.hxx> #include <ucbhelper/resultsetmetadata.hxx> +#include <ucbhelper/macros.hxx> using namespace com::sun::star; diff --git a/ucbhelper/source/provider/resultsethelper.cxx b/ucbhelper/source/provider/resultsethelper.cxx index 6d720ef56460..0a09c69de542 100644 --- a/ucbhelper/source/provider/resultsethelper.cxx +++ b/ucbhelper/source/provider/resultsethelper.cxx @@ -33,8 +33,10 @@ #include <com/sun/star/ucb/CachedDynamicResultSetStubFactory.hpp> #include <com/sun/star/ucb/XSourceInitialization.hpp> #include <cppuhelper/interfacecontainer.h> +#include <cppuhelper/queryinterface.hxx> #include <ucbhelper/resultsethelper.hxx> #include <ucbhelper/getcomponentcontext.hxx> +#include <ucbhelper/macros.hxx> #include <osl/diagnose.h> diff --git a/ucbhelper/source/provider/resultsetmetadata.cxx b/ucbhelper/source/provider/resultsetmetadata.cxx index 385d121f8426..4f99af2cae39 100644 --- a/ucbhelper/source/provider/resultsetmetadata.cxx +++ b/ucbhelper/source/provider/resultsetmetadata.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/XArray.hpp> #include <com/sun/star/sdbc/XBlob.hpp> @@ -38,7 +39,9 @@ #include <com/sun/star/util/Time.hpp> #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/ucb/PropertiesManager.hpp> +#include <ucbhelper/macros.hxx> #include <ucbhelper/resultsetmetadata.hxx> +#include <cppuhelper/queryinterface.hxx> using namespace com::sun::star::beans; using namespace com::sun::star::io; diff --git a/ucbhelper/source/provider/simpleinteractionrequest.cxx b/ucbhelper/source/provider/simpleinteractionrequest.cxx index 69f8ba4906f3..d846be5d352b 100644 --- a/ucbhelper/source/provider/simpleinteractionrequest.cxx +++ b/ucbhelper/source/provider/simpleinteractionrequest.cxx @@ -21,6 +21,7 @@ #include <comphelper/sequence.hxx> #include <osl/diagnose.h> +#include <rtl/ref.hxx> using namespace com::sun::star; using namespace ucbhelper; diff --git a/unotools/source/misc/mediadescriptor.cxx b/unotools/source/misc/mediadescriptor.cxx index 21f3ab959a98..674f2a98a986 100644 --- a/unotools/source/misc/mediadescriptor.cxx +++ b/unotools/source/misc/mediadescriptor.cxx @@ -26,6 +26,7 @@ #include <comphelper/namedvaluecollection.hxx> #include <comphelper/stillreadwriteinteraction.hxx> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ucb/XContent.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> diff --git a/unotools/source/ucbhelper/ucblockbytes.cxx b/unotools/source/ucbhelper/ucblockbytes.cxx index 92c5b30d80bc..8f8343a56870 100644 --- a/unotools/source/ucbhelper/ucblockbytes.cxx +++ b/unotools/source/ucbhelper/ucblockbytes.cxx @@ -30,6 +30,8 @@ #include <com/sun/star/task/XInteractionAbort.hpp> #include <com/sun/star/ucb/InteractiveNetworkConnectException.hpp> #include <com/sun/star/ucb/CommandFailedException.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> +#include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/ucb/UnsupportedDataSinkException.hpp> #include <com/sun/star/ucb/InteractiveIOException.hpp> #include <com/sun/star/io/IOException.hpp> diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx index 7ded3ca9ad47..4cb749306149 100644 --- a/unotools/source/ucbhelper/ucbstreamhelper.cxx +++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx @@ -21,6 +21,7 @@ #include <unotools/ucbstreamhelper.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/task/InteractionHandler.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/ucb/UniversalContentBroker.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index b02e77c9b6a3..7e51364da608 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -63,6 +63,7 @@ #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/xml/sax/Writer.hpp> #include <com/sun/star/ucb/CommandAbortedException.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <unotools/ucbstreamhelper.hxx> #include <rtl/bootstrap.hxx> #include <rtl/instance.hxx> diff --git a/vcl/source/gdi/impgraph.cxx b/vcl/source/gdi/impgraph.cxx index 005427b66dce..ab208fd2231d 100644 --- a/vcl/source/gdi/impgraph.cxx +++ b/vcl/source/gdi/impgraph.cxx @@ -39,6 +39,7 @@ #include <vcl/metaact.hxx> #include <impgraph.hxx> #include <com/sun/star/ucb/CommandAbortedException.hpp> +#include <com/sun/star/ucb/ContentCreationException.hpp> #include <vcl/dibtools.hxx> #include <memory> #include <o3tl/make_unique.hxx> diff --git a/xmlhelp/source/cxxhelp/provider/content.cxx b/xmlhelp/source/cxxhelp/provider/content.cxx index 1b7104950641..2551c82baa61 100644 --- a/xmlhelp/source/cxxhelp/provider/content.cxx +++ b/xmlhelp/source/cxxhelp/provider/content.cxx @@ -38,6 +38,7 @@ #include <ucbhelper/contentidentifier.hxx> #include <ucbhelper/propertyvalueset.hxx> #include <ucbhelper/cancelcommandexecution.hxx> +#include <ucbhelper/macros.hxx> #include <o3tl/make_unique.hxx> #include "content.hxx" #include "provider.hxx" diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx index 24a953e7aabb..960650048718 100644 --- a/xmlhelp/source/cxxhelp/provider/provider.cxx +++ b/xmlhelp/source/cxxhelp/provider/provider.cxx @@ -30,6 +30,9 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <comphelper/processfactory.hxx> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/queryinterface.hxx> +#include <cppuhelper/typeprovider.hxx> +#include <cppuhelper/factory.hxx> #include <unotools/configmgr.hxx> #include <unotools/pathoptions.hxx> diff --git a/xmlhelp/source/cxxhelp/provider/provider.hxx b/xmlhelp/source/cxxhelp/provider/provider.hxx index 1063de490069..c90950306062 100644 --- a/xmlhelp/source/cxxhelp/provider/provider.hxx +++ b/xmlhelp/source/cxxhelp/provider/provider.hxx @@ -26,6 +26,8 @@ #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/container/XContainer.hpp> #include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/lang/XSingleServiceFactory.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> namespace chelp { diff --git a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx index f32c54a56c02..c399d32c660c 100644 --- a/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx +++ b/xmlhelp/source/cxxhelp/provider/resultsetbase.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/ucb/ListActionType.hpp> #include <com/sun/star/ucb/XSourceInitialization.hpp> #include <ucbhelper/resultsetmetadata.hxx> +#include <cppuhelper/queryinterface.hxx> #include "resultsetbase.hxx" |