Kaydet (Commit) 3d12a333 authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud

fdo#65108 inter-module includes <> include/ucbhelper

Change-Id: I355c0873ef51b92f39dd7cc0d696075f54f890d9
üst 4a61b2fe
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <com/sun/star/io/XActiveDataSink.hpp> #include <com/sun/star/io/XActiveDataSink.hpp>
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#include <ucbhelper/macros.hxx> #include <ucbhelper/macros.hxx>
#include "ucbhelper/ucbhelperdllapi.h" #include <ucbhelper/ucbhelperdllapi.h>
namespace ucbhelper namespace ucbhelper
{ {
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/uno/Exception.hpp>
#include <com/sun/star/ucb/IOErrorCode.hpp> #include <com/sun/star/ucb/IOErrorCode.hpp>
#include <com/sun/star/ucb/XCommandProcessor.hpp> #include <com/sun/star/ucb/XCommandProcessor.hpp>
#include "ucbhelper/ucbhelperdllapi.h" #include <ucbhelper/ucbhelperdllapi.h>
namespace com { namespace sun { namespace star { namespace com { namespace sun { namespace star {
namespace uno { class Any; } namespace uno { class Any; }
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#include <ucbhelper/macros.hxx> #include <ucbhelper/macros.hxx>
#include "ucbhelper/ucbhelperdllapi.h" #include <ucbhelper/ucbhelperdllapi.h>
namespace ucbhelper namespace ucbhelper
{ {
......
...@@ -19,13 +19,13 @@ ...@@ -19,13 +19,13 @@
#ifndef INCLUDED_UCBHELPER_CONTENT_HXX #ifndef INCLUDED_UCBHELPER_CONTENT_HXX
#define INCLUDED_UCBHELPER_CONTENT_HXX #define INCLUDED_UCBHELPER_CONTENT_HXX
#include "rtl/ref.hxx" #include <rtl/ref.hxx>
#include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ucb/ContentCreationException.hpp>
#include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/ucb/CommandAbortedException.hpp>
#include <com/sun/star/io/XStream.hpp> #include <com/sun/star/io/XStream.hpp>
#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Sequence.hxx>
#include "ucbhelper/ucbhelperdllapi.h" #include <ucbhelper/ucbhelperdllapi.h>
namespace com { namespace sun { namespace star { namespace beans { namespace com { namespace sun { namespace star { namespace beans {
class XPropertySetInfo; class XPropertySetInfo;
......
...@@ -34,10 +34,10 @@ ...@@ -34,10 +34,10 @@
#include <com/sun/star/ucb/CommandAbortedException.hpp> #include <com/sun/star/ucb/CommandAbortedException.hpp>
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#include "osl/mutex.hxx" #include <osl/mutex.hxx>
#include "rtl/ref.hxx" #include <rtl/ref.hxx>
#include <ucbhelper/macros.hxx> #include <ucbhelper/macros.hxx>
#include "ucbhelper/ucbhelperdllapi.h" #include <ucbhelper/ucbhelperdllapi.h>
namespace com { namespace sun { namespace star { namespace ucb { namespace com { namespace sun { namespace star { namespace ucb {
struct CommandInfo; struct CommandInfo;
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/ucb/XContentIdentifier.hpp> #include <com/sun/star/ucb/XContentIdentifier.hpp>
#include "ucbhelper/ucbhelperdllapi.h" #include <ucbhelper/ucbhelperdllapi.h>
namespace ucbhelper namespace ucbhelper
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp>
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#include "osl/mutex.hxx" #include <osl/mutex.hxx>
#include <ucbhelper/macros.hxx> #include <ucbhelper/macros.hxx>
namespace ucbhelper { namespace ucbhelper {
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase2.hxx>
#include <cppuhelper/basemutex.hxx> #include <cppuhelper/basemutex.hxx>
#include "ucbhelper/ucbhelperdllapi.h" #include <ucbhelper/ucbhelperdllapi.h>
namespace ucbhelper namespace ucbhelper
{ {
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/uno/RuntimeException.hpp>
#include <sal/types.h> #include <sal/types.h>
#include "ucbhelper/ucbhelperdllapi.h" #include <ucbhelper/ucbhelperdllapi.h>
namespace com { namespace sun { namespace star { namespace ucb { namespace com { namespace sun { namespace star { namespace ucb {
class XUniversalContentBroker; class XUniversalContentBroker;
......
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
#ifndef INCLUDED_UCBHELPER_GETCOMPONENTCONTEXT_HXX #ifndef INCLUDED_UCBHELPER_GETCOMPONENTCONTEXT_HXX
#define INCLUDED_UCBHELPER_GETCOMPONENTCONTEXT_HXX #define INCLUDED_UCBHELPER_GETCOMPONENTCONTEXT_HXX
#include "sal/config.h" #include <sal/config.h>
#include "com/sun/star/uno/Reference.hxx" #include <com/sun/star/uno/Reference.hxx>
#include "ucbhelper/ucbhelperdllapi.h" #include <ucbhelper/ucbhelperdllapi.h>
namespace com { namespace sun { namespace star { namespace com { namespace sun { namespace star {
namespace lang { class XMultiServiceFactory; } namespace lang { class XMultiServiceFactory; }
......
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
#include <com/sun/star/ucb/XInteractionSupplyName.hpp> #include <com/sun/star/ucb/XInteractionSupplyName.hpp>
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#include "ucbhelper/ucbhelperdllapi.h" #include <ucbhelper/ucbhelperdllapi.h>
namespace ucbhelper { namespace ucbhelper {
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <com/sun/star/task/XInteractionRequest.hpp> #include <com/sun/star/task/XInteractionRequest.hpp>
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase1.hxx>
#include "ucbhelper/ucbhelperdllapi.h" #include <ucbhelper/ucbhelperdllapi.h>
namespace ucbhelper{ namespace ucbhelper{
......
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
#include <cppuhelper/weakref.hxx> #include <cppuhelper/weakref.hxx>
#include <cppuhelper/typeprovider.hxx> #include <cppuhelper/typeprovider.hxx>
#include "osl/mutex.hxx" #include <osl/mutex.hxx>
#include "ucbhelper/getcomponentcontext.hxx" #include <ucbhelper/getcomponentcontext.hxx>
//========================================================================= //=========================================================================
......
...@@ -26,9 +26,9 @@ ...@@ -26,9 +26,9 @@
#include <com/sun/star/beans/Property.hpp> #include <com/sun/star/beans/Property.hpp>
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#include "osl/mutex.hxx" #include <osl/mutex.hxx>
#include <ucbhelper/macros.hxx> #include <ucbhelper/macros.hxx>
#include "ucbhelper/ucbhelperdllapi.h" #include <ucbhelper/ucbhelperdllapi.h>
namespace com { namespace sun { namespace star { namespace script { namespace com { namespace sun { namespace star { namespace script {
class XTypeConverter; class XTypeConverter;
......
...@@ -27,10 +27,10 @@ ...@@ -27,10 +27,10 @@
#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XTypeProvider.hpp>
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#include "osl/mutex.hxx" #include <osl/mutex.hxx>
#include "rtl/ref.hxx" #include <rtl/ref.hxx>
#include <ucbhelper/macros.hxx> #include <ucbhelper/macros.hxx>
#include "ucbhelper/ucbhelperdllapi.h" #include <ucbhelper/ucbhelperdllapi.h>
//========================================================================= //=========================================================================
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Reference.hxx>
#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XComponentContext.hpp>
#include "ucbhelper/ucbhelperdllapi.h" #include <ucbhelper/ucbhelperdllapi.h>
namespace com { namespace sun { namespace star { namespace lang { namespace com { namespace sun { namespace star { namespace lang {
class XMultiServiceFactory; class XMultiServiceFactory;
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
#include <com/sun/star/ucb/XContentProviderManager.hpp> #include <com/sun/star/ucb/XContentProviderManager.hpp>
#include <vector> #include <vector>
#include "ucbhelper/ucbhelperdllapi.h" #include <ucbhelper/ucbhelperdllapi.h>
namespace com { namespace sun { namespace star { namespace com { namespace sun { namespace star {
namespace lang { class XMultiServiceFactory; } namespace lang { class XMultiServiceFactory; }
......
...@@ -32,11 +32,11 @@ ...@@ -32,11 +32,11 @@
#include <com/sun/star/sdbc/XCloseable.hpp> #include <com/sun/star/sdbc/XCloseable.hpp>
#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySet.hpp>
#include "rtl/ref.hxx" #include <rtl/ref.hxx>
#include "salhelper/simplereferenceobject.hxx" #include <salhelper/simplereferenceobject.hxx>
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#include <ucbhelper/macros.hxx> #include <ucbhelper/macros.hxx>
#include "ucbhelper/ucbhelperdllapi.h" #include <ucbhelper/ucbhelperdllapi.h>
namespace ucbhelper { namespace ucbhelper {
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#include <ucbhelper/macros.hxx> #include <ucbhelper/macros.hxx>
#include <ucbhelper/contenthelper.hxx> #include <ucbhelper/contenthelper.hxx>
#include "ucbhelper/ucbhelperdllapi.h" #include <ucbhelper/ucbhelperdllapi.h>
namespace cppu { namespace cppu {
class OInterfaceContainerHelper; class OInterfaceContainerHelper;
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <com/sun/star/sdbc/XResultSetMetaData.hpp> #include <com/sun/star/sdbc/XResultSetMetaData.hpp>
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#include <ucbhelper/macros.hxx> #include <ucbhelper/macros.hxx>
#include "ucbhelper/ucbhelperdllapi.h" #include <ucbhelper/ucbhelperdllapi.h>
namespace com { namespace sun { namespace star { namespace com { namespace sun { namespace star {
namespace lang { class XMultiServiceFactory; } namespace lang { class XMultiServiceFactory; }
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
#include <ucbhelper/interactionrequest.hxx> #include <ucbhelper/interactionrequest.hxx>
#include "ucbhelper/ucbhelperdllapi.h" #include <ucbhelper/ucbhelperdllapi.h>
namespace com { namespace sun { namespace star { namespace ucb { namespace com { namespace sun { namespace star { namespace ucb {
class URLAuthenticationRequest; class URLAuthenticationRequest;
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
#include <ucbhelper/interactionrequest.hxx> #include <ucbhelper/interactionrequest.hxx>
#include "ucbhelper/ucbhelperdllapi.h" #include <ucbhelper/ucbhelperdllapi.h>
#include <com/sun/star/security/XCertificate.hpp> #include <com/sun/star/security/XCertificate.hpp>
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define INCLUDED_UCBHELPER_SIMPLEINTERACTIONREQUEST_HXX #define INCLUDED_UCBHELPER_SIMPLEINTERACTIONREQUEST_HXX
#include <ucbhelper/interactionrequest.hxx> #include <ucbhelper/interactionrequest.hxx>
#include "ucbhelper/ucbhelperdllapi.h" #include <ucbhelper/ucbhelperdllapi.h>
namespace ucbhelper { namespace ucbhelper {
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
#include <ucbhelper/interactionrequest.hxx> #include <ucbhelper/interactionrequest.hxx>
#include "ucbhelper/ucbhelperdllapi.h" #include <ucbhelper/ucbhelperdllapi.h>
namespace ucbhelper { namespace ucbhelper {
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/io/XSeekable.hpp>
#include "ucbhelper/ucbhelperdllapi.h" #include <ucbhelper/ucbhelperdllapi.h>
namespace ucbhelper namespace ucbhelper
{ {
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/queryinterface.hxx>
#include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp>
#include "ucbhelper/ucbhelperdllapi.h" #include <ucbhelper/ucbhelperdllapi.h>
namespace ucbhelper namespace ucbhelper
{ {
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#ifndef INCLUDED_UCBHELPER_UCBHELPERDLLAPI_H #ifndef INCLUDED_UCBHELPER_UCBHELPERDLLAPI_H
#define INCLUDED_UCBHELPER_UCBHELPERDLLAPI_H #define INCLUDED_UCBHELPER_UCBHELPERDLLAPI_H
#include "sal/types.h" #include <sal/types.h>
#if defined(UCBHELPER_DLLIMPLEMENTATION) #if defined(UCBHELPER_DLLIMPLEMENTATION)
#define UCBHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #define UCBHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment