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 /cui | |
| 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 'cui')
| -rw-r--r-- | cui/source/options/personalization.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 1a9b02e3b1c5..5399dab23768 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -381,7 +381,7 @@ void SvxPersonalizationTabPage::LoadDefaultImages() { OString aLine; aStream.ReadLine( aLine ); - OUString aPersonaSetting( OUString::fromUtf8( aLine ) ); + OUString aPersonaSetting( OStringToOUString( aLine, RTL_TEXTENCODING_UTF8 ) ); OUString aPreviewFile; sal_Int32 nNewIndex = aPersonaSetting.indexOf( ';', 0 ); if( nNewIndex < 0 ) |