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 /sot/source | |
| 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 'sot/source')
| -rw-r--r-- | sot/source/sdstor/ucbstorage.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index 21119b34ac8d..6f66c25b7621 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -3167,7 +3167,7 @@ OUString UCBStorage::GetLinkedFile( SvStream &rStream ) OString aTmp = read_uInt16_lenPrefixed_uInt8s_ToOString(rStream); if (aTmp.match("ContentURL=")) { - aString = OUString::fromUtf8(aTmp.copy(11)); + aString = OStringToOUString(aTmp.copy(11), RTL_TEXTENCODING_UTF8); } } |