diff options
| author | Noel Grandin <noel@peralex.com> | 2014-11-06 07:45:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-11-06 13:51:10 +0200 |
| commit | 05050cdb23de586870bf479a9df5ced06828d498 (patch) | |
| tree | a34c3bba9a921a5e9abf23d5757c15dfaea0ceac /shell | |
| parent | 8f266781a6bd6a629bce65c0f613683047c9a794 (diff) | |
use the new OUString::fromUtf8 method
Change-Id: I771004b7ccab3344a67e827e45bc34c22ffa5f77
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/source/backends/gconfbe/gconfaccess.cxx | 8 | ||||
| -rw-r--r-- | shell/source/tools/lngconvex/lngconvex.cxx | 3 |
2 files changed, 5 insertions, 6 deletions
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<sal_Int16>( 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" ); diff --git a/shell/source/tools/lngconvex/lngconvex.cxx b/shell/source/tools/lngconvex/lngconvex.cxx index bb08e4d68ceb..538bec8747bb 100644 --- a/shell/source/tools/lngconvex/lngconvex.cxx +++ b/shell/source/tools/lngconvex/lngconvex.cxx @@ -306,8 +306,7 @@ void add_group_entries( key_value_utf8 = comphelper::string::strip(key_value_utf8, '\"'); - OUString key_value_utf16 = - OStringToOUString(key_value_utf8, RTL_TEXTENCODING_UTF8); + OUString key_value_utf16 = OUString::fromUtf8(key_value_utf8); Substitutor.add_substitution( GroupName.getStr(), make_winrc_unicode_string(key_value_utf16)); |