From fc0d57b7aff84f4bdca0a1f201527c265d5f0cf5 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann 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). --- testtools/source/bridgetest/multi.cxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'testtools') diff --git a/testtools/source/bridgetest/multi.cxx b/testtools/source/bridgetest/multi.cxx index 256247433bc6..0c20128345a0 100644 --- a/testtools/source/bridgetest/multi.cxx +++ b/testtools/source/bridgetest/multi.cxx @@ -46,7 +46,9 @@ template< typename T > void checkEqual(T const & value, T const & argument) { if (argument != value) { std::ostringstream s; s << value << " != " << argument; - throw CheckFailed( OUString::fromUtf8(OString(s.str().c_str())) ); + throw CheckFailed( + OStringToOUString( + OString(s.str().c_str()), RTL_TEXTENCODING_UTF8)); } } -- cgit