From e5e9c6b22981d9ae35c8e16c0120f1bd94e6c011 Mon Sep 17 00:00:00 2001 From: tb121644 Date: Tue, 19 Jan 2010 15:46:03 +0100 Subject: #i106811# new global variable: gAutoUpdate --- testautomation/global/system/includes/gvariabl.inc | 1 + testautomation/global/system/includes/master.inc | 2 ++ 2 files changed, 3 insertions(+) (limited to 'testautomation/global/system') diff --git a/testautomation/global/system/includes/gvariabl.inc b/testautomation/global/system/includes/gvariabl.inc index 52c9f9f54dd0..aef5a2dfb126 100755 --- a/testautomation/global/system/includes/gvariabl.inc +++ b/testautomation/global/system/includes/gvariabl.inc @@ -91,6 +91,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/master.inc b/testautomation/global/system/includes/master.inc index 718a7cf066cc..37f8320b804c 100755 --- a/testautomation/global/system/includes/master.inc +++ b/testautomation/global/system/includes/master.inc @@ -924,8 +924,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. -- cgit From 6f013a4859726d7665a3b212108596aca1789b62 Mon Sep 17 00:00:00 2001 From: tb121644 Date: Thu, 4 Feb 2010 15:33:15 +0100 Subject: #i108832# guessing culprint --- testautomation/global/system/includes/status.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'testautomation/global/system') diff --git a/testautomation/global/system/includes/status.inc b/testautomation/global/system/includes/status.inc index 32899a4d39bb..c5d512b729d9 100755 --- a/testautomation/global/system/includes/status.inc +++ b/testautomation/global/system/includes/status.inc @@ -422,7 +422,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()) -- cgit From 5bab3af95158025e439be06b9b9b4233c1f3c714 Mon Sep 17 00:00:00 2001 From: Ingo Schmidt Date: Wed, 27 Jan 2010 15:50:07 +0100 Subject: native0: committing this file, because someone else changed it in this cws, and obviously forgot to commit it ((IS and CD) --- testautomation/global/system/includes/iniinfo.inc | 1 + 1 file changed, 1 insertion(+) mode change 100644 => 100755 testautomation/global/system/includes/iniinfo.inc (limited to 'testautomation/global/system') diff --git a/testautomation/global/system/includes/iniinfo.inc b/testautomation/global/system/includes/iniinfo.inc old mode 100644 new mode 100755 index a5ef11521e5f..acb6d5ad337b --- a/testautomation/global/system/includes/iniinfo.inc +++ b/testautomation/global/system/includes/iniinfo.inc @@ -905,6 +905,7 @@ function getSofficeNative() as string sVendor(iVendorEntries) = "OpenOffice.org" : 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) -- cgit From e5b5d2c23ba9f52e3d5ebed91a5d34fe109dde68 Mon Sep 17 00:00:00 2001 From: Ingo Schmidt Date: Wed, 27 Jan 2010 15:57:47 +0100 Subject: native0: committing this file, because someone else changed it in this cws, and obviously forgot to commit it ((IS and CD) --- testautomation/global/system/includes/status.inc | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 testautomation/global/system/includes/status.inc (limited to 'testautomation/global/system') diff --git a/testautomation/global/system/includes/status.inc b/testautomation/global/system/includes/status.inc old mode 100755 new mode 100644 -- cgit From 5e5b36d4eaf2575c5935832dab12858600d76219 Mon Sep 17 00:00:00 2001 From: "Marc Neumann [msc]" Date: Mon, 1 Mar 2010 11:10:49 +0100 Subject: add Oracle Open Office to the list of known offices --- testautomation/global/system/includes/iniinfo.inc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'testautomation/global/system') diff --git a/testautomation/global/system/includes/iniinfo.inc b/testautomation/global/system/includes/iniinfo.inc index acb6d5ad337b..10831114d1e3 100755 --- a/testautomation/global/system/includes/iniinfo.inc +++ b/testautomation/global/system/includes/iniinfo.inc @@ -903,6 +903,7 @@ 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) @@ -913,6 +914,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) -- cgit