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 /idlc/source/astenum.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 'idlc/source/astenum.cxx')
| -rw-r--r-- | idlc/source/astenum.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/idlc/source/astenum.cxx b/idlc/source/astenum.cxx index 7332f1c76d32..1f330b18f780 100644 --- a/idlc/source/astenum.cxx +++ b/idlc/source/astenum.cxx @@ -60,7 +60,7 @@ AstConstant* AstEnum::checkValue(AstExpression* pExpr) bool AstEnum::dump(RegistryKey& rKey) { RegistryKey localKey; - if (rKey.createKey( OUString::fromUtf8(getFullName()), localKey)) + if (rKey.createKey( OStringToOUString(getFullName(), RTL_TEXTENCODING_UTF8 ), localKey)) { fprintf(stderr, "%s: warning, could not create key '%s' in '%s'\n", idlc()->getOptions()->getProgramName().getStr(), @@ -75,7 +75,7 @@ bool AstEnum::dump(RegistryKey& rKey) typereg::Writer aBlob( m_bPublished ? TYPEREG_VERSION_1 : TYPEREG_VERSION_0, getDocumentation(), emptyStr, RT_TYPE_ENUM, m_bPublished, - OUString::fromUtf8(getRelativName()), 0, + OStringToOUString(getRelativName(), RTL_TEXTENCODING_UTF8), 0, nConst, 0, 0); DeclList::const_iterator iter = getIteratorBegin(); |