CWS-TOOLING: integrate CWS automation_gapplication_unify

2009-03-24 14:40:09 +0100 jsk  r269948 : #i99878# - and another one...
2009-03-24 14:36:22 +0100 jsk  r269946 : #i99878# - another one...
2009-03-23 14:52:17 +0100 jsk  r269873 : #i99878# replace DESKTOP with BACKGROUND
2009-03-23 12:49:08 +0100 jsk  r269868 : #i99878# - special focus on database application
2009-03-23 12:46:13 +0100 jsk  r269867 : #i100474# - fix broken writer update testcase names
2009-03-20 15:44:29 +0100 jsk  r269817 : #i99878 - Step 3: Fixing round three - applications.txt
2009-03-20 15:40:43 +0100 jsk  r269816 : #i99878 - Step 3: Fixing round two - .bas-files
2009-03-20 15:19:04 +0100 jsk  r269813 : #i99878 - Step 3: Fixing round one
2009-03-20 15:01:07 +0100 jsk  r269811 : #i99878 - Step 1: rename, Step 2: Uppercase

3 files changed, 31 insertions, 31 deletions

diff --git a/testautomation/graphics/tools/id_tools.inc b/testautomation/graphics/tools/id_tools.inc
index ac61d8fc0513..51dcb9e42ec7 100755
--- a/testautomation/graphics/tools/id_tools.inc
+++ b/testautomation/graphics/tools/id_tools.inc
@@ -268,7 +268,7 @@ function setStartCurrentPage(optional bState as boolean) as boolean
     '/// tools->options ///'
     ToolsOptions
     '///+ select in section 'Presentation' tabpage 'general' ///'
-    hToolsOptions ("Presentation","General")
+    hToolsOptions ("IMPRESS","General")
         '///+ check the checkbox 'Always with current page' ///'
         setStartCurrentPage = MitAktuellerSeite.isChecked
         if bState then
diff --git a/testautomation/graphics/tools/id_tools_2.inc b/testautomation/graphics/tools/id_tools_2.inc
index a15d067511af..9f3783f8249c 100755
--- a/testautomation/graphics/tools/id_tools_2.inc
+++ b/testautomation/graphics/tools/id_tools_2.inc
@@ -98,14 +98,14 @@ sub sFileExport
     Dim ExPath as String
     Dim Liste( 50 ) as String
     
-    if (lCase(gApplication) = "impress") then 
+    if (gApplication = "IMPRESS") then 
       ExtensionString = "odp"
     else
       ExtensionString = "odg"
     end if
 
     '///- all files are saved in [StarOfficePath]/user/work/[applicatoion]/export ///'
-    ExPath = ConvertPath (gOfficePath + "user\work\" + lCase(gApplication) + "\export\" )
+    ExPath = ConvertPath (gOfficePath + "user\work\" + gApplication + "\export\" )
     OutputGrafikTBO = ExPath & "expo"
     Printlog "Create the export-dir for the graphics ( " + ExPath + " )"
     try
@@ -315,14 +315,14 @@ end Sub
 '-------------------------------------------------------------------------------
 sub SaveMeasurementSetFirst
 
-    if (lCase(gApplication) = "draw") then
+    if (gApplication = "DRAW") then
        sApplication = "DRAWING"
-    elseIf (lCase(gApplication) = "impress") then
-       sApplication = "PRESENTATION"
-    elseIf (lCase(gApplication) = "writer") then
-       sApplication = "TEXTDOCUMENT"
-    elseIf (lCase(gApplication) = "calc") then
-       sApplication = "SPREADSHEET"
+    elseIf (gApplication = "IMPRESS") then
+       sApplication = "IMPRESS"
+    elseIf (gApplication = "WRITER") then
+       sApplication = "WRITER"
+    elseIf (gApplication = "CALC") then
+       sApplication = "CALC"
     endif
     printlog "   '/// - save states ///'"
     ToolsOptions
@@ -338,14 +338,14 @@ end Sub
 sub MeasurementSetFirst
 
     dim f as integer
-    if (lCase(gApplication) = "draw") then
+    if (gApplication = "DRAW") then
        sApplication = "DRAWING"
-    elseIf (lCase(gApplication) = "impress") then
-       sApplication = "PRESENTATION"
-    elseIf (lCase(gApplication) = "writer") then
-       sApplication = "TEXTDOCUMENT"
-    elseIf (lCase(gApplication) = "calc") then
-       sApplication = "SPREADSHEET"
+    elseIf (gApplication = "IMPRESS") then
+       sApplication = "IMPRESS"
+    elseIf (gApplication = "WRITER") then
+       sApplication = "WRITER"
+    elseIf (gApplication = "CALC") then
+       sApplication = "CALC"
     endif
     ToolsOptions
      hToolsOptions (sApplication,"General")
@@ -367,14 +367,14 @@ end Sub
 sub ResetMeasurement
 
     dim f as integer
-    if (lCase(gApplication) = "draw") then
+    if (gApplication = "DRAW") then
        sApplication = "DRAWING"
-    elseIf (lCase(gApplication) = "impress") then
-       sApplication = "PRESENTATION"
-    elseIf (lCase(gApplication) = "writer") then
-       sApplication = "TEXTDOCUMENT"
-    elseIf (lCase(gApplication) = "calc") then
-       sApplication = "SPREADSHEET"
+    elseIf (gApplication = "IMPRESS") then
+       sApplication = "IMPRESS"
+    elseIf (gApplication = "WRITER") then
+       sApplication = "WRITER"
+    elseIf (gApplication = "CALC") then
+       sApplication = "CALC"
     endif
     printlog "'/// - Reset states back to what they were before ///'"
     ToolsOptions
diff --git a/testautomation/graphics/tools/makeLokaleTxt.bas b/testautomation/graphics/tools/makeLokaleTxt.bas
index 46ffc8fd5936..13c7d204c7b2 100755
--- a/testautomation/graphics/tools/makeLokaleTxt.bas
+++ b/testautomation/graphics/tools/makeLokaleTxt.bas
@@ -116,7 +116,7 @@ printlog "Strings from current office: "
    hCloseDocument
 
 '(3)tFormatStylistTemplateSelect 'stylist.inc::tFormatStylistTemplateSelect
-    gApplication = "Writer"
+    gApplication = "WRITER"
    hNewDocument
    kontext "Gestalter"
    if NOT Gestalter.Exists then
@@ -126,14 +126,14 @@ printlog "Strings from current office: "
    glLocale (3) = Vorlagenliste.getSelText    '   HID_STYLE_LISTBOX   ' get "Default"
    printlog "L3: '" + glLocale (3) + "'"
    hCloseDocument
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
 
 '(4)ASIANONLY tiToolsSpellcheckError
 ' no need to exclude eurtopean!
 ' this entry will get English (USA)
 '   spellbook language as alternative for not existijng asians one
 '    tiToolsSpellcheckError
-    gApplication = "Draw"
+    gApplication = "DRAW"
     hDateiOeffnen (convertPath(gTesttoolpath + "graphics/required/input/recht_1.sxd"))
     sleep 5
     hTypeKeys "<Tab><F2><Mod1 Home><Shift End>"
@@ -154,7 +154,7 @@ printlog "Strings from current office: "
     TabFont.Ok
     sleep 5
     Call hCloseDocument
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
 
 '(5)tFormatStylistBackground
 '    stylist only one tabpage area!
@@ -245,7 +245,7 @@ printlog "Strings from current office: "
 
 '(6)
 ' this entry will get German (Germany)
-    gApplication = "Draw"
+    gApplication = "DRAW"
     hDateiOeffnen (convertPath(gTesttoolpath + "graphics/required/input/recht_49.sxd"))
     sleep 5
     hTypeKeys "<Tab><F2><Mod1 Home><Shift End>"
@@ -267,7 +267,7 @@ printlog "Strings from current office: "
     sleep 5
     Call hCloseDocument
 
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
 
    dim lLocale (15*20) as string ' list, where file gets loaded into
    dim flocale as string
@@ -287,7 +287,7 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call GetUseFiles
 end sub