diff options
Diffstat (limited to 'idlc/source/aststruct.cxx')
-rw-r--r-- | idlc/source/aststruct.cxx | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/idlc/source/aststruct.cxx b/idlc/source/aststruct.cxx index 482ee73dadfa..b8f0a2e3a264 100644 --- a/idlc/source/aststruct.cxx +++ b/idlc/source/aststruct.cxx @@ -78,7 +78,7 @@ bool AstStruct::isType() const { bool AstStruct::dump(RegistryKey& rKey) { RegistryKey localKey; - if (rKey.createKey( OStringToOUString(getFullName(), RTL_TEXTENCODING_UTF8 ), localKey)) + if (rKey.createKey( OUString::fromUtf8(getFullName()), localKey)) { fprintf(stderr, "%s: warning, could not create key '%s' in '%s'\n", idlc()->getOptions()->getProgramName().getStr(), @@ -107,14 +107,13 @@ bool AstStruct::dump(RegistryKey& rKey) (m_typeParameters.empty() && !m_bPublished ? TYPEREG_VERSION_0 : TYPEREG_VERSION_1), getDocumentation(), emptyStr, typeClass, m_bPublished, - OStringToOUString(getRelativName(), RTL_TEXTENCODING_UTF8), + OUString::fromUtf8(getRelativName()), m_pBaseType == 0 ? 0 : 1, nMember, 0, static_cast< sal_uInt16 >(m_typeParameters.size())); if (m_pBaseType != 0) { aBlob.setSuperTypeName( 0, - OStringToOUString( - m_pBaseType->getRelativName(), RTL_TEXTENCODING_UTF8)); + OUString::fromUtf8(m_pBaseType->getRelativName())); } if ( nMember > 0 ) @@ -140,9 +139,8 @@ bool AstStruct::dump(RegistryKey& rKey) } aBlob.setFieldData( index++, pMember->getDocumentation(), emptyStr, flags, - OStringToOUString( - pMember->getLocalName(), RTL_TEXTENCODING_UTF8), - OStringToOUString(typeName, RTL_TEXTENCODING_UTF8), + OUString::fromUtf8(pMember->getLocalName()), + OUString::fromUtf8(typeName), RTConstValue()); } ++iter; @@ -155,8 +153,7 @@ bool AstStruct::dump(RegistryKey& rKey) { aBlob.setReferenceData( index++, emptyStr, RT_REF_TYPE_PARAMETER, RT_ACCESS_INVALID, - OStringToOUString( - (*i)->getLocalName(), RTL_TEXTENCODING_UTF8)); + OUString::fromUtf8((*i)->getLocalName())); } sal_uInt32 aBlobSize; |