diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-08-02 08:43:56 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-08-02 08:43:56 +0000 |
| commit | 66c458350f6d82c58356b3d1543133a7f18abd3c (patch) | |
| tree | 88e803d3105a445cebab86597fc45c1d6a1a11a7 /javaunohelper | |
| parent | c54d1aaf4dfa7842c8bcd256a80202a21dc69da3 (diff) | |
INTEGRATION: CWS jl10 (1.7.104); FILE MERGED
2004/07/22 12:55:46 jl 1.7.104.1: #115688# support for UNO enum types
Diffstat (limited to 'javaunohelper')
| -rw-r--r-- | javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java index 220d85bc11ea..7c0907776c60 100644 --- a/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java +++ b/javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java @@ -2,9 +2,9 @@ * * $RCSfile: PropertySet.java,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: jl $ $Date: 2002-10-21 11:21:58 $ + * last change: $Author: rt $ $Date: 2004-08-02 09:43:56 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -754,6 +754,7 @@ XMultiPropertySet || obj instanceof String || obj instanceof XInterface || obj instanceof Type + || obj instanceof com.sun.star.uno.Enum || obj.getClass().isArray()) return true; return false; @@ -813,6 +814,8 @@ XMultiPropertySet retVal= new Double(AnyConverter.toDouble(obj)); else if (XInterface.class.isAssignableFrom(cl)) retVal= AnyConverter.toObject(new Type(cl), obj); + else if (com.sun.star.uno.Enum.class.isAssignableFrom(cl)) + retVal= AnyConverter.toObject(new Type(cl), obj); else throw new com.sun.star.lang.IllegalArgumentException("Could not convert the argument"); return retVal; |