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). --- drawinglayer/source/dumper/XShapeDumper.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'drawinglayer/source/dumper') diff --git a/drawinglayer/source/dumper/XShapeDumper.cxx b/drawinglayer/source/dumper/XShapeDumper.cxx index c64ba81b7565..c0d1979a42c4 100644 --- a/drawinglayer/source/dumper/XShapeDumper.cxx +++ b/drawinglayer/source/dumper/XShapeDumper.cxx @@ -1957,7 +1957,7 @@ OUString XShapeDumper::dump(uno::Reference xPageShapes, bool b xmlTextWriterEndDocument( xmlWriter ); xmlFreeTextWriter( xmlWriter ); - return OUString::fromUtf8(aString.makeStringAndClear()); + return OStringToOUString(aString.makeStringAndClear(), RTL_TEXTENCODING_UTF8); } OUString XShapeDumper::dump(uno::Reference xPageShapes, bool bDumpInteropProperties) @@ -1981,7 +1981,7 @@ OUString XShapeDumper::dump(uno::Reference xPageShapes, bool bD xmlTextWriterEndDocument( xmlWriter ); xmlFreeTextWriter( xmlWriter ); - return OUString::fromUtf8(aString.makeStringAndClear()); + return OStringToOUString(aString.makeStringAndClear(), RTL_TEXTENCODING_UTF8); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit