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

INTEGRATION: CWS odfmetadata (1.22.4); FILE MERGED

Browse Source 
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
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java
View File

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