mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove RTL_CONST* macros from codemaker - pt1

Browse Source 
For more easy review, this is the first part of these changes.

More will come :)

Change-Id: Ic6ab0c7baebf0414dbcccb5dcfad434b3b07964c
Reviewed-on: https://gerrit.libreoffice.org/2595
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
This commit is contained in:
Marcos Paulo de Souza
2013-03-08 09:42:45 -03:00
committed by Fridrich Strba
parent 5745d7a08f
commit 596334776a
5 changed files with 150 additions and 557 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,36 +55,21 @@ OString translateUnoToJavaType(
}
} else {
rtl::OString const javaTypes[codemaker::UnoType::SORT_ANY + 1][2] = {
{ rtl::OString(RTL_CONSTASCII_STRINGPARAM("void")),
rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Void")) },
{ rtl::OString(RTL_CONSTASCII_STRINGPARAM("boolean")),
rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Boolean")) },
{ rtl::OString(RTL_CONSTASCII_STRINGPARAM("byte")),
rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Byte")) },
{ rtl::OString(RTL_CONSTASCII_STRINGPARAM("short")),
rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Short")) },
{ rtl::OString(RTL_CONSTASCII_STRINGPARAM("short")),
rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Short")) },
{ rtl::OString(RTL_CONSTASCII_STRINGPARAM("int")),
rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Integer")) },
{ rtl::OString(RTL_CONSTASCII_STRINGPARAM("int")),
rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Integer")) },
{ rtl::OString(RTL_CONSTASCII_STRINGPARAM("long")),
rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Long")) },
{ rtl::OString(RTL_CONSTASCII_STRINGPARAM("long")),
rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Long")) },
{ rtl::OString(RTL_CONSTASCII_STRINGPARAM("float")),
rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Float")) },
{ rtl::OString(RTL_CONSTASCII_STRINGPARAM("double")),
rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Double")) },
{ rtl::OString(RTL_CONSTASCII_STRINGPARAM("char")),
rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Character")) },
{ rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/String")),
rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/String")) },
{ rtl::OString(RTL_CONSTASCII_STRINGPARAM("com/sun/star/uno/Type")),
rtl::OString(RTL_CONSTASCII_STRINGPARAM("com/sun/star/uno/Type")) },
{ rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Object")),
rtl::OString(RTL_CONSTASCII_STRINGPARAM("java/lang/Object")) } };
{ "void", "java/lang/Void" },
{ "boolean", "java/lang/Boolean" },
{ "byte", "java/lang/Byte" },
{ "short", "java/lang/Short" },
{ "short", "java/lang/Short" },
{ "int", "java/lang/Integer" },
{ "int", "java/lang/Integer" },
{ "long", "java/lang/Long" },
{ "long", "java/lang/Long" },
{ "float", "java/lang/Float" },
{ "double", "java/lang/Double" },
{ "char", "java/lang/Character" },
{ "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]);
}
return buf.makeStringAndClear();