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

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);

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. 
+            }
+        }
     }
 
 // ________________________________________________________________