From fc0d57b7aff84f4bdca0a1f201527c265d5f0cf5 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Thu, 6 Nov 2014 17:24:13 +0100
Subject: 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).
---
 jvmfwk/source/libxmlutil.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'jvmfwk/source/libxmlutil.cxx')

diff --git a/jvmfwk/source/libxmlutil.cxx b/jvmfwk/source/libxmlutil.cxx
index c7ac695a041e..838c73590102 100644
--- a/jvmfwk/source/libxmlutil.cxx
+++ b/jvmfwk/source/libxmlutil.cxx
@@ -130,7 +130,7 @@ CXmlCharPtr::operator OUString()
     if (_object != NULL)
     {
         OString aOStr((sal_Char*)_object);
-        ret = OUString::fromUtf8(aOStr);
+        ret = OStringToOUString(aOStr, RTL_TEXTENCODING_UTF8);
     }
     return ret;
 }
-- 
cgit