diff options
author | Kay Ramme <kr@openoffice.org> | 2001-02-08 08:18:35 +0000 |
---|---|---|
committer | Kay Ramme <kr@openoffice.org> | 2001-02-08 08:18:35 +0000 |
commit | 2497989ab0783d48674bda9ba72207295cf47210 (patch) | |
tree | a300d4d4409ca0729822ceb4325a2087546c54fd /ridljar/com/sun | |
parent | 215f06a52d72d5ffd55d85b9a0217e3dc7c556e6 (diff) |
_initMemberType now takes care of inherited members (#83228#)
Diffstat (limited to 'ridljar/com/sun')
-rw-r--r-- | ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java b/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java index 6ed1827bb088..f82f259e0f85 100644 --- a/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java +++ b/ridljar/com/sun/star/lib/uno/typedesc/TypeDescription.java @@ -2,9 +2,9 @@ * * $RCSfile: TypeDescription.java,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: kr $ $Date: 2001-02-08 09:14:28 $ + * last change: $Author: kr $ $Date: 2001-02-08 09:18:35 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -94,7 +94,7 @@ import com.sun.star.lib.uno.typeinfo.TypeInfo; * methods, which may be changed or moved in the furture, so please * do not use these methods. * <p> - * @version $Revision: 1.2 $ $ $Date: 2001-02-08 09:14:28 $ + * @version $Revision: 1.3 $ $ $Date: 2001-02-08 09:18:35 $ * @author Kay Ramme * @since UDK2.0 */ @@ -567,12 +567,18 @@ public class TypeDescription { _memberTypeInfosByName = new Hashtable(); for(int i = 0; i < fields.length; ++ i) { - MemberTypeInfo memberTypeInfo = __findMemberTypeInfo(typeInfos, fields[i].getName()); + MemberTypeInfo memberTypeInfo = null; + + if(_superType != null) + memberTypeInfo = _superType.getMemberTypeInfo(fields[i].getName()); + + if(memberTypeInfo == null) + memberTypeInfo = __findMemberTypeInfo(typeInfos, fields[i].getName()); if(memberTypeInfo == null) memberTypeInfo = new MemberTypeInfo(fields[i].getName(), 0); - _memberTypeInfosByName.put(memberTypeInfo.getName(), memberTypeInfo); + _memberTypeInfosByName.put(memberTypeInfo.getName(), memberTypeInfo); } } |