From d93f1af562e459899b1c2e41405069d0240644d4 Mon Sep 17 00:00:00 2001
From: "Joerg Skottke [jsk]" <jsk@openoffice.org>
Date: Thu, 9 Sep 2010 13:11:38 +0200
Subject: automationdev300m87: #i112208# - Implemented fuction to work with a
 local copy of a file which resides anywhere else in the filesystem. The file
 is then copied to the users work directory and opened from there. This is
 experimental and the function needs to be called explicitly. The function is
 another workaround for the paramount problem that we cannot reliably switch a
 readonly document to edit-mode. Used the opportunity to introduce a new
 global variable (and fix the case of others, as they are not constants as
 they were initially planned to be)

---
 testautomation/global/system/includes/gvariabl.inc | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
 mode change 100755 => 100644 testautomation/global/system/includes/gvariabl.inc

(limited to 'testautomation/global/system/includes')

diff --git a/testautomation/global/system/includes/gvariabl.inc b/testautomation/global/system/includes/gvariabl.inc
old mode 100755
new mode 100644
index ca3764a1a51b..d9290ebb2c3c
--- a/testautomation/global/system/includes/gvariabl.inc
+++ b/testautomation/global/system/includes/gvariabl.inc
@@ -171,11 +171,14 @@ Global Const GC_MACRO_SECURITY_LEVEL_DEFAULT  = 2  '///+ GC_MACRO_SECURITY_LEVEL
 '///* OOo Improvement Program
 Global gOOoImprovementIsEnabled as boolean
 
-'///* Performance flags
-Global GLOBAL_USE_NEW_SLEEP as boolean ' keep the old sleep() behavior
+'///* Performance flags, set to true to eliminate wait/sleep statements, default is FALSE
+Global global_use_new_sleep as boolean
 
-'///* If set to TRUE in master.inc many functions become more talkative
-Global GVERBOSE as boolean
+'///* If set to TRUE  many functions become more talkative, default is FALSE
+Global gVerbose as boolean
+
+'///* When using hFileOpenLocally(...) we do not know the filename under which the file has been saved.
+Global gLastWorkFile as string
 
 sub OnlyForDocuGVariables
 '///<b>System for the installed Office</b>
-- 
cgit 


From 2b816892590a1980331803de8a21bbfe0dc08a25 Mon Sep 17 00:00:00 2001
From: Thorsten Bosbach <Thorsten.Bosbach@Oracle.Com>
Date: Tue, 19 Oct 2010 16:44:25 +0200
Subject: #i115122# hid.lst is again static

---
 testautomation/global/system/includes/master.inc | 98 ------------------------
 1 file changed, 98 deletions(-)

(limited to 'testautomation/global/system/includes')

diff --git a/testautomation/global/system/includes/master.inc b/testautomation/global/system/includes/master.inc
index 880496e3dc42..3825dadff409 100644
--- a/testautomation/global/system/includes/master.inc
+++ b/testautomation/global/system/includes/master.inc
@@ -84,7 +84,6 @@ sub GetUseFiles
     Call GetIniInformation                '///+<li><b>GetIniInformation</b>: Get all information out of the <i>testtool.ini/.testtoolrc</i> and set it on global variables (iniinfo.inc)</li>
     Call GetOfficeInformation             '///+<li><b>GetOfficeInformation</b>: Set <i>sAppExe</i> for startup (iniinfo.inc)</li>
 
-    Call prepareHidLst
     Call LoadDeclaration                  '///+<ul><li><b>LoadDeclaration</b>: Load all declaration files (master.inc)</li>
 
     Call FirstOfficeStart                 '///+<li><b>FirstOfficeStart</b>: Try to start the office for first time (master.inc)</li>
@@ -133,97 +132,6 @@ sub GetUseFiles
 end sub
 
 '-------------------------------------------------------------------------
