summaryrefslogtreecommitdiff
path: root/ridljar
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2008-07-01 14:57:43 +0000
committerVladimir Glazounov <vg@openoffice.org>2008-07-01 14:57:43 +0000
commit88c650dcb3e447b8f9a8c51312fe8b8c23ca5a9c (patch)
treeb59a1b80007969d001ce2a704d524a3d27f6920f /ridljar
parent0681b10f16ea8a1b768154419a485ab3b5f314a0 (diff)
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
Diffstat (limited to 'ridljar')
-rw-r--r--ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java7
1 files changed, 4 insertions, 3 deletions
diff --git a/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java b/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java
index 78a6e34cff88..aa40e7cd69bc 100644
--- a/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java
+++ b/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java
@@ -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(