diff options
Diffstat (limited to 'codemaker/source')
| -rw-r--r-- | codemaker/source/commoncpp/commoncpp.cxx | 2 | ||||
| -rw-r--r-- | codemaker/source/javamaker/javatype.cxx | 20 |
2 files changed, 15 insertions, 7 deletions
diff --git a/codemaker/source/commoncpp/commoncpp.cxx b/codemaker/source/commoncpp/commoncpp.cxx index 2c605cd68f0e..9d1de754a2ee 100644 --- a/codemaker/source/commoncpp/commoncpp.cxx +++ b/codemaker/source/commoncpp/commoncpp.cxx @@ -344,7 +344,7 @@ rtl::OString translateUnoToCppIdentifier( || unoIdentifier == "std")) // Others: || unoIdentifier == "NDEBUG" - || forbidden != 0 && unoIdentifier == *forbidden) + || (forbidden != 0 && unoIdentifier == *forbidden) ) { rtl::OStringBuffer buf(prefix); buf.append('_'); diff --git a/codemaker/source/javamaker/javatype.cxx b/codemaker/source/javamaker/javatype.cxx index ea929455eccc..b168cf2cd216 100644 --- a/codemaker/source/javamaker/javatype.cxx +++ b/codemaker/source/javamaker/javatype.cxx @@ -1768,8 +1768,10 @@ void addBaseArguments( } firstField = 1; } else { - if (typeClass == RT_TYPE_STRUCT && (superTypes > 1 || fields == 0) - || typeClass == RT_TYPE_EXCEPTION && superTypes != 1) + if ( + (typeClass == RT_TYPE_STRUCT && (superTypes > 1 || fields == 0)) || + (typeClass == RT_TYPE_EXCEPTION && superTypes != 1) + ) { throw CannotDumpException( rtl::OString( @@ -1871,10 +1873,16 @@ void handleAggregatingType( RTL_CONSTASCII_STRINGPARAM("java/lang/RuntimeException")); runtimeException = true; } else { - if ((typeClass == RT_TYPE_STRUCT - && (fields == 0 - || (references == 0 ? superTypes > 1 : superTypes != 0))) - || typeClass == RT_TYPE_EXCEPTION && superTypes != 1) + if ( + ( + typeClass == RT_TYPE_STRUCT && + ( + fields == 0 || + (references == 0 ? superTypes > 1 : superTypes != 0) + ) + ) || + (typeClass == RT_TYPE_EXCEPTION && superTypes != 1) + ) { throw CannotDumpException( rtl::OString( |