diff options
author | Ivo Hinkelmann <ihi@openoffice.org> | 2009-07-16 11:33:46 +0000 |
---|---|---|
committer | Ivo Hinkelmann <ihi@openoffice.org> | 2009-07-16 11:33:46 +0000 |
commit | e796d331e88d4dbb1442a49905c054b52a66987e (patch) | |
tree | 7539d6be81bd767efa1c78f81bd3ef377793e850 /testtools | |
parent | 8c04a0e1c1aba6b89c59d8ec9639ca44b85644f5 (diff) |
CWS-TOOLING: integrate CWS jl129
2009-07-08 09:24:14 +0200 jl r273817 : #i103275# catching DisposedException when calling XDesktop.terminate, the test librariesversion_3_0_0.dll, ..3_0_1.dll, .. 3.1.dll have been recreated and checked in
2009-07-08 09:20:29 +0200 jl r273816 : #
2009-07-07 10:51:52 +0200 jl r273784 : #103378# allow to pass Nothing in Basic for uno null reference
2009-07-07 10:30:48 +0200 jl r273781 : #103242# VS 2008 changes
2009-07-07 10:21:23 +0200 jl r273778 : #103242
2009-07-07 10:12:20 +0200 jl r273777 : #103242 adapting to VS 2008
2009-07-03 09:47:21 +0200 jl r273679 : #i10324# fix build errors
2009-07-03 09:12:08 +0200 jl r273677 : #i10324# fix build errors
2009-07-02 15:26:07 +0200 jl r273657 : #i103242 make it build again
2009-07-02 14:39:34 +0200 jl r273652 : #i103242 make it build again
2009-07-02 14:18:45 +0200 jl r273650 : #i103242 remove warnings
2009-07-02 14:11:48 +0200 jl r273648 : #i103242
2009-07-02 12:41:23 +0200 jl r273637 : #i103242
2009-07-02 12:25:09 +0200 jl r273636 : #i103242 upgraded to VS2008
2009-07-02 12:00:07 +0200 jl r273632 : #i103242 upgraded to VS2008
2009-07-02 11:30:55 +0200 jl r273630 : #i103242 test does not build anymore
2009-07-02 11:14:21 +0200 jl r273629 : #i103242 test does not build anymore
2009-07-02 10:59:56 +0200 jl r273628 : #i103242 test does not build anymore
2009-07-02 10:17:43 +0200 jl r273622 : #i103242 run test prints out the InnerException in case there was an exception. The InnerException is usually the one thrown in OOo
2009-07-01 17:06:24 +0200 jl r273604 : #i103242 test does not build anymore
Diffstat (limited to 'testtools')
-rw-r--r-- | testtools/source/cliversioning/runtests.cs | 5 | ||||
-rw-r--r-- | testtools/source/cliversioning/version.cs | 13 | ||||
-rw-r--r-- | testtools/source/cliversioning/version_libs/version_3_0_0.dll | bin | 11776 -> 11776 bytes | |||
-rw-r--r-- | testtools/source/cliversioning/version_libs/version_3_0_1.dll | bin | 11776 -> 11776 bytes | |||
-rwxr-xr-x | testtools/source/cliversioning/version_libs/version_3_1.dll | bin | 11776 -> 11776 bytes |
5 files changed, 17 insertions, 1 deletions
diff --git a/testtools/source/cliversioning/runtests.cs b/testtools/source/cliversioning/runtests.cs index 52d2752aab0a..1ee56f18b973 100644 --- a/testtools/source/cliversioning/runtests.cs +++ b/testtools/source/cliversioning/runtests.cs @@ -110,6 +110,11 @@ public class RunTests "Original message: " + fl.Message + "\n\n FusionLog: \n" + fl.FusionLog ); return -1; } + + if (e.InnerException != null) + { + Console.WriteLine(e.InnerException); + } } Console.WriteLine("#Unexpected Exception"); Console.WriteLine(e.Message); diff --git a/testtools/source/cliversioning/version.cs b/testtools/source/cliversioning/version.cs index 98aefee218fd..318941b63b8e 100644 --- a/testtools/source/cliversioning/version.cs +++ b/testtools/source/cliversioning/version.cs @@ -591,7 +591,18 @@ class SpreadsheetDocHelper : System.IDisposable XDesktop aDesktop = (XDesktop) mxMSFactory.createInstance( "com.sun.star.frame.Desktop" ); if (aDesktop != null) - aDesktop.terminate(); + { + try + { + aDesktop.terminate(); + } + catch (DisposedException d) + { + //This exception may be thrown because shutting down OOo using + //XDesktop terminate does not really work. In the case of the + //Exception OOo will still terminate. + } + } } // ________________________________________________________________ diff --git a/testtools/source/cliversioning/version_libs/version_3_0_0.dll b/testtools/source/cliversioning/version_libs/version_3_0_0.dll Binary files differindex 6ecaf2ac9682..71769a44f287 100644 --- a/testtools/source/cliversioning/version_libs/version_3_0_0.dll +++ b/testtools/source/cliversioning/version_libs/version_3_0_0.dll diff --git a/testtools/source/cliversioning/version_libs/version_3_0_1.dll b/testtools/source/cliversioning/version_libs/version_3_0_1.dll Binary files differindex 23878f4b91ea..823cfc8c8678 100644 --- a/testtools/source/cliversioning/version_libs/version_3_0_1.dll +++ b/testtools/source/cliversioning/version_libs/version_3_0_1.dll diff --git a/testtools/source/cliversioning/version_libs/version_3_1.dll b/testtools/source/cliversioning/version_libs/version_3_1.dll Binary files differindex 8b160f90ec17..b16da2df5d39 100755 --- a/testtools/source/cliversioning/version_libs/version_3_1.dll +++ b/testtools/source/cliversioning/version_libs/version_3_1.dll |