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