From 62174f6a8d4c191d67b7952d851a06b84a2b02be Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Sat, 7 Dec 2013 06:57:57 +0100 Subject: correct UTF8 handling for FILTERXML, fdo#72427 Change-Id: Ie0a5824ddbc3e75a1bb22121e620378ad3e0dfde --- sc/source/core/tool/interpr7.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx index d714057bf10b..bb647c1eb698 100644 --- a/sc/source/core/tool/interpr7.cxx +++ b/sc/source/core/tool/interpr7.cxx @@ -89,19 +89,19 @@ void ScInterpreter::ScFilterXML() xmlNsPtr ns = (xmlNsPtr)pNodeSet->nodeTab[0]; xmlNodePtr cur = (xmlNodePtr)ns->next; boost::shared_ptr pChar2(xmlNodeGetContent(cur), xmlFree); - aResult = OUString::createFromAscii((char*)pChar2.get()); + aResult = OStringToOUString(OString((char*)pChar2.get()), RTL_TEXTENCODING_UTF8); } else if(pNodeSet->nodeTab[0]->type == XML_ELEMENT_NODE) { xmlNodePtr cur = pNodeSet->nodeTab[0]; boost::shared_ptr pChar2(xmlNodeGetContent(cur), xmlFree); - aResult = OUString::createFromAscii((char*)pChar2.get()); + aResult = OStringToOUString(OString((char*)pChar2.get()), RTL_TEXTENCODING_UTF8); } else { xmlNodePtr cur = pNodeSet->nodeTab[0]; boost::shared_ptr pChar2(xmlNodeGetContent(cur), xmlFree); - aResult = OUString::createFromAscii((char*)pChar2.get()); + aResult = OStringToOUString(OString((char*)pChar2.get()), RTL_TEXTENCODING_UTF8); } } else -- cgit