From 9f25802cc08803b0b23e5f316e282a5cdceda77d Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Thu, 4 May 2006 07:08:52 +0000 Subject: INTEGRATION: CWS mmt7 (1.15.14); FILE MERGED 2006/02/14 12:19:06 sb 1.15.14.1: #i60643# Restructured parts of ridl.jar due to new cyclic inter-package dependencies. --- jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'jurt/com/sun/star/lib/uno') diff --git a/jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java b/jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java index 6f02dab2fcee..11752b196141 100644 --- a/jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java +++ b/jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java @@ -4,9 +4,9 @@ * * $RCSfile: Unmarshal.java,v $ * - * $Revision: 1.15 $ + * $Revision: 1.16 $ * - * last change: $Author: rt $ $Date: 2005-09-07 19:03:42 $ + * last change: $Author: rt $ $Date: 2006-05-04 08:08:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -35,7 +35,6 @@ package com.sun.star.lib.uno.protocols.urp; import com.sun.star.lib.uno.environments.remote.ThreadId; -import com.sun.star.lib.uno.typedesc.FieldDescription; import com.sun.star.lib.uno.typedesc.TypeDescription; import com.sun.star.uno.Any; import com.sun.star.uno.Enum; @@ -476,14 +475,11 @@ final class Unmarshal { private void readFields(TypeDescription type, Object value) { IFieldDescription[] fields = type.getFieldDescriptions(); for (int i = 0; i < fields.length; ++i) { - int index = ((FieldDescription) fields[i]).getTypeParameterIndex(); try { fields[i].getField().set( value, readValue( - index < 0 - ? (TypeDescription) fields[i].getTypeDescription() - : type.getTypeArgument(index))); + (TypeDescription) fields[i].getTypeDescription())); } catch (IllegalAccessException e) { throw new RuntimeException(e.toString()); } -- cgit