strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fVal->nVal

Browse source 
Change-Id: Ia5b041094f29e42cb60f2c83888cace42b91cc13
This commit is contained in:
Caolán McNamara 2014-06-24 12:04:33 +01:00
parent a1b89677b7
commit 266fa9f4f7
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
stoc/source/typeconv/convert.cxx
View file

@ -391,15 +391,15 @@ sal_Int64 TypeConverter_Impl::toHyper( const Any& rAny, sal_Int64 min, sal_uInt6
// STRING
case TypeClass_STRING:
{
sal_Int64 fVal = SAL_CONST_INT64(0);
if (! getHyperValue( fVal, *(OUString const *)rAny.getValue() ))
sal_Int64 nVal = SAL_CONST_INT64(0);
if (! getHyperValue( nVal, *(OUString const *)rAny.getValue() ))
{
throw CannotConvertException(
"invalid STRING value!",
Reference<XInterface>(), aDestinationClass, FailReason::IS_NOT_NUMBER, 0 );
}
nRet = fVal;
if (fVal >= min && (fVal < 0 || ((sal_uInt64)fVal) <= max))
nRet = nVal;
if (nVal >= min && (nVal < 0 || ((sal_uInt64)nVal) <= max))
return nRet;
throw CannotConvertException(
"STRING value out of range!",