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/attr.cxx | |
| parent | implement toggling off removeable master elements with direct delete (diff) | |
| download | core-fc0d57b7aff84f4bdca0a1f201527c265d5f0cf5.tar.gz core-fc0d57b7aff84f4bdca0a1f201527c265d5f0cf5.zip | |
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/attr.cxx')
| -rw-r--r-- | unoxml/source/dom/attr.cxx | 6 |
1 files changed, 4 insertions, 2 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(); |