diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-06 17:24:13 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-06 17:24:13 +0100 |
| commit | fc0d57b7aff84f4bdca0a1f201527c265d5f0cf5 (patch) | |
| tree | 49a72b76d2d2a92af6371748c19277778159b86d /unoxml/source/dom | |
| parent | e36dae401fc8963c9a92cb2c11d9b650b943c6d3 (diff) | |
Revert "use the new OUString::fromUtf8 method"
This reverts commit 05050cdb23de586870bf479a9df5ced06828d498,
not all places that use e.g. OStringToOUString to convert potential UTF-8
are guaranteed to fulfil the prerequisites necessary to use fromUtf8 (and
some places like e.g. in codemaker are happy with the best-effort effect
of OStringToOUString's OSTRING_TO_OUSTRING_CVTFLAGS).
Diffstat (limited to 'unoxml/source/dom')
| -rw-r--r-- | unoxml/source/dom/attr.cxx | 6 | ||||
| -rw-r--r-- | unoxml/source/dom/characterdata.cxx | 8 |
2 files changed, 8 insertions, 6 deletions
diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx index f835e6dab6de..68c5c82a4e6b 100644 --- a/unoxml/source/dom/attr.cxx +++ b/unoxml/source/dom/attr.cxx @@ -238,7 +238,8 @@ namespace DOM if (m_pNamespace.get()) { OSL_ASSERT(!m_aNodePtr->parent); - OUString const ret(OUString::fromUtf8(m_pNamespace->second)); + OUString const ret(OStringToOUString( + m_pNamespace->second, RTL_TEXTENCODING_UTF8)); return ret; } else { return CNode::getPrefix(); @@ -254,7 +255,8 @@ namespace DOM if (m_pNamespace.get()) { OSL_ASSERT(!m_aNodePtr->parent); - OUString const ret(OUString::fromUtf8(m_pNamespace->first)); + OUString const ret(OStringToOUString( + m_pNamespace->first, RTL_TEXTENCODING_UTF8)); return ret; } else { return CNode::getNamespaceURI(); diff --git a/unoxml/source/dom/characterdata.cxx b/unoxml/source/dom/characterdata.cxx index 9f5888dba942..1033a7c9aabf 100644 --- a/unoxml/source/dom/characterdata.cxx +++ b/unoxml/source/dom/characterdata.cxx @@ -88,7 +88,7 @@ namespace DOM ::boost::shared_ptr<xmlChar const> const pContent( xmlNodeGetContent(m_aNodePtr), xmlFree); OString aData(reinterpret_cast<sal_Char const*>(pContent.get())); - OUString tmp(OUString::fromUtf8(aData)); + OUString tmp(OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); if (offset > tmp.getLength() || offset < 0 || count < 0) { DOMException e; e.Code = DOMExceptionType_INDEX_SIZE_ERR; @@ -159,7 +159,7 @@ namespace DOM ::boost::shared_ptr<xmlChar const> const pContent( xmlNodeGetContent(m_aNodePtr), xmlFree); OString aData(reinterpret_cast<sal_Char const*>(pContent.get())); - OUString tmp(OUString::fromUtf8(aData)); + OUString tmp(OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); if (offset > tmp.getLength() || offset < 0) { DOMException e; e.Code = DOMExceptionType_INDEX_SIZE_ERR; @@ -194,7 +194,7 @@ namespace DOM ::boost::shared_ptr<xmlChar const> const pContent( xmlNodeGetContent(m_aNodePtr), xmlFree); OString aData(reinterpret_cast<sal_Char const*>(pContent.get())); - OUString tmp(OUString::fromUtf8(aData)); + OUString tmp(OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); if (offset > tmp.getLength() || offset < 0 || count < 0){ DOMException e; e.Code = DOMExceptionType_INDEX_SIZE_ERR; @@ -249,7 +249,7 @@ namespace DOM ::boost::shared_ptr<xmlChar const> const pContent( xmlNodeGetContent(m_aNodePtr), xmlFree); OString aData(reinterpret_cast<sal_Char const*>(pContent.get())); - OUString tmp(OUString::fromUtf8(aData)); + OUString tmp(OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); if (offset > tmp.getLength() || offset < 0 || count < 0) { DOMException e; e.Code = DOMExceptionType_INDEX_SIZE_ERR; |