CWS-TOOLING: integrate CWS jl115

2009-01-29 13:13:16 +0100 jsk  r267121 : #i98596#
2009-01-23 14:50:24 +0100 jl  r266821 : #98273# climaker.exe.config prevents using publisher policy
2009-01-23 14:10:51 +0100 jl  r266817 : #i98392# wrong use of iterator when removing a factory, which may lead to a crash
2009-01-19 11:36:29 +0100 jl  r266484 : #i96690# test extension
2009-01-19 11:32:46 +0100 jl  r266483 : #i96690#
2009-01-16 17:09:19 +0100 jl  r266439 : #i96690# ignore duplicate path URLs in manifest.xml. These may be introduces by copy/paste and lead to nasty errors
2009-01-16 14:04:00 +0100 jl  r266416 : #i92032# increasing minimum version of Java
2009-01-16 10:57:02 +0100 jl  r266407 : #i96816# compiler warning breaks build
2009-01-15 16:58:54 +0100 jl  r266384 : #i94938# patch from cmc.
2009-01-15 16:35:18 +0100 jl  r266383 : #i95838# applying patch
2009-01-15 16:15:58 +0100 jl  r266381 : #i70855# #i96102# WaitForMultipleObjects wrong implemented
2009-01-14 12:46:21 +0100 jl  r266287 : #i98038# increased assembly versions
2009-01-14 12:44:55 +0100 jl  r266285 : #i98038# increased assembly versions
2009-01-13 17:11:20 +0100 jl  r266239 : #i98038# new test library for assemblies from 3.0.1

1 files changed, 19 insertions, 13 deletions

diff --git a/testautomation/global/system/includes/master.inc b/testautomation/global/system/includes/master.inc
index 11e0462bee1d..0edf346f592a 100755
--- a/testautomation/global/system/includes/master.inc
+++ b/testautomation/global/system/includes/master.inc
@@ -702,7 +702,6 @@ sub mMakeGeneralOptionsAPI
     Dim bHelpTip as Boolean
     Dim sTempPath as string
     Dim sWorkPath as string    
-    Dim sFileFunction as string
     Dim oUnoOfficeConnection as object
     Dim oUnoConfigurationAccess as object
     Dim aPropertyValue(1) As new com.sun.star.beans.PropertyValue ' Array of pairs: Property with Value
@@ -712,7 +711,7 @@ sub mMakeGeneralOptionsAPI
 
     Dim oOOoImprovementController as object  ' Check presence of the OOo Improvement Extension
    
-    sFileFunction="global::system::inc::master.inc::hMakeGeneralOptionsAPI:: "
+    const sFileFunction = "global::system::inc::master.inc::hMakeGeneralOptionsAPI:: "
 
     ' Open OOo UNO-Port for communication
     oUnoOfficeConnection=hGetUnoService(TRUE)
@@ -811,17 +810,24 @@ sub mMakeGeneralOptionsAPI
         xViewRoot.dispose()
 
         '///+ <li>Disable automatic check for updates
-        aPropertyValue(0).Value="/org.openoffice.Office.Jobs/Jobs/Job['UpdateCheck']/Arguments"
-        xViewRoot=oUnoConfigurationAccess.createInstanceWithArguments("com.sun.star.configuration.ConfigurationUpdateAccess",aPropertyValue())
-        xViewRoot.replaceByName("AutoCheckEnabled", false)
-        xViewRoot.commitChanges()
-        ' Since we use lazywrite=false, the call to '.commitChanges()' returns if all data is written.
-        ' This call to ask for pending changes is just to convince me;
-        if xViewRoot.hasPendingChanges() then
-            qaErrorLog(sFileFunction+"Changes still pending...: AutoCheckEnabled")
-            ' At this point there is no needed to think about what to do, if it doesn't work.
-        end if
-        xViewRoot.dispose()
+        ' Encapsulating this in a try...catch block because external (non-Sun) builds
+        ' do usually not support online update so the API is not available and we get an
+        ' exception. In case of failure we print a QAErrorLog.
+        try
+            aPropertyValue(0).Value="/org.openoffice.Office.Jobs/Jobs/Job['UpdateCheck']/Arguments"
+            xViewRoot=oUnoConfigurationAccess.createInstanceWithArguments("com.sun.star.configuration.ConfigurationUpdateAccess",aPropertyValue())
+            xViewRoot.replaceByName("AutoCheckEnabled", false)
+            xViewRoot.commitChanges()
+            ' Since we use lazywrite=false, the call to '.commitChanges()' returns if all data is written.
+            ' This call to ask for pending changes is just to convince me;
+            if xViewRoot.hasPendingChanges() then
+                qaErrorLog(sFileFunction+"Changes still pending...: AutoCheckEnabled")
+                ' At this point there is no needed to think about what to do, if it doesn't work.
+            end if
+            xViewRoot.dispose()
+        catch
+            qaErrorLog( sFileFunction & "This build does not support online update." )
+        endcatch
 
         '///+ OOo Improvement Extension
         ' Note: Logging is disabled the hard way. The UI will not notice the change so even if logging is disabled