From e667ddb65062741077784c1accfe20b651e13de8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Timm?= Date: Fri, 1 Dec 2006 13:46:29 +0000 Subject: [PATCH] INTEGRATION: CWS sb23 (1.18.2); FILE MERGED 2006/08/18 15:22:19 sb 1.18.2.4: RESYNC: (1.18-1.20); FILE MERGED 2005/03/14 14:59:49 sb 1.18.2.3: #i35277# Further cleanup. 2005/03/14 10:53:32 sb 1.18.2.2: #i35277# Further cleanup. 2005/03/11 14:00:32 sb 1.18.2.1: #i35277# Improve URP performance by always sending asynchronous release requests, regardless of forceSynchronous. --- .../lib/uno/typedesc/TypeDescription.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java b/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java index 098ac1c9824f..ae9db3ba6fab 100644 --- a/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java +++ b/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java @@ -4,9 +4,9 @@ * * $RCSfile: TypeDescription.java,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: rt $ $Date: 2006-05-04 08:04:14 $ + * last change: $Author: rt $ $Date: 2006-12-01 14:46:29 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -418,25 +418,25 @@ public final class TypeDescription implements ITypeDescription { superMethodDescriptions = new IMethodDescription[0]; methodDescriptions = new IMethodDescription[] { new MethodDescription( - "queryInterface", 0, false, - new ITypeDescription[] { getDefinitely(Type.TYPE) }, + "queryInterface", MethodDescription.ID_QUERY_INTERFACE, + false, new ITypeDescription[] { getDefinitely(Type.TYPE) }, new ITypeDescription[] { null }, getDefinitely(Type.ANY), null), new MethodDescription( - "acquire", 1, true, new ITypeDescription[0], - new ITypeDescription[0], getDefinitely(Type.VOID), null), + "acquire", MethodDescription.ID_ACQUIRE, true, + new ITypeDescription[0], new ITypeDescription[0], + getDefinitely(Type.VOID), null), new MethodDescription( - "release", 2, true, new ITypeDescription[0], - new ITypeDescription[0], getDefinitely(Type.VOID), null) }; + "release", MethodDescription.ID_RELEASE, true, + new ITypeDescription[0], new ITypeDescription[0], + getDefinitely(Type.VOID), null) }; } else { int methodOffset = 0; ArrayList superList = new ArrayList(); for (int i = 0; i < superTypes.length; ++i) { IMethodDescription[] ds = superTypes[i].getMethodDescriptions(); for (int j = 0; j < ds.length; ++j) { - superList.add( - new MethodDescription( - (MethodDescription) ds[j], methodOffset++)); + superList.add(new MethodDescription(ds[j], methodOffset++)); } } superMethodDescriptions = (IMethodDescription[]) superList.toArray(