diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-01-21 15:47:22 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-01-21 15:47:22 +0000 |
| commit | 9c2dec22625afee522b6b511404ce6c6de928d9c (patch) | |
| tree | 3715002b167d5db4eefdd3f300b96e5212394eb4 /toolkit/source/controls | |
| parent | 8034ef19c08ffaac8091fe8a6b9abc80e934b9be (diff) | |
INTEGRATION: CWS dba22 (1.36.54); FILE MERGED
2005/01/19 17:24:16 fs 1.36.54.2: RESYNC: (1.36-1.37); FILE MERGED
2004/12/29 11:12:26 fs 1.36.54.1: #i34551# convertFastPropertyValue: proper conversion of enum values
Diffstat (limited to 'toolkit/source/controls')
| -rw-r--r-- | toolkit/source/controls/unocontrolmodel.cxx | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 11a255282130..5b93c3c00523 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unocontrolmodel.cxx,v $ * - * $Revision: 1.37 $ + * $Revision: 1.38 $ * - * last change: $Author: rt $ $Date: 2005-01-11 12:03:42 $ + * last change: $Author: kz $ $Date: 2005-01-21 16:47:22 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -91,6 +91,9 @@ #ifndef _CPPUHELPER_TYPEPROVIDER_HXX_ #include <cppuhelper/typeprovider.hxx> #endif +#ifndef _COMPHELPER_EXTRACT_HXX_ +#include <cppuhelper/extract.hxx> +#endif #ifndef _RTL_MEMORY_H_ #include <rtl/memory.h> #endif @@ -331,6 +334,7 @@ void UnoControlModel::ImplPropertyChanged( sal_uInt16 nPropId ) { switch ( nPropId ) { + case BASEPROPERTY_VERTICALALIGN: case BASEPROPERTY_BORDERCOLOR: case BASEPROPERTY_SYMBOL_COLOR: case BASEPROPERTY_TABSTOP: @@ -1214,7 +1218,13 @@ sal_Bool UnoControlModel::convertFastPropertyValue( Any & rConvertedValue, Any & } } break; - // TODO: perhaps we should allow us some more tolerance for enum types, too .... + case TypeClass_ENUM: + { + sal_Int32 nValue = 0; + if ( bConverted = ( rValue >>= nValue ) ) + rConvertedValue = ::cppu::int2enum( nValue, *pDestType ); + } + break; } if (!bConverted) |