From 3d12a3339bfcadd776029c078b456817d0aba2f2 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 9 Nov 2013 15:37:02 -0600 Subject: fdo#65108 inter-module includes <> include/ucbhelper Change-Id: I355c0873ef51b92f39dd7cc0d696075f54f890d9 --- include/ucbhelper/activedatasink.hxx | 2 +- include/ucbhelper/cancelcommandexecution.hxx | 2 +- include/ucbhelper/commandenvironment.hxx | 2 +- include/ucbhelper/content.hxx | 4 ++-- include/ucbhelper/contenthelper.hxx | 6 +++--- include/ucbhelper/contentidentifier.hxx | 2 +- include/ucbhelper/contentinfo.hxx | 2 +- include/ucbhelper/fd_inputstream.hxx | 2 +- include/ucbhelper/fileidentifierconverter.hxx | 2 +- include/ucbhelper/getcomponentcontext.hxx | 6 +++--- include/ucbhelper/interactionrequest.hxx | 2 +- include/ucbhelper/interceptedinteraction.hxx | 2 +- include/ucbhelper/macros.hxx | 4 ++-- include/ucbhelper/propertyvalueset.hxx | 4 ++-- include/ucbhelper/providerhelper.hxx | 6 +++--- include/ucbhelper/proxydecider.hxx | 2 +- include/ucbhelper/registerucb.hxx | 2 +- include/ucbhelper/resultset.hxx | 6 +++--- include/ucbhelper/resultsethelper.hxx | 2 +- include/ucbhelper/resultsetmetadata.hxx | 2 +- include/ucbhelper/simpleauthenticationrequest.hxx | 2 +- include/ucbhelper/simplecertificatevalidationrequest.hxx | 2 +- include/ucbhelper/simpleinteractionrequest.hxx | 2 +- include/ucbhelper/simplenameclashresolverequest.hxx | 2 +- include/ucbhelper/std_inputstream.hxx | 2 +- include/ucbhelper/std_outputstream.hxx | 2 +- include/ucbhelper/ucbhelperdllapi.h | 2 +- 27 files changed, 38 insertions(+), 38 deletions(-) (limited to 'include') diff --git a/include/ucbhelper/activedatasink.hxx b/include/ucbhelper/activedatasink.hxx index 4a98ff186b69..2a375cf36f65 100644 --- a/include/ucbhelper/activedatasink.hxx +++ b/include/ucbhelper/activedatasink.hxx @@ -24,7 +24,7 @@ #include #include #include -#include "ucbhelper/ucbhelperdllapi.h" +#include namespace ucbhelper { diff --git a/include/ucbhelper/cancelcommandexecution.hxx b/include/ucbhelper/cancelcommandexecution.hxx index 3d2cfb166eac..71e9ab19116a 100644 --- a/include/ucbhelper/cancelcommandexecution.hxx +++ b/include/ucbhelper/cancelcommandexecution.hxx @@ -24,7 +24,7 @@ #include #include #include -#include "ucbhelper/ucbhelperdllapi.h" +#include namespace com { namespace sun { namespace star { namespace uno { class Any; } diff --git a/include/ucbhelper/commandenvironment.hxx b/include/ucbhelper/commandenvironment.hxx index d1d89cc40ad8..97ba46e094d6 100644 --- a/include/ucbhelper/commandenvironment.hxx +++ b/include/ucbhelper/commandenvironment.hxx @@ -24,7 +24,7 @@ #include #include #include -#include "ucbhelper/ucbhelperdllapi.h" +#include namespace ucbhelper { diff --git a/include/ucbhelper/content.hxx b/include/ucbhelper/content.hxx index 3308a8e23526..217cfcb82a6b 100644 --- a/include/ucbhelper/content.hxx +++ b/include/ucbhelper/content.hxx @@ -19,13 +19,13 @@ #ifndef INCLUDED_UCBHELPER_CONTENT_HXX #define INCLUDED_UCBHELPER_CONTENT_HXX -#include "rtl/ref.hxx" +#include #include #include #include #include #include -#include "ucbhelper/ucbhelperdllapi.h" +#include namespace com { namespace sun { namespace star { namespace beans { class XPropertySetInfo; diff --git a/include/ucbhelper/contenthelper.hxx b/include/ucbhelper/contenthelper.hxx index f89941d6cc1b..08d44a95fe80 100644 --- a/include/ucbhelper/contenthelper.hxx +++ b/include/ucbhelper/contenthelper.hxx @@ -34,10 +34,10 @@ #include #include -#include "osl/mutex.hxx" -#include "rtl/ref.hxx" +#include +#include #include -#include "ucbhelper/ucbhelperdllapi.h" +#include namespace com { namespace sun { namespace star { namespace ucb { struct CommandInfo; diff --git a/include/ucbhelper/contentidentifier.hxx b/include/ucbhelper/contentidentifier.hxx index 16d87b3e08d7..7f95634578ed 100644 --- a/include/ucbhelper/contentidentifier.hxx +++ b/include/ucbhelper/contentidentifier.hxx @@ -23,7 +23,7 @@ #include #include #include -#include "ucbhelper/ucbhelperdllapi.h" +#include namespace ucbhelper diff --git a/include/ucbhelper/contentinfo.hxx b/include/ucbhelper/contentinfo.hxx index ca3c5e974868..95314adedfc3 100644 --- a/include/ucbhelper/contentinfo.hxx +++ b/include/ucbhelper/contentinfo.hxx @@ -26,7 +26,7 @@ #include #include -#include "osl/mutex.hxx" +#include #include namespace ucbhelper { diff --git a/include/ucbhelper/fd_inputstream.hxx b/include/ucbhelper/fd_inputstream.hxx index fcb7c4e68c5c..c3f4ca5e704a 100644 --- a/include/ucbhelper/fd_inputstream.hxx +++ b/include/ucbhelper/fd_inputstream.hxx @@ -28,7 +28,7 @@ #include #include -#include "ucbhelper/ucbhelperdllapi.h" +#include namespace ucbhelper { diff --git a/include/ucbhelper/fileidentifierconverter.hxx b/include/ucbhelper/fileidentifierconverter.hxx index 3b0953cca674..09b1ed1e88e4 100644 --- a/include/ucbhelper/fileidentifierconverter.hxx +++ b/include/ucbhelper/fileidentifierconverter.hxx @@ -23,7 +23,7 @@ #include #include #include -#include "ucbhelper/ucbhelperdllapi.h" +#include namespace com { namespace sun { namespace star { namespace ucb { class XUniversalContentBroker; diff --git a/include/ucbhelper/getcomponentcontext.hxx b/include/ucbhelper/getcomponentcontext.hxx index 5d25e6cf8e9b..28e0dea5da60 100644 --- a/include/ucbhelper/getcomponentcontext.hxx +++ b/include/ucbhelper/getcomponentcontext.hxx @@ -20,10 +20,10 @@ #ifndef INCLUDED_UCBHELPER_GETCOMPONENTCONTEXT_HXX #define INCLUDED_UCBHELPER_GETCOMPONENTCONTEXT_HXX -#include "sal/config.h" +#include -#include "com/sun/star/uno/Reference.hxx" -#include "ucbhelper/ucbhelperdllapi.h" +#include +#include namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx index afb144b84d41..50e8fda8cd28 100644 --- a/include/ucbhelper/interactionrequest.hxx +++ b/include/ucbhelper/interactionrequest.hxx @@ -31,7 +31,7 @@ #include #include #include -#include "ucbhelper/ucbhelperdllapi.h" +#include namespace ucbhelper { diff --git a/include/ucbhelper/interceptedinteraction.hxx b/include/ucbhelper/interceptedinteraction.hxx index 06d6ef55f158..2d52d9331cfc 100644 --- a/include/ucbhelper/interceptedinteraction.hxx +++ b/include/ucbhelper/interceptedinteraction.hxx @@ -26,7 +26,7 @@ #include #include -#include "ucbhelper/ucbhelperdllapi.h" +#include namespace ucbhelper{ diff --git a/include/ucbhelper/macros.hxx b/include/ucbhelper/macros.hxx index 1c8a7af7635d..846f31bd645a 100644 --- a/include/ucbhelper/macros.hxx +++ b/include/ucbhelper/macros.hxx @@ -26,8 +26,8 @@ #include #include -#include "osl/mutex.hxx" -#include "ucbhelper/getcomponentcontext.hxx" +#include +#include //========================================================================= diff --git a/include/ucbhelper/propertyvalueset.hxx b/include/ucbhelper/propertyvalueset.hxx index ea5aec2cd868..694fd41183b6 100644 --- a/include/ucbhelper/propertyvalueset.hxx +++ b/include/ucbhelper/propertyvalueset.hxx @@ -26,9 +26,9 @@ #include #include -#include "osl/mutex.hxx" +#include #include -#include "ucbhelper/ucbhelperdllapi.h" +#include namespace com { namespace sun { namespace star { namespace script { class XTypeConverter; diff --git a/include/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx index 3f8bf0a7c203..3f7165053d4f 100644 --- a/include/ucbhelper/providerhelper.hxx +++ b/include/ucbhelper/providerhelper.hxx @@ -27,10 +27,10 @@ #include #include -#include "osl/mutex.hxx" -#include "rtl/ref.hxx" +#include +#include #include -#include "ucbhelper/ucbhelperdllapi.h" +#include //========================================================================= diff --git a/include/ucbhelper/proxydecider.hxx b/include/ucbhelper/proxydecider.hxx index b1525af573fb..3da828795e31 100644 --- a/include/ucbhelper/proxydecider.hxx +++ b/include/ucbhelper/proxydecider.hxx @@ -23,7 +23,7 @@ #include #include #include -#include "ucbhelper/ucbhelperdllapi.h" +#include namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; diff --git a/include/ucbhelper/registerucb.hxx b/include/ucbhelper/registerucb.hxx index fe4a1acc9070..62dd09a277ab 100644 --- a/include/ucbhelper/registerucb.hxx +++ b/include/ucbhelper/registerucb.hxx @@ -25,7 +25,7 @@ #include #include -#include "ucbhelper/ucbhelperdllapi.h" +#include namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx index 8efb26d8c4ac..3cec3bce2e4f 100644 --- a/include/ucbhelper/resultset.hxx +++ b/include/ucbhelper/resultset.hxx @@ -32,11 +32,11 @@ #include #include -#include "rtl/ref.hxx" -#include "salhelper/simplereferenceobject.hxx" +#include +#include #include #include -#include "ucbhelper/ucbhelperdllapi.h" +#include namespace ucbhelper { diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx index 411124d2965a..502c01aba8aa 100644 --- a/include/ucbhelper/resultsethelper.hxx +++ b/include/ucbhelper/resultsethelper.hxx @@ -29,7 +29,7 @@ #include #include #include -#include "ucbhelper/ucbhelperdllapi.h" +#include namespace cppu { class OInterfaceContainerHelper; diff --git a/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx index 7497df5edc71..30795815a98d 100644 --- a/include/ucbhelper/resultsetmetadata.hxx +++ b/include/ucbhelper/resultsetmetadata.hxx @@ -28,7 +28,7 @@ #include #include #include -#include "ucbhelper/ucbhelperdllapi.h" +#include namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } diff --git a/include/ucbhelper/simpleauthenticationrequest.hxx b/include/ucbhelper/simpleauthenticationrequest.hxx index 40a41f4baeff..d51ce6d90d43 100644 --- a/include/ucbhelper/simpleauthenticationrequest.hxx +++ b/include/ucbhelper/simpleauthenticationrequest.hxx @@ -22,7 +22,7 @@ #include #include -#include "ucbhelper/ucbhelperdllapi.h" +#include namespace com { namespace sun { namespace star { namespace ucb { class URLAuthenticationRequest; diff --git a/include/ucbhelper/simplecertificatevalidationrequest.hxx b/include/ucbhelper/simplecertificatevalidationrequest.hxx index 078bf2606353..934fb0153eff 100644 --- a/include/ucbhelper/simplecertificatevalidationrequest.hxx +++ b/include/ucbhelper/simplecertificatevalidationrequest.hxx @@ -22,7 +22,7 @@ #include #include -#include "ucbhelper/ucbhelperdllapi.h" +#include #include diff --git a/include/ucbhelper/simpleinteractionrequest.hxx b/include/ucbhelper/simpleinteractionrequest.hxx index 11ba26e94ccb..de8842d8127b 100644 --- a/include/ucbhelper/simpleinteractionrequest.hxx +++ b/include/ucbhelper/simpleinteractionrequest.hxx @@ -21,7 +21,7 @@ #define INCLUDED_UCBHELPER_SIMPLEINTERACTIONREQUEST_HXX #include -#include "ucbhelper/ucbhelperdllapi.h" +#include namespace ucbhelper { diff --git a/include/ucbhelper/simplenameclashresolverequest.hxx b/include/ucbhelper/simplenameclashresolverequest.hxx index 512775bd3ab7..e5ced512c5f6 100644 --- a/include/ucbhelper/simplenameclashresolverequest.hxx +++ b/include/ucbhelper/simplenameclashresolverequest.hxx @@ -22,7 +22,7 @@ #include #include -#include "ucbhelper/ucbhelperdllapi.h" +#include namespace ucbhelper { diff --git a/include/ucbhelper/std_inputstream.hxx b/include/ucbhelper/std_inputstream.hxx index a9dc2163dd5b..85b19434e251 100644 --- a/include/ucbhelper/std_inputstream.hxx +++ b/include/ucbhelper/std_inputstream.hxx @@ -20,7 +20,7 @@ #include #include -#include "ucbhelper/ucbhelperdllapi.h" +#include namespace ucbhelper { diff --git a/include/ucbhelper/std_outputstream.hxx b/include/ucbhelper/std_outputstream.hxx index 9631b98d740c..76ee31a68a74 100644 --- a/include/ucbhelper/std_outputstream.hxx +++ b/include/ucbhelper/std_outputstream.hxx @@ -17,7 +17,7 @@ #include #include #include -#include "ucbhelper/ucbhelperdllapi.h" +#include namespace ucbhelper { diff --git a/include/ucbhelper/ucbhelperdllapi.h b/include/ucbhelper/ucbhelperdllapi.h index 94522acb98c5..bebc94781661 100644 --- a/include/ucbhelper/ucbhelperdllapi.h +++ b/include/ucbhelper/ucbhelperdllapi.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_UCBHELPER_UCBHELPERDLLAPI_H #define INCLUDED_UCBHELPER_UCBHELPERDLLAPI_H -#include "sal/types.h" +#include #if defined(UCBHELPER_DLLIMPLEMENTATION) #define UCBHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT -- cgit