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 /editeng | |
| 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 'editeng')
| -rw-r--r-- | editeng/qa/lookuptree/lookuptree_test.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/editeng/qa/lookuptree/lookuptree_test.cxx b/editeng/qa/lookuptree/lookuptree_test.cxx index ff47330be2b6..e1a35f41d0ef 100644 --- a/editeng/qa/lookuptree/lookuptree_test.cxx +++ b/editeng/qa/lookuptree/lookuptree_test.cxx @@ -98,12 +98,12 @@ void LookupTreeTest::testTrie() CPPUNIT_ASSERT_EQUAL( OUString("H31l0"), suggestions[0] ); suggestions.clear(); - trie.insert( OUString::fromUtf8( "H\xC3\xA4llo" ) ); + trie.insert( OStringToOUString( "H\xC3\xA4llo", RTL_TEXTENCODING_UTF8 ) ); trie.findSuggestions( OUString("H"), suggestions ); CPPUNIT_ASSERT_EQUAL( (size_t) 3, suggestions.size() ); CPPUNIT_ASSERT_EQUAL( OUString("H31l0"), suggestions[0] ); CPPUNIT_ASSERT_EQUAL( OUString("H1"), suggestions[1] ); - CPPUNIT_ASSERT_EQUAL( OUString::fromUtf8( "H\xC3\xA4llo" ), suggestions[2] ); + CPPUNIT_ASSERT_EQUAL( OStringToOUString( "H\xC3\xA4llo", RTL_TEXTENCODING_UTF8 ), suggestions[2] ); suggestions.clear(); trie.findSuggestions( OUString("H3"), suggestions ); @@ -111,9 +111,9 @@ void LookupTreeTest::testTrie() CPPUNIT_ASSERT_EQUAL( OUString("H31l0"), suggestions[0] ); suggestions.clear(); - trie.findSuggestions( OUString::fromUtf8("H\xC3\xA4"), suggestions ); + trie.findSuggestions( OStringToOUString("H\xC3\xA4", RTL_TEXTENCODING_UTF8), suggestions ); CPPUNIT_ASSERT_EQUAL( (size_t) 1, suggestions.size() ); - CPPUNIT_ASSERT_EQUAL( OUString::fromUtf8("H\xC3\xA4llo"), suggestions[0] ); + CPPUNIT_ASSERT_EQUAL( OStringToOUString("H\xC3\xA4llo", RTL_TEXTENCODING_UTF8), suggestions[0] ); suggestions.clear(); trie.findSuggestions( OUString(""), suggestions); |