diff options
| author | Lars Langhans <lla@openoffice.org> | 2000-09-22 13:29:49 +0000 |
|---|---|---|
| committer | Lars Langhans <lla@openoffice.org> | 2000-09-22 13:29:49 +0000 |
| commit | 72104ede8756c7e92386330b4daf48b99ba5b2a4 (patch) | |
| tree | 6c2412390672ed49ec13d2f2febab1b83464c360 /configmgr | |
| parent | 2ae24b88639dcfe6c8a8453758af821f1bcd8fed (diff) | |
#78928# the method convertToSimpleType create an exception when someone try to create an Any with an type and not the right data but we put now a void type in this any if this is happend.
Diffstat (limited to 'configmgr')
| -rw-r--r-- | configmgr/source/xml/typeconverter.cxx | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/configmgr/source/xml/typeconverter.cxx b/configmgr/source/xml/typeconverter.cxx index 1448bbaf6336..88f5c9bafa59 100644 --- a/configmgr/source/xml/typeconverter.cxx +++ b/configmgr/source/xml/typeconverter.cxx @@ -2,9 +2,9 @@ * * $RCSfile: typeconverter.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: babak.mahbod $ $Date: 2000-09-21 20:17:23 $ + * last change: $Author: lla $ $Date: 2000-09-22 14:29:49 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -130,11 +130,12 @@ namespace configmgr staruno::Any aRes; try { - xTypeConverter->convertToSimpleType(staruno::makeAny(_rValue), _rTypeClass) >>= aRes; + aRes = xTypeConverter->convertToSimpleType(staruno::makeAny(_rValue), _rTypeClass); } catch (starscript::CannotConvertException&) { - OSL_ENSHURE(sal_False, "toAny : could not convert !"); + if (_rValue.getLength() != 0) + OSL_ENSHURE(sal_False, "toAny : could not convert !"); } catch (starlang::IllegalArgumentException&) { @@ -336,18 +337,18 @@ namespace configmgr OSL_ASSERT(pSequenceTD->pType); if ( pSequenceTD && pSequenceTD->pType ) - { - // SUPD expects a decimal constant, hence, - // build version comparison is made using - // a decimal number - - #if ( SUPD >= 601 ) - return staruno::Type(pSequenceTD->pType); - #else - OSL_ASSERT(pSequenceTD->pType); - return staruno::Type(pSequenceTD->pType->pWeakRef); - #endif - } //if + { + // SUPD expects a decimal constant, hence, + // build version comparison is made using + // a decimal number + +#if ( SUPD >= 601 ) + return staruno::Type(pSequenceTD->pType); +#else + OSL_ASSERT(pSequenceTD->pType); + return staruno::Type(pSequenceTD->pType->pWeakRef); +#endif + } //if return staruno::Type(); } |