diff options
author | RĂ¼diger Timm <rt@openoffice.org> | 2004-08-23 07:26:25 +0000 |
---|---|---|
committer | RĂ¼diger Timm <rt@openoffice.org> | 2004-08-23 07:26:25 +0000 |
commit | 1a14ff39a8c28637b707cf3cb7a013c9363b4c92 (patch) | |
tree | 9a01efddbc0eead9a62d77dff11a199a9e7c00be /cppuhelper | |
parent | 4d84ffd114ffa24fdea1a0227b15f6a13718dfc9 (diff) |
INTEGRATION: CWS tune03 (1.11.10); FILE MERGED
2004/08/11 17:56:44 mhu 1.11.10.1: #i10000# Merged in lost changes from cws 'gcc340fixes01'
Diffstat (limited to 'cppuhelper')
-rw-r--r-- | cppuhelper/inc/cppuhelper/implbase4.hxx | 14 | ||||
-rw-r--r-- | cppuhelper/inc/cppuhelper/implbase5.hxx | 16 | ||||
-rw-r--r-- | cppuhelper/inc/cppuhelper/implbase6.hxx | 18 | ||||
-rw-r--r-- | cppuhelper/inc/cppuhelper/implbase7.hxx | 20 | ||||
-rw-r--r-- | cppuhelper/inc/cppuhelper/implbase8.hxx | 19 |
5 files changed, 50 insertions, 37 deletions
diff --git a/cppuhelper/inc/cppuhelper/implbase4.hxx b/cppuhelper/inc/cppuhelper/implbase4.hxx index 15aa5de88..23427462b 100644 --- a/cppuhelper/inc/cppuhelper/implbase4.hxx +++ b/cppuhelper/inc/cppuhelper/implbase4.hxx @@ -2,9 +2,9 @@ * * $RCSfile: implbase4.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: rt $ $Date: 2004-07-23 15:01:20 $ + * last change: $Author: rt $ $Date: 2004-08-23 08:25:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,11 +91,11 @@ namespace cppu 4 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (Impl *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (Impl *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (Impl *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (Impl *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (Impl *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (Impl *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (Impl *) 16) - 16 }, + { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (Impl *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 } } }; return reinterpret_cast< class_data * >(&s_cd); diff --git a/cppuhelper/inc/cppuhelper/implbase5.hxx b/cppuhelper/inc/cppuhelper/implbase5.hxx index 2ab20309e..abd4dcc93 100644 --- a/cppuhelper/inc/cppuhelper/implbase5.hxx +++ b/cppuhelper/inc/cppuhelper/implbase5.hxx @@ -2,9 +2,9 @@ * * $RCSfile: implbase5.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: rt $ $Date: 2004-07-23 15:01:36 $ + * last change: $Author: rt $ $Date: 2004-08-23 08:25:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,12 +91,12 @@ namespace cppu 5 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (Impl *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (Impl *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (Impl *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (Impl *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (Impl *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (Impl *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (Impl *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (Impl *) 16) - 16 }, + { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (Impl *) 16) - 16 }, + { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (Impl *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 } } }; return reinterpret_cast< class_data * >(&s_cd); diff --git a/cppuhelper/inc/cppuhelper/implbase6.hxx b/cppuhelper/inc/cppuhelper/implbase6.hxx index 8cf18016c..31bc47083 100644 --- a/cppuhelper/inc/cppuhelper/implbase6.hxx +++ b/cppuhelper/inc/cppuhelper/implbase6.hxx @@ -2,9 +2,9 @@ * * $RCSfile: implbase6.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: rt $ $Date: 2004-07-23 15:01:49 $ + * last change: $Author: rt $ $Date: 2004-08-23 08:25:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,13 +91,13 @@ namespace cppu 6 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (Impl *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (Impl *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (Impl *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (Impl *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (Impl *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (Impl *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (Impl *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (Impl *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (Impl *) 16) - 16 }, + { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (Impl *) 16) - 16 }, + { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (Impl *) 16) - 16 }, + { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (Impl *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 } } }; return reinterpret_cast< class_data * >(&s_cd); diff --git a/cppuhelper/inc/cppuhelper/implbase7.hxx b/cppuhelper/inc/cppuhelper/implbase7.hxx index 955aef3e2..c2b2da087 100644 --- a/cppuhelper/inc/cppuhelper/implbase7.hxx +++ b/cppuhelper/inc/cppuhelper/implbase7.hxx @@ -2,9 +2,9 @@ * * $RCSfile: implbase7.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: rt $ $Date: 2004-07-23 15:02:02 $ + * last change: $Author: rt $ $Date: 2004-08-23 08:26:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,11 +89,17 @@ namespace cppu static class_data7 s_cd = { 7 +1, sal_False, sal_False, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (Impl *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (Impl *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (Impl *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (Impl *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (Impl *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (Impl *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (Impl *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 } - } + { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, + { + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (Impl *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (Impl *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (Impl *) 16) - 16 }, + { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (Impl *) 16) - 16 }, + { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (Impl *) 16) - 16 }, + { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (Impl *) 16) - 16 }, + { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (Impl *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 } + } }; return reinterpret_cast< class_data * >(&s_cd); } diff --git a/cppuhelper/inc/cppuhelper/implbase8.hxx b/cppuhelper/inc/cppuhelper/implbase8.hxx index 27e6ecd3c..d39fe8fed 100644 --- a/cppuhelper/inc/cppuhelper/implbase8.hxx +++ b/cppuhelper/inc/cppuhelper/implbase8.hxx @@ -2,9 +2,9 @@ * * $RCSfile: implbase8.hxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: rt $ $Date: 2004-07-23 15:02:15 $ + * last change: $Author: rt $ $Date: 2004-08-23 08:26:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -82,17 +82,24 @@ namespace cppu /** @internal */ template< typename Ifc1, typename Ifc2, typename Ifc3, typename Ifc4, typename Ifc5, typename Ifc6, typename Ifc7, typename Ifc8, typename Impl > - struct ImplClassData8 + struct ImplClassData8 { class_data* operator ()() { static class_data8 s_cd = { - 8 +1, sal_False, sal_False, + 8 +1, sal_False, sal_False, { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc1 > const * ))&getCppuType, ((sal_Int32)(Ifc1 *) (Impl *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc2 > const * ))&getCppuType, ((sal_Int32)(Ifc2 *) (Impl *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc3 > const * ))&getCppuType, ((sal_Int32)(Ifc3 *) (Impl *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc4 > const * ))&getCppuType, ((sal_Int32)(Ifc4 *) (Impl *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc5 > const * ))&getCppuType, ((sal_Int32)(Ifc5 *) (Impl *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc6 > const * ))&getCppuType, ((sal_Int32)(Ifc6 *) (Impl *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc7 > const * ))&getCppuType, ((sal_Int32)(Ifc7 *) (Impl *) 16) - 16 }, { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< Ifc8 > const * ))&getCppuType, ((sal_Int32)(Ifc8 *) (Impl *) 16) - 16 }, - { (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider > const * ))&getCppuType, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 } + { Ifc1::static_type, ((sal_Int32)(Ifc1 *) (Impl *) 16) - 16 }, + { Ifc2::static_type, ((sal_Int32)(Ifc2 *) (Impl *) 16) - 16 }, + { Ifc3::static_type, ((sal_Int32)(Ifc3 *) (Impl *) 16) - 16 }, + { Ifc4::static_type, ((sal_Int32)(Ifc4 *) (Impl *) 16) - 16 }, + { Ifc5::static_type, ((sal_Int32)(Ifc5 *) (Impl *) 16) - 16 }, + { Ifc6::static_type, ((sal_Int32)(Ifc6 *) (Impl *) 16) - 16 }, + { Ifc7::static_type, ((sal_Int32)(Ifc7 *) (Impl *) 16) - 16 }, + { Ifc8::static_type, ((sal_Int32)(Ifc8 *) (Impl *) 16) - 16 }, + { ::com::sun::star::lang::XTypeProvider::static_type, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 } } }; return reinterpret_cast< class_data * >(&s_cd); |