From c7788533a2565593405e55b617d09425e08ef439 Mon Sep 17 00:00:00 2001
From: Jens-Heiner Rechtien
Date: Wed, 16 Sep 2009 14:37:52 +0000
Subject: CWS-TOOLING: integrate CWS sb113 2009-09-01 sb #i76393# second
attempt at properly #ifdef-ing previous HG commit d598efdbf012 2009-08-28 sb
#i102469# change back to just on queryInterface,
to avoid binary incompatibility (method changing its signature from
(Ljava/lang/Class;Ljava/lang/Object;)Ljava/lang/Object; to
(Ljava/lang/Class;Ljava/lang/Object;)Lcom/sun/star/uno/XInterface;)
2009-08-28 sb #i76393# properly #ifdef previous HG commit d598efdbf012
2009-08-27 sb #i94421# work around compiler error (based on a patch supplied
by cloph) 2009-08-26 sb merged in DEV300_m56 2009-08-26 sb #i76393# on Linux,
include dynamic section offset in crash report so as to be able to map
"prelinked" callstacks back to original (patch by cmc) 2009-08-26 sb #i88162#
remove unnecessary whitespace lines from per-locale xcu files (patch by tora)
2009-08-17 Juergen Schmidt #i104292# set context classloader after create new
custom UNO loader 2009-08-17 Juergen Schmidt #i103749# integrate patch
2009-08-14 sb #i103269# cherry-picked
ssh://hg@hg.services.openoffice.org/cws/sb111 -r 5124ebd5edd1 ("#i101955#
changed encoding of XML file content from erroneous ISO-8859-1 to UTF-8")
2009-08-12 sb #i102469# fixed mis-applications of UnoRuntime.queryInterface
(detected via the simplified UnoRuntime.queryInterface, the HG changeset
29de35fc9554) to use AnyConverter instead; changed qadevOOo's
lib.MultiMethodTest.before to allow throwing arbitrary exceptions, to cater
for IllegalArgumentException thrown by AnyConverter 2009-08-12 sb #i104178#
drop extra libxml2-config script from libxmlsec 2009-08-10 sb #i101754#
simplified osl_getProcessInfo for LINUX (patch by cmc) 2009-08-10 sb #i95018#
avoid closing -1 fds (patch supplied by cmc) 2009-08-10 sb #i103585# removed
(apparently unnecessary) zlib support from libxml2; in turn, removed zlib
dependencies from libxmlsec, libxslt, and redland (assuming those were
transitive dependencies brought in by direct dependencies on libxml2)
2009-08-10 sb #i102469# simplified UnoRuntime.queryInterface using Java 5
generics; adapted URE-related modules accordingly 2009-08-10 sb #i101213#
adapted setsolar env (solenv/config/) to set PYTHONPATH (and not set
PYTHONHOME) in accordance with configure env (set_soenv.in); fixed
testtools/source/bridgetest/pyuno (which now should work everywhere out of
the box, thanks to the fixed setsolar PYTHONPATH) 2009-08-10 sb cherry-picked
ssh://hg@hg.services.openoffice.org/cws/sb111 -r ea8de6d9396b ("#i101955#
work in progress for a .hgignore file, continued")
---
ure/source/uretest/JavaClient.java | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
(limited to 'ure')
diff --git a/ure/source/uretest/JavaClient.java b/ure/source/uretest/JavaClient.java
index e7b6a6ed54d2..fbb35a910c96 100644
--- a/ure/source/uretest/JavaClient.java
+++ b/ure/source/uretest/JavaClient.java
@@ -50,7 +50,7 @@ public final class JavaClient {
if (manager == null) {
throw new NullPointerException("no service manager");
}
- XBridgeFactory factory = (XBridgeFactory) UnoRuntime.queryInterface(
+ XBridgeFactory factory = UnoRuntime.queryInterface(
XBridgeFactory.class,
manager.createInstanceWithContext(
"com.sun.star.bridge.BridgeFactory", context));
@@ -63,11 +63,9 @@ public final class JavaClient {
Connector.create(context).connect(
url.getConnectionAndParametersAsString()),
null);
- Data d =
- ((XServer) UnoRuntime.queryInterface(
- XServer.class, bridge.getInstance(url.getRootOid()))).getData();
- ((XComponent) UnoRuntime.queryInterface(XComponent.class, bridge)).
- dispose();
+ Data d = UnoRuntime.queryInterface(
+ XServer.class, bridge.getInstance(url.getRootOid())).getData();
+ UnoRuntime.queryInterface(XComponent.class, bridge).dispose();
if (!d.m1.equals("Hello") || d.m2 != 42) {
throw new RuntimeException("Data object contains bad values");
}
--
cgit