diff options
author | Marcos Paulo de Souza <marcos.souza.org@gmail.com> | 2013-03-08 09:42:45 -0300 |
---|---|---|
committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-03-08 13:02:22 +0000 |
commit | 596334776ad45f7ab87937615fa1d4e7d2d0fd42 (patch) | |
tree | e194dd2a25a6f2c3c4a3e99dbac6117902ba7498 /codemaker/source/commonjava | |
parent | 5745d7a08f6a0cb450b662fadb5892f168850fae (diff) |
Remove RTL_CONST* macros from codemaker - pt1
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>
Diffstat (limited to 'codemaker/source/commonjava')
-rw-r--r-- | codemaker/source/commonjava/commonjava.cxx | 45 |
1 files changed, 15 insertions, 30 deletions
diff --git a/codemaker/source/commonjava/commonjava.cxx b/codemaker/source/commonjava/commonjava.cxx index e5f6eca8fc5d..8049c98295a0 100644 --- a/codemaker/source/commonjava/commonjava.cxx +++ b/codemaker/source/commonjava/commonjava.cxx @@ -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(); |