[Libreoffice-commits] core.git: sc/source
Markus Mohrhard
markus.mohrhard at googlemail.com
Fri Dec 6 22:00:32 PST 2013
sc/source/core/tool/interpr7.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 62174f6a8d4c191d67b7952d851a06b84a2b02be
Author: Markus Mohrhard <markus.mohrhard at googlemail.com>
Date: Sat Dec 7 06:57:57 2013 +0100
correct UTF8 handling for FILTERXML, fdo#72427
Change-Id: Ie0a5824ddbc3e75a1bb22121e620378ad3e0dfde
diff --git a/sc/source/core/tool/interpr7.cxx b/sc/source/core/tool/interpr7.cxx
index d714057..bb647c1 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
More information about the Libreoffice-commits
mailing list