From 88c650dcb3e447b8f9a8c51312fe8b8c23ca5a9c Mon Sep 17 00:00:00 2001 From: Vladimir Glazounov Date: Tue, 1 Jul 2008 14:57:43 +0000 Subject: 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 --- ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'ridljar/com') 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( -- cgit v1.2.3