GUIControlFactory: no need to convert strings from loaded XML
authorKarlson2k <k2k@narod.ru>
Tue, 5 Nov 2013 20:53:09 +0000 (00:53 +0400)
committerKarlson2k <k2k@narod.ru>
Wed, 6 Nov 2013 01:00:12 +0000 (05:00 +0400)
xbmc/guilib/GUIControlFactory.cpp

index 285ace7..088dff6 100644 (file)
@@ -573,8 +573,6 @@ bool CGUIControlFactory::GetInfoLabelFromElement(const TiXmlElement *element, CG
   CStdString fallback = element->Attribute("fallback");
   if (StringUtils::IsNaturalNumber(label))
     label = g_localizeStrings.Get(atoi(label));
-  else // we assume the skin xml's aren't encoded as UTF-8
-    g_charsetConverter.unknownToUTF8(label);
   if (StringUtils::IsNaturalNumber(fallback))
     fallback = g_localizeStrings.Get(atoi(fallback));
   else
@@ -645,8 +643,6 @@ bool CGUIControlFactory::GetString(const TiXmlNode* pRootNode, const char *strTa
     text.Empty();
   if (StringUtils::IsNaturalNumber(text))
     text = g_localizeStrings.Get(atoi(text.c_str()));
-  else
-    g_charsetConverter.unknownToUTF8(text);
   return true;
 }