diff options
Diffstat (limited to 'unoxml')
| -rw-r--r-- | unoxml/source/dom/attr.cxx | 6 | ||||
| -rw-r--r-- | unoxml/source/dom/characterdata.cxx | 8 | ||||
| -rw-r--r-- | unoxml/source/rdf/librdf_repository.cxx | 16 |
3 files changed, 10 insertions, 20 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; diff --git a/unoxml/source/rdf/librdf_repository.cxx b/unoxml/source/rdf/librdf_repository.cxx index 1bec82992295..0013f400b98d 100644 --- a/unoxml/source/rdf/librdf_repository.cxx +++ b/unoxml/source/rdf/librdf_repository.cxx @@ -2319,9 +2319,7 @@ librdf_TypeConverter::convertToXURI(librdf_uri* i_pURI) const "librdf_TypeConverter::convertToXURI: " "librdf_uri_as_string failed", m_rRep); } - OUString uriU( OStringToOUString( - OString(reinterpret_cast<const sal_Char*>(uri)), - RTL_TEXTENCODING_UTF8) ); + OUString uriU( OUString::fromUtf8( OString(reinterpret_cast<const sal_Char*>(uri))) ); try { return rdf::URI::create(m_xContext, uriU); } catch (const lang::IllegalArgumentException & iae) { @@ -2360,9 +2358,7 @@ librdf_TypeConverter::convertToXResource(librdf_node* i_pNode) const "librdf_TypeConverter::convertToXResource: " "blank node has no label", m_rRep); } - OUString labelU( OStringToOUString( - OString(reinterpret_cast<const sal_Char*>(label)), - RTL_TEXTENCODING_UTF8) ); + OUString labelU( OUString::fromUtf8( OString(reinterpret_cast<const sal_Char*>(label))) ); try { return uno::Reference<rdf::XResource>( rdf::BlankNode::create(m_xContext, labelU), uno::UNO_QUERY); @@ -2395,13 +2391,9 @@ librdf_TypeConverter::convertToXNode(librdf_node* i_pNode) const librdf_uri* pType( librdf_node_get_literal_value_datatype_uri(i_pNode) ); OSL_ENSURE(!lang || !pType, "convertToXNode: invalid literal"); - const OUString valueU( OStringToOUString( - OString(reinterpret_cast<const sal_Char*>(value)), - RTL_TEXTENCODING_UTF8) ); + const OUString valueU( OUString::fromUtf8(OString(reinterpret_cast<const sal_Char*>(value))) ); if (lang) { - const OUString langU( OStringToOUString( - OString(reinterpret_cast<const sal_Char*>(lang)), - RTL_TEXTENCODING_UTF8) ); + const OUString langU( OUString::fromUtf8( OString(reinterpret_cast<const sal_Char*>(lang))) ); return uno::Reference<rdf::XNode>( rdf::Literal::createWithLanguage(m_xContext, valueU, langU), uno::UNO_QUERY); |