diff options
Diffstat (limited to 'include')
31 files changed, 130 insertions, 43 deletions
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index 9ad89d5d1344..9717b10d9754 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -49,3 +49,48 @@ blacklist: include/sfx2/toolbarids.hxx: # needed for enum definition - sal/types.h + include/cppuhelper/compbase1.hxx: + # Needed for template functions + - cppuhelper/implbase1.hxx + include/cppuhelper/compbase2.hxx: + # Needed for template functions + - cppuhelper/implbase2.hxx + include/cppuhelper/compbase3.hxx: + # Needed for template functions + - cppuhelper/implbase3.hxx + include/cppuhelper/compbase4.hxx: + # Needed for template functions + - cppuhelper/implbase4.hxx + include/cppuhelper/compbase5.hxx: + # Needed for template functions + - cppuhelper/implbase5.hxx + include/cppuhelper/compbase6.hxx: + # Needed for template functions + - cppuhelper/implbase6.hxx + include/cppuhelper/compbase7.hxx: + # Needed for template functions + - cppuhelper/implbase7.hxx + include/cppuhelper/compbase8.hxx: + # Needed for template functions + - cppuhelper/implbase8.hxx + include/cppuhelper/compbase9.hxx: + # Needed for template functions + - cppuhelper/implbase9.hxx + include/cppuhelper/compbase10.hxx: + # Needed for template functions + - cppuhelper/implbase10.hxx + include/cppuhelper/compbase11.hxx: + # Needed for template functions + - cppuhelper/implbase11.hxx + include/cppuhelper/compbase12.hxx: + # Needed for template functions + - cppuhelper/implbase12.hxx + include/cppuhelper/exc_hlp.hxx: + #Needed for implicit destructor + - com/sun/star/uno/Any.hxx + include/cppuhelper/propertysetmixin.hxx: + #Needed for implicit destructor + - com/sun/star/uno/Sequence.hxx + include/cppuhelper/interfacecontainer.h: + #Needed for implicit destructor + - com/sun/star/uno/Sequence.hxx diff --git a/include/cppuhelper/access_control.hxx b/include/cppuhelper/access_control.hxx index 816eb07829e0..35b6282522b0 100644 --- a/include/cppuhelper/access_control.hxx +++ b/include/cppuhelper/access_control.hxx @@ -19,10 +19,11 @@ #ifndef INCLUDED_CPPUHELPER_ACCESS_CONTROL_HXX #define INCLUDED_CPPUHELPER_ACCESS_CONTROL_HXX -#include "com/sun/star/uno/XComponentContext.hpp" -#include "com/sun/star/security/XAccessController.hpp" #include "cppuhelper/cppuhelperdllapi.h" +#include "com/sun/star/uno/Reference.hxx" +namespace com { namespace sun { namespace star { namespace security { class XAccessController; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } namespace cppu { diff --git a/include/cppuhelper/bootstrap.hxx b/include/cppuhelper/bootstrap.hxx index bdb4d90584dd..a7f92bbb7cd1 100644 --- a/include/cppuhelper/bootstrap.hxx +++ b/include/cppuhelper/bootstrap.hxx @@ -20,7 +20,7 @@ #define INCLUDED_CPPUHELPER_BOOTSTRAP_HXX #include "sal/config.h" -#include "com/sun/star/uno/Reference.hxx" +#include "com/sun/star/uno/Reference.h" #include "rtl/ustring.hxx" #include "sal/types.h" #include "cppuhelper/cppuhelperdllapi.h" diff --git a/include/cppuhelper/compbase.hxx b/include/cppuhelper/compbase.hxx index d9230482753d..8e00da57bfdc 100644 --- a/include/cppuhelper/compbase.hxx +++ b/include/cppuhelper/compbase.hxx @@ -22,14 +22,11 @@ #include "sal/config.h" -#include <exception> - #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 "com/sun/star/uno/Any.h" +#include "com/sun/star/uno/Reference.h" +#include "com/sun/star/uno/Sequence.h" +#include "com/sun/star/uno/Type.h" #include "cppuhelper/compbase_ex.hxx" #include "cppuhelper/implbase.hxx" #include "rtl/instance.hxx" diff --git a/include/cppuhelper/compbase_ex.hxx b/include/cppuhelper/compbase_ex.hxx index 6a3f0000c992..db216e8655f9 100644 --- a/include/cppuhelper/compbase_ex.hxx +++ b/include/cppuhelper/compbase_ex.hxx @@ -19,14 +19,16 @@ #ifndef INCLUDED_CPPUHELPER_COMPBASE_EX_HXX #define INCLUDED_CPPUHELPER_COMPBASE_EX_HXX -#include "cppuhelper/implbase_ex.hxx" #include "cppuhelper/interfacecontainer.h" #include "com/sun/star/lang/XComponent.hpp" #include "cppuhelper/cppuhelperdllapi.h" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" /// @cond INTERNAL namespace osl { class Mutex; } +namespace cppu { struct class_data; } namespace cppu { diff --git a/include/cppuhelper/component.hxx b/include/cppuhelper/component.hxx index e9f50a8f8bd7..d99e7b82fdad 100644 --- a/include/cppuhelper/component.hxx +++ b/include/cppuhelper/component.hxx @@ -22,9 +22,8 @@ #include "cppuhelper/weakagg.hxx" #include "cppuhelper/interfacecontainer.h" -#include "cppuhelper/implbase1.hxx" - #include "com/sun/star/lang/XComponent.hpp" +#include "com/sun/star/lang/XTypeProvider.hpp" #include "cppuhelper/cppuhelperdllapi.h" diff --git a/include/cppuhelper/component_context.hxx b/include/cppuhelper/component_context.hxx index e0a67845b770..a2592f89c039 100644 --- a/include/cppuhelper/component_context.hxx +++ b/include/cppuhelper/component_context.hxx @@ -19,13 +19,13 @@ #ifndef INCLUDED_CPPUHELPER_COMPONENT_CONTEXT_HXX #define INCLUDED_CPPUHELPER_COMPONENT_CONTEXT_HXX -#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 com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } namespace cppu { diff --git a/include/cppuhelper/factory.hxx b/include/cppuhelper/factory.hxx index aa5fdf6dad7c..edcbc9d6e375 100644 --- a/include/cppuhelper/factory.hxx +++ b/include/cppuhelper/factory.hxx @@ -26,13 +26,16 @@ #include "rtl/ustring.hxx" #include "rtl/unload.h" -#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 "com/sun/star/uno/Reference.h" #include "cppuhelper/cppuhelperdllapi.h" +namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } +namespace com { namespace sun { namespace star { namespace lang { class XSingleComponentFactory; } } } } +namespace com { namespace sun { namespace star { namespace lang { class XSingleServiceFactory; } } } } +namespace com { namespace sun { namespace star { namespace registry { class XRegistryKey; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } } +namespace com { namespace sun { namespace star { namespace uno { template <class E> class Sequence; } } } } #define COMPONENT_GETENV "component_getImplementationEnvironment" #define COMPONENT_GETENVEXT "component_getImplementationEnvironmentExt" diff --git a/include/cppuhelper/implbase.hxx b/include/cppuhelper/implbase.hxx index c946fb9cb052..b5d67edac990 100644 --- a/include/cppuhelper/implbase.hxx +++ b/include/cppuhelper/implbase.hxx @@ -23,14 +23,12 @@ #include "sal/config.h" #include <cstddef> -#include <exception> #include <utility> #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/Any.h" #include "com/sun/star/uno/Sequence.hxx" -#include "com/sun/star/uno/Type.hxx" +#include "com/sun/star/uno/Type.h" #include "cppuhelper/implbase_ex.hxx" #include "cppuhelper/weak.hxx" #include "rtl/instance.hxx" diff --git a/include/cppuhelper/implbase1.hxx b/include/cppuhelper/implbase1.hxx index d274d661b4f7..61f7c0780df8 100644 --- a/include/cppuhelper/implbase1.hxx +++ b/include/cppuhelper/implbase1.hxx @@ -21,6 +21,9 @@ #include "cppuhelper/implbase_ex.hxx" #include "rtl/instance.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" +#include "com/sun/star/lang/XTypeProvider.hpp" namespace cppu { diff --git a/include/cppuhelper/implbase10.hxx b/include/cppuhelper/implbase10.hxx index d4278d551c2a..ea978e115162 100644 --- a/include/cppuhelper/implbase10.hxx +++ b/include/cppuhelper/implbase10.hxx @@ -21,6 +21,9 @@ #include "cppuhelper/implbase_ex.hxx" #include "rtl/instance.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" +#include "com/sun/star/lang/XTypeProvider.hpp" namespace cppu { diff --git a/include/cppuhelper/implbase11.hxx b/include/cppuhelper/implbase11.hxx index 937705b3c2a5..2ce61f8f8a4b 100644 --- a/include/cppuhelper/implbase11.hxx +++ b/include/cppuhelper/implbase11.hxx @@ -21,6 +21,9 @@ #include "cppuhelper/implbase_ex.hxx" #include "rtl/instance.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" +#include "com/sun/star/lang/XTypeProvider.hpp" namespace cppu { diff --git a/include/cppuhelper/implbase12.hxx b/include/cppuhelper/implbase12.hxx index 57c01184cb08..afc5b4e34f0e 100644 --- a/include/cppuhelper/implbase12.hxx +++ b/include/cppuhelper/implbase12.hxx @@ -21,6 +21,9 @@ #include "cppuhelper/implbase_ex.hxx" #include "rtl/instance.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" +#include "com/sun/star/lang/XTypeProvider.hpp" namespace cppu { diff --git a/include/cppuhelper/implbase13.hxx b/include/cppuhelper/implbase13.hxx index 21ab3d4017f1..7ebb695d2ce6 100644 --- a/include/cppuhelper/implbase13.hxx +++ b/include/cppuhelper/implbase13.hxx @@ -21,6 +21,9 @@ #include "cppuhelper/implbase_ex.hxx" #include "rtl/instance.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" +#include "com/sun/star/lang/XTypeProvider.hpp" namespace cppu { diff --git a/include/cppuhelper/implbase2.hxx b/include/cppuhelper/implbase2.hxx index ff1daf927375..bdf8568db51a 100644 --- a/include/cppuhelper/implbase2.hxx +++ b/include/cppuhelper/implbase2.hxx @@ -21,6 +21,9 @@ #include "cppuhelper/implbase_ex.hxx" #include "rtl/instance.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" +#include "com/sun/star/lang/XTypeProvider.hpp" namespace cppu { diff --git a/include/cppuhelper/implbase3.hxx b/include/cppuhelper/implbase3.hxx index 4238739f78a1..590471118f8b 100644 --- a/include/cppuhelper/implbase3.hxx +++ b/include/cppuhelper/implbase3.hxx @@ -21,6 +21,9 @@ #include "cppuhelper/implbase_ex.hxx" #include "rtl/instance.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" +#include "com/sun/star/lang/XTypeProvider.hpp" namespace cppu { diff --git a/include/cppuhelper/implbase4.hxx b/include/cppuhelper/implbase4.hxx index 827f56eece37..36279a0f74b5 100644 --- a/include/cppuhelper/implbase4.hxx +++ b/include/cppuhelper/implbase4.hxx @@ -21,6 +21,9 @@ #include "cppuhelper/implbase_ex.hxx" #include "rtl/instance.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" +#include "com/sun/star/lang/XTypeProvider.hpp" namespace cppu { diff --git a/include/cppuhelper/implbase5.hxx b/include/cppuhelper/implbase5.hxx index 26cac953bfa9..1b300dcf6c04 100644 --- a/include/cppuhelper/implbase5.hxx +++ b/include/cppuhelper/implbase5.hxx @@ -21,6 +21,9 @@ #include "cppuhelper/implbase_ex.hxx" #include "rtl/instance.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" +#include "com/sun/star/lang/XTypeProvider.hpp" namespace cppu { diff --git a/include/cppuhelper/implbase6.hxx b/include/cppuhelper/implbase6.hxx index 0b1db8d75bfc..62652c9819e2 100644 --- a/include/cppuhelper/implbase6.hxx +++ b/include/cppuhelper/implbase6.hxx @@ -21,6 +21,9 @@ #include "cppuhelper/implbase_ex.hxx" #include "rtl/instance.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" +#include "com/sun/star/lang/XTypeProvider.hpp" namespace cppu { diff --git a/include/cppuhelper/implbase7.hxx b/include/cppuhelper/implbase7.hxx index 157e1c945418..0d1e12a91117 100644 --- a/include/cppuhelper/implbase7.hxx +++ b/include/cppuhelper/implbase7.hxx @@ -21,6 +21,9 @@ #include "cppuhelper/implbase_ex.hxx" #include "rtl/instance.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" +#include "com/sun/star/lang/XTypeProvider.hpp" namespace cppu { diff --git a/include/cppuhelper/implbase8.hxx b/include/cppuhelper/implbase8.hxx index c55198888bdf..08dec44e4215 100644 --- a/include/cppuhelper/implbase8.hxx +++ b/include/cppuhelper/implbase8.hxx @@ -21,6 +21,9 @@ #include "cppuhelper/implbase_ex.hxx" #include "rtl/instance.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" +#include "com/sun/star/lang/XTypeProvider.hpp" namespace cppu { diff --git a/include/cppuhelper/implbase9.hxx b/include/cppuhelper/implbase9.hxx index a71fd7c7eba2..2c3fe2bd1a74 100644 --- a/include/cppuhelper/implbase9.hxx +++ b/include/cppuhelper/implbase9.hxx @@ -21,6 +21,9 @@ #include "cppuhelper/implbase_ex.hxx" #include "rtl/instance.hxx" +#include "cppuhelper/weak.hxx" +#include "cppuhelper/weakagg.hxx" +#include "com/sun/star/lang/XTypeProvider.hpp" namespace cppu { diff --git a/include/cppuhelper/implbase_ex.hxx b/include/cppuhelper/implbase_ex.hxx index 922f5ac68475..75f758d46094 100644 --- a/include/cppuhelper/implbase_ex.hxx +++ b/include/cppuhelper/implbase_ex.hxx @@ -19,9 +19,15 @@ #ifndef INCLUDED_CPPUHELPER_IMPLBASE_EX_HXX #define INCLUDED_CPPUHELPER_IMPLBASE_EX_HXX -#include "cppuhelper/weak.hxx" -#include "cppuhelper/weakagg.hxx" -#include "com/sun/star/lang/XTypeProvider.hpp" +#include "com/sun/star/uno/Any.h" +#include "com/sun/star/uno/Sequence.h" +#include "com/sun/star/uno/Type.h" +#include "com/sun/star/uno/genfunc.h" +#include "cppuhelper/cppuhelperdllapi.h" +#include "sal/types.h" + +namespace cppu { class OWeakAggObject; } +namespace cppu { class OWeakObject; } /* If you need to define implementation helper classes that deal with more than diff --git a/include/cppuhelper/interfacecontainer.h b/include/cppuhelper/interfacecontainer.h index 67e6353f4a2d..66522576fe03 100644 --- a/include/cppuhelper/interfacecontainer.h +++ b/include/cppuhelper/interfacecontainer.h @@ -30,12 +30,13 @@ #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 "com/sun/star/lang/DisposedException.hpp" #include "cppuhelper/cppuhelperdllapi.h" +namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } } + /** */ //for docpp namespace cppu { diff --git a/include/cppuhelper/propertysetmixin.hxx b/include/cppuhelper/propertysetmixin.hxx index 287ef7dd1fc7..56887d9b7cf1 100644 --- a/include/cppuhelper/propertysetmixin.hxx +++ b/include/cppuhelper/propertysetmixin.hxx @@ -22,17 +22,10 @@ #include "sal/config.h" -#include <exception> - -#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/Reference.h" #include "com/sun/star/uno/Sequence.hxx" #include "sal/types.h" #include "cppuhelper/cppuhelperdllapi.h" @@ -45,17 +38,13 @@ namespace com { namespace sun { namespace star { struct PropertyValue; } namespace uno { - class Any; class Type; class XComponentContext; } } } } -namespace rtl { class OUString; } namespace cppu { -template< typename T > class PropertySetMixin; - /** @short A helper base class for <code>cppu::PropertySetMixin</code>. diff --git a/include/cppuhelper/proptypehlp.h b/include/cppuhelper/proptypehlp.h index dcd2cd16c6bc..e1e6684f1d40 100644 --- a/include/cppuhelper/proptypehlp.h +++ b/include/cppuhelper/proptypehlp.h @@ -19,8 +19,9 @@ #ifndef INCLUDED_CPPUHELPER_PROPTYPEHLP_H #define INCLUDED_CPPUHELPER_PROPTYPEHLP_H -#include "com/sun/star/uno/Any.h" +#include "sal/types.h" +namespace com { namespace sun { namespace star { namespace uno { class Any; } } } } namespace cppu { diff --git a/include/cppuhelper/queryinterface.hxx b/include/cppuhelper/queryinterface.hxx index 0d662943695c..d54994ac1cd8 100644 --- a/include/cppuhelper/queryinterface.hxx +++ b/include/cppuhelper/queryinterface.hxx @@ -22,7 +22,7 @@ #include "sal/config.h" #include "com/sun/star/uno/Any.hxx" -#include "com/sun/star/uno/Type.hxx" +#include "com/sun/star/uno/Type.h" #include "sal/types.h" namespace cppu diff --git a/include/cppuhelper/shlib.hxx b/include/cppuhelper/shlib.hxx index 83e77daa3145..fa5efa424486 100644 --- a/include/cppuhelper/shlib.hxx +++ b/include/cppuhelper/shlib.hxx @@ -19,10 +19,13 @@ #ifndef INCLUDED_CPPUHELPER_SHLIB_HXX #define INCLUDED_CPPUHELPER_SHLIB_HXX -#include "com/sun/star/lang/XMultiServiceFactory.hpp" -#include "com/sun/star/registry/XRegistryKey.hpp" #include "cppuhelper/cppuhelperdllapi.h" +#include "com/sun/star/uno/Reference.h" +#include "rtl/ustring.hxx" +namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } } } } +namespace com { namespace sun { namespace star { namespace registry { class XRegistryKey; } } } } +namespace com { namespace sun { namespace star { namespace uno { class XInterface; } } } } namespace cppu { diff --git a/include/svtools/openfiledroptargetlistener.hxx b/include/svtools/openfiledroptargetlistener.hxx index 88e7dbe4da71..695f14df7135 100644 --- a/include/svtools/openfiledroptargetlistener.hxx +++ b/include/svtools/openfiledroptargetlistener.hxx @@ -26,6 +26,7 @@ #include <com/sun/star/frame/XFrame.hpp> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/weakref.hxx> #include <sot/exchange.hxx> diff --git a/include/svx/unomodel.hxx b/include/svx/unomodel.hxx index 5d5e15a5bee8..3b82b337c6cc 100644 --- a/include/svx/unomodel.hxx +++ b/include/svx/unomodel.hxx @@ -28,6 +28,7 @@ #include <sfx2/sfxbasemodel.hxx> #include <svx/fmdmod.hxx> #include <svx/svxdllapi.h> +#include <cppuhelper/weakref.hxx> class SdrModel; diff --git a/include/toolkit/controls/controlmodelcontainerbase.hxx b/include/toolkit/controls/controlmodelcontainerbase.hxx index eb8068e40f8e..9d92b8d4e8dc 100644 --- a/include/toolkit/controls/controlmodelcontainerbase.hxx +++ b/include/toolkit/controls/controlmodelcontainerbase.hxx @@ -31,6 +31,7 @@ #include <com/sun/star/resource/XStringResourceResolver.hpp> #include <cppuhelper/implbase8.hxx> #include <cppuhelper/implbase3.hxx> +#include <cppuhelper/weak.hxx> #include <toolkit/helper/listenermultiplexer.hxx> #include <toolkit/controls/unocontrolmodel.hxx> #include <toolkit/controls/unocontrolcontainer.hxx> |