From 7a37085df77102276e7c1d83dc111afe76beb6ef Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Fri, 19 Aug 2022 12:15:58 +1000 Subject: [PATCH] Don't store null QChar in numeric format variants --- src/core/numericformats/qgsbasicnumericformat.cpp | 4 ++-- src/core/numericformats/qgsfractionnumericformat.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/core/numericformats/qgsbasicnumericformat.cpp b/src/core/numericformats/qgsbasicnumericformat.cpp index c692451f2241..e2f59d38c511 100644 --- a/src/core/numericformats/qgsbasicnumericformat.cpp +++ b/src/core/numericformats/qgsbasicnumericformat.cpp @@ -155,8 +155,8 @@ QVariantMap QgsBasicNumericFormat::configuration( const QgsReadWriteContext & ) res.insert( QStringLiteral( "show_plus" ), mShowPlusSign ); res.insert( QStringLiteral( "show_trailing_zeros" ), mShowTrailingZeros ); res.insert( QStringLiteral( "rounding_type" ), static_cast< int >( mRoundingType ) ); - res.insert( QStringLiteral( "thousand_separator" ), mThousandsSeparator ); - res.insert( QStringLiteral( "decimal_separator" ), mDecimalSeparator ); + res.insert( QStringLiteral( "thousand_separator" ), mThousandsSeparator.isNull() ? QVariant() : QVariant::fromValue( mThousandsSeparator ) ); + res.insert( QStringLiteral( "decimal_separator" ), mDecimalSeparator.isNull() ? QVariant() : QVariant::fromValue( mDecimalSeparator ) ); return res; } diff --git a/src/core/numericformats/qgsfractionnumericformat.cpp b/src/core/numericformats/qgsfractionnumericformat.cpp index 293d2739c6be..2e1d388249b0 100644 --- a/src/core/numericformats/qgsfractionnumericformat.cpp +++ b/src/core/numericformats/qgsfractionnumericformat.cpp @@ -162,7 +162,7 @@ QVariantMap QgsFractionNumericFormat::configuration( const QgsReadWriteContext & QVariantMap res; res.insert( QStringLiteral( "show_thousand_separator" ), mShowThousandsSeparator ); res.insert( QStringLiteral( "show_plus" ), mShowPlusSign ); - res.insert( QStringLiteral( "thousand_separator" ), mThousandsSeparator ); + res.insert( QStringLiteral( "thousand_separator" ), mThousandsSeparator.isNull() ? QVariant() : QVariant::fromValue( mThousandsSeparator ) ); res.insert( QStringLiteral( "use_dedicated_unicode" ), mUseDedicatedUnicode ); res.insert( QStringLiteral( "use_unicode_supersubscript" ), mUseUnicodeSuperSubscript ); return res;