only encode to unicode once

jef · jef · commit 27942449cfa1 · 2008-03-28T20:09:06.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@8295 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -1292,7 +1292,7 @@ QVariant QgsOgrProvider::minValue(int index)
     return QVariant();
   }
 
-  QString str = mEncoding->toUnicode( mEncoding->toUnicode( OGR_F_GetFieldAsString(f,0) ) );
+  QString str = mEncoding->toUnicode( OGR_F_GetFieldAsString(f,0) );
   OGR_F_Destroy(f);
 
   QVariant value;
@@ -1331,7 +1331,7 @@ QVariant QgsOgrProvider::maxValue(int index)
     return QVariant();
   }
 
-  QString str = mEncoding->toUnicode( mEncoding->toUnicode( OGR_F_GetFieldAsString(f,0) ) );
+  QString str = mEncoding->toUnicode( OGR_F_GetFieldAsString(f,0) );
   OGR_F_Destroy(f);
 
   QVariant value;

Original file line number	Diff line number	Diff line change
`@@ -1292,7 +1292,7 @@ QVariant QgsOgrProvider::minValue(int index)`
`1292`	`1292`	`return QVariant();`
`1293`	`1293`	`}`
`1294`	`1294`
`1295`		`- QString str = mEncoding->toUnicode( mEncoding->toUnicode( OGR_F_GetFieldAsString(f,0) ) );`
	`1295`	`+ QString str = mEncoding->toUnicode( OGR_F_GetFieldAsString(f,0) );`
`1296`	`1296`	`OGR_F_Destroy(f);`
`1297`	`1297`
`1298`	`1298`	`QVariant value;`
`@@ -1331,7 +1331,7 @@ QVariant QgsOgrProvider::maxValue(int index)`
`1331`	`1331`	`return QVariant();`
`1332`	`1332`	`}`
`1333`	`1333`
`1334`		`- QString str = mEncoding->toUnicode( mEncoding->toUnicode( OGR_F_GetFieldAsString(f,0) ) );`
	`1334`	`+ QString str = mEncoding->toUnicode( OGR_F_GetFieldAsString(f,0) );`
`1335`	`1335`	`OGR_F_Destroy(f);`
`1336`	`1336`
`1337`	`1337`	`QVariant value;`