diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-06 17:24:13 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-06 17:24:13 +0100 |
| commit | fc0d57b7aff84f4bdca0a1f201527c265d5f0cf5 (patch) | |
| tree | 49a72b76d2d2a92af6371748c19277778159b86d /shell | |
| parent | e36dae401fc8963c9a92cb2c11d9b650b943c6d3 (diff) | |
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).
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, 6 insertions, 5 deletions
diff --git a/shell/source/backends/gconfbe/gconfaccess.cxx b/shell/source/backends/gconfbe/gconfaccess.cxx index d3e3b0b977b0..371b76603043 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( OUString::fromUtf8( OString( - gconf_value_get_string(pGconfValue) ) ) ); + return uno::makeAny( OStringToOUString( OString( + gconf_value_get_string(pGconfValue) ), RTL_TEXTENCODING_UTF8 ) ); 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 = OUString::fromUtf8( aFont.copy( 0, nIdx ) ); + rName = OStringToOUString( aFont.copy( 0, nIdx ), RTL_TEXTENCODING_UTF8 ); } @@ -265,7 +265,7 @@ uno::Any translateToOOo( const ConfigurationValue &rValue, GConfValue *pGconfVal } // Remove trailing ";" aBuffer.setLength(aBuffer.getLength()-1); - return uno::makeAny(OUString::fromUtf8(aBuffer.makeStringAndClear())); + return uno::makeAny(OStringToOUString(aBuffer.makeStringAndClear(), RTL_TEXTENCODING_UTF8)); } 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 538bec8747bb..bb08e4d68ceb 100644 --- a/shell/source/tools/lngconvex/lngconvex.cxx +++ b/shell/source/tools/lngconvex/lngconvex.cxx @@ -306,7 +306,8 @@ void add_group_entries( key_value_utf8 = comphelper::string::strip(key_value_utf8, '\"'); - OUString key_value_utf16 = OUString::fromUtf8(key_value_utf8); + OUString key_value_utf16 = + OStringToOUString(key_value_utf8, RTL_TEXTENCODING_UTF8); Substitutor.add_substitution( GroupName.getStr(), make_winrc_unicode_string(key_value_utf16)); |