From 2f3305e939b5ad1f1a6af5a608c10e745deb56d6 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 9 Nov 2013 15:10:54 -0600 Subject: fdo#65108 inter-module includes <> include/cppuhelper Change-Id: Ife81bf3dacb574b664982f3b4d2c7af9eb78a66a --- include/cppuhelper/access_control.hxx | 2 +- include/cppuhelper/bootstrap.hxx | 12 ++++++------ include/cppuhelper/compbase_ex.hxx | 2 +- include/cppuhelper/component.hxx | 2 +- include/cppuhelper/component_context.hxx | 2 +- include/cppuhelper/cppuhelperdllapi.h | 2 +- include/cppuhelper/exc_hlp.hxx | 2 +- include/cppuhelper/factory.hxx | 2 +- include/cppuhelper/findsofficepath.h | 2 +- include/cppuhelper/implbase.hxx | 2 +- include/cppuhelper/implementationentry.hxx | 2 +- include/cppuhelper/interfacecontainer.h | 4 ++-- include/cppuhelper/propertysetmixin.hxx | 26 +++++++++++++------------- include/cppuhelper/propshlp.hxx | 2 +- include/cppuhelper/queryinterface.hxx | 8 ++++---- include/cppuhelper/shlib.hxx | 2 +- include/cppuhelper/supportsservice.hxx | 4 ++-- include/cppuhelper/typeprovider.hxx | 2 +- include/cppuhelper/unourl.hxx | 2 +- include/cppuhelper/weak.hxx | 2 +- include/cppuhelper/weakagg.hxx | 2 +- include/cppuhelper/weakref.hxx | 2 +- 22 files changed, 44 insertions(+), 44 deletions(-) (limited to 'include/cppuhelper') diff --git a/include/cppuhelper/access_control.hxx b/include/cppuhelper/access_control.hxx index 19078e95d217..77b934937268 100644 --- a/include/cppuhelper/access_control.hxx +++ b/include/cppuhelper/access_control.hxx @@ -21,7 +21,7 @@ #include #include -#include "cppuhelperdllapi.h" +#include namespace cppu diff --git a/include/cppuhelper/bootstrap.hxx b/include/cppuhelper/bootstrap.hxx index 080d66966fa3..e27f2b5fa4ec 100644 --- a/include/cppuhelper/bootstrap.hxx +++ b/include/cppuhelper/bootstrap.hxx @@ -19,12 +19,12 @@ #ifndef INCLUDED_CPPUHELPER_BOOTSTRAP_HXX #define INCLUDED_CPPUHELPER_BOOTSTRAP_HXX -#include "sal/config.h" -#include "com/sun/star/uno/Exception.hpp" -#include "com/sun/star/uno/Reference.hxx" -#include "rtl/ustring.hxx" -#include "sal/types.h" -#include "cppuhelperdllapi.h" +#include +#include +#include +#include +#include +#include namespace com { namespace sun { namespace star { namespace container { class XHierarchicalNameAccess; } diff --git a/include/cppuhelper/compbase_ex.hxx b/include/cppuhelper/compbase_ex.hxx index 8cfa78a089a0..b87b25f0d10b 100644 --- a/include/cppuhelper/compbase_ex.hxx +++ b/include/cppuhelper/compbase_ex.hxx @@ -23,7 +23,7 @@ #include #include #include -#include "cppuhelperdllapi.h" +#include /// @cond INTERNAL diff --git a/include/cppuhelper/component.hxx b/include/cppuhelper/component.hxx index 7fb919d2b0a6..b987c85f8fa4 100644 --- a/include/cppuhelper/component.hxx +++ b/include/cppuhelper/component.hxx @@ -28,7 +28,7 @@ #include #include -#include "cppuhelperdllapi.h" +#include namespace cppu { diff --git a/include/cppuhelper/component_context.hxx b/include/cppuhelper/component_context.hxx index 943efdd7fcdd..6e479d46e923 100644 --- a/include/cppuhelper/component_context.hxx +++ b/include/cppuhelper/component_context.hxx @@ -21,7 +21,7 @@ #include #include -#include "cppuhelperdllapi.h" +#include namespace cppu diff --git a/include/cppuhelper/cppuhelperdllapi.h b/include/cppuhelper/cppuhelperdllapi.h index 1eff7bedc313..c7662763556a 100644 --- a/include/cppuhelper/cppuhelperdllapi.h +++ b/include/cppuhelper/cppuhelperdllapi.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_CPPUHELPER_CPPUHELPERDLLAPI_H #define INCLUDED_CPPUHELPER_CPPUHELPERDLLAPI_H -#include "sal/types.h" +#include #if defined(CPPUHELPER_DLLIMPLEMENTATION) #define CPPUHELPER_DLLPUBLIC SAL_DLLPUBLIC_EXPORT diff --git a/include/cppuhelper/exc_hlp.hxx b/include/cppuhelper/exc_hlp.hxx index 0ca1d1f8e086..666211822a9b 100644 --- a/include/cppuhelper/exc_hlp.hxx +++ b/include/cppuhelper/exc_hlp.hxx @@ -21,7 +21,7 @@ #define INCLUDED_CPPUHELPER_EXC_HLP_HXX #include -#include "cppuhelperdllapi.h" +#include namespace cppu { diff --git a/include/cppuhelper/factory.hxx b/include/cppuhelper/factory.hxx index 5a20cc7fcba8..60fabb44e7dc 100644 --- a/include/cppuhelper/factory.hxx +++ b/include/cppuhelper/factory.hxx @@ -28,7 +28,7 @@ #include #include #include -#include "cppuhelperdllapi.h" +#include //################################################################################################## diff --git a/include/cppuhelper/findsofficepath.h b/include/cppuhelper/findsofficepath.h index 1d24009f6bb8..717f316a422b 100644 --- a/include/cppuhelper/findsofficepath.h +++ b/include/cppuhelper/findsofficepath.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_CPPUHELPER_FINDSOFFICEPATH_H #define INCLUDED_CPPUHELPER_FINDSOFFICEPATH_H -#include "sal/config.h" +#include #if defined __cplusplus extern "C" { diff --git a/include/cppuhelper/implbase.hxx b/include/cppuhelper/implbase.hxx index 5c1bdf45a159..bc8be9aa56ab 100644 --- a/include/cppuhelper/implbase.hxx +++ b/include/cppuhelper/implbase.hxx @@ -26,7 +26,7 @@ #include #include -#include "cppuhelperdllapi.h" +#include /* This header should not be used anymore. @deprecated diff --git a/include/cppuhelper/implementationentry.hxx b/include/cppuhelper/implementationentry.hxx index c99a9b9156c9..533b729b22e2 100644 --- a/include/cppuhelper/implementationentry.hxx +++ b/include/cppuhelper/implementationentry.hxx @@ -20,7 +20,7 @@ #define INCLUDED_CPPUHELPER_IMPLEMENTATIONENTRY_HXX #include -#include "cppuhelperdllapi.h" +#include // MinGW wants it the one way around while MSVC wants it the other (cf. // "Syntactic __cdecl diff --git a/include/cppuhelper/interfacecontainer.h b/include/cppuhelper/interfacecontainer.h index 39e467e0e2dc..223148f586e6 100644 --- a/include/cppuhelper/interfacecontainer.h +++ b/include/cppuhelper/interfacecontainer.h @@ -26,8 +26,8 @@ #include #include -#include "com/sun/star/lang/DisposedException.hpp" -#include "cppuhelperdllapi.h" +#include +#include /** */ //for docpp namespace cppu diff --git a/include/cppuhelper/propertysetmixin.hxx b/include/cppuhelper/propertysetmixin.hxx index bb01f2848e68..8cdb0f361a08 100644 --- a/include/cppuhelper/propertysetmixin.hxx +++ b/include/cppuhelper/propertysetmixin.hxx @@ -20,22 +20,22 @@ #ifndef INCLUDED_CPPUHELPER_PROPERTYSETMIXIN_HXX #define INCLUDED_CPPUHELPER_PROPERTYSETMIXIN_HXX -#include "sal/config.h" +#include #include -#include "com/sun/star/beans/PropertyVetoException.hpp" -#include "com/sun/star/beans/UnknownPropertyException.hpp" -#include "com/sun/star/beans/XFastPropertySet.hpp" -#include "com/sun/star/beans/XPropertyAccess.hpp" -#include "com/sun/star/beans/XPropertySet.hpp" -#include "com/sun/star/lang/IllegalArgumentException.hpp" -#include "com/sun/star/lang/WrappedTargetException.hpp" -#include "com/sun/star/uno/Reference.hxx" -#include "com/sun/star/uno/RuntimeException.hpp" -#include "com/sun/star/uno/Sequence.hxx" -#include "sal/types.h" -#include "cppuhelperdllapi.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include namespace com { namespace sun { namespace star { namespace beans { diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx index 4f886d13df5f..bc01cbccb2b2 100644 --- a/include/cppuhelper/propshlp.hxx +++ b/include/cppuhelper/propshlp.hxx @@ -30,7 +30,7 @@ #include #include -#include "cppuhelperdllapi.h" +#include namespace cppu diff --git a/include/cppuhelper/queryinterface.hxx b/include/cppuhelper/queryinterface.hxx index b01dfa6dd453..29045f34d63a 100644 --- a/include/cppuhelper/queryinterface.hxx +++ b/include/cppuhelper/queryinterface.hxx @@ -20,10 +20,10 @@ #ifndef INCLUDED_CPPUHELPER_QUERYINTERFACE_HXX #define INCLUDED_CPPUHELPER_QUERYINTERFACE_HXX -#include "sal/config.h" -#include "com/sun/star/uno/Any.hxx" -#include "com/sun/star/uno/Type.hxx" -#include "sal/types.h" +#include +#include +#include +#include namespace cppu { diff --git a/include/cppuhelper/shlib.hxx b/include/cppuhelper/shlib.hxx index c0abe4779128..d5d2058b36f8 100644 --- a/include/cppuhelper/shlib.hxx +++ b/include/cppuhelper/shlib.hxx @@ -23,7 +23,7 @@ #include #include #include -#include "cppuhelperdllapi.h" +#include namespace cppu diff --git a/include/cppuhelper/supportsservice.hxx b/include/cppuhelper/supportsservice.hxx index a5cc2003a1ed..10dcfb553b38 100644 --- a/include/cppuhelper/supportsservice.hxx +++ b/include/cppuhelper/supportsservice.hxx @@ -10,9 +10,9 @@ #ifndef INCLUDED_CPPUHELPER_SUPPORTSSERVICE_HXX #define INCLUDED_CPPUHELPER_SUPPORTSSERVICE_HXX -#include "sal/config.h" +#include -#include "cppuhelper/cppuhelperdllapi.h" +#include namespace com { namespace sun { namespace star { namespace lang { class XServiceInfo; diff --git a/include/cppuhelper/typeprovider.hxx b/include/cppuhelper/typeprovider.hxx index 79241e52cb31..c9f864dce0f3 100644 --- a/include/cppuhelper/typeprovider.hxx +++ b/include/cppuhelper/typeprovider.hxx @@ -22,7 +22,7 @@ #include #include #include -#include "cppuhelperdllapi.h" +#include namespace cppu diff --git a/include/cppuhelper/unourl.hxx b/include/cppuhelper/unourl.hxx index e9a7f2baa55e..992870985617 100644 --- a/include/cppuhelper/unourl.hxx +++ b/include/cppuhelper/unourl.hxx @@ -21,7 +21,7 @@ #define INCLUDED_CPPUHELPER_UNOURL_HXX #include -#include "cppuhelperdllapi.h" +#include namespace rtl { class OUString; } diff --git a/include/cppuhelper/weak.hxx b/include/cppuhelper/weak.hxx index 1bc1646e85c7..e74fac929fc8 100644 --- a/include/cppuhelper/weak.hxx +++ b/include/cppuhelper/weak.hxx @@ -24,7 +24,7 @@ #include #include #include -#include "cppuhelperdllapi.h" +#include namespace cppu diff --git a/include/cppuhelper/weakagg.hxx b/include/cppuhelper/weakagg.hxx index 397a80e46ac3..dce45f2e76b9 100644 --- a/include/cppuhelper/weakagg.hxx +++ b/include/cppuhelper/weakagg.hxx @@ -21,7 +21,7 @@ #include #include -#include "cppuhelperdllapi.h" +#include namespace cppu diff --git a/include/cppuhelper/weakref.hxx b/include/cppuhelper/weakref.hxx index 218612acada3..d9a77287b364 100644 --- a/include/cppuhelper/weakref.hxx +++ b/include/cppuhelper/weakref.hxx @@ -20,7 +20,7 @@ #define INCLUDED_CPPUHELPER_WEAKREF_HXX #include -#include "cppuhelperdllapi.h" +#include namespace com -- cgit