update dev300-m58
[ooovba.git] / applied_patches / 0417-unittesting-bridges.diff
blob7c7f2d75c3d9b991e978f7694b3608bc7d57f4a2
1 --- bridges/prj/tests.lst 1970-01-01 01:00:00.000000000 +0100
2 +++ bridges/prj/tests.lst 2007-09-07 10:34:48.000000000 +0200
3 @@ -0,0 +1,9 @@
4 +#does not build: br bridges\test\com\sun\star\lib\uno\bridges\java_remote nmake - all br_test_com_sun_star_lib_uno_bridges_java_remote NULL
5 +#does not build: br bridges\test\com\sun\star\lib nmake - all br_test_com_sun_star_lib NULL
6 +br bridges\test nmake - all br_test NULL
7 +br bridges\test\inter_libs_exc nmake - all br_test_inter_libs_exc NULL
8 +#does not build: br bridges\test\java_uno\acquire nmake - all br_test_java_uno_acquire NULL
9 +#does not build: br bridges\test\java_uno\any nmake - all br_test_java_uno_any NULL
10 +#does not build: br bridges\test\java_uno\equals nmake - all br_test_java_uno_equals NULL
11 +#depends on javaunohelper: br bridges\test\java_uno\nativethreadpool nmake - all br_test_java_uno_nativethreadpool NULL
12 +#does not build: br bridges\test\performance nmake - all br_test_performance NULL
13 --- bridges/test/java_uno/nativethreadpool/Relay.java 2005-09-08 01:00:52.000000000 +0200
14 +++ bridges/test/java_uno/nativethreadpool/Relay.java 2007-09-07 10:32:08.000000000 +0200
15 @@ -106,7 +106,7 @@ public final class Relay implements XRel
19 - public int get() {
20 + public long get() {
21 return source.get();
24 --- bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx 2006-09-16 18:05:35.000000000 +0200
25 +++ bridges/test/java_uno/nativethreadpool/testnativethreadpoolclient.cxx 2007-09-07 10:28:34.000000000 +0200
26 @@ -82,7 +82,7 @@ private:
27 virtual sal_Int32 SAL_CALL run(css::uno::Sequence< rtl::OUString > const &)
28 throw (css::uno::RuntimeException);
30 - virtual sal_Int32 SAL_CALL get() throw (css::uno::RuntimeException);
31 + virtual sal_Int64 SAL_CALL get() throw (css::uno::RuntimeException);
33 css::uno::Reference< css::uno::XComponentContext > context;
34 osl::ThreadData data;
35 @@ -150,8 +150,8 @@ sal_Int32 Client::run(css::uno::Sequence
36 return success ? 0 : 1;
39 -sal_Int32 Client::get() throw (css::uno::RuntimeException) {
40 - return reinterpret_cast< sal_Int32 >(data.getData());
41 +sal_Int64 Client::get() throw (css::uno::RuntimeException) {
42 + return static_cast< sal_Int64 >(reinterpret_cast< sal_IntPtr >(data.getData()));
45 css::uno::Reference< css::uno::XInterface > SAL_CALL create(
46 --- bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx 2006-09-16 18:05:51.000000000 +0200
47 +++ bridges/test/java_uno/nativethreadpool/testnativethreadpoolserver.cxx 2007-09-07 10:30:20.000000000 +0200
48 @@ -74,12 +74,12 @@ public:
49 private:
50 virtual ~Server() {}
52 - virtual sal_Int32 SAL_CALL get() throw (css::uno::RuntimeException);
53 + virtual sal_Int64 SAL_CALL get() throw (css::uno::RuntimeException);
55 css::uno::Reference< css::uno::XComponentContext > context;
58 -sal_Int32 Server::get() throw (css::uno::RuntimeException) {
59 +sal_Int64 Server::get() throw (css::uno::RuntimeException) {
60 css::uno::Reference< css::lang::XMultiComponentFactory > factory(
61 context->getServiceManager());
62 if (!factory.is()) {
63 --- bridges/test/java_uno/nativethreadpool/types.idl 2005-09-08 01:02:09.000000000 +0200
64 +++ bridges/test/java_uno/nativethreadpool/types.idl 2007-09-07 10:27:57.000000000 +0200
65 @@ -38,7 +38,7 @@
66 module test { module javauno { module nativethreadpool {
68 interface XSource: com::sun::star::uno::XInterface {
69 - long get();
70 + hyper get();
73 interface XRelay: com::sun::star::uno::XInterface {