From 05050cdb23de586870bf479a9df5ced06828d498 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Thu, 6 Nov 2014 07:45:00 +0200 Subject: use the new OUString::fromUtf8 method Change-Id: I771004b7ccab3344a67e827e45bc34c22ffa5f77 --- shell/source/backends/gconfbe/gconfaccess.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'shell/source/backends') diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx index 371b76603043..d3e3b0b977b0 100644 --- a/shell/source/backends/gconfbe/gconfaccess.cxx +++ b/shell/source/backends/gconfbe/gconfaccess.cxx @@ -204,8 +204,8 @@ uno::Any makeAnyOfGconfValue( GConfValue *pGconfValue ) return uno::makeAny( (sal_Int32) gconf_value_get_int( pGconfValue ) ); case GCONF_VALUE_STRING: - return uno::makeAny( OStringToOUString( OString( - gconf_value_get_string(pGconfValue) ), RTL_TEXTENCODING_UTF8 ) ); + return uno::makeAny( OUString::fromUtf8( OString( + gconf_value_get_string(pGconfValue) ) ) ); default: fprintf( stderr, "makeAnyOfGconfValue: Type not handled.\n" ); @@ -230,7 +230,7 @@ static void splitFontName( GConfValue *pGconfValue, OUString &rName, sal_Int16 & rHeight = static_cast( aSize.toInt32() ); } - rName = OStringToOUString( aFont.copy( 0, nIdx ), RTL_TEXTENCODING_UTF8 ); + rName = OUString::fromUtf8( aFont.copy( 0, nIdx ) ); } @@ -265,7 +265,7 @@ uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfVal } // Remove trailing ";" aBuffer.setLength(aBuffer.getLength()-1); - return uno::makeAny(OStringToOUString(aBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); + return uno::makeAny(OUString::fromUtf8(aBuffer.makeStringAndClear())); } else g_warning( "unexpected type for ignore_hosts" ); -- cgit