diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-12-07 06:57:57 +0100 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2013-12-07 07:01:51 +0100 |
| commit | 9bb72868b846a7ba7e8f985a87e944fb760a0f10 (patch) | |
| tree | 90192a09623da952314d5225c70066b92175c8f3 /sc/source/core | |
| parent | 4e57eaaaccb114b03849521d5a1a88da4b110236 (diff) | |
correct UTF8 handling for FILTERXML, fdo#72427
Change-Id: Ie0a5824ddbc3e75a1bb22121e620378ad3e0dfde
Diffstat (limited to 'sc/source/core')
| -rw-r--r-- | sc/source/core/tool/interpr7.cxx | 6 |
1 files 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<xmlChar> 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<xmlChar> 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<xmlChar> pChar2(xmlNodeGetContent(cur), xmlFree); - aResult = OUString::createFromAscii((char*)pChar2.get()); + aResult = OStringToOUString(OString((char*)pChar2.get()), RTL_TEXTENCODING_UTF8); } } else |