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 /ucb/source/ucp/webdav-neon/NeonPropFindRequest.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 'ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx')
-rw-r--r-- | ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx index f4a58ccb5def..73b6c7c5df32 100644 --- a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx +++ b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx @@ -175,7 +175,7 @@ extern "C" int NPFR_propfind_iter( void* userdata, else { thePropertyValue.Value - <<= OUString::fromUtf8( value ); + <<= OStringToOUString( value, RTL_TEXTENCODING_UTF8 ); } } @@ -192,7 +192,8 @@ extern "C" void NPFR_propfind_results( void* userdata, { // @@@ href is not the uri! DAVResource ctor wants uri! - DAVResource theResource( OUString::fromUtf8( uri->path ) ); + DAVResource theResource( + OStringToOUString( uri->path, RTL_TEXTENCODING_UTF8 ) ); ne_propset_iterate( set, NPFR_propfind_iter, &theResource ); @@ -223,7 +224,8 @@ extern "C" void NPFR_propnames_results( void* userdata, { // @@@ href is not the uri! DAVResourceInfo ctor wants uri! // Create entry for the resource. - DAVResourceInfo theResource( OUString::fromUtf8( uri->path ) ); + DAVResourceInfo theResource( + OStringToOUString( uri->path, RTL_TEXTENCODING_UTF8 ) ); // Fill entry. ne_propset_iterate( results, NPFR_propnames_iter, &theResource ); |