diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-10-05 13:27:12 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-10-05 13:27:12 +0000 |
| commit | 1f435ac55812db805a4b7a2c9eabda2a42a7112b (patch) | |
| tree | d0901f52bb968dffdfd7a14a0574a2cd2fc7c2bb /cppuhelper | |
| parent | efc0c2d727c71a1d0e76785a403af64148e981b0 (diff) | |
INTEGRATION: CWS intptr (1.13.30); FILE MERGED
2005/09/13 14:50:05 kendy 1.13.30.1: #i54498#
Introduce and use sal_IntPtr/sal_uIntPtr for ints where we have to store a pointer
Diffstat (limited to 'cppuhelper')
| -rw-r--r-- | cppuhelper/inc/cppuhelper/implbase7.hxx | 20 | ||||
| -rw-r--r-- | cppuhelper/inc/cppuhelper/implbase8.hxx | 22 |
2 files changed, 21 insertions, 21 deletions
diff --git a/cppuhelper/inc/cppuhelper/implbase7.hxx b/cppuhelper/inc/cppuhelper/implbase7.hxx index 5c9592c1e310..c91d742cf3e2 100644 --- a/cppuhelper/inc/cppuhelper/implbase7.hxx +++ b/cppuhelper/inc/cppuhelper/implbase7.hxx @@ -4,9 +4,9 @@ * * $RCSfile: implbase7.hxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: rt $ $Date: 2005-09-08 09:16:21 $ + * last change: $Author: kz $ $Date: 2005-10-05 14:26:54 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -65,14 +65,14 @@ namespace cppu 7 +1, sal_False, sal_False, { 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 } + { { Ifc1::static_type }, ((sal_IntPtr)(Ifc1 *) (Impl *) 16) - 16 }, + { { Ifc2::static_type }, ((sal_IntPtr)(Ifc2 *) (Impl *) 16) - 16 }, + { { Ifc3::static_type }, ((sal_IntPtr)(Ifc3 *) (Impl *) 16) - 16 }, + { { Ifc4::static_type }, ((sal_IntPtr)(Ifc4 *) (Impl *) 16) - 16 }, + { { Ifc5::static_type }, ((sal_IntPtr)(Ifc5 *) (Impl *) 16) - 16 }, + { { Ifc6::static_type }, ((sal_IntPtr)(Ifc6 *) (Impl *) 16) - 16 }, + { { Ifc7::static_type }, ((sal_IntPtr)(Ifc7 *) (Impl *) 16) - 16 }, + { { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::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 1781741f787e..53d12b85384c 100644 --- a/cppuhelper/inc/cppuhelper/implbase8.hxx +++ b/cppuhelper/inc/cppuhelper/implbase8.hxx @@ -4,9 +4,9 @@ * * $RCSfile: implbase8.hxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: rt $ $Date: 2005-09-08 09:16:47 $ + * last change: $Author: kz $ $Date: 2005-10-05 14:27:12 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -65,15 +65,15 @@ namespace cppu 8 +1, sal_False, sal_False, { 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 }, - { { 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 } + { { Ifc1::static_type }, ((sal_IntPtr)(Ifc1 *) (Impl *) 16) - 16 }, + { { Ifc2::static_type }, ((sal_IntPtr)(Ifc2 *) (Impl *) 16) - 16 }, + { { Ifc3::static_type }, ((sal_IntPtr)(Ifc3 *) (Impl *) 16) - 16 }, + { { Ifc4::static_type }, ((sal_IntPtr)(Ifc4 *) (Impl *) 16) - 16 }, + { { Ifc5::static_type }, ((sal_IntPtr)(Ifc5 *) (Impl *) 16) - 16 }, + { { Ifc6::static_type }, ((sal_IntPtr)(Ifc6 *) (Impl *) 16) - 16 }, + { { Ifc7::static_type }, ((sal_IntPtr)(Ifc7 *) (Impl *) 16) - 16 }, + { { Ifc8::static_type }, ((sal_IntPtr)(Ifc8 *) (Impl *) 16) - 16 }, + { { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_IntPtr)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 } } }; return reinterpret_cast< class_data * >(&s_cd); |