chenxuewei/loongoffice
1
0
Fork 0
forked from amazingfate/loongoffice
Code Pull Requests Activity

convert codemaker::UnoType::Sort to scoped enum

Browse Source 
Change-Id: I70a84f777e714bcc20c2d7b06b918e3be0f3ce4a
This commit is contained in:
Noel Grandin
2016-02-23 12:01:14 +02:00
parent 6ddc80e53a
commit cd1bbdf0a4
14 changed files with 546 additions and 547 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
codemaker/source/commonjava/commonjava.cxx
View File

@ -41,8 +41,8 @@ OString translateUnoToJavaType(
codemaker::UnoType::Sort sort, OString const & nucleus, bool referenceType)
{
OStringBuffer buf;
if (sort <= codemaker::UnoType::SORT_ANY) {
OString const javaTypes[codemaker::UnoType::SORT_ANY + 1][2] = {
if (sort <= codemaker::UnoType::Sort::Any) {
OString const javaTypes[static_cast<int>(codemaker::UnoType::Sort::Any) + 1][2] = {
{ "void", "java/lang/Void" },
{ "boolean", "java/lang/Boolean" },
{ "byte", "java/lang/Byte" },
@ -58,7 +58,7 @@ OString translateUnoToJavaType(
{ "java/lang/String", "java/lang/String" },
{ "com/sun/star/uno/Type", "com/sun/star/uno/Type" },
{ "java/lang/Object", "java/lang/Object" } };
buf.append(javaTypes[sort][referenceType]);
buf.append(javaTypes[static_cast<int>(sort)][referenceType]);
} else {
if (nucleus == "com/sun/star/uno/XInterface") {
buf.append("java/lang/Object");