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).
---
 toolkit/source/awt/vclxwindow.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'toolkit')

diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx
index 476c1fa7f1c5..f7d7b419154b 100644
--- a/toolkit/source/awt/vclxwindow.cxx
+++ b/toolkit/source/awt/vclxwindow.cxx
@@ -1993,7 +1993,7 @@ void VCLXWindow::setProperty( const OUString& PropertyName, const ::com::sun::st
             break;
             case BASEPROPERTY_HELPURL:
             {
-                OUString aHelpId( OUString::fromUtf8( GetWindow()->GetHelpId() ) );
+                OUString aHelpId( OStringToOUString( GetWindow()->GetHelpId(), RTL_TEXTENCODING_UTF8 ) );
                 aProp <<= OUString( aHelpId );
             }
             break;
-- 
cgit