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/astconstant.cxx | |
| parent | implement toggling off removeable master elements with direct delete (diff) | |
| download | core-fc0d57b7aff84f4bdca0a1f201527c265d5f0cf5.tar.gz core-fc0d57b7aff84f4bdca0a1f201527c265d5f0cf5.zip | |
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/astconstant.cxx')
| -rw-r--r-- | idlc/source/astconstant.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/idlc/source/astconstant.cxx b/idlc/source/astconstant.cxx index 7b9797981e61..b37ff90e6b73 100644 --- a/idlc/source/astconstant.cxx +++ b/idlc/source/astconstant.cxx @@ -109,13 +109,13 @@ bool AstConstant::dumpBlob( OUString type; if ( getNodeType() != NT_enum_val ) { - type = OUString::fromUtf8(exprTypeToString(getConstValueType())); + type = OStringToOUString(exprTypeToString(getConstValueType()), RTL_TEXTENCODING_UTF8); } rBlob.setFieldData( index, getDocumentation(), OUString(), RT_ACCESS_CONST | (published ? RT_ACCESS_PUBLISHED : 0), - OUString::fromUtf8(name), type, aConst); + OStringToOUString(name, RTL_TEXTENCODING_UTF8), type, aConst); return true; } |