From 05050cdb23de586870bf479a9df5ced06828d498 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Thu, 6 Nov 2014 07:45:00 +0200
Subject: use the new OUString::fromUtf8 method

Change-Id: I771004b7ccab3344a67e827e45bc34c22ffa5f77
---
 unoxml/source/rdf/librdf_repository.cxx | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

(limited to 'unoxml/source/rdf')

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);
-- 
cgit