diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 12:40:18 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-11-09 12:40:18 +0000 |
commit | b70d6cfee035a5ec0cdc3f53a0dc029e7869a242 (patch) | |
tree | 5381ca889ee628b714cb0439c8cb77687fae3d2f /cppuhelper/inc | |
parent | 6c30c3c7713fb90446ea7a86209e05fac8b59c42 (diff) |
INTEGRATION: CWS jl13 (1.2.158); FILE MERGED
2004/09/20 15:23:59 dbo 1.2.158.1: #i32854# correct union initializer
Diffstat (limited to 'cppuhelper/inc')
-rw-r--r-- | cppuhelper/inc/cppuhelper/implbase_ex_pre.hxx | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/cppuhelper/inc/cppuhelper/implbase_ex_pre.hxx b/cppuhelper/inc/cppuhelper/implbase_ex_pre.hxx index 79fa418a506f..1927bce5b9ba 100644 --- a/cppuhelper/inc/cppuhelper/implbase_ex_pre.hxx +++ b/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 ) |