summaryrefslogtreecommitdiff
path: root/tubes
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-11-06 17:24:13 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-11-06 17:24:13 +0100
commitfc0d57b7aff84f4bdca0a1f201527c265d5f0cf5 (patch)
tree49a72b76d2d2a92af6371748c19277778159b86d /tubes
parente36dae401fc8963c9a92cb2c11d9b650b943c6d3 (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 'tubes')
-rw-r--r--tubes/source/contacts.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/tubes/source/contacts.cxx b/tubes/source/contacts.cxx
index 867a9c95d3cb..df9900565dd8 100644
--- a/tubes/source/contacts.cxx
+++ b/tubes/source/contacts.cxx
@@ -128,7 +128,8 @@ public:
static OUString fromUTF8( const char *pStr )
{
- return OUString::fromUtf8( OString( pStr, strlen( pStr ) ) );
+ return OStringToOUString( OString( pStr, strlen( pStr ) ),
+ RTL_TEXTENCODING_UTF8 );
}
void Populate()