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

INTEGRATION: CWS warnings01 (1.27.12); FILE MERGED

Browse Source 
2006/05/23 23:37:32 sb 1.27.12.6: RESYNC: (1.31-1.32); FILE MERGED
2006/04/07 20:41:00 sb 1.27.12.5: RESYNC: (1.29-1.31); FILE MERGED
2006/01/25 21:03:23 sb 1.27.12.4: RESYNC: (1.28-1.29); FILE MERGED
2005/11/24 14:59:59 sb 1.27.12.3: #i53898# Made code warning-free.
2005/09/22 22:29:26 sb 1.27.12.2: RESYNC: (1.27-1.28); FILE MERGED
2005/09/05 13:32:31 sb 1.27.12.1: #i53898# Made code warning-free.
This commit is contained in:
Jens-Heiner Rechtien
2006-06-20 01:25:24 +00:00
parent 4e56ed5205
commit aa6734328f
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
codemaker/source/javamaker/javatype.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: javatype.cxx,v $ * $RCSfile: javatype.cxx,v $
* *
* $Revision: 1.32 $ * $Revision: 1.33 $
* *
* last change: $Author: hr $ $Date: 2006-04-19 13:42:39 $ * last change: $Author: hr $ $Date: 2006-06-20 02:25:24 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -854,10 +854,9 @@ typedef void (* handleUnoTypeRegistryEntityFunction)(
typereg::Reader const & reader, Dependencies * dependencies); typereg::Reader const & reader, Dependencies * dependencies);
void handleEnumType( void handleEnumType(
TypeManager const & manager, JavaOptions /*TODO const*/ & options, TypeManager const &, JavaOptions /*TODO const*/ & options,
typereg::Reader const & reader, Dependencies * dependencies) typereg::Reader const & reader, Dependencies *)
{ {
OSL_ASSERT(dependencies != 0);
sal_uInt16 fields = reader.getFieldCount(); sal_uInt16 fields = reader.getFieldCount();
if (fields == 0 || reader.getSuperTypeCount() != 0 if (fields == 0 || reader.getSuperTypeCount() != 0
|| reader.getMethodCount() != 0 || reader.getReferenceCount() != 0) || reader.getMethodCount() != 0 || reader.getReferenceCount() != 0)
@@ -1737,7 +1736,7 @@ sal_uInt16 addLoadLocal(
RTL_CONSTASCII_STRINGPARAM( RTL_CONSTASCII_STRINGPARAM(
"Too many local variables for Java class file format"))); "Too many local variables for Java class file format")));
} }
*index += size; *index = *index + size;
return stack; return stack;
} }
@@ -2006,7 +2005,7 @@ void handleAggregatingType(
code->instrInvokespecial( code->instrInvokespecial(
superClass, rtl::OString(RTL_CONSTASCII_STRINGPARAM("<init>")), superClass, rtl::OString(RTL_CONSTASCII_STRINGPARAM("<init>")),
rtl::OString(RTL_CONSTASCII_STRINGPARAM("(Ljava/lang/String;)V"))); rtl::OString(RTL_CONSTASCII_STRINGPARAM("(Ljava/lang/String;)V")));
sal_uInt16 stack = 0; stack = 0;
for (sal_uInt16 i = firstField; i < fields; ++i) { for (sal_uInt16 i = firstField; i < fields; ++i) {
stack = std::max( stack = std::max(
stack, stack,
@@ -2224,16 +2223,16 @@ void handleInterfaceType(
manager, dependencies, manager, dependencies,
rtl::OString(RTL_CONSTASCII_STRINGPARAM("void")), 0, 0); rtl::OString(RTL_CONSTASCII_STRINGPARAM("void")), 0, 0);
sdesc.addParameter(fieldType, false, true, 0); sdesc.addParameter(fieldType, false, true, 0);
std::vector< rtl::OString > exc; std::vector< rtl::OString > exc2;
if (setter != SAL_MAX_UINT16) { if (setter != SAL_MAX_UINT16) {
createExceptionsAttribute( createExceptionsAttribute(
manager, reader, setter, dependencies, &exc, 0); manager, reader, setter, dependencies, &exc2, 0);
} }
cf->addMethod( cf->addMethod(
static_cast< ClassFile::AccessFlags >( static_cast< ClassFile::AccessFlags >(
ClassFile::ACC_PUBLIC | ClassFile::ACC_ABSTRACT), ClassFile::ACC_PUBLIC | ClassFile::ACC_ABSTRACT),
rtl::OString(RTL_CONSTASCII_STRINGPARAM("set")) + attrName, rtl::OString(RTL_CONSTASCII_STRINGPARAM("set")) + attrName,
sdesc.getDescriptor(), 0, exc, sdesc.getSignature()); sdesc.getDescriptor(), 0, exc2, sdesc.getSignature());
} }
typeInfo.push_back( typeInfo.push_back(
TypeInfo( TypeInfo(
@@ -2312,13 +2311,13 @@ void handleInterfaceType(
polymorphicUnoType)); polymorphicUnoType));
} }
} }
std::vector< rtl::OString > exc; std::vector< rtl::OString > exc2;
createExceptionsAttribute( createExceptionsAttribute(
manager, reader, i, dependencies, &exc, 0); manager, reader, i, dependencies, &exc2, 0);
cf->addMethod( cf->addMethod(
static_cast< ClassFile::AccessFlags >( static_cast< ClassFile::AccessFlags >(
ClassFile::ACC_PUBLIC | ClassFile::ACC_ABSTRACT), ClassFile::ACC_PUBLIC | ClassFile::ACC_ABSTRACT),
methodName, desc.getDescriptor(), 0, exc, methodName, desc.getDescriptor(), 0, exc2,
desc.getSignature()); desc.getSignature());
break; break;
} }
@@ -2351,7 +2350,7 @@ void handleInterfaceType(
} }
void handleTypedef( void handleTypedef(
TypeManager const & manager, JavaOptions /*TODO const*/ & options, TypeManager const & manager, JavaOptions /*TODO const*/ &,
typereg::Reader const & reader, Dependencies * dependencies) typereg::Reader const & reader, Dependencies * dependencies)
{ {
OSL_ASSERT(dependencies != 0); OSL_ASSERT(dependencies != 0);