ogr provider: don't ignore set encoding if SHAPE_ENCODING is set although OGR

jef-n · jef-n · commit fea86ea17632 · 2013-04-12T14:23:57.000+02:00
still claims that strings are already UTF-8
diff --git a/src/providers/ogr/qgsogrprovider.cpp b/src/providers/ogr/qgsogrprovider.cpp
@@ -503,7 +503,8 @@ QStringList QgsOgrProvider::subLayers() const
 void QgsOgrProvider::setEncoding( const QString& e )
 {
 #if defined(OLCStringsAsUTF8)
-  if ( !OGR_L_TestCapability( ogrLayer, OLCStringsAsUTF8 ) )
+  QSettings settings;
+  if ( settings.value( "/qgis/ignoreShapeEncoding", true ).toBool() && !OGR_L_TestCapability( ogrLayer, OLCStringsAsUTF8 ) )
   {
     QgsVectorDataProvider::setEncoding( e );
   }

Original file line number	Diff line number	Diff line change
`@@ -503,7 +503,8 @@ QStringList QgsOgrProvider::subLayers() const`
`503`	`503`	`void QgsOgrProvider::setEncoding( const QString& e )`
`504`	`504`	`{`
`505`	`505`	`#if defined(OLCStringsAsUTF8)`
`506`		`- if ( !OGR_L_TestCapability( ogrLayer, OLCStringsAsUTF8 ) )`
	`506`	`+ QSettings settings;`
	`507`	`+ if ( settings.value( "/qgis/ignoreShapeEncoding", true ).toBool() && !OGR_L_TestCapability( ogrLayer, OLCStringsAsUTF8 ) )`
`507`	`508`	`{`
`508`	`509`	`QgsVectorDataProvider::setEncoding( e );`
`509`	`510`	`}`