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

fdo#57950: Remove chained appends in codemaker

Browse Source 
And another cleanups like removing RTL_CONST* macros and other simple
things.

Much more can be done inside codemaker.

Change-Id: I338e1c0e88558124741c6202896355533535a129
Reviewed-on: https://gerrit.libreoffice.org/2583
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
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-07 10:25:27 -03:00
committed by Fridrich Strba
parent 8035a3af26
commit 75e6856b08
5 changed files with 44 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,16 +39,15 @@
namespace codemaker { namespace java {
rtl::OString translateUnoToJavaType(
OString translateUnoToJavaType(
codemaker::UnoType::Sort sort, RTTypeClass typeClass,
rtl::OString const & nucleus, bool referenceType)
OString const & nucleus, bool referenceType)
{
rtl::OStringBuffer buf;
OStringBuffer buf;
if (sort == codemaker::UnoType::SORT_COMPLEX) {
if (typeClass == RT_TYPE_INTERFACE
&& nucleus == rtl::OString("com/sun/star/uno/XInterface"))
if (typeClass == RT_TYPE_INTERFACE && nucleus == "com/sun/star/uno/XInterface")
{
buf.append(RTL_CONSTASCII_STRINGPARAM("java/lang/Object"));
buf.append("java/lang/Object");
} else {
//TODO: check that nucleus is a valid (Java-modified UTF-8)
// identifier
@ -145,10 +144,7 @@ rtl::OString translateUnoToJavaIdentifier(
|| identifier == "volatile"
|| identifier == "while")
{
rtl::OStringBuffer buf(prefix);
buf.append('_');
buf.append(identifier);
return buf.makeStringAndClear();
return prefix + "_" + identifier;
} else {
return identifier;
}