diff options
Diffstat (limited to 'include/ucbhelper')
-rw-r--r-- | include/ucbhelper/authenticationfallback.hxx | 1 | ||||
-rw-r--r-- | include/ucbhelper/cancelcommandexecution.hxx | 3 | ||||
-rw-r--r-- | include/ucbhelper/content.hxx | 11 | ||||
-rw-r--r-- | include/ucbhelper/contenthelper.hxx | 5 | ||||
-rw-r--r-- | include/ucbhelper/contentinfo.hxx | 4 | ||||
-rw-r--r-- | include/ucbhelper/fd_inputstream.hxx | 1 | ||||
-rw-r--r-- | include/ucbhelper/getcomponentcontext.hxx | 2 | ||||
-rw-r--r-- | include/ucbhelper/interactionrequest.hxx | 3 | ||||
-rw-r--r-- | include/ucbhelper/macros.hxx | 5 | ||||
-rw-r--r-- | include/ucbhelper/propertyvalueset.hxx | 4 | ||||
-rw-r--r-- | include/ucbhelper/providerhelper.hxx | 4 | ||||
-rw-r--r-- | include/ucbhelper/proxydecider.hxx | 7 | ||||
-rw-r--r-- | include/ucbhelper/registerucb.hxx | 8 | ||||
-rw-r--r-- | include/ucbhelper/resultset.hxx | 6 | ||||
-rw-r--r-- | include/ucbhelper/resultsethelper.hxx | 5 | ||||
-rw-r--r-- | include/ucbhelper/resultsetmetadata.hxx | 8 | ||||
-rw-r--r-- | include/ucbhelper/simplecertificatevalidationrequest.hxx | 5 |
17 files changed, 34 insertions, 48 deletions
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 { |