INTEGRATION: CWS jl13 (1.12.4); FILE MERGED

2004/09/20 15:23:59 dbo 1.12.4.1: #i32854# correct union initializer
This commit is contained in:
Jens-Heiner Rechtien
2004-11-09 12:39:49 +00:00
parent 47972346a1
commit cea19c4752

View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: implbase9.hxx,v $ * $RCSfile: implbase9.hxx,v $
* *
* $Revision: 1.12 $ * $Revision: 1.13 $
* *
* last change: $Author: rt $ $Date: 2004-08-23 08:26:37 $ * last change: $Author: hr $ $Date: 2004-11-09 13:39:49 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -91,16 +91,16 @@ namespace cppu
9 +1, sal_False, sal_False, 9 +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_Int32)(Ifc1 *) (Impl *) 16) - 16 },
{ Ifc2::static_type, ((sal_Int32)(Ifc2 *) (Impl *) 16) - 16 }, { { Ifc2::static_type }, ((sal_Int32)(Ifc2 *) (Impl *) 16) - 16 },
{ Ifc3::static_type, ((sal_Int32)(Ifc3 *) (Impl *) 16) - 16 }, { { Ifc3::static_type }, ((sal_Int32)(Ifc3 *) (Impl *) 16) - 16 },
{ Ifc4::static_type, ((sal_Int32)(Ifc4 *) (Impl *) 16) - 16 }, { { Ifc4::static_type }, ((sal_Int32)(Ifc4 *) (Impl *) 16) - 16 },
{ Ifc5::static_type, ((sal_Int32)(Ifc5 *) (Impl *) 16) - 16 }, { { Ifc5::static_type }, ((sal_Int32)(Ifc5 *) (Impl *) 16) - 16 },
{ Ifc6::static_type, ((sal_Int32)(Ifc6 *) (Impl *) 16) - 16 }, { { Ifc6::static_type }, ((sal_Int32)(Ifc6 *) (Impl *) 16) - 16 },
{ Ifc7::static_type, ((sal_Int32)(Ifc7 *) (Impl *) 16) - 16 }, { { Ifc7::static_type }, ((sal_Int32)(Ifc7 *) (Impl *) 16) - 16 },
{ Ifc8::static_type, ((sal_Int32)(Ifc8 *) (Impl *) 16) - 16 }, { { Ifc8::static_type }, ((sal_Int32)(Ifc8 *) (Impl *) 16) - 16 },
{ Ifc9::static_type, ((sal_Int32)(Ifc9 *) (Impl *) 16) - 16 }, { { Ifc9::static_type }, ((sal_Int32)(Ifc9 *) (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_Int32)(::com::sun::star::lang::XTypeProvider *) (Impl *) 16) - 16 }
} }
}; };
return reinterpret_cast< class_data * >(&s_cd); return reinterpret_cast< class_data * >(&s_cd);