diff options
| author | Noel Grandin <noel@peralex.com> | 2014-11-06 07:45:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-11-06 13:51:10 +0200 |
| commit | 05050cdb23de586870bf479a9df5ced06828d498 (patch) | |
| tree | a34c3bba9a921a5e9abf23d5757c15dfaea0ceac /unoxml/source/dom | |
| parent | 8f266781a6bd6a629bce65c0f613683047c9a794 (diff) | |
use the new OUString::fromUtf8 method
Change-Id: I771004b7ccab3344a67e827e45bc34c22ffa5f77
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, 6 insertions, 8 deletions
diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx index 68c5c82a4e6b..f835e6dab6de 100644 --- a/unoxml/source/dom/attr.cxx +++ b/unoxml/source/dom/attr.cxx @@ -238,8 +238,7 @@ namespace DOM if (m_pNamespace.get()) { OSL_ASSERT(!m_aNodePtr->parent); - OUString const ret(OStringToOUString( - m_pNamespace->second, RTL_TEXTENCODING_UTF8)); + OUString const ret(OUString::fromUtf8(m_pNamespace->second)); return ret; } else { return CNode::getPrefix(); @@ -255,8 +254,7 @@ namespace DOM if (m_pNamespace.get()) { OSL_ASSERT(!m_aNodePtr->parent); - OUString const ret(OStringToOUString( - m_pNamespace->first, RTL_TEXTENCODING_UTF8)); + OUString const ret(OUString::fromUtf8(m_pNamespace->first)); return ret; } else { return CNode::getNamespaceURI(); diff --git a/unoxml/source/dom/characterdata.cxx b/unoxml/source/dom/characterdata.cxx index 1033a7c9aabf..9f5888dba942 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(OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); + OUString tmp(OUString::fromUtf8(aData)); 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(OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); + OUString tmp(OUString::fromUtf8(aData)); 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(OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); + OUString tmp(OUString::fromUtf8(aData)); 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(OStringToOUString(aData, RTL_TEXTENCODING_UTF8)); + OUString tmp(OUString::fromUtf8(aData)); if (offset > tmp.getLength() || offset < 0 || count < 0) { DOMException e; e.Code = DOMExceptionType_INDEX_SIZE_ERR; |