From 189abcf0db61c41a565bd355294bf6e712fc3e5a Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Mon, 23 Oct 2017 22:22:50 +0200 Subject: loplugin:includeform: UNO API include files Change these back to consistently use the "..." form to include other UNO API include files, for the benefit of external users of this API. Change-Id: I9c9188e895eb3495e20a71ad44abfa2f6061fa94 --- include/cppuhelper/access_control.hxx | 6 +++--- include/cppuhelper/basemutex.hxx | 2 +- include/cppuhelper/bootstrap.hxx | 10 +++++----- include/cppuhelper/compbase.hxx | 22 +++++++++++----------- include/cppuhelper/compbase1.hxx | 4 ++-- include/cppuhelper/compbase10.hxx | 4 ++-- include/cppuhelper/compbase11.hxx | 4 ++-- include/cppuhelper/compbase12.hxx | 4 ++-- include/cppuhelper/compbase2.hxx | 4 ++-- include/cppuhelper/compbase3.hxx | 4 ++-- include/cppuhelper/compbase4.hxx | 4 ++-- include/cppuhelper/compbase5.hxx | 4 ++-- include/cppuhelper/compbase6.hxx | 4 ++-- include/cppuhelper/compbase7.hxx | 4 ++-- include/cppuhelper/compbase8.hxx | 4 ++-- include/cppuhelper/compbase9.hxx | 4 ++-- include/cppuhelper/compbase_ex.hxx | 8 ++++---- include/cppuhelper/component.hxx | 10 +++++----- include/cppuhelper/component_context.hxx | 12 ++++++------ include/cppuhelper/cppuhelperdllapi.h | 2 +- include/cppuhelper/exc_hlp.hxx | 4 ++-- include/cppuhelper/factory.hxx | 18 +++++++++--------- include/cppuhelper/findsofficepath.h | 2 +- include/cppuhelper/implbase.hxx | 20 ++++++++++---------- include/cppuhelper/implbase1.hxx | 4 ++-- include/cppuhelper/implbase10.hxx | 4 ++-- include/cppuhelper/implbase11.hxx | 4 ++-- include/cppuhelper/implbase12.hxx | 4 ++-- include/cppuhelper/implbase13.hxx | 4 ++-- include/cppuhelper/implbase2.hxx | 4 ++-- include/cppuhelper/implbase3.hxx | 4 ++-- include/cppuhelper/implbase4.hxx | 4 ++-- include/cppuhelper/implbase5.hxx | 4 ++-- include/cppuhelper/implbase6.hxx | 4 ++-- include/cppuhelper/implbase7.hxx | 4 ++-- include/cppuhelper/implbase8.hxx | 4 ++-- include/cppuhelper/implbase9.hxx | 4 ++-- include/cppuhelper/implbase_ex.hxx | 6 +++--- include/cppuhelper/implementationentry.hxx | 4 ++-- include/cppuhelper/interfacecontainer.h | 18 +++++++++--------- include/cppuhelper/interfacecontainer.hxx | 4 ++-- include/cppuhelper/propertysetmixin.hxx | 26 +++++++++++++------------- include/cppuhelper/propshlp.hxx | 14 +++++++------- include/cppuhelper/proptypehlp.h | 2 +- include/cppuhelper/proptypehlp.hxx | 6 +++--- include/cppuhelper/queryinterface.hxx | 8 ++++---- include/cppuhelper/shlib.hxx | 6 +++--- include/cppuhelper/supportsservice.hxx | 4 ++-- include/cppuhelper/typeprovider.hxx | 8 ++++---- include/cppuhelper/unourl.hxx | 4 ++-- include/cppuhelper/weak.hxx | 8 ++++---- include/cppuhelper/weakagg.hxx | 8 ++++---- include/cppuhelper/weakref.hxx | 8 ++++---- 53 files changed, 175 insertions(+), 175 deletions(-) (limited to 'include/cppuhelper') diff --git a/include/cppuhelper/access_control.hxx b/include/cppuhelper/access_control.hxx index 9158c8e0a783..816eb07829e0 100644 --- a/include/cppuhelper/access_control.hxx +++ b/include/cppuhelper/access_control.hxx @@ -19,9 +19,9 @@ #ifndef INCLUDED_CPPUHELPER_ACCESS_CONTROL_HXX #define INCLUDED_CPPUHELPER_ACCESS_CONTROL_HXX -#include -#include -#include +#include "com/sun/star/uno/XComponentContext.hpp" +#include "com/sun/star/security/XAccessController.hpp" +#include "cppuhelper/cppuhelperdllapi.h" namespace cppu diff --git a/include/cppuhelper/basemutex.hxx b/include/cppuhelper/basemutex.hxx index 648529619061..643919d6d509 100644 --- a/include/cppuhelper/basemutex.hxx +++ b/include/cppuhelper/basemutex.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CPPUHELPER_BASEMUTEX_HXX #define INCLUDED_CPPUHELPER_BASEMUTEX_HXX -#include +#include "osl/mutex.hxx" namespace cppu { diff --git a/include/cppuhelper/bootstrap.hxx b/include/cppuhelper/bootstrap.hxx index e9a0c2d1c4f6..bdb4d90584dd 100644 --- a/include/cppuhelper/bootstrap.hxx +++ b/include/cppuhelper/bootstrap.hxx @@ -19,11 +19,11 @@ #ifndef INCLUDED_CPPUHELPER_BOOTSTRAP_HXX #define INCLUDED_CPPUHELPER_BOOTSTRAP_HXX -#include -#include -#include -#include -#include +#include "sal/config.h" +#include "com/sun/star/uno/Reference.hxx" +#include "rtl/ustring.hxx" +#include "sal/types.h" +#include "cppuhelper/cppuhelperdllapi.h" namespace com { namespace sun { namespace star { namespace container { class XHierarchicalNameAccess; } diff --git a/include/cppuhelper/compbase.hxx b/include/cppuhelper/compbase.hxx index e7e196e9e2af..d9230482753d 100644 --- a/include/cppuhelper/compbase.hxx +++ b/include/cppuhelper/compbase.hxx @@ -20,20 +20,20 @@ #ifndef INCLUDED_CPPUHELPER_COMPBASE_HXX #define INCLUDED_CPPUHELPER_COMPBASE_HXX -#include +#include "sal/config.h" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "com/sun/star/lang/XTypeProvider.hpp" +#include "com/sun/star/uno/Any.hxx" +#include "com/sun/star/uno/Reference.hxx" +#include "com/sun/star/uno/RuntimeException.hpp" +#include "com/sun/star/uno/Sequence.hxx" +#include "com/sun/star/uno/Type.hxx" +#include "cppuhelper/compbase_ex.hxx" +#include "cppuhelper/implbase.hxx" +#include "rtl/instance.hxx" +#include "sal/types.h" namespace com { namespace sun { namespace star { namespace lang { class XEventListener; diff --git a/include/cppuhelper/compbase1.hxx b/include/cppuhelper/compbase1.hxx index ab55d4fca1ac..54f22319c810 100644 --- a/include/cppuhelper/compbase1.hxx +++ b/include/cppuhelper/compbase1.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CPPUHELPER_COMPBASE1_HXX #define INCLUDED_CPPUHELPER_COMPBASE1_HXX -#include -#include +#include "cppuhelper/implbase1.hxx" +#include "cppuhelper/compbase_ex.hxx" namespace cppu { diff --git a/include/cppuhelper/compbase10.hxx b/include/cppuhelper/compbase10.hxx index fabcf4d8035d..dd6959d879c3 100644 --- a/include/cppuhelper/compbase10.hxx +++ b/include/cppuhelper/compbase10.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CPPUHELPER_COMPBASE10_HXX #define INCLUDED_CPPUHELPER_COMPBASE10_HXX -#include -#include +#include "cppuhelper/implbase10.hxx" +#include "cppuhelper/compbase_ex.hxx" namespace cppu { diff --git a/include/cppuhelper/compbase11.hxx b/include/cppuhelper/compbase11.hxx index d914bc4aac9e..6f9ead47ee13 100644 --- a/include/cppuhelper/compbase11.hxx +++ b/include/cppuhelper/compbase11.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CPPUHELPER_COMPBASE11_HXX #define INCLUDED_CPPUHELPER_COMPBASE11_HXX -#include -#include +#include "cppuhelper/implbase11.hxx" +#include "cppuhelper/compbase_ex.hxx" namespace cppu { diff --git a/include/cppuhelper/compbase12.hxx b/include/cppuhelper/compbase12.hxx index e7f6c9ca3671..38706782e2b5 100644 --- a/include/cppuhelper/compbase12.hxx +++ b/include/cppuhelper/compbase12.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CPPUHELPER_COMPBASE12_HXX #define INCLUDED_CPPUHELPER_COMPBASE12_HXX -#include -#include +#include "cppuhelper/implbase12.hxx" +#include "cppuhelper/compbase_ex.hxx" namespace cppu { diff --git a/include/cppuhelper/compbase2.hxx b/include/cppuhelper/compbase2.hxx index 3534f8a1885e..dda2507e34f9 100644 --- a/include/cppuhelper/compbase2.hxx +++ b/include/cppuhelper/compbase2.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CPPUHELPER_COMPBASE2_HXX #define INCLUDED_CPPUHELPER_COMPBASE2_HXX -#include -#include +#include "cppuhelper/implbase2.hxx" +#include "cppuhelper/compbase_ex.hxx" namespace cppu { diff --git a/include/cppuhelper/compbase3.hxx b/include/cppuhelper/compbase3.hxx index 34fb477582b9..f36eecf9c7ad 100644 --- a/include/cppuhelper/compbase3.hxx +++ b/include/cppuhelper/compbase3.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CPPUHELPER_COMPBASE3_HXX #define INCLUDED_CPPUHELPER_COMPBASE3_HXX -#include -#include +#include "cppuhelper/implbase3.hxx" +#include "cppuhelper/compbase_ex.hxx" namespace cppu { diff --git a/include/cppuhelper/compbase4.hxx b/include/cppuhelper/compbase4.hxx index b3d1a263ed03..eeabc6995d77 100644 --- a/include/cppuhelper/compbase4.hxx +++ b/include/cppuhelper/compbase4.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CPPUHELPER_COMPBASE4_HXX #define INCLUDED_CPPUHELPER_COMPBASE4_HXX -#include -#include +#include "cppuhelper/implbase4.hxx" +#include "cppuhelper/compbase_ex.hxx" namespace cppu { diff --git a/include/cppuhelper/compbase5.hxx b/include/cppuhelper/compbase5.hxx index 5e583aa3ff13..7f279e553dc0 100644 --- a/include/cppuhelper/compbase5.hxx +++ b/include/cppuhelper/compbase5.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CPPUHELPER_COMPBASE5_HXX #define INCLUDED_CPPUHELPER_COMPBASE5_HXX -#include -#include +#include "cppuhelper/implbase5.hxx" +#include "cppuhelper/compbase_ex.hxx" namespace cppu { diff --git a/include/cppuhelper/compbase6.hxx b/include/cppuhelper/compbase6.hxx index 1ae3a95dd443..a491abc9b40d 100644 --- a/include/cppuhelper/compbase6.hxx +++ b/include/cppuhelper/compbase6.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CPPUHELPER_COMPBASE6_HXX #define INCLUDED_CPPUHELPER_COMPBASE6_HXX -#include -#include +#include "cppuhelper/implbase6.hxx" +#include "cppuhelper/compbase_ex.hxx" namespace cppu { diff --git a/include/cppuhelper/compbase7.hxx b/include/cppuhelper/compbase7.hxx index ee4a9b445a56..8d3ed55d635e 100644 --- a/include/cppuhelper/compbase7.hxx +++ b/include/cppuhelper/compbase7.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CPPUHELPER_COMPBASE7_HXX #define INCLUDED_CPPUHELPER_COMPBASE7_HXX -#include -#include +#include "cppuhelper/implbase7.hxx" +#include "cppuhelper/compbase_ex.hxx" namespace cppu { diff --git a/include/cppuhelper/compbase8.hxx b/include/cppuhelper/compbase8.hxx index 89b30358c805..b9dab2ceefc5 100644 --- a/include/cppuhelper/compbase8.hxx +++ b/include/cppuhelper/compbase8.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CPPUHELPER_COMPBASE8_HXX #define INCLUDED_CPPUHELPER_COMPBASE8_HXX -#include -#include +#include "cppuhelper/implbase8.hxx" +#include "cppuhelper/compbase_ex.hxx" namespace cppu { diff --git a/include/cppuhelper/compbase9.hxx b/include/cppuhelper/compbase9.hxx index 78cd2b96e0d9..c07f56bd467b 100644 --- a/include/cppuhelper/compbase9.hxx +++ b/include/cppuhelper/compbase9.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CPPUHELPER_COMPBASE9_HXX #define INCLUDED_CPPUHELPER_COMPBASE9_HXX -#include -#include +#include "cppuhelper/implbase9.hxx" +#include "cppuhelper/compbase_ex.hxx" namespace cppu { diff --git a/include/cppuhelper/compbase_ex.hxx b/include/cppuhelper/compbase_ex.hxx index 28535e8bb6ca..6a3f0000c992 100644 --- a/include/cppuhelper/compbase_ex.hxx +++ b/include/cppuhelper/compbase_ex.hxx @@ -19,10 +19,10 @@ #ifndef INCLUDED_CPPUHELPER_COMPBASE_EX_HXX #define INCLUDED_CPPUHELPER_COMPBASE_EX_HXX -#include -#include -#include -#include +#include "cppuhelper/implbase_ex.hxx" +#include "cppuhelper/interfacecontainer.h" +#include "com/sun/star/lang/XComponent.hpp" +#include "cppuhelper/cppuhelperdllapi.h" /// @cond INTERNAL diff --git a/include/cppuhelper/component.hxx b/include/cppuhelper/component.hxx index d6b45a825222..e9f50a8f8bd7 100644 --- a/include/cppuhelper/component.hxx +++ b/include/cppuhelper/component.hxx @@ -19,14 +19,14 @@ #ifndef INCLUDED_CPPUHELPER_COMPONENT_HXX #define INCLUDED_CPPUHELPER_COMPONENT_HXX -#include -#include +#include "cppuhelper/weakagg.hxx" +#include "cppuhelper/interfacecontainer.h" -#include +#include "cppuhelper/implbase1.hxx" -#include +#include "com/sun/star/lang/XComponent.hpp" -#include +#include "cppuhelper/cppuhelperdllapi.h" namespace osl { class Mutex; } diff --git a/include/cppuhelper/component_context.hxx b/include/cppuhelper/component_context.hxx index bd52ce92d9f0..e0a67845b770 100644 --- a/include/cppuhelper/component_context.hxx +++ b/include/cppuhelper/component_context.hxx @@ -19,12 +19,12 @@ #ifndef INCLUDED_CPPUHELPER_COMPONENT_CONTEXT_HXX #define INCLUDED_CPPUHELPER_COMPONENT_CONTEXT_HXX -#include -#include -#include -#include -#include -#include +#include "com/sun/star/uno/XComponentContext.hpp" +#include "com/sun/star/uno/Any.hxx" +#include "com/sun/star/uno/Reference.hxx" +#include "cppuhelper/cppuhelperdllapi.h" +#include "rtl/ustring.hxx" +#include "sal/types.h" namespace cppu diff --git a/include/cppuhelper/cppuhelperdllapi.h b/include/cppuhelper/cppuhelperdllapi.h index c7662763556a..1eff7bedc313 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 +#include "sal/types.h" #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 3d54b59c269a..ea7353693936 100644 --- a/include/cppuhelper/exc_hlp.hxx +++ b/include/cppuhelper/exc_hlp.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_CPPUHELPER_EXC_HLP_HXX #define INCLUDED_CPPUHELPER_EXC_HLP_HXX -#include -#include +#include "com/sun/star/uno/Any.hxx" +#include "cppuhelper/cppuhelperdllapi.h" namespace cppu { diff --git a/include/cppuhelper/factory.hxx b/include/cppuhelper/factory.hxx index 062252e92f4e..aa5fdf6dad7c 100644 --- a/include/cppuhelper/factory.hxx +++ b/include/cppuhelper/factory.hxx @@ -19,19 +19,19 @@ #ifndef INCLUDED_CPPUHELPER_FACTORY_HXX #define INCLUDED_CPPUHELPER_FACTORY_HXX -#include +#include "sal/config.h" #include -#include -#include +#include "rtl/ustring.hxx" +#include "rtl/unload.h" -#include -#include -#include -#include -#include -#include +#include "com/sun/star/uno/XComponentContext.hpp" +#include "com/sun/star/lang/XSingleComponentFactory.hpp" +#include "com/sun/star/lang/XSingleServiceFactory.hpp" +#include "com/sun/star/lang/XMultiServiceFactory.hpp" +#include "com/sun/star/registry/XRegistryKey.hpp" +#include "cppuhelper/cppuhelperdllapi.h" #define COMPONENT_GETENV "component_getImplementationEnvironment" diff --git a/include/cppuhelper/findsofficepath.h b/include/cppuhelper/findsofficepath.h index d06cc32cbf1c..d7e2d3847e65 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 +#include "sal/config.h" #if defined __cplusplus extern "C" { diff --git a/include/cppuhelper/implbase.hxx b/include/cppuhelper/implbase.hxx index 7d46d47edd31..cfd68022c1e6 100644 --- a/include/cppuhelper/implbase.hxx +++ b/include/cppuhelper/implbase.hxx @@ -20,21 +20,21 @@ #ifndef INCLUDED_CPPUHELPER_IMPLBASE_HXX #define INCLUDED_CPPUHELPER_IMPLBASE_HXX -#include +#include "sal/config.h" #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include "com/sun/star/lang/XTypeProvider.hpp" +#include "com/sun/star/uno/Any.hxx" +#include "com/sun/star/uno/RuntimeException.hpp" +#include "com/sun/star/uno/Sequence.hxx" +#include "com/sun/star/uno/Type.hxx" +#include "cppuhelper/implbase_ex.hxx" +#include "cppuhelper/weak.hxx" +#include "rtl/instance.hxx" +#include "sal/types.h" #if defined LIBO_INTERNAL_ONLY diff --git a/include/cppuhelper/implbase1.hxx b/include/cppuhelper/implbase1.hxx index 3f93735a823d..395723fe98e0 100644 --- a/include/cppuhelper/implbase1.hxx +++ b/include/cppuhelper/implbase1.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CPPUHELPER_IMPLBASE1_HXX #define INCLUDED_CPPUHELPER_IMPLBASE1_HXX -#include -#include +#include "cppuhelper/implbase_ex.hxx" +#include "rtl/instance.hxx" namespace cppu { diff --git a/include/cppuhelper/implbase10.hxx b/include/cppuhelper/implbase10.hxx index 7b1e5920505d..75d4e10d1203 100644 --- a/include/cppuhelper/implbase10.hxx +++ b/include/cppuhelper/implbase10.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CPPUHELPER_IMPLBASE10_HXX #define INCLUDED_CPPUHELPER_IMPLBASE10_HXX -#include -#include +#include "cppuhelper/implbase_ex.hxx" +#include "rtl/instance.hxx" namespace cppu { diff --git a/include/cppuhelper/implbase11.hxx b/include/cppuhelper/implbase11.hxx index 2eccf402e3f9..6082880d88e7 100644 --- a/include/cppuhelper/implbase11.hxx +++ b/include/cppuhelper/implbase11.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CPPUHELPER_IMPLBASE11_HXX #define INCLUDED_CPPUHELPER_IMPLBASE11_HXX -#include -#include +#include "cppuhelper/implbase_ex.hxx" +#include "rtl/instance.hxx" namespace cppu { diff --git a/include/cppuhelper/implbase12.hxx b/include/cppuhelper/implbase12.hxx index e63e1bab0be5..b126d925cb67 100644 --- a/include/cppuhelper/implbase12.hxx +++ b/include/cppuhelper/implbase12.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CPPUHELPER_IMPLBASE12_HXX #define INCLUDED_CPPUHELPER_IMPLBASE12_HXX -#include -#include +#include "cppuhelper/implbase_ex.hxx" +#include "rtl/instance.hxx" namespace cppu { diff --git a/include/cppuhelper/implbase13.hxx b/include/cppuhelper/implbase13.hxx index 4f4aac6c6613..61dd1646dafd 100644 --- a/include/cppuhelper/implbase13.hxx +++ b/include/cppuhelper/implbase13.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CPPUHELPER_IMPLBASE13_HXX #define INCLUDED_CPPUHELPER_IMPLBASE13_HXX -#include -#include +#include "cppuhelper/implbase_ex.hxx" +#include "rtl/instance.hxx" namespace cppu { diff --git a/include/cppuhelper/implbase2.hxx b/include/cppuhelper/implbase2.hxx index de6c716c652f..ce67df2c4671 100644 --- a/include/cppuhelper/implbase2.hxx +++ b/include/cppuhelper/implbase2.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CPPUHELPER_IMPLBASE2_HXX #define INCLUDED_CPPUHELPER_IMPLBASE2_HXX -#include -#include +#include "cppuhelper/implbase_ex.hxx" +#include "rtl/instance.hxx" namespace cppu { diff --git a/include/cppuhelper/implbase3.hxx b/include/cppuhelper/implbase3.hxx index 47941db70929..11b78b19d585 100644 --- a/include/cppuhelper/implbase3.hxx +++ b/include/cppuhelper/implbase3.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CPPUHELPER_IMPLBASE3_HXX #define INCLUDED_CPPUHELPER_IMPLBASE3_HXX -#include -#include +#include "cppuhelper/implbase_ex.hxx" +#include "rtl/instance.hxx" namespace cppu { diff --git a/include/cppuhelper/implbase4.hxx b/include/cppuhelper/implbase4.hxx index 2a2e2cb288de..2fe3d6757418 100644 --- a/include/cppuhelper/implbase4.hxx +++ b/include/cppuhelper/implbase4.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CPPUHELPER_IMPLBASE4_HXX #define INCLUDED_CPPUHELPER_IMPLBASE4_HXX -#include -#include +#include "cppuhelper/implbase_ex.hxx" +#include "rtl/instance.hxx" namespace cppu { diff --git a/include/cppuhelper/implbase5.hxx b/include/cppuhelper/implbase5.hxx index fe6fa2653b5b..8321089e3fd0 100644 --- a/include/cppuhelper/implbase5.hxx +++ b/include/cppuhelper/implbase5.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CPPUHELPER_IMPLBASE5_HXX #define INCLUDED_CPPUHELPER_IMPLBASE5_HXX -#include -#include +#include "cppuhelper/implbase_ex.hxx" +#include "rtl/instance.hxx" namespace cppu { diff --git a/include/cppuhelper/implbase6.hxx b/include/cppuhelper/implbase6.hxx index 1dbb48167bc1..50c07d0ae314 100644 --- a/include/cppuhelper/implbase6.hxx +++ b/include/cppuhelper/implbase6.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CPPUHELPER_IMPLBASE6_HXX #define INCLUDED_CPPUHELPER_IMPLBASE6_HXX -#include -#include +#include "cppuhelper/implbase_ex.hxx" +#include "rtl/instance.hxx" namespace cppu { diff --git a/include/cppuhelper/implbase7.hxx b/include/cppuhelper/implbase7.hxx index e1ca12482e83..9c6c041d7b69 100644 --- a/include/cppuhelper/implbase7.hxx +++ b/include/cppuhelper/implbase7.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CPPUHELPER_IMPLBASE7_HXX #define INCLUDED_CPPUHELPER_IMPLBASE7_HXX -#include -#include +#include "cppuhelper/implbase_ex.hxx" +#include "rtl/instance.hxx" namespace cppu { diff --git a/include/cppuhelper/implbase8.hxx b/include/cppuhelper/implbase8.hxx index 279b3206d613..1c02b961c00d 100644 --- a/include/cppuhelper/implbase8.hxx +++ b/include/cppuhelper/implbase8.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CPPUHELPER_IMPLBASE8_HXX #define INCLUDED_CPPUHELPER_IMPLBASE8_HXX -#include -#include +#include "cppuhelper/implbase_ex.hxx" +#include "rtl/instance.hxx" namespace cppu { diff --git a/include/cppuhelper/implbase9.hxx b/include/cppuhelper/implbase9.hxx index 09bb6c69a4c1..ece67befea76 100644 --- a/include/cppuhelper/implbase9.hxx +++ b/include/cppuhelper/implbase9.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CPPUHELPER_IMPLBASE9_HXX #define INCLUDED_CPPUHELPER_IMPLBASE9_HXX -#include -#include +#include "cppuhelper/implbase_ex.hxx" +#include "rtl/instance.hxx" namespace cppu { diff --git a/include/cppuhelper/implbase_ex.hxx b/include/cppuhelper/implbase_ex.hxx index d8711f17bb79..922f5ac68475 100644 --- a/include/cppuhelper/implbase_ex.hxx +++ b/include/cppuhelper/implbase_ex.hxx @@ -19,9 +19,9 @@ #ifndef INCLUDED_CPPUHELPER_IMPLBASE_EX_HXX #define INCLUDED_CPPUHELPER_IMPLBASE_EX_HXX -#include -#include -#include +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" +#include "com/sun/star/lang/XTypeProvider.hpp" /* If you need to define implementation helper classes that deal with more than diff --git a/include/cppuhelper/implementationentry.hxx b/include/cppuhelper/implementationentry.hxx index 36bf15af138d..23f40a7f7453 100644 --- a/include/cppuhelper/implementationentry.hxx +++ b/include/cppuhelper/implementationentry.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CPPUHELPER_IMPLEMENTATIONENTRY_HXX #define INCLUDED_CPPUHELPER_IMPLEMENTATIONENTRY_HXX -#include -#include +#include "cppuhelper/factory.hxx" +#include "cppuhelper/cppuhelperdllapi.h" namespace cppu { diff --git a/include/cppuhelper/interfacecontainer.h b/include/cppuhelper/interfacecontainer.h index 0049cb8e2b75..58298e3e9490 100644 --- a/include/cppuhelper/interfacecontainer.h +++ b/include/cppuhelper/interfacecontainer.h @@ -19,22 +19,22 @@ #ifndef INCLUDED_CPPUHELPER_INTERFACECONTAINER_H #define INCLUDED_CPPUHELPER_INTERFACECONTAINER_H -#include +#include "sal/config.h" #include #include #include #include -#include -#include -#include -#include -#include -#include +#include "osl/diagnose.h" +#include "osl/mutex.hxx" +#include "rtl/alloc.h" +#include "com/sun/star/uno/Sequence.hxx" +#include "com/sun/star/uno/XInterface.hpp" +#include "com/sun/star/lang/EventObject.hpp" -#include -#include +#include "com/sun/star/lang/DisposedException.hpp" +#include "cppuhelper/cppuhelperdllapi.h" /** */ //for docpp namespace cppu diff --git a/include/cppuhelper/interfacecontainer.hxx b/include/cppuhelper/interfacecontainer.hxx index 6b765ba2bccd..b30adbab96c3 100644 --- a/include/cppuhelper/interfacecontainer.hxx +++ b/include/cppuhelper/interfacecontainer.hxx @@ -19,11 +19,11 @@ #ifndef INCLUDED_CPPUHELPER_INTERFACECONTAINER_HXX #define INCLUDED_CPPUHELPER_INTERFACECONTAINER_HXX -#include +#include "sal/config.h" #include -#include +#include "cppuhelper/interfacecontainer.h" namespace cppu diff --git a/include/cppuhelper/propertysetmixin.hxx b/include/cppuhelper/propertysetmixin.hxx index fb112fea09cb..c50da4591b70 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 +#include "sal/config.h" #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#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 "cppuhelper/cppuhelperdllapi.h" namespace com { namespace sun { namespace star { namespace beans { diff --git a/include/cppuhelper/propshlp.hxx b/include/cppuhelper/propshlp.hxx index 31a91b425112..d9eb0c493741 100644 --- a/include/cppuhelper/propshlp.hxx +++ b/include/cppuhelper/propshlp.hxx @@ -20,16 +20,16 @@ #ifndef INCLUDED_CPPUHELPER_PROPSHLP_HXX #define INCLUDED_CPPUHELPER_PROPSHLP_HXX -#include +#include "rtl/alloc.h" -#include +#include "cppuhelper/interfacecontainer.h" -#include -#include -#include -#include +#include "com/sun/star/beans/XPropertySet.hpp" +#include "com/sun/star/beans/XPropertySetOption.hpp" +#include "com/sun/star/beans/XMultiPropertySet.hpp" +#include "com/sun/star/beans/XFastPropertySet.hpp" -#include +#include "cppuhelper/cppuhelperdllapi.h" namespace cppu diff --git a/include/cppuhelper/proptypehlp.h b/include/cppuhelper/proptypehlp.h index ad44bdf39781..dcd2cd16c6bc 100644 --- a/include/cppuhelper/proptypehlp.h +++ b/include/cppuhelper/proptypehlp.h @@ -19,7 +19,7 @@ #ifndef INCLUDED_CPPUHELPER_PROPTYPEHLP_H #define INCLUDED_CPPUHELPER_PROPTYPEHLP_H -#include +#include "com/sun/star/uno/Any.h" namespace cppu { diff --git a/include/cppuhelper/proptypehlp.hxx b/include/cppuhelper/proptypehlp.hxx index bcaefca97470..d598f9d1f2aa 100644 --- a/include/cppuhelper/proptypehlp.hxx +++ b/include/cppuhelper/proptypehlp.hxx @@ -20,9 +20,9 @@ #ifndef INCLUDED_CPPUHELPER_PROPTYPEHLP_HXX #define INCLUDED_CPPUHELPER_PROPTYPEHLP_HXX -#include -#include -#include +#include "cppuhelper/proptypehlp.h" +#include "com/sun/star/lang/IllegalArgumentException.hpp" +#include "com/sun/star/uno/TypeClass.hpp" namespace cppu { diff --git a/include/cppuhelper/queryinterface.hxx b/include/cppuhelper/queryinterface.hxx index 0fe2f5a99605..0d662943695c 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 -#include -#include -#include +#include "sal/config.h" +#include "com/sun/star/uno/Any.hxx" +#include "com/sun/star/uno/Type.hxx" +#include "sal/types.h" namespace cppu { diff --git a/include/cppuhelper/shlib.hxx b/include/cppuhelper/shlib.hxx index 8fec1fd4e6bd..83e77daa3145 100644 --- a/include/cppuhelper/shlib.hxx +++ b/include/cppuhelper/shlib.hxx @@ -19,9 +19,9 @@ #ifndef INCLUDED_CPPUHELPER_SHLIB_HXX #define INCLUDED_CPPUHELPER_SHLIB_HXX -#include -#include -#include +#include "com/sun/star/lang/XMultiServiceFactory.hpp" +#include "com/sun/star/registry/XRegistryKey.hpp" +#include "cppuhelper/cppuhelperdllapi.h" namespace cppu diff --git a/include/cppuhelper/supportsservice.hxx b/include/cppuhelper/supportsservice.hxx index 0a1bee42f926..4a21e0faa693 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 +#include "sal/config.h" -#include +#include "cppuhelper/cppuhelperdllapi.h" namespace com { namespace sun { namespace star { namespace lang { class XServiceInfo; diff --git a/include/cppuhelper/typeprovider.hxx b/include/cppuhelper/typeprovider.hxx index 912f90865e04..fec7ea2efc84 100644 --- a/include/cppuhelper/typeprovider.hxx +++ b/include/cppuhelper/typeprovider.hxx @@ -19,13 +19,13 @@ #ifndef INCLUDED_CPPUHELPER_TYPEPROVIDER_HXX #define INCLUDED_CPPUHELPER_TYPEPROVIDER_HXX -#include +#include "sal/config.h" #include -#include -#include -#include +#include "rtl/alloc.h" +#include "com/sun/star/uno/Sequence.hxx" +#include "cppuhelper/cppuhelperdllapi.h" namespace cppu diff --git a/include/cppuhelper/unourl.hxx b/include/cppuhelper/unourl.hxx index e31ef6bf5cff..8771c0c44396 100644 --- a/include/cppuhelper/unourl.hxx +++ b/include/cppuhelper/unourl.hxx @@ -20,9 +20,9 @@ #ifndef INCLUDED_CPPUHELPER_UNOURL_HXX #define INCLUDED_CPPUHELPER_UNOURL_HXX -#include +#include "sal/config.h" -#include +#include "cppuhelper/cppuhelperdllapi.h" namespace rtl { class OUString; } diff --git a/include/cppuhelper/weak.hxx b/include/cppuhelper/weak.hxx index 44e026743d2a..a6471149c39e 100644 --- a/include/cppuhelper/weak.hxx +++ b/include/cppuhelper/weak.hxx @@ -21,10 +21,10 @@ #include #include -#include -#include -#include -#include +#include "osl/interlck.h" +#include "rtl/alloc.h" +#include "com/sun/star/uno/XWeak.hpp" +#include "cppuhelper/cppuhelperdllapi.h" namespace cppu diff --git a/include/cppuhelper/weakagg.hxx b/include/cppuhelper/weakagg.hxx index 03754f3ec06f..3ca7a51cdf85 100644 --- a/include/cppuhelper/weakagg.hxx +++ b/include/cppuhelper/weakagg.hxx @@ -19,10 +19,10 @@ #ifndef INCLUDED_CPPUHELPER_WEAKAGG_HXX #define INCLUDED_CPPUHELPER_WEAKAGG_HXX -#include -#include -#include -#include +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakref.hxx" +#include "com/sun/star/uno/XAggregation.hpp" +#include "cppuhelper/cppuhelperdllapi.h" namespace cppu diff --git a/include/cppuhelper/weakref.hxx b/include/cppuhelper/weakref.hxx index 1afdd864f136..cd05d3bee39b 100644 --- a/include/cppuhelper/weakref.hxx +++ b/include/cppuhelper/weakref.hxx @@ -19,13 +19,13 @@ #ifndef INCLUDED_CPPUHELPER_WEAKREF_HXX #define INCLUDED_CPPUHELPER_WEAKREF_HXX -#include +#include "sal/config.h" #include -#include -#include -#include +#include "com/sun/star/uno/Reference.hxx" +#include "com/sun/star/uno/XInterface.hpp" +#include "cppuhelper/cppuhelperdllapi.h" namespace com -- cgit