Kaydet (Commit) 2f3305e9 authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud

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

Change-Id: Ife81bf3dacb574b664982f3b4d2c7af9eb78a66a
üst 7f997d5d
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/security/XAccessController.hpp> #include <com/sun/star/security/XAccessController.hpp>
#include "cppuhelperdllapi.h" #include <cppuhelper/cppuhelperdllapi.h>
namespace cppu namespace cppu
......
...@@ -19,12 +19,12 @@ ...@@ -19,12 +19,12 @@
#ifndef INCLUDED_CPPUHELPER_BOOTSTRAP_HXX #ifndef INCLUDED_CPPUHELPER_BOOTSTRAP_HXX
#define INCLUDED_CPPUHELPER_BOOTSTRAP_HXX #define INCLUDED_CPPUHELPER_BOOTSTRAP_HXX
#include "sal/config.h" #include <sal/config.h>
#include "com/sun/star/uno/Exception.hpp" #include <com/sun/star/uno/Exception.hpp>
#include "com/sun/star/uno/Reference.hxx" #include <com/sun/star/uno/Reference.hxx>
#include "rtl/ustring.hxx" #include <rtl/ustring.hxx>
#include "sal/types.h" #include <sal/types.h>
#include "cppuhelperdllapi.h" #include <cppuhelper/cppuhelperdllapi.h>
namespace com { namespace sun { namespace star { namespace com { namespace sun { namespace star {
namespace container { class XHierarchicalNameAccess; } namespace container { class XHierarchicalNameAccess; }
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <cppuhelper/implbase_ex.hxx> #include <cppuhelper/implbase_ex.hxx>
#include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/interfacecontainer.hxx>
#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XComponent.hpp>
#include "cppuhelperdllapi.h" #include <cppuhelper/cppuhelperdllapi.h>
/// @cond INTERNAL /// @cond INTERNAL
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XEventListener.hpp>
#include "cppuhelperdllapi.h" #include <cppuhelper/cppuhelperdllapi.h>
namespace cppu namespace cppu
{ {
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp>
#include "cppuhelperdllapi.h" #include <cppuhelper/cppuhelperdllapi.h>
namespace cppu namespace cppu
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#ifndef INCLUDED_CPPUHELPER_CPPUHELPERDLLAPI_H #ifndef INCLUDED_CPPUHELPER_CPPUHELPERDLLAPI_H
#define INCLUDED_CPPUHELPER_CPPUHELPERDLLAPI_H #define INCLUDED_CPPUHELPER_CPPUHELPERDLLAPI_H
#include "sal/types.h" #include <sal/types.h>
#if defined(CPPUHELPER_DLLIMPLEMENTATION) #if defined(CPPUHELPER_DLLIMPLEMENTATION)
#define CPPUHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT #define CPPUHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define INCLUDED_CPPUHELPER_EXC_HLP_HXX #define INCLUDED_CPPUHELPER_EXC_HLP_HXX
#include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Any.hxx>
#include "cppuhelperdllapi.h" #include <cppuhelper/cppuhelperdllapi.h>
namespace cppu namespace cppu
{ {
......
...@@ -28,7 +28,7 @@ ...@@ -28,7 +28,7 @@
#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/registry/XRegistryKey.hpp>
#include "cppuhelperdllapi.h" #include <cppuhelper/cppuhelperdllapi.h>
//################################################################################################## //##################################################################################################
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#ifndef INCLUDED_CPPUHELPER_FINDSOFFICEPATH_H #ifndef INCLUDED_CPPUHELPER_FINDSOFFICEPATH_H
#define INCLUDED_CPPUHELPER_FINDSOFFICEPATH_H #define INCLUDED_CPPUHELPER_FINDSOFFICEPATH_H
#include "sal/config.h" #include <sal/config.h>
#if defined __cplusplus #if defined __cplusplus
extern "C" { extern "C" {
......
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include "cppuhelperdllapi.h" #include <cppuhelper/cppuhelperdllapi.h>
/* This header should not be used anymore. /* This header should not be used anymore.
@deprecated @deprecated
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define INCLUDED_CPPUHELPER_IMPLEMENTATIONENTRY_HXX #define INCLUDED_CPPUHELPER_IMPLEMENTATIONENTRY_HXX
#include <cppuhelper/factory.hxx> #include <cppuhelper/factory.hxx>
#include "cppuhelperdllapi.h" #include <cppuhelper/cppuhelperdllapi.h>
// MinGW wants it the one way around while MSVC wants it the other (cf. // MinGW wants it the one way around while MSVC wants it the other (cf.
// <sourceforge.net/support/tracker.php?aid=3514133> "Syntactic __cdecl // <sourceforge.net/support/tracker.php?aid=3514133> "Syntactic __cdecl
......
...@@ -26,8 +26,8 @@ ...@@ -26,8 +26,8 @@
#include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/XInterface.hpp>
#include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/lang/EventObject.hpp>
#include "com/sun/star/lang/DisposedException.hpp" #include <com/sun/star/lang/DisposedException.hpp>
#include "cppuhelperdllapi.h" #include <cppuhelper/cppuhelperdllapi.h>
/** */ //for docpp /** */ //for docpp
namespace cppu namespace cppu
......
...@@ -20,22 +20,22 @@ ...@@ -20,22 +20,22 @@
#ifndef INCLUDED_CPPUHELPER_PROPERTYSETMIXIN_HXX #ifndef INCLUDED_CPPUHELPER_PROPERTYSETMIXIN_HXX
#define INCLUDED_CPPUHELPER_PROPERTYSETMIXIN_HXX #define INCLUDED_CPPUHELPER_PROPERTYSETMIXIN_HXX
#include "sal/config.h" #include <sal/config.h>
#include <exception> #include <exception>
#include "com/sun/star/beans/PropertyVetoException.hpp" #include <com/sun/star/beans/PropertyVetoException.hpp>
#include "com/sun/star/beans/UnknownPropertyException.hpp" #include <com/sun/star/beans/UnknownPropertyException.hpp>
#include "com/sun/star/beans/XFastPropertySet.hpp" #include <com/sun/star/beans/XFastPropertySet.hpp>
#include "com/sun/star/beans/XPropertyAccess.hpp" #include <com/sun/star/beans/XPropertyAccess.hpp>
#include "com/sun/star/beans/XPropertySet.hpp" #include <com/sun/star/beans/XPropertySet.hpp>
#include "com/sun/star/lang/IllegalArgumentException.hpp" #include <com/sun/star/lang/IllegalArgumentException.hpp>
#include "com/sun/star/lang/WrappedTargetException.hpp" #include <com/sun/star/lang/WrappedTargetException.hpp>
#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 "com/sun/star/uno/Sequence.hxx" #include <com/sun/star/uno/Sequence.hxx>
#include "sal/types.h" #include <sal/types.h>
#include "cppuhelperdllapi.h" #include <cppuhelper/cppuhelperdllapi.h>
namespace com { namespace sun { namespace star { namespace com { namespace sun { namespace star {
namespace beans { namespace beans {
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <com/sun/star/beans/XFastPropertySet.hpp> #include <com/sun/star/beans/XFastPropertySet.hpp>
#include <memory> #include <memory>
#include "cppuhelperdllapi.h" #include <cppuhelper/cppuhelperdllapi.h>
namespace cppu namespace cppu
......
...@@ -20,10 +20,10 @@ ...@@ -20,10 +20,10 @@
#ifndef INCLUDED_CPPUHELPER_QUERYINTERFACE_HXX #ifndef INCLUDED_CPPUHELPER_QUERYINTERFACE_HXX
#define INCLUDED_CPPUHELPER_QUERYINTERFACE_HXX #define INCLUDED_CPPUHELPER_QUERYINTERFACE_HXX
#include "sal/config.h" #include <sal/config.h>
#include "com/sun/star/uno/Any.hxx" #include <com/sun/star/uno/Any.hxx>
#include "com/sun/star/uno/Type.hxx" #include <com/sun/star/uno/Type.hxx>
#include "sal/types.h" #include <sal/types.h>
namespace cppu namespace cppu
{ {
......
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
#include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/registry/XRegistryKey.hpp>
#include <com/sun/star/loader/CannotActivateFactoryException.hpp> #include <com/sun/star/loader/CannotActivateFactoryException.hpp>
#include <com/sun/star/registry/CannotRegisterImplementationException.hpp> #include <com/sun/star/registry/CannotRegisterImplementationException.hpp>
#include "cppuhelperdllapi.h" #include <cppuhelper/cppuhelperdllapi.h>
namespace cppu namespace cppu
......
...@@ -10,9 +10,9 @@ ...@@ -10,9 +10,9 @@
#ifndef INCLUDED_CPPUHELPER_SUPPORTSSERVICE_HXX #ifndef INCLUDED_CPPUHELPER_SUPPORTSSERVICE_HXX
#define INCLUDED_CPPUHELPER_SUPPORTSSERVICE_HXX #define INCLUDED_CPPUHELPER_SUPPORTSSERVICE_HXX
#include "sal/config.h" #include <sal/config.h>
#include "cppuhelper/cppuhelperdllapi.h" #include <cppuhelper/cppuhelperdllapi.h>
namespace com { namespace sun { namespace star { namespace lang { namespace com { namespace sun { namespace star { namespace lang {
class XServiceInfo; class XServiceInfo;
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <rtl/alloc.h> #include <rtl/alloc.h>
#include <rtl/uuid.h> #include <rtl/uuid.h>
#include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Sequence.hxx>
#include "cppuhelperdllapi.h" #include <cppuhelper/cppuhelperdllapi.h>
namespace cppu namespace cppu
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#define INCLUDED_CPPUHELPER_UNOURL_HXX #define INCLUDED_CPPUHELPER_UNOURL_HXX
#include <memory> #include <memory>
#include "cppuhelperdllapi.h" #include <cppuhelper/cppuhelperdllapi.h>
namespace rtl { class OUString; } namespace rtl { class OUString; }
......
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
#include <cppuhelper/weakref.hxx> #include <cppuhelper/weakref.hxx>
#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/queryinterface.hxx>
#include <com/sun/star/uno/XWeak.hpp> #include <com/sun/star/uno/XWeak.hpp>
#include "cppuhelperdllapi.h" #include <cppuhelper/cppuhelperdllapi.h>
namespace cppu namespace cppu
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#include <com/sun/star/uno/XAggregation.hpp> #include <com/sun/star/uno/XAggregation.hpp>
#include "cppuhelperdllapi.h" #include <cppuhelper/cppuhelperdllapi.h>
namespace cppu namespace cppu
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
#define INCLUDED_CPPUHELPER_WEAKREF_HXX #define INCLUDED_CPPUHELPER_WEAKREF_HXX
#include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/XInterface.hpp>
#include "cppuhelperdllapi.h" #include <cppuhelper/cppuhelperdllapi.h>
namespace com namespace com
......
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