-function checkWriteable() as boolean
-    '//// Check hid.lst destination for user writeability
-    dim sTestDir as string
-    dim bReturn as boolean
-
-    bReturn = FALSE
-            try
-                sTestDir = "tbotest"   ' nasty bug, if the path is with a path sign at the end; usually on windows root dirs :-(
-                if (right(ConvertPath(gtHidLstPath, gtPlatform), 1) <> hGetPathSigne(gtPlatform)) then
-                    sTestDir = hgetPathSigne(gtPlatform) + sTestDir
-                end if
-                MkDir (ConvertPath(gtHidLstPath + sTestDir, gtPlatform))
-                RmDir (ConvertPath(gtHidLstPath + sTestDir, gtPlatform))
-                
-                bReturn = TRUE
-            catch
-                ' fail
-                bReturn = FALSE
-            endcatch
-    checkWriteable = bReturn
-end function
-'-------------------------------------------------------------------------
-
-sub prepareHidLst
-    '/// Determine and set OOo version information
-    '/// Check if hid.lst is at default location: testautomation/global/hid
-    '/// If not, check OOo basis path for hid.lst; check if default location from above is writeable for user
-    '/// Copy hid.lst from OOo basis path to the default location
-    '/// If something fails, give warnlog
-    dim sHidOOo as string
-    dim iShellReturn as integer
-    dim qHost as string
-    dim qPath as string
-
-        gVersionsnummer = FindBuildID
-        ' split versionstring into its parts
-        call hSetBuildVersionInformation(False)
-    qHost = "quaste.services.openoffice.org"
-    qPath = "/index.php?option=com_quaste&task=tests_overview&download=2" + "&workspace=" + gMajor + "&milestone=" + gMinor
-    ' check for hid.lst in $HID_DIR_LOCATION!
-    if (fileExists(gtHidLstPath + "hid.lst")) then
-        printlog "Found hid.lst file; It is taken from: " + gtHidLstPath
-    else
-        ' check for hid.lst in OOo installation
-        sHidOOo = convertPath(gOfficeBasisPath + "program/" + "hid.lst")
-        if (fileExists(sHidOOo)) then
-            printlog "Found hid.lst file; It exists in OOo installation: " + sHidOOo
-        
-            ' make compatibility hint against version.txt
-    
-            ' check for writeable global/hid/
-            if (checkWriteable()) then    
-                ' copy hid.lst
-                fileCopy(sHidOOo, gtHidLstPath + "hid.lst")
-                printlog "File hid.lst successfull copied to location in VCL TestTool settings: " + gtHidLstPath
-            else
-                ' fail: make hint for hid.lst path
-                warnlog "File hid.lst could not be copied to default location, due to missing access rights"
-                warnlog "Please open the settings in VCL TestTool and change the path for HID directory to: " + sHidOOo
-                if MsgBox ("The test won't start! Further informations are in the result file below...", 16, "Error with hid.lst file") = 1 then end
-            end if
-        else
-            ' Disabled, because Joomla! can not provide plain text webpage
-            'if (checkWriteable()) then
-                'try to get from Quaste via http
-                'httpSetProxy(Host, Port)
-            '    try 
-            '        iShellReturn = httpSend(qHost, qPath, 80, gtHidLstPath + "hid.lst")
-            '    catch
-            '        iShellReturn = 99
-            '    endcatch
-                ' when using internal httpSend, iShellReturn contains http status numbers: 200 means: ok
-            '    if (iShellReturn <> 200) then 
-            '        warnlog "Fetching file hid.lst with internal httpsend command failed with error code: " + iShellReturn + chr(13) + qHost+qPath + chr(13) + gtHidLstPath + "hid.lst"
-                    ' no hid.lst in OOo available and not available via http...
-            '        warnlog "No hid.lst file in OOo installation or on Quaste server found; Please read documentation at " + ConvertPath (gTestToolPath + "global\hid\readme.txt") + " or ask on mailing list: dev@qa.openoffice.org"
-            '        kill gtHidLstPath + "hid.lst"
-            '    else
-            '        printlog "File hid.lst successfull fetched from "+qHost+qPath+" and saved to location in VCL TestTool settings: " + gtHidLstPath
-            '    endif
-            'else
-            '    warnlog "File hid.lst could not be saved to default location, due to missing access rights"
-            '    warnlog "Please download hid.lst file from: "+qHost+qPath+" and open the settings in VCL TestTool and change the path for HID directory to your download location."
-                warnlog "Please download hid.lst file from: "+ chr(13) +"http://"+qHost+qPath+ chr(13) + "and save it to: "+ chr(13) + gtHidLstPath+"hid.lst"
-                if MsgBox ("The test won't start! Further informations are in the result file below...", 16, "Error with hid.lst file") = 1 then end
-            'end if
-        end if
-    end if
-end sub
-'-------------------------------------------------------------------------
-
 sub LoadDeclaration
 '/// Include all .sid-declarations (all menu-items as SlotIDs)
 '///+&lt;German names&gt; (<u><b>DEPRECATED</u>, only fixes allowed!</b>)
@@ -680,12 +588,7 @@ sub hFirstOutput
     Dim sDir as String
     Dim sDir1 as String
     Dim sMajor as String
-    Dim sHidVersion as String
   
-    sHidVersion = getBuildNumHidLst
-    if lCase(trim(sHidVersion)) <> lCase(gMajor + "." + gMinor) then
-        qaErrorLog "Version of file hid.lst differs from OOo version"
-    end if
     if gSamePC = TRUE then
         if (len(gMajor)>3) then
             sMajor = left(gMajor,3)
@@ -722,7 +625,6 @@ sub hFirstOutput
 	'http://wiki.services.openoffice.org/wiki/QUASTe
         printlog "**  Status feature (QUASTe)       : Enabled " + gLocalStatusDatabase  
     end if
-    printlog    "**  HID.LST based on milestone    : " + sHidVersion
     printlog    "----------------------------------------------------------------------------------------------------"  
     printlog    "**  Application installation path : " +  gNetzOfficePath
     printlog    "**  User configuration path       : " +  gOfficePath
-- 
cgit