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 /extensions/source/plugin | |
| 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 'extensions/source/plugin')
| -rw-r--r-- | extensions/source/plugin/aqua/macmgr.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extensions/source/plugin/aqua/macmgr.mm b/extensions/source/plugin/aqua/macmgr.mm index c92f4fef92b4..878571a9377e 100644 --- a/extensions/source/plugin/aqua/macmgr.mm +++ b/extensions/source/plugin/aqua/macmgr.mm @@ -283,7 +283,7 @@ static rtl::OUString GetNextPluginStringFromHandle(Handle h, short *index) rtl::OStringBuffer aBuf( nLen ); aBuf.append( pPascalBytes+1, nLen ); *index += nLen + 1; - return rtl::OUString::fromUtf8( aBuf.makeStringAndClear() ); + return rtl::OStringToOUString( aBuf.makeStringAndClear(), RTL_TEXTENCODING_UTF8 ); } static int parseMimeResource( CFBundleRef i_xBundle, |