summaryrefslogtreecommitdiff
path: root/jurt/com/sun/star/lib/uno
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2006-12-01 13:53:29 +0000
committerRüdiger Timm <rt@openoffice.org>2006-12-01 13:53:29 +0000
commit1e0b5f1a572db74235fcd9066a2401794bf6b0fb (patch)
treed302b8d3df54ad26dd577bf629763e7f1fd9d041 /jurt/com/sun/star/lib/uno
parent4fd65b4c15e0c562e2eada2f6974e84feabfa2fc (diff)
INTEGRATION: CWS sb23 (1.14.10); FILE MERGED
2006/08/18 16:22:36 sb 1.14.10.2: RESYNC: (1.14-1.16); FILE MERGED 2005/03/15 10:29:36 sb 1.14.10.1: #88601# Support for current context in Java URP.
Diffstat (limited to 'jurt/com/sun/star/lib/uno')
-rw-r--r--jurt/com/sun/star/lib/uno/protocols/urp/Unmarshal.java12
1 files changed, 8 insertions, 4 deletions
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 11752b196141..13b4c7a21ab0 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.16 $
+ * $Revision: 1.17 $
*
- * last change: $Author: rt $ $Date: 2006-05-04 08:08:52 $
+ * last change: $Author: rt $ $Date: 2006-12-01 14:53:29 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -92,6 +92,11 @@ final class Unmarshal {
return id;
}
+ public Object readInterface(Type type) {
+ String id = readObjectId();
+ return id == null ? null : bridge.mapInterfaceFrom(id, type);
+ }
+
public ThreadId readThreadId() {
int len = readCompressedNumber();
byte[] data = null;
@@ -451,8 +456,7 @@ final class Unmarshal {
}
private Object readInterfaceValue(TypeDescription type) {
- String id = readObjectId();
- return id == null ? null : bridge.mapInterfaceFrom(id, new Type(type));
+ return readInterface(new Type(type));
}
private int readCompressedNumber() {