diff options
author | Vladimir Glazounov <vg@openoffice.org> | 2003-10-09 09:16:44 +0000 |
---|---|---|
committer | Vladimir Glazounov <vg@openoffice.org> | 2003-10-09 09:16:44 +0000 |
commit | 0baa829b3d7499b92f29bae0011d8d25bfd54f4f (patch) | |
tree | d345c253265e938e51ac75c19b4daff2782697b9 /ridljar | |
parent | 33c6f47e0e088c1e48a8e146a90722f6a29f701d (diff) |
INTEGRATION: CWS sb8 (1.11.2); FILE MERGED
2003/08/22 09:25:39 sb 1.11.2.1: Made Type.isSupertypeOf fully reflexive.
Diffstat (limited to 'ridljar')
-rw-r--r-- | ridljar/com/sun/star/uno/Type.java | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ridljar/com/sun/star/uno/Type.java b/ridljar/com/sun/star/uno/Type.java index 53c347ae19f8..9ce74ddcd051 100644 --- a/ridljar/com/sun/star/uno/Type.java +++ b/ridljar/com/sun/star/uno/Type.java @@ -2,9 +2,9 @@ * * $RCSfile: Type.java,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: hr $ $Date: 2003-08-13 17:23:42 $ + * last change: $Author: vg $ $Date: 2003-10-09 10:16:44 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -399,10 +399,13 @@ public class Type { Class c1 = getZClass(); Class c2 = type.getZClass(); return c1 != null && c2 != null && c1.isAssignableFrom(c2); + } else { + return false; } - break; + + default: + return this.equals(type); } - return false; } // @see java.lang.Object#equals |