INTEGRATION: CWS odfmetadata (1.22.4); FILE MERGED

2008/06/11 15:01:10 mst 1.22.4.1: fix issue #i88703#
- ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java:
  + fix bug: TypeDescription.calculateTypeArguments erroneously
    eliminates duplicate type arguments
This commit is contained in:
Vladimir Glazounov 2008-07-01 14:57:43 +00:00
parent 0681b10f16
commit 88c650dcb3

View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: TypeDescription.java,v $
* $Revision: 1.22 $
* $Revision: 1.23 $
*
* This file is part of OpenOffice.org.
*
@ -525,7 +525,7 @@ public final class TypeDescription implements ITypeDescription {
if (i < 0) {
return null;
}
List args = new List();
java.util.List args = new java.util.ArrayList();
do {
++i; // skip '<' or ','
int j = i;
@ -568,7 +568,8 @@ public final class TypeDescription implements ITypeDescription {
throw new IllegalArgumentException(
"UNO type name \"" + typeName + "\" is syntactically invalid");
}
return args.toArray();
return (TypeDescription[]) args.toArray(
new TypeDescription[args.size()]);
}
private IFieldDescription[] calculateFieldDescriptions(