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 /l10ntools/source/propmerge.cxx | |
| 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 'l10ntools/source/propmerge.cxx')
| -rw-r--r-- | l10ntools/source/propmerge.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/l10ntools/source/propmerge.cxx b/l10ntools/source/propmerge.cxx index 25a7b15d6465..a41cd154d4c3 100644 --- a/l10ntools/source/propmerge.cxx +++ b/l10ntools/source/propmerge.cxx @@ -61,7 +61,8 @@ namespace //Escape unicode characters static void lcl_PrintJavaStyle( const OString& rText, std::ofstream &rOfstream ) { - const OUString sTemp = OUString::fromUtf8( rText ); + const OUString sTemp = + OStringToOUString( rText, RTL_TEXTENCODING_UTF8 ); for ( sal_Int32 nIndex = 0; nIndex < sTemp.getLength(); ++nIndex ) { sal_Unicode cUniCode = sTemp[nIndex]; |