diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-01-10 14:51:47 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-01-10 14:51:47 +0000 |
| commit | c1ea7aa3384667b87fe1f45eb1a4696b1856c47a (patch) | |
| tree | 190f59e35edfd52cf0ddd7569efcacf92b367bcd /comphelper | |
| parent | b247bf67548398c7eaa51a910db0f2e4759b433d (diff) | |
INTEGRATION: CWS sb41 (1.3.32); FILE MERGED
2005/12/13 09:37:10 sb 1.3.32.1: #i57855# Fixed use of getCppuType (which does not work on Compilers that correctly implement two-phase lookup).
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/inc/comphelper/extract.hxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/comphelper/inc/comphelper/extract.hxx b/comphelper/inc/comphelper/extract.hxx index a26a61462d4b..daa7160df889 100644 --- a/comphelper/inc/comphelper/extract.hxx +++ b/comphelper/inc/comphelper/extract.hxx @@ -4,9 +4,9 @@ * * $RCSfile: extract.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: rt $ $Date: 2005-09-08 02:30:55 $ + * last change: $Author: rt $ $Date: 2006-01-10 15:51:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -50,7 +50,9 @@ #ifndef _COM_SUN_STAR_UNO_ANY_HXX_ #include <com/sun/star/uno/Any.hxx> #endif - +#ifndef INCLUDED_CPPU_UNOTYPE_HXX +#include "cppu/unotype.hxx" +#endif namespace cppu { @@ -123,7 +125,7 @@ inline void SAL_CALL any2enum( E & eRet, const ::com::sun::star::uno::Any & rAny template< typename E > inline ::com::sun::star::uno::Any SAL_CALL enum2any( E eEnum ) { - return ::com::sun::star::uno::Any( &eEnum, getCppuType((const E*)0) ); + return ::com::sun::star::uno::Any( &eEnum, ::cppu::UnoType< E >::get() ); } /** |