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).
---
 tubes/source/contacts.cxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'tubes')

diff --git a/tubes/source/contacts.cxx b/tubes/source/contacts.cxx
index 867a9c95d3cb..df9900565dd8 100644
--- a/tubes/source/contacts.cxx
+++ b/tubes/source/contacts.cxx
@@ -128,7 +128,8 @@ public:
 
     static OUString fromUTF8( const char *pStr )
     {
-        return OUString::fromUtf8( OString( pStr, strlen( pStr ) ) );
+        return OStringToOUString( OString( pStr, strlen( pStr ) ),
+                                       RTL_TEXTENCODING_UTF8 );
     }
 
     void Populate()
-- 
cgit