INTEGRATION: CWS jl13 (1.12.4); FILE MERGED

2004/09/20 15:23:58 dbo 1.12.4.1: #i32854# correct union initializer
This commit is contained in:
Jens-Heiner Rechtien
2004-11-09 12:39:35 +00:00
parent b32cd2553a
commit 47972346a1
6 changed files with 51 additions and 51 deletions

View File

@@ -2,9 +2,9 @@
*
* $RCSfile: implbase3.hxx,v $
*
* $Revision: 1.12 $
* $Revision: 1.13 $
*
* last change: $Author: rt $ $Date: 2004-08-23 08:25:24 $
* last change: $Author: hr $ $Date: 2004-11-09 13:38:25 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -90,10 +90,10 @@ namespace cppu
3 +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 },
{ ::com::sun::star::lang::XTypeProvider::static_type, ((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 },
{ { ::com::sun::star::lang::XTypeProvider::static_type }, ((sal_Int32)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
}
};
return reinterpret_cast< class_data * >(&s_cd);

View File

@@ -2,9 +2,9 @@
*
* $RCSfile: implbase4.hxx,v $
*
* $Revision: 1.12 $
* $Revision: 1.13 $
*
* last change: $Author: rt $ $Date: 2004-08-23 08:25:36 $
* last change: $Author: hr $ $Date: 2004-11-09 13:38:39 $
*
* 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 },
{
{ 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 }
{ { 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);

View File

@@ -2,9 +2,9 @@
*
* $RCSfile: implbase5.hxx,v $
*
* $Revision: 1.12 $
* $Revision: 1.13 $
*
* last change: $Author: rt $ $Date: 2004-08-23 08:25:47 $
* last change: $Author: hr $ $Date: 2004-11-09 13:38:56 $
*
* 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 },
{
{ 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 }
{ { 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);

View File

@@ -2,9 +2,9 @@
*
* $RCSfile: implbase6.hxx,v $
*
* $Revision: 1.12 $
* $Revision: 1.13 $
*
* last change: $Author: rt $ $Date: 2004-08-23 08:25:59 $
* last change: $Author: hr $ $Date: 2004-11-09 13:39:09 $
*
* 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 },
{
{ 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 }
{ { 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);

View File

@@ -2,9 +2,9 @@
*
* $RCSfile: implbase7.hxx,v $
*
* $Revision: 1.12 $
* $Revision: 1.13 $
*
* last change: $Author: rt $ $Date: 2004-08-23 08:26:11 $
* last change: $Author: hr $ $Date: 2004-11-09 13:39:23 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -91,14 +91,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_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);

View File

@@ -2,9 +2,9 @@
*
* $RCSfile: implbase8.hxx,v $
*
* $Revision: 1.12 $
* $Revision: 1.13 $
*
* last change: $Author: rt $ $Date: 2004-08-23 08:26:25 $
* last change: $Author: hr $ $Date: 2004-11-09 13:39:35 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -91,15 +91,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_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);