chart47: merge with DEV300_m80

3 files changed, 14 insertions, 42 deletions

diff --git a/testautomation/global/system/includes/iniinfo.inc b/testautomation/global/system/includes/iniinfo.inc
index 10831114d1e3..8a2807269152 100755
--- a/testautomation/global/system/includes/iniinfo.inc
+++ b/testautomation/global/system/includes/iniinfo.inc
@@ -120,12 +120,14 @@ sub GetIniInformation
    gOOoStartupTimeOut = fgetOOoStartupTimeOut()
    gOOoShutdownTimeOut = fgetOOoShutdownTimeOut()
    call sCheckValgrindStatus()
+    ' set a global path for custom scripts, like basepath, but outside of current environment
    gPrivateEnvironmentLocation = getIniValue(gTesttoolIni, "PrivateEnvironment", "Current")
-   sTemp = ConvertPath (gTestToolPath + gPrivateEnvironmentLocation + "inc/privateenvironment.inc")
-   if fileExists(sTemp) then
-       use sTemp
-       call getUseFilesPrivateEnvironment
-   else
+    if (gPrivateEnvironmentLocation <> "" AND gPrivateEnvironmentLocation <> ".") then
+        if NOT fileExists(gPrivateEnvironmentLocation) then
+            qaErrorLog "[PrivateEnvironment] defined in: '"+gTesttoolIni+"', but the path '"+gPrivateEnvironmentLocation+"'does not exist!"
+        else
+            gPrivateEnvironmentLocation = ""
+        end if
        gPrivateEnvironmentLocation = ""
    end if
 end sub
@@ -334,6 +336,7 @@ sub GetLanguageInformation
          case "no_no", "no-no", "no" : iSprache = 47        ' Norwegian
          case "pl_pl", "pl-pl", "pl" : iSprache = 48        ' Polish
          case "de_de", "de-de", "de" : iSprache = 49        ' German
+         case "sl_si", "sl-si", "sl" : iSprache = 50        ' Slovenian
 		 case "sr_rs", "sr-rs", "sr" : iSprache = 51        ' Serbian (Cyrillic)
          case "sh_rs", "sh-rs", "sh" : iSprache = 52        ' Serbian (Latin)		 
          case "pt_br", "pt-br", "br" : iSprache = 55        ' Portuguese (Brazil)
@@ -347,7 +350,6 @@ sub GetLanguageInformation
          case "hi_in", "hi-in", "hi" : iSprache = 91        ' Hindi
          case "ar_ar", "ar-ar", "ar" : iSprache = 96        ' Arabic
          case "he_he", "he-he", "he" : iSprache = 97        ' Hebrew
-         case "sl_si", "sl-si", "sl" : iSprache = 386       ' Slovenian
          case "zz_zz", "zz-zz", "zz" : iSprache = 01        ' unknown
                                        warnlog "iniinfo.inc::GetLanguageInformation()"
                                        warnlog "- sLanOutIni = " & sLanOutIni & " (unknown language)"
@@ -397,7 +399,8 @@ function ConvertLanguage ( Sprache as String ) as Integer
       case "daenisch", "danish"                             : ConvertLanguage = 45
       case "schwedisch", "swedish"                          : ConvertLanguage = 46
       case "norwegian", "norwegisch"                        : ConvertLanguage = 47
-      case "polnisch", "polish"                             : ConvertLanguage = 48      
+      case "polnisch", "polish"                             : ConvertLanguage = 48
+      case "slovenian", "slovenisch"                        : ConvertLanguage = 50
 	  case "serbisch kyrillisch", "serbian cyrillic"        : ConvertLanguage = 51
 	  case "serbisch latein", "serbian latin"               : ConvertLanguage = 52	  
       case "japanisch", "japanese"                          : ConvertLanguage = 81
@@ -408,7 +411,6 @@ function ConvertLanguage ( Sprache as String ) as Integer
       case "tuerkisch", "turkish"                           : ConvertLanguage = 90
       case "arabisch", "arab"                               : ConvertLanguage = 96
       case "catalan", "katalanisch"                         : ConvertLanguage = 99
-      case "slovenian", "slovenisch"                        : ConvertLanguage = 386
    end select
 end function
 
@@ -436,6 +438,7 @@ function GetLanguageText ( iLan ) as String
       case 47   : GetLanguageText = "Norwegian"
       case 48   : GetLanguageText = "Polnish"
       case 49   : GetLanguageText = "German"
+      case 50   : GetlanguageText = "Slovenian"
       case 51   : GetlanguageText = "Serbian (Cyrillic)"
       case 52   : GetlanguageText = "Serbian (Latin)"	  
       case 55   : GetLanguageText = "Portuguese (Brazil)"
@@ -450,7 +453,6 @@ function GetLanguageText ( iLan ) as String
       case 96   : GetLanguageText = "Arabic"
       case 97   : GetLanguageText = "Hebrew"
       case 99   : GetLanguageText = "Unknown"
-      case 386  : GetlanguageText = "Slovenian"
       case else : GetLanguageText = "detection failed"
    end select
 end function
@@ -480,6 +482,7 @@ function ConvertLanguage2 ( sSprache as String, optional bExact ) as Integer
          case "no_no", "no-no", "no" : ConvertLanguage2 = 47        ' Norwegian
          case "pl_pl", "pl-pl", "pl" : ConvertLanguage2 = 48        ' Polish
          case "de_de", "de-de", "de" : ConvertLanguage2 = 49        ' German
+         case "sl_si", "sl-si", "sl" : ConvertLanguage2 = 50        ' Slovenian
          case "sr_rs", "sr_rs", "sr" : ConvertLanguage2 = 51        ' Serbian (Cyrillic)
          case "sh_rs", "sh_rs", "sh" : ConvertLanguage2 = 52        ' Serbian (Latin)		 
          case "pt_br", "pt-br", "br" : ConvertLanguage2 = 55        ' Portuguese (Brazil)
@@ -493,7 +496,6 @@ function ConvertLanguage2 ( sSprache as String, optional bExact ) as Integer
          case "hi_in", "hi-in", "hi" : ConvertLanguage2 = 91        ' Hindi
          case "ar_ar", "ar-ar", "ar" : ConvertLanguage2 = 96        ' Arabic
          case "he_he", "he-he", "he" : ConvertLanguage2 = 97        ' Hebrew
-         case "sl_si", "sl-si", "sl" : ConvertLanguage2 = 386
          case "zz_zz", "zz-zz", "zz" : ConvertLanguage2 = 01        ' unknown
          case else                   : if isMissing (bExact) then
                                          printlog "iniinfo.inc::ConvertLanguage2(): Unknown systemlanguage '" & sSprache & "'!"
@@ -535,6 +537,7 @@ function ConvertCodeToLanguage ( sSprache as String ) as Integer
          case "2047" : ConvertCodeToLanguage = 47        ' Norwegian
          case "1045" : ConvertCodeToLanguage = 48        ' Polish
          case "1031" : ConvertCodeToLanguage = 49        ' German
+         case "1060" : ConvertCodeToLanguage = 50        ' Slovenian
          case "    " : ConvertCodeToLanguage = 55        ' Portuguese (Brazil)
          case "3098" : ConvertCodeToLanguage = 51        ' Serbian (Cyriliic)
          case "2074" : ConvertCodeToLanguage = 52        ' Serbian (Latin)		 
@@ -548,7 +551,6 @@ function ConvertCodeToLanguage ( sSprache as String ) as Integer
 '         case "    " : ConvertCodeToLanguage = 91        ' Hindi
          case "1025" : ConvertCodeToLanguage = 96        ' Arabic
 '         case "    " : ConvertCodeToLanguage = 97        ' Hebrew
-         case "1060" : ConvertCodeToLanguage = 386        ' Slovenian
          case else   : printlog "iniinfo.inc::ConvertCodeToLanguage(): Num. Code could not be detect or is unknown and will be set to 01 (English (USA))!"
                        ConvertCodeToLanguage = 01
    end select
diff --git a/testautomation/global/system/includes/master.inc b/testautomation/global/system/includes/master.inc
index d349c3737d91..9e693eea445e 100755
--- a/testautomation/global/system/includes/master.inc
+++ b/testautomation/global/system/includes/master.inc
@@ -102,35 +102,6 @@ sub GetUseFiles
         gTestToolPath = gRemotePath
     end if
     
-'/// Load private environment dependant settings
-'/// BaseDirectory is the setting from the TestTool application at Extra->Settings->Profile->Base directory
-'/// This path is available in the global variable: gTestToolPath
-'/// The private environment location directory is taken from the file BaseDirectory+errorlog/privateenvironment.txt
-'/// The default file is taken from cvs: qa/qatesttool/errorlog/privateenvironment.txt
-'/// The default content is: 
-'/// >[PrivateEnvironment]
-'/// >Current=global/private/
-'/// The path is defined relative to BaseDirectory and put into the global variable: gPrivateEnvironmentLocation
-'/// At the resulting path of BaseDirectory + gPrivateEnvironmentLocation + 'inc/' there has to exist the file: privateenvironment.inc
-'/// with at least the sub: getUseFilesPrivateEnvironment which will get executed
-
-    if (gPrivateEnvironmentLocation = "") then
-    sPrivateEnvironmentLocation = ConvertPath (gTestToolPath + "errorlog\privateenvironment.txt")
-    if fileExists(sPrivateEnvironmentLocation) then
-        gPrivateEnvironmentLocation = getIniValue(sPrivateEnvironmentLocation, "PrivateEnvironment", "Current")
-        ' TODO: remove trailing path character
-    else
-        gPrivateEnvironmentLocation = "global/private/"
-    end if
-    sTemp = ConvertPath (gTestToolPath + gPrivateEnvironmentLocation + "inc/privateenvironment.inc")
-    if fileExists(sTemp) then
-        use sTemp
-        call getUseFilesPrivateEnvironment
-    else
-        'qaErrorLog "Private Environment Control File Location specified in '" + sPrivateEnvironmentLocation + "', but the file doesn't exist: '" +sTemp+ "'"
-    end if
-    end if
-    
     ' Check if environment works with this OOo version
 '/// Control the behaviour of the environment via the file qa/qatesttool/global/version.txt:
 '/// [EnvironmentVersion]
diff --git a/testautomation/global/system/includes/status.inc b/testautomation/global/system/includes/status.inc
index 49d3a836043a..bf1ba6a74416 100644..100755
--- a/testautomation/global/system/includes/status.inc
+++ b/testautomation/global/system/includes/status.inc
@@ -271,8 +271,7 @@ sub hStatusWriteOutputFirstFile ()
         sPlat = "win"
     end if
 
-   slVersion() = Split(gProductName, " ")                         '(15)
-   sProduct = slVersion(0)
+    sProduct = gProductName                         '(15)
 
     ' major is from start to 'm'
     iPosA = 1