INTEGRATION: CWS jl13 (1.2.158); FILE MERGED

2004/09/20 15:23:59 dbo 1.2.158.1: #i32854# correct union initializer

cppuhelper/inc/cppuhelper/implbase_ex_pre.hxx

@@ -2,9 +2,9 @@
  *
  *  $RCSfile: implbase_ex_pre.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: dbo $ $Date: 2001-11-09 13:49:15 $
+ *  last change: $Author: hr $ $Date: 2004-11-09 13:40:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -63,8 +63,7 @@
 
 /** @internal */
 #define __IFC_EX_TYPE_INIT_NAME( class_cast, ifc_name ) \
-{ (::cppu::fptr_getCppuType)(::com::sun::star::uno::Type const & (SAL_CALL *)( ::com::sun::star::uno::Reference< ifc_name > const * ))&getCppuType, \
-((sal_Int32)(ifc_name *) class_cast 16) - 16 }
+{ { ifc_name::static_type }, ((sal_Int32)(ifc_name *) class_cast 16) - 16 }
 /** @internal */
 #define __IFC_EX_TYPE_INIT( class_cast, N ) __IFC_EX_TYPE_INIT_NAME( class_cast, Ifc##N )