mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS intptr (1.13.30); FILE MERGED

Browse Source 
2005/09/13 14:50:02 kendy 1.13.30.1: #i54498#
Introduce and use sal_IntPtr/sal_uIntPtr for ints where we have to store a pointer
This commit is contained in:
Kurt Zenker
2005-10-05 13:25:28 +00:00
parent 0fd3043761
commit 5d54aa7cdb
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
cppuhelper/inc/cppuhelper/implbase12.hxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: implbase12.hxx,v $ * $RCSfile: implbase12.hxx,v $
* *
* $Revision: 1.14 $ * $Revision: 1.15 $
* *
* last change: $Author: rt $ $Date: 2005-09-08 09:14:09 $ * last change: $Author: kz $ $Date: 2005-10-05 14:25:08 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -65,19 +65,19 @@ namespace cppu
12 +1, sal_False, sal_False, 12 +1, sal_False, sal_False,
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 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 }, { { Ifc1::static_type }, ((sal_IntPtr)(Ifc1 *) (Impl *) 16) - 16 },
{ { Ifc2::static_type }, ((sal_Int32)(Ifc2 *) (Impl *) 16) - 16 }, { { Ifc2::static_type }, ((sal_IntPtr)(Ifc2 *) (Impl *) 16) - 16 },
{ { Ifc3::static_type }, ((sal_Int32)(Ifc3 *) (Impl *) 16) - 16 }, { { Ifc3::static_type }, ((sal_IntPtr)(Ifc3 *) (Impl *) 16) - 16 },
{ { Ifc4::static_type }, ((sal_Int32)(Ifc4 *) (Impl *) 16) - 16 }, { { Ifc4::static_type }, ((sal_IntPtr)(Ifc4 *) (Impl *) 16) - 16 },
{ { Ifc5::static_type }, ((sal_Int32)(Ifc5 *) (Impl *) 16) - 16 }, { { Ifc5::static_type }, ((sal_IntPtr)(Ifc5 *) (Impl *) 16) - 16 },
{ { Ifc6::static_type }, ((sal_Int32)(Ifc6 *) (Impl *) 16) - 16 }, { { Ifc6::static_type }, ((sal_IntPtr)(Ifc6 *) (Impl *) 16) - 16 },
{ { Ifc7::static_type }, ((sal_Int32)(Ifc7 *) (Impl *) 16) - 16 }, { { Ifc7::static_type }, ((sal_IntPtr)(Ifc7 *) (Impl *) 16) - 16 },
{ { Ifc8::static_type }, ((sal_Int32)(Ifc8 *) (Impl *) 16) - 16 }, { { Ifc8::static_type }, ((sal_IntPtr)(Ifc8 *) (Impl *) 16) - 16 },
{ { Ifc9::static_type }, ((sal_Int32)(Ifc9 *) (Impl *) 16) - 16 }, { { Ifc9::static_type }, ((sal_IntPtr)(Ifc9 *) (Impl *) 16) - 16 },
{ { Ifc10::static_type }, ((sal_Int32)(Ifc10 *) (Impl *) 16) - 16 }, { { Ifc10::static_type }, ((sal_IntPtr)(Ifc10 *) (Impl *) 16) - 16 },
{ { Ifc11::static_type }, ((sal_Int32)(Ifc11 *) (Impl *) 16) - 16 }, { { Ifc11::static_type }, ((sal_IntPtr)(Ifc11 *) (Impl *) 16) - 16 },
{ { Ifc12::static_type }, ((sal_Int32)(Ifc12 *) (Impl *) 16) - 16 }, { { Ifc12::static_type }, ((sal_IntPtr)(Ifc12 *) (Impl *) 16) - 16 },
{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (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); return reinterpret_cast< class_data * >(&s_cd);

10
cppuhelper/inc/cppuhelper/implbase2.hxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: implbase2.hxx,v $ * $RCSfile: implbase2.hxx,v $
* *
* $Revision: 1.14 $ * $Revision: 1.15 $
* *
* last change: $Author: rt $ $Date: 2005-09-08 09:14:30 $ * last change: $Author: kz $ $Date: 2005-10-05 14:25:28 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -64,9 +64,9 @@ namespace cppu
2 +1, sal_False, sal_False, 2 +1, sal_False, sal_False,
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, { 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 }, { { Ifc1::static_type }, ((sal_IntPtr)(Ifc1 *) (Impl *) 16) - 16 },
{ { Ifc2::static_type }, ((sal_Int32)(Ifc2 *) (Impl *) 16) - 16 }, { { Ifc2::static_type }, ((sal_IntPtr)(Ifc2 *) (Impl *) 16) - 16 },
{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (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); return reinterpret_cast< class_data * >(&s_cd);