Skip to content

Commit 4488551

Browse files
committed
styles: explictly save symbol XML in UTF-8 (fixes #9045)
1 parent 65bf9ac commit 4488551

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

src/core/symbology-ng/qgsstylev2.cpp

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ bool QgsStyleV2::saveSymbol( QString name, QgsSymbolV2* symbol, int groupid, QSt
119119

120120
QByteArray xmlArray;
121121
QTextStream stream( &xmlArray );
122+
stream.setCodec( "UTF-8" );
122123
symEl.save( stream, 4 );
123124
char *query = sqlite3_mprintf( "INSERT INTO symbol VALUES (NULL, '%q', '%q', %d);",
124125
name.toUtf8().constData(), xmlArray.constData(), groupid );
@@ -222,6 +223,7 @@ bool QgsStyleV2::saveColorRamp( QString name, QgsVectorColorRampV2* ramp, int gr
222223

223224
QByteArray xmlArray;
224225
QTextStream stream( &xmlArray );
226+
stream.setCodec( "UTF-8" );
225227
rampEl.save( stream, 4 );
226228
char *query = sqlite3_mprintf( "INSERT INTO colorramp VALUES (NULL, '%q', '%q', %d);",
227229
name.toUtf8().constData(), xmlArray.constData(), groupid );
@@ -390,6 +392,7 @@ bool QgsStyleV2::save( QString filename )
390392
return false;
391393
}
392394
QTextStream ts( &f );
395+
ts.setCodec( "UTF-8" );
393396
doc.save( ts, 2 );
394397
f.close();
395398
#endif
@@ -1029,6 +1032,7 @@ int QgsStyleV2::addSmartgroup( QString name, QString op, QgsSmartConditionMap co
10291032

10301033
QByteArray xmlArray;
10311034
QTextStream stream( &xmlArray );
1035+
stream.setCodec( "UTF-8" );
10321036
smartEl.save( stream, 4 );
10331037
char *query = sqlite3_mprintf( "INSERT INTO smartgroup VALUES (NULL, '%q', '%q')",
10341038
name.toUtf8().constData(), xmlArray.constData() );
@@ -1318,6 +1322,7 @@ bool QgsStyleV2::exportXML( QString filename )
13181322
}
13191323

13201324
QTextStream ts( &f );
1325+
ts.setCodec( "UTF-8" );
13211326
doc.save( ts, 2 );
13221327
f.close();
13231328

@@ -1427,6 +1432,7 @@ bool QgsStyleV2::updateSymbol( StyleEntity type, QString name )
14271432
QDomElement symEl;
14281433
QByteArray xmlArray;
14291434
QTextStream stream( &xmlArray );
1435+
stream.setCodec( "UTF-8" );
14301436

14311437
char *query;
14321438

0 commit comments

Comments
 (0)