diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-01-10 14:52:00 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-01-10 14:52:00 +0000 |
| commit | d254e1e4faa3873f07d9ac459a6c15b0d94c0ee1 (patch) | |
| tree | e49857335b0da5b3ddbae51d3bba03905f9cd2a5 /comphelper | |
| parent | c1ea7aa3384667b87fe1f45eb1a4696b1856c47a (diff) | |
INTEGRATION: CWS sb41 (1.7.32); FILE MERGED
2005/11/28 13:00:58 sb 1.7.32.1: #i57855# Replaced getCppuType (which is still there for backwards compatibility) with new cppu::UnoType and helper cppu::getTypeFavourUnsigned, as GCC 4.1 started to complain about non-conforming uses of getCppuType in template code.
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/inc/comphelper/property.hxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/comphelper/inc/comphelper/property.hxx b/comphelper/inc/comphelper/property.hxx index 2b1dc93e21f7..68b5bfe26967 100644 --- a/comphelper/inc/comphelper/property.hxx +++ b/comphelper/inc/comphelper/property.hxx @@ -4,9 +4,9 @@ * * $RCSfile: property.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: rt $ $Date: 2005-09-08 02:35:26 $ + * last change: $Author: rt $ $Date: 2006-01-10 15:52:00 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -52,6 +52,9 @@ #ifndef INCLUDED_COMPHELPERDLLAPI_H #include "comphelper/comphelperdllapi.h" #endif +#ifndef INCLUDED_CPPU_UNOTYPE_HXX +#include "cppu/unotype.hxx" +#endif //========================================================================= //= property helper classes @@ -156,7 +159,8 @@ sal_Bool tryPropertyValue(staruno::Any& /*out*/_rConvertedValue, staruno::Any& / template <class ENUMTYPE> sal_Bool tryPropertyValueEnum(staruno::Any& /*out*/_rConvertedValue, staruno::Any& /*out*/_rOldValue, const staruno::Any& _rValueToSet, const ENUMTYPE& _rCurrentValue) { - if (getCppuType(&_rCurrentValue).getTypeClass() != staruno::TypeClass_ENUM) + if (cppu::getTypeFavourUnsigned(&_rCurrentValue).getTypeClass() + != staruno::TypeClass_ENUM) return tryPropertyValue(_rConvertedValue, _rOldValue, _rValueToSet, _rCurrentValue); sal_Bool bModified(sal_False); |