sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-01 00:46:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Check if conversion was successful before passing to locale

Browse Source
This commit is contained in:
Alessandro Pasotti 2018-06-09 18:42:14 +02:00
parent 85e34f2c92
commit bf810e9c50
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/core/qgsfield.cpp
View File

@ -244,11 +244,14 @@ QString QgsField::displayString( const QVariant &v ) const
return QString::number( v.toDouble(), 'f', d->precision ); return QString::number( v.toDouble(), 'f', d->precision );
} }
} }
// Other numeric types out of doubles // Other numeric types than doubles
else if ( isNumeric() && else if ( isNumeric() &&
! QLocale().numberOptions() & QLocale::NumberOption::OmitGroupSeparator ) ! QLocale().numberOptions() & QLocale::NumberOption::OmitGroupSeparator )
{ {
return QLocale().toString( v.toLongLong() ); bool ok;
qlonglong converted( v.toLongLong( &ok ) );
if ( ok )
return QLocale().toString( converted );
} }
// Fallback if special rules do not apply // Fallback if special rules do not apply
return v.toString(); return v.toString();
@ -305,7 +308,7 @@ bool QgsField::convertCompatible( QVariant &v ) const
QVariant tmp( v ); QVariant tmp( v );
if ( d->type == QVariant::Double && !tmp.convert( d->type ) ) if ( d->type == QVariant::Double && !tmp.convert( d->type ) )
{ {
v = v.toString().replace( ',', '.' ); v = v.toString().replace( QLocale().decimalPoint(), '.' );
} }
} }