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 <T extends XInterface> to just <T> 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")

2 files changed, 5 insertions, 5 deletions

diff --git a/jurt/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test.java b/jurt/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test.java
index 8c6722c9f69a..a5fdccf613f8 100644
--- a/jurt/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test.java
+++ b/jurt/test/com/sun/star/comp/bridgefactory/BridgeFactory_Test.java
@@ -75,7 +75,7 @@ public final class BridgeFactory_Test extends ComplexTestCase {
         assure("", UnoRuntime.areSame(xBridge, xBridges[0]));
 
         // dispose the bridge
-        XComponent xComponent = (XComponent)UnoRuntime.queryInterface(XComponent.class, xBridge);
+        XComponent xComponent = UnoRuntime.queryInterface(XComponent.class, xBridge);
         xComponent.dispose();
 
 
@@ -103,7 +103,7 @@ public final class BridgeFactory_Test extends ComplexTestCase {
                && UnoRuntime.areSame(xBridge_new, xBridges[0]));
 
         // dispose the new bridge
-        XComponent xComponent_new = (XComponent)UnoRuntime.queryInterface(XComponent.class, xBridge_new);
+        XComponent xComponent_new = UnoRuntime.queryInterface(XComponent.class, xBridge_new);
         xComponent_new.dispose();
     }
 }
diff --git a/jurt/test/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge_Test.java b/jurt/test/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge_Test.java
index 8e71d51a0c6f..ffef8f7664a0 100644
--- a/jurt/test/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge_Test.java
+++ b/jurt/test/com/sun/star/lib/uno/bridges/java_remote/java_remote_bridge_Test.java
@@ -132,17 +132,17 @@ public final class java_remote_bridge_Test extends ComplexTestCase {
             proxyBXInterface[i] = (XInterface) bridgeB.getInstance(name);
 
             // map object:
-            proxyBTestInterface[i] = (TestInterface) UnoRuntime.queryInterface(
+            proxyBTestInterface[i] = UnoRuntime.queryInterface(
                 TestInterface.class, proxyBXInterface[i]);
             proxyBTestInterface[i].function();
 
             // remap object once:
-            TestInterface remapped = (TestInterface) UnoRuntime.queryInterface(
+            TestInterface remapped = UnoRuntime.queryInterface(
                 TestInterface.class, proxyBXInterface[i]);
             remapped.function();
 
             // remap object twice:
-            remapped = (TestInterface) UnoRuntime.queryInterface(
+            remapped = UnoRuntime.queryInterface(
                 TestInterface.class, proxyBXInterface[i]);
             remapped.function();
         }