vitomation01: #i109562 - local merge with DEV300_m76 which had conflicts with changes from native0

4 files changed, 8 insertions, 2 deletions

diff --git a/testautomation/global/system/includes/gvariabl.inc b/testautomation/global/system/includes/gvariabl.inc
index a654ec22d7bc..eff969fbee2c 100644..100755
--- a/testautomation/global/system/includes/gvariabl.inc
+++ b/testautomation/global/system/includes/gvariabl.inc
@@ -85,6 +85,7 @@ Global gAccessibility as Boolean    '///+ gAccessibility => If an accessibility
 Global gProductName as string        '///+ gProductName => Name of the product (StarOffice, OpenOffice.org, ...)
 Global gMacroSecurityLevel as integer'///+ gMacroSecurityLevel => Macro Security Level (0: Low ... 3: Very High) 
 Global gOfficeVersion as string     '///+ gOfficeVersion => The version number of the office like 3.1, 9.0 ...
+Global gAutoUpdate as boolean     '///+ gAutoUpdate => if office is able to request update streams
 
 '/// - global OLE-objectnames
 global gOLEWriter as String         '///+ gOLEWriter       => OLE-object-name for Writer
diff --git a/testautomation/global/system/includes/iniinfo.inc b/testautomation/global/system/includes/iniinfo.inc
index 4f32125ec07f..a67c7554c8d5 100644..100755
--- a/testautomation/global/system/includes/iniinfo.inc
+++ b/testautomation/global/system/includes/iniinfo.inc
@@ -897,8 +897,10 @@ function getSofficeNative() as string
         iVendorEntries = 1
         sVendor(iVendorEntries) = "Sun Microsystems": inc (iVendorEntries)
         sVendor(iVendorEntries) = "OpenOffice.org"  : inc (iVendorEntries)
-
+       sVendor(iVendorEntries) = "Oracle"  : inc (iVendorEntries)
+        
         iOfficeEntries = 1
+        sOffice(iOfficeEntries) = "Oracle Open Office"    : inc (iOfficeEntries)
         sOffice(iOfficeEntries) = "StarOffice"    : inc (iOfficeEntries)
         sOffice(iOfficeEntries) = "StarSuite"     : inc (iOfficeEntries)
         sOffice(iOfficeEntries) = "OpenOffice.org": inc (iOfficeEntries)
@@ -906,6 +908,7 @@ function getSofficeNative() as string
         iVersionEntries = 1
         sVersion(iVersionEntries) = "9"      : inc (iVersionEntries)
         sVersion(iVersionEntries) = "8"      : inc (iVersionEntries)
+        sVersion(iVersionEntries) = "3"      : inc (iVersionEntries)
         iOOoVersionBorder = iVersionEntries
         sVersion(iVersionEntries) = "2.0.0"  : inc (iVersionEntries)
         sVersion(iVersionEntries) = "680"    : inc (iVersionEntries)
diff --git a/testautomation/global/system/includes/master.inc b/testautomation/global/system/includes/master.inc
index 36e6ef7f4570..fa6975e525d3 100644..100755
--- a/testautomation/global/system/includes/master.inc
+++ b/testautomation/global/system/includes/master.inc
@@ -909,8 +909,10 @@ sub mMakeGeneralOptionsAPI
                 ' At this point there is no needed to think about what to do, if it doesn't work.
             end if
             xViewRoot.dispose()
+            gAutoUpdate = TRUE
         catch
             qaErrorLog( sFileFunction & "This build does not support online update." )
+            gAutoUpdate = FALSE
         endcatch
 
         '///+ OOo Improvement - only if BUILD_SPECIAL is set we have this file created.
diff --git a/testautomation/global/system/includes/status.inc b/testautomation/global/system/includes/status.inc
index 5c7eb77d3695..49d3a836043a 100644
--- a/testautomation/global/system/includes/status.inc
+++ b/testautomation/global/system/includes/status.inc
@@ -416,7 +416,7 @@ gTestName="" '!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
     wend
     bError = True
     if (i = 18) then ' big database error; resultfile wasn't created
-        warnlog "Status Write Error! (TimeOut waiting for webservice result)" +chr(13)+ "Email is send to: " + gReturnAddress
+        warnlog "Status Write Error! (TimeOut waiting for webservice result)"
     else
         ListRead(glsStatusPage(), sOutFileTemp)   '3
         i = ListCount(glsStatusPage())