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

80 files changed, 195 insertions, 195 deletions

diff --git a/testautomation/graphics/optional/d_export_graphic_a.bas b/testautomation/graphics/optional/d_export_graphic_a.bas
index 7bdc42cae6fe..574eb2807f2b 100755
--- a/testautomation/graphics/optional/d_export_graphic_a.bas
+++ b/testautomation/graphics/optional/d_export_graphic_a.bas
@@ -75,6 +75,6 @@ sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
     Call GetUseFiles
-    gApplication = "Draw"
+    gApplication = "DRAW"
 end sub
 
diff --git a/testautomation/graphics/optional/d_export_graphic_b.bas b/testautomation/graphics/optional/d_export_graphic_b.bas
index ea102113df58..4fe60ab26acd 100755
--- a/testautomation/graphics/optional/d_export_graphic_b.bas
+++ b/testautomation/graphics/optional/d_export_graphic_b.bas
@@ -74,6 +74,6 @@ sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
     Call GetUseFiles
-    gApplication = "Draw"
+    gApplication = "DRAW"
 end sub
 
diff --git a/testautomation/graphics/optional/export_graphic_a.bas b/testautomation/graphics/optional/export_graphic_a.bas
index e10a49873329..df405ba9f8a8 100755
--- a/testautomation/graphics/optional/export_graphic_a.bas
+++ b/testautomation/graphics/optional/export_graphic_a.bas
@@ -74,6 +74,6 @@ sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
     Call GetUseFiles
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
 end sub
 
diff --git a/testautomation/graphics/optional/export_graphic_b.bas b/testautomation/graphics/optional/export_graphic_b.bas
index 2f5e3366545d..bf1f78512bb8 100755
--- a/testautomation/graphics/optional/export_graphic_b.bas
+++ b/testautomation/graphics/optional/export_graphic_b.bas
@@ -74,6 +74,6 @@ sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
     Call GetUseFiles
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
 end sub
 
diff --git a/testautomation/graphics/optional/g_accessability.bas b/testautomation/graphics/optional/g_accessability.bas
index ee14795a40b1..aaff8f00b90d 100755
--- a/testautomation/graphics/optional/g_accessability.bas
+++ b/testautomation/graphics/optional/g_accessability.bas
@@ -49,7 +49,7 @@ sub main
         Call tEis1549
         Call tEis1523
 
-    gApplication = "Draw"
+    gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
         Call tEis1549
         Call tEis1523
@@ -60,6 +60,6 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/g_area.bas b/testautomation/graphics/optional/g_area.bas
index ab8ba3ee2436..99fe74639b9d 100755
--- a/testautomation/graphics/optional/g_area.bas
+++ b/testautomation/graphics/optional/g_area.bas
@@ -47,7 +47,7 @@ sub main
         Call tiFormatArea
         Call tdFormatArea1
 
-    gApplication = "Draw"
+    gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
         Call tiFormatArea
         Call tdFormatArea1
@@ -58,6 +58,6 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/g_arrangealign.bas b/testautomation/graphics/optional/g_arrangealign.bas
index 61ff3a62924a..d47403967994 100755
--- a/testautomation/graphics/optional/g_arrangealign.bas
+++ b/testautomation/graphics/optional/g_arrangealign.bas
@@ -66,7 +66,7 @@ sub main
         Call tdContextBehindObject
         Call tdContextReverse
 
-    gApplication = "Draw"
+    gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
         if (Lcase(gApplication) = "impress") then
             Datei = ConvertPath (gOfficePath + "user\work\" + "anord.odp")
@@ -89,6 +89,6 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/g_autocorrection.bas b/testautomation/graphics/optional/g_autocorrection.bas
index b7760a229e5f..fa7e30b23fb2 100755
--- a/testautomation/graphics/optional/g_autocorrection.bas
+++ b/testautomation/graphics/optional/g_autocorrection.bas
@@ -51,7 +51,7 @@ sub main
     GetOLEDefaultNames
     hSetLocaleStrings ( gTesttoolPath + "graphics\tools\locale_1.txt" , glLocale () )
 
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     PrintLog "-------------------------" + gApplication + "-------------------"
 'qaErrorLog "#i76832# - tToolsAutocorrectCustomQuotes (x4) outcommented due to Bug."
     Call tToolsAutocorrectCustomQuotes (TRUE)
@@ -60,7 +60,7 @@ sub main
     Call tToolsAutocorrectReplace
     Call tToolsAutocorrectExceptions
 
-    gApplication = "Draw"
+    gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
     Call tToolsAutocorrectCustomQuotes (TRUE)
     Call tToolsAutocorrectCustomQuotes (FALSE)
@@ -74,6 +74,6 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/g_character.bas b/testautomation/graphics/optional/g_character.bas
index 8079a3f3cb3d..85cff92a27ba 100755
--- a/testautomation/graphics/optional/g_character.bas
+++ b/testautomation/graphics/optional/g_character.bas
@@ -52,7 +52,7 @@ sub main
         Call tSetFormatCharacter
         Call tGetFormatCharacter
 
-    gApplication = "Draw"
+    gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
 
         Call tDialogCharacter
@@ -67,6 +67,6 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/g_clipboard.bas b/testautomation/graphics/optional/g_clipboard.bas
index bd632421a70c..13fb611ca854 100755
--- a/testautomation/graphics/optional/g_clipboard.bas
+++ b/testautomation/graphics/optional/g_clipboard.bas
@@ -61,7 +61,7 @@ sub main
         Call tdEditPasteSpecial_Graphic
         Call tdEditPasteSpecial_Circle
 
-    gApplication = "Draw"
+    gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
         Call tiEditPasteSpecial
         Call tiEditUndo
@@ -78,6 +78,6 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/g_convertto.bas b/testautomation/graphics/optional/g_convertto.bas
index ca930a936b78..d453025659a6 100755
--- a/testautomation/graphics/optional/g_convertto.bas
+++ b/testautomation/graphics/optional/g_convertto.bas
@@ -57,7 +57,7 @@ sub main
         Call tiAendernUmwandelnIn3DRotationsKoerper
         Call tiAendernUmwandelnInMetaFile
 
-    gApplication = "Draw"
+    gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
         Call tiModifyConvertToPolygon
         Call tdContextConvertIntoBitmap
@@ -73,6 +73,6 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/g_crossfading.bas b/testautomation/graphics/optional/g_crossfading.bas
index 950ecd2370a3..3967f71937b1 100755
--- a/testautomation/graphics/optional/g_crossfading.bas
+++ b/testautomation/graphics/optional/g_crossfading.bas
@@ -47,7 +47,7 @@ sub main
     PrintLog "-------------------------" + gApplication + "-------------------"
         Call tCrossfading
 
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     PrintLog "-------------------------" + gApplication + "-------------------"
         Call tCrossfading
 
@@ -57,6 +57,6 @@ end sub
 sub LoadIncludeFiles
    use "global\system\includes\master.inc"
    use "global\system\includes\gvariabl.inc"
-   gApplication = "Draw"
+   gApplication = "DRAW"
    Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/g_customshapes.bas b/testautomation/graphics/optional/g_customshapes.bas
index 54cf5a1d4ea0..6a99f090ad04 100755
--- a/testautomation/graphics/optional/g_customshapes.bas
+++ b/testautomation/graphics/optional/g_customshapes.bas
@@ -48,7 +48,7 @@ sub main
     Call tFormatPaintbrush
     Call tCustomshapes
 
-    gApplication = "Draw"
+    gApplication = "DRAW"
     PrintLog "--------------------- " + gApplication + " -------------------"
         Call tFormatPaintbrush
         Call tCustomshapes
@@ -59,6 +59,6 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/g_demoguide.bas b/testautomation/graphics/optional/g_demoguide.bas
index faf9018c5164..819cfa73d062 100755
--- a/testautomation/graphics/optional/g_demoguide.bas
+++ b/testautomation/graphics/optional/g_demoguide.bas
@@ -57,6 +57,6 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/g_dimensions.bas b/testautomation/graphics/optional/g_dimensions.bas
index ae5dc30d41d3..33a4f42ed0a9 100755
--- a/testautomation/graphics/optional/g_dimensions.bas
+++ b/testautomation/graphics/optional/g_dimensions.bas
@@ -46,7 +46,7 @@ sub main
     PrintLog "-------------------------" + gApplication + "-------------------"
         Call testFormatDimensioning
 
-    gApplication = "Draw"
+    gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
         Call testFormatDimensioning
 
@@ -56,6 +56,6 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/g_edit.bas b/testautomation/graphics/optional/g_edit.bas
index 9e0a4e9fece5..22d37329bf8e 100755
--- a/testautomation/graphics/optional/g_edit.bas
+++ b/testautomation/graphics/optional/g_edit.bas
@@ -54,7 +54,7 @@ sub main
         Call tEditLinks
         Call tEditObjectEdit
 
-    gApplication = "Draw"
+    gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
         Call tEditDuplicate
         Call tEditFields
@@ -70,5 +70,5 @@ sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
     Call GetUseFiles
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
 end sub
diff --git a/testautomation/graphics/optional/g_export_html.bas b/testautomation/graphics/optional/g_export_html.bas
index d4ea75e7456b..43fff300041c 100755
--- a/testautomation/graphics/optional/g_export_html.bas
+++ b/testautomation/graphics/optional/g_export_html.bas
@@ -53,7 +53,7 @@ sub main
         Call tHTMLExport
         Call tHtmlExport_Webcast
 
-    gApplication = "Draw"
+    gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
         Call tHTMLExport
 
@@ -65,5 +65,5 @@ sub LoadIncludeFiles
     use "global\system\includes\gvariabl.inc"
     use "global\tools\includes\optional\t_ui_filters.inc"
     Call GetUseFiles
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
 end sub
diff --git a/testautomation/graphics/optional/g_findreplace.bas b/testautomation/graphics/optional/g_findreplace.bas
index 473b215c8fc7..cf013a01f2c8 100755
--- a/testautomation/graphics/optional/g_findreplace.bas
+++ b/testautomation/graphics/optional/g_findreplace.bas
@@ -52,7 +52,7 @@ sub main
    Call tiEditSearchAndReplace
    Call tiEditSearchAndReplaceBUGS
 
-   gApplication = "Draw"
+   gApplication = "DRAW"
    PrintLog "-------------------------" + gApplication + "-------------------"
    Call tiEditSearchAndReplace
 
@@ -62,6 +62,6 @@ end sub
 sub LoadIncludeFiles
    use "global\system\includes\master.inc"
    use "global\system\includes\gvariabl.inc"
-   gApplication = "Impress"
+   gApplication = "IMPRESS"
    Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/g_format.bas b/testautomation/graphics/optional/g_format.bas
index 8faf9a3f18b0..bd2bc0fee601 100755
--- a/testautomation/graphics/optional/g_format.bas
+++ b/testautomation/graphics/optional/g_format.bas
@@ -55,7 +55,7 @@ sub main
         Call tiFormatAufzaehlungszeichen
         Call tdFormatTemplates
 
-    gApplication = "Draw"
+    gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
         Call tiFormatText
         Call tdFormatLayer
@@ -72,5 +72,5 @@ sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
     Call GetUseFiles
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
 end sub
diff --git a/testautomation/graphics/optional/g_group.bas b/testautomation/graphics/optional/g_group.bas
index 0ac5da2c4c9f..7841eee6f843 100755
--- a/testautomation/graphics/optional/g_group.bas
+++ b/testautomation/graphics/optional/g_group.bas
@@ -47,7 +47,7 @@ sub main
     PrintLog "-------------------------" + gApplication + "-------------------"
         Call tiGruppierung
 
-    gApplication = "Draw"
+    gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
         Call tiGruppierung
 
@@ -57,6 +57,6 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/g_imagemap.bas b/testautomation/graphics/optional/g_imagemap.bas
index 972faf3df12c..d358f9d60270 100755
--- a/testautomation/graphics/optional/g_imagemap.bas
+++ b/testautomation/graphics/optional/g_imagemap.bas
@@ -48,7 +48,7 @@ sub main
         Call tEditImageMap
         Call tEditImageMapProperties
 
-    gApplication = "Draw"
+    gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
         Call tEditImageMap
         Call tEditImageMapProperties
@@ -59,6 +59,6 @@ end sub
 sub LoadIncludeFiles
    use "global\system\includes\master.inc"
    use "global\system\includes\gvariabl.inc"
-   gApplication = "Impress"
+   gApplication = "IMPRESS"
    Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/g_insert.bas b/testautomation/graphics/optional/g_insert.bas
index 3eb70b48520f..2abe9d6e1978 100755
--- a/testautomation/graphics/optional/g_insert.bas
+++ b/testautomation/graphics/optional/g_insert.bas
@@ -66,7 +66,7 @@ sub main
     Call tInsertChart
     Call tdInsertFile
 
-    gApplication = "Draw"
+    gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
 
     Call tInsertFloatingFrame
@@ -95,6 +95,6 @@ end sub
 sub LoadIncludeFiles
    use "global\system\includes\master.inc"
    use "global\system\includes\gvariabl.inc"
-   gApplication = "Impress"
+   gApplication = "IMPRESS"
    Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/g_line.bas b/testautomation/graphics/optional/g_line.bas
index fc71c628eef3..d6e8501c0340 100755
--- a/testautomation/graphics/optional/g_line.bas
+++ b/testautomation/graphics/optional/g_line.bas
@@ -47,7 +47,7 @@ sub main
         Call tiFormatLine
         Call tLineConnect
 
-    gApplication = "Draw"
+    gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
         Call tiFormatLine
         Call tLineConnect
@@ -59,6 +59,6 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/g_load_save.bas b/testautomation/graphics/optional/g_load_save.bas
index 066829ec801f..2800bd8512f1 100755
--- a/testautomation/graphics/optional/g_load_save.bas
+++ b/testautomation/graphics/optional/g_load_save.bas
@@ -67,7 +67,7 @@ sub main
         call tSaveLoadLayoutChart
         call tSaveLoadLayoutSpreadsheet
 
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     PrintLog "-------------------------" + gApplication + "-------------------"
         Call tFileOpenSaveEtc
         Call tFileProperties
@@ -90,7 +90,7 @@ sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
     Call GetUseFiles
-    gApplication = "Draw"
+    gApplication = "DRAW"
 end sub
 
 
diff --git a/testautomation/graphics/optional/g_mediaplayer.bas b/testautomation/graphics/optional/g_mediaplayer.bas
index fd6a20f4f106..bc143d7d68f9 100755
--- a/testautomation/graphics/optional/g_mediaplayer.bas
+++ b/testautomation/graphics/optional/g_mediaplayer.bas
@@ -46,7 +46,7 @@ sub main
 
     PrintLog "-------------------------" + gApplication + "-------------------"
     call g_mediaplayer
-    gApplication = "Draw"
+    gApplication = "DRAW"
     
     PrintLog "-------------------------" + gApplication + "-------------------"
     call g_mediaplayer
@@ -57,6 +57,6 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/g_navigator.bas b/testautomation/graphics/optional/g_navigator.bas
index bef4fe20088a..b0a2caa83c1e 100755
--- a/testautomation/graphics/optional/g_navigator.bas
+++ b/testautomation/graphics/optional/g_navigator.bas
@@ -51,7 +51,7 @@ sub main
        Call tViewNavigatorGroupedObjects
        Call tViewNavigatorNameActivated
 
-    gApplication = "Draw"
+    gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
        Call tViewNavigatorZOrder
        Call tdViewNavigator
@@ -65,6 +65,6 @@ sub LoadIncludeFiles
    use "global\system\includes\master.inc"
    use "global\system\includes\gvariabl.inc"
     
-   gApplication = "Impress"
+   gApplication = "IMPRESS"
    Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/g_ole.bas b/testautomation/graphics/optional/g_ole.bas
index 9f99e64e8ab8..4f75f10508c1 100755
--- a/testautomation/graphics/optional/g_ole.bas
+++ b/testautomation/graphics/optional/g_ole.bas
@@ -61,6 +61,6 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/g_paneview.bas b/testautomation/graphics/optional/g_paneview.bas
index bb46790aeda3..04955496744e 100755
--- a/testautomation/graphics/optional/g_paneview.bas
+++ b/testautomation/graphics/optional/g_paneview.bas
@@ -52,7 +52,7 @@ sub main
      call tiMinimize_Maximize_Docking_TaskPane
      call tiPaneview_LoadSave_Windowsstate
 
-    gApplication = "Draw"
+    gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
      call tdMinimize_Maximize_Docking_Pagepane
      call tdPaneview_LoadSave_Windowsstate
@@ -63,6 +63,6 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/g_paragraph.bas b/testautomation/graphics/optional/g_paragraph.bas
index fefb227a1e30..52bfc72c1dd0 100755
--- a/testautomation/graphics/optional/g_paragraph.bas
+++ b/testautomation/graphics/optional/g_paragraph.bas
@@ -47,7 +47,7 @@ sub main
     PrintLog "-------------------------" + gApplication + "-------------------"
         Call tdFormatParagraph
 
-    gApplication = "Draw"
+    gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
         Call tdFormatParagraph
 
@@ -57,6 +57,6 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/g_print.bas b/testautomation/graphics/optional/g_print.bas
index d853085c06b2..a08905c7ae99 100755
--- a/testautomation/graphics/optional/g_print.bas
+++ b/testautomation/graphics/optional/g_print.bas
@@ -49,7 +49,7 @@ sub main
     PrintLog "-------------------------" + gApplication + "-------------------"
         call tFilePrint
 
-    gApplication = "Draw"
+    gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
         call tFilePrint
 
@@ -59,6 +59,6 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/g_savepictureas.bas b/testautomation/graphics/optional/g_savepictureas.bas
index a261738f94aa..b6fed70b9f53 100755
--- a/testautomation/graphics/optional/g_savepictureas.bas
+++ b/testautomation/graphics/optional/g_savepictureas.bas
@@ -52,7 +52,7 @@ sub main
     Call tContextSavePictureLinkAsPicture
     Call Mnemonickey
     
-    gApplication = "Draw"
+    gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
     Call tContextSaveAsPicture
     Call tContextSavePictureLinkAsPicture
@@ -65,6 +65,6 @@ sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
     Call GetUseFiles
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
 end sub
 
diff --git a/testautomation/graphics/optional/g_shaddow.bas b/testautomation/graphics/optional/g_shaddow.bas
index ed7dc74c38a8..1231ab4c51dc 100755
--- a/testautomation/graphics/optional/g_shaddow.bas
+++ b/testautomation/graphics/optional/g_shaddow.bas
@@ -48,11 +48,11 @@ sub main
     use "graphics\tools\id_tools_2.inc"
     use "graphics\optional\includes\global\g_shaddow.inc"
 
-   gApplication = "Impress"
+   gApplication = "IMPRESS"
    PrintLog "------------------------- " + gApplication + " Shaddow-Optional Test -------------------"
    Call tiShaddow
 
-   gApplication = "Draw"
+   gApplication = "DRAW"
    PrintLog "------------------------- " + gApplication + " Shaddow-Optional Test -------------------"
    Call tiShaddow
 
@@ -62,6 +62,6 @@ end sub
 sub LoadIncludeFiles
    use "global\system\includes\master.inc"
    use "global\system\includes\gvariabl.inc"
-   gApplication = "Draw"
+   gApplication = "DRAW"
    Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/g_slidelayer.bas b/testautomation/graphics/optional/g_slidelayer.bas
index fb331e54ded6..8a243323932c 100755
--- a/testautomation/graphics/optional/g_slidelayer.bas
+++ b/testautomation/graphics/optional/g_slidelayer.bas
@@ -58,7 +58,7 @@ sub main
         Call t114174  ' only in impress
         Call t111862
 
-    gApplication = "Draw"
+    gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
         Call tInsertSlide
         Call tInsertDuplicateSlide
@@ -70,6 +70,6 @@ end sub
 sub LoadIncludeFiles
    use "global\system\includes\master.inc"
    use "global\system\includes\gvariabl.inc"
-   gApplication = "Impress"
+   gApplication = "IMPRESS"
    Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/g_spellcheck.bas b/testautomation/graphics/optional/g_spellcheck.bas
index caceb20796f8..4b06ae014b26 100755
--- a/testautomation/graphics/optional/g_spellcheck.bas
+++ b/testautomation/graphics/optional/g_spellcheck.bas
@@ -55,7 +55,7 @@ sub main
         Call tiToolsSpellcheckCheck        
         Call tToolsSpellcheckAutoSpellcheck
 
-    gApplication = "Draw"
+    gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
         Call tiToolsSpellcheckCorrect
         Call tiToolsSpellcheckError
@@ -69,6 +69,6 @@ sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
     use "global\tools\includes\optional\t_extension_manager_tools.inc"
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/g_stylist.bas b/testautomation/graphics/optional/g_stylist.bas
index 90c013350bb0..6ec8d4f4be7b 100755
--- a/testautomation/graphics/optional/g_stylist.bas
+++ b/testautomation/graphics/optional/g_stylist.bas
@@ -53,7 +53,7 @@ sub main
         warnlog "Locales file doesn't exist graphics\tools\locale_1.txt"
     endif
 
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
 
     PrintLog "-------------------------" + gApplication + "-------------------"
     Call tFormatStylistFlyer
@@ -79,7 +79,7 @@ else
    qaerrorlog "Deactivated tFormatStylistBackground due to string-name-difficulties."
 endif
 
-    gApplication = "Draw"
+    gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
 
     Call tFormatStylistFlyer
@@ -101,6 +101,6 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/g_tables.bas b/testautomation/graphics/optional/g_tables.bas
index 0bd6eb867e57..f585b343be70 100755
--- a/testautomation/graphics/optional/g_tables.bas
+++ b/testautomation/graphics/optional/g_tables.bas
@@ -49,7 +49,7 @@ sub main
     call tiInsertTableUsingButton 
     call tiInsertTableUsingToolbarbutton
     call tiTableObjectBar 
-    gApplication = "Draw"
+    gApplication = "DRAW"
     
     PrintLog "-------------------------" + gApplication + "-------------------"
     
@@ -65,7 +65,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
 
diff --git a/testautomation/graphics/optional/g_toolbars.bas b/testautomation/graphics/optional/g_toolbars.bas
index 88499551d228..f1dbbda362ae 100755
--- a/testautomation/graphics/optional/g_toolbars.bas
+++ b/testautomation/graphics/optional/g_toolbars.bas
@@ -54,7 +54,7 @@ sub main
         Call Toolboxen_Linien
         Call tToolsCustomize              'global\required\includes
 
-    gApplication = "Draw"
+    gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
         Call Toolboxen_Rechtecke
         Call Toolboxen_Kreise
@@ -71,5 +71,5 @@ sub LoadIncludeFiles
     use "global\system\includes\gvariabl.inc"
     use "global\required\includes\g_customize.inc"
     Call GetUseFiles
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
 end sub
diff --git a/testautomation/graphics/optional/g_tools.bas b/testautomation/graphics/optional/g_tools.bas
index 86feba5f5af4..65e3227dd8eb 100755
--- a/testautomation/graphics/optional/g_tools.bas
+++ b/testautomation/graphics/optional/g_tools.bas
@@ -54,7 +54,7 @@ sub main
         Call tiToolsHyphenation2
         Call tToolsMacro
 
-    gApplication = "Draw"
+    gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
         Call tiToolsThesaurus
         Call tiToolsHyphenation1
@@ -68,5 +68,5 @@ sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
     Call GetUseFiles
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
 end sub
diff --git a/testautomation/graphics/optional/g_zoom.bas b/testautomation/graphics/optional/g_zoom.bas
index 164d3935f0a0..0e7e4779967d 100755
--- a/testautomation/graphics/optional/g_zoom.bas
+++ b/testautomation/graphics/optional/g_zoom.bas
@@ -48,7 +48,7 @@ sub main
     PrintLog "-------------------------" + gApplication + "-------------------"
         Call tViewZoom
 
-    gApplication = "Draw"
+    gApplication = "DRAW"
     PrintLog "-------------------------" + gApplication + "-------------------"
         Call tViewZoom
 
@@ -58,6 +58,6 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/i_animation.bas b/testautomation/graphics/optional/i_animation.bas
index 4b9c91777730..fc63b3bdc304 100755
--- a/testautomation/graphics/optional/i_animation.bas
+++ b/testautomation/graphics/optional/i_animation.bas
@@ -52,6 +52,6 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/i_headerfooter.bas b/testautomation/graphics/optional/i_headerfooter.bas
index 81d9967ec34e..453a3c206caf 100755
--- a/testautomation/graphics/optional/i_headerfooter.bas
+++ b/testautomation/graphics/optional/i_headerfooter.bas
@@ -55,6 +55,6 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/i_pengine.bas b/testautomation/graphics/optional/i_pengine.bas
index 1de701dcb8f8..6e6440e5a390 100755
--- a/testautomation/graphics/optional/i_pengine.bas
+++ b/testautomation/graphics/optional/i_pengine.bas
@@ -80,6 +80,6 @@ sub LoadIncludeFiles
    use "global\system\includes\master.inc"
    use "global\system\includes\gvariabl.inc"
    use "global\tools\includes\optional\t_ui_filters.inc"
-   gApplication = "Impress"
+   gApplication = "IMPRESS"
    Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/i_saveloadlayout.bas b/testautomation/graphics/optional/i_saveloadlayout.bas
index bfe3017a2467..d90fa4369ad3 100755
--- a/testautomation/graphics/optional/i_saveloadlayout.bas
+++ b/testautomation/graphics/optional/i_saveloadlayout.bas
@@ -62,7 +62,7 @@ sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
     Call GetUseFiles
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
 end sub
 
 
diff --git a/testautomation/graphics/optional/i_slidecopy.bas b/testautomation/graphics/optional/i_slidecopy.bas
index fc442282b43f..7c5aa61caf0b 100755
--- a/testautomation/graphics/optional/i_slidecopy.bas
+++ b/testautomation/graphics/optional/i_slidecopy.bas
@@ -62,6 +62,6 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/i_slideshow.bas b/testautomation/graphics/optional/i_slideshow.bas
index f433fc92488f..54dbfde3dd5e 100755
--- a/testautomation/graphics/optional/i_slideshow.bas
+++ b/testautomation/graphics/optional/i_slideshow.bas
@@ -92,6 +92,6 @@ sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
     use "global\tools\includes\optional\t_ui_filters.inc"
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/i_us_presentation.bas b/testautomation/graphics/optional/i_us_presentation.bas
index ce0be19dda49..5b9bf47f9b3d 100755
--- a/testautomation/graphics/optional/i_us_presentation.bas
+++ b/testautomation/graphics/optional/i_us_presentation.bas
@@ -65,6 +65,6 @@ end sub
 sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/i_view.bas b/testautomation/graphics/optional/i_view.bas
index aa55ab34e8d8..9a10da11ee97 100755
--- a/testautomation/graphics/optional/i_view.bas
+++ b/testautomation/graphics/optional/i_view.bas
@@ -61,6 +61,6 @@ end sub
 sub LoadIncludeFiles
    use "global\system\includes\master.inc"
    use "global\system\includes\gvariabl.inc"
-   gApplication = "Impress"
+   gApplication = "IMPRESS"
    Call GetUseFiles
 end sub
diff --git a/testautomation/graphics/optional/includes/global/export_graphic_2.inc b/testautomation/graphics/optional/includes/global/export_graphic_2.inc
index 7500462615bf..033a27b05eae 100755
--- a/testautomation/graphics/optional/includes/global/export_graphic_2.inc
+++ b/testautomation/graphics/optional/includes/global/export_graphic_2.inc
@@ -536,7 +536,7 @@ testcase tPDF_Creator
     End If
 
     sApp = gApplication
-    gApplication = "writer"
+    gApplication = "WRITER"
     sleep 5 ' wait for document to be loaded
     ' /Creator
     bTemp = hFindeImDokument ("<</Creator<",true)
@@ -653,7 +653,7 @@ testcase tSVG
                 endif
                 '-------------------------------/
                 sTemp = gApplication
-                gApplication = "writer"
+                gApplication = "WRITER"
                 sleep 5 ' wait for document to be loaded
                 bTemp = hFindeImDokument ("<!DOCTYPE svg PUBLIC "+chr(34)+ "-//W3C//DTD SVG 1.1//EN"+chr(34)+" "+chr(34)+"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"+chr(34)+">",true)
                 '-------------------------------\
diff --git a/testautomation/graphics/optional/includes/global/g_accessability.inc b/testautomation/graphics/optional/includes/global/g_accessability.inc
index 3ec4dd559241..b4622711a5c5 100755
--- a/testautomation/graphics/optional/includes/global/g_accessability.inc
+++ b/testautomation/graphics/optional/includes/global/g_accessability.inc
@@ -205,7 +205,7 @@ testcase tEis1523
       warnlog "Unexpected error :-("
    endcatch
 
-   if (lcase(gApplication) = "impress") then
+   if (gApplication = "IMPRESS") then
    '/// IMPRESS only ///'
       '///+ check if Layout placeholders are inherited ///'
       '///+ create new page with [ctrl]+[Return]] ///'
@@ -254,7 +254,7 @@ testcase tEis1581
    '/// open application ///'
    call hNewDocument
 
-   if (lcase(gApplication) = "impress") then
+   if (gApplication = "IMPRESS") then
       '/// Format -> Layout ///'
       FormatModifyPage
       '/// choose layout with graphic ///'
diff --git a/testautomation/graphics/optional/includes/global/g_autocorrection.inc b/testautomation/graphics/optional/includes/global/g_autocorrection.inc
index ca936ba3a995..0ae5980e3f06 100755
--- a/testautomation/graphics/optional/includes/global/g_autocorrection.inc
+++ b/testautomation/graphics/optional/includes/global/g_autocorrection.inc
@@ -145,7 +145,7 @@ testcase tToolsAutocorrectCustomQuotes(bSimple as boolean)
     dim sTemp as string
     dim sFileName as string
 
-    if (lCase(gApplication) = "impress") then 
+    if (gApplication = "IMPRESS") then 
         ExtensionString = "odp"
     else
         ExtensionString = "odg"
diff --git a/testautomation/graphics/optional/includes/global/g_character.inc b/testautomation/graphics/optional/includes/global/g_character.inc
index e3a0d370f051..52af1ca97b62 100755
--- a/testautomation/graphics/optional/includes/global/g_character.inc
+++ b/testautomation/graphics/optional/includes/global/g_character.inc
@@ -380,7 +380,7 @@ testcase tSetFormatCharacter
     dim sFile as string
     dim sTemp as string
 
-   if (lCase(gApplication) = "impress") then 
+   if (gApplication = "IMPRESS") then 
       ExtensionString = "odp"
    else
       ExtensionString = "odg"
@@ -580,7 +580,7 @@ testcase tGetFormatCharacter
     dim iTemp as integer
     dim sSpellBooks(30) as string
 
-    if (lCase(gApplication) = "impress") then 
+    if (gApplication = "IMPRESS") then 
        ExtensionString = "odp"
     else
        ExtensionString = "odg"
diff --git a/testautomation/graphics/optional/includes/global/g_clipboard.inc b/testautomation/graphics/optional/includes/global/g_clipboard.inc
index 352808509de5..5725417d50a5 100755
--- a/testautomation/graphics/optional/includes/global/g_clipboard.inc
+++ b/testautomation/graphics/optional/includes/global/g_clipboard.inc
@@ -51,7 +51,7 @@ testcase tiEditUndo
     Dim sDatei as string
     Dim Ueber_Text_1 as string
     
-    if (lCase(gApplication) = "impress") then 
+    if (gApplication = "IMPRESS") then 
         ExtensionString = "odp"
     else
         ExtensionString = "odg"
@@ -137,7 +137,7 @@ testcase tiEditRedo
     Dim Datei$
     Dim Ueber_Text_1
     
-    if (lCase(gApplication) = "impress") then 
+    if (gApplication = "IMPRESS") then 
         ExtensionString = "odp"
     else
         ExtensionString = "odg"
diff --git a/testautomation/graphics/optional/includes/global/g_clipexport2.inc b/testautomation/graphics/optional/includes/global/g_clipexport2.inc
index 18f64b5c0632..a575c0c75101 100755
--- a/testautomation/graphics/optional/includes/global/g_clipexport2.inc
+++ b/testautomation/graphics/optional/includes/global/g_clipexport2.inc
@@ -119,7 +119,7 @@ sub Make3dObject
         Kontext "ThreeDObjectsbar"
         ThreeDObjectsbar.close
     else
-        if (lCase(gApplication) = "DRAW") then
+        if (gApplication = "DRAW") then
             Toolbar.OpenContextMenu           '/// enable 3d-object-button in menubar
             sleep 1
             hMenuselectNr (1)
diff --git a/testautomation/graphics/optional/includes/global/g_clipexport3.inc b/testautomation/graphics/optional/includes/global/g_clipexport3.inc
index a2a337b483da..563691496242 100755
--- a/testautomation/graphics/optional/includes/global/g_clipexport3.inc
+++ b/testautomation/graphics/optional/includes/global/g_clipexport3.inc
@@ -404,13 +404,13 @@ sub Check_Text_Formatting
     sleep (3)
 
     '/// Select the text and bring up the attributes for it. ///'
-    select case (lCase(gApplication))
-           case "draw"    : hTypeKeys "<RETURN>"
+    select case (gApplication)
+           case "DRAW"    : hTypeKeys "<RETURN>"
                             hTypeKeys "<SHIFT HOME>" 'Mark the whole text'
-	   case "impress" : hTypeKeys "<RETURN>"
+	   case "IMPRESS" : hTypeKeys "<RETURN>"
                             hTypeKeys "<SHIFT HOME>" 'Mark the whole text'
-	   case "writer"  : EditSelectAll  'Since there is currently only (should only be) one object (the text) in the document.
-	   case "calc"    : hTypeKeys "<MOD1 HOME>"
+	   case "WRITER"  : EditSelectAll  'Since there is currently only (should only be) one object (the text) in the document.
+	   case "CALC"    : hTypeKeys "<MOD1 HOME>"
 '                           hTypeKeys "<SHIFT HOME>" 'Mark the whole text'  
            case else      : warnlog "   the test has not been configured for this application ( '" + gApplication + "' ). Please notify testwriter."
     end select
@@ -444,7 +444,7 @@ sub Check_Text_Formatting
    if Unterstrichen.GetState(2) <> Text6 then warnlog "   Underline should be: " + Text6 + " but was: " + Unterstrichen.GetState(2)
 
    Kontext "TextObjectbar"
-   if (lCase(gApplication)) = "calc" then
+   if (gApplication) = "CALC" then
       kontext "FormatObjectBar"
       Printlog "   - Check if the Font-attribute is set to Justified"
       '/// check state for button 'Justified' ///'
diff --git a/testautomation/graphics/optional/includes/global/g_customshapes.inc b/testautomation/graphics/optional/includes/global/g_customshapes.inc
index 65961f5b12b5..11383ea62fb2 100755
--- a/testautomation/graphics/optional/includes/global/g_customshapes.inc
+++ b/testautomation/graphics/optional/includes/global/g_customshapes.inc
@@ -46,7 +46,7 @@ testcase tCustomshapes
 
    '/// Create new document ///'
    Call hNewDocument
-     if lcase(gApplication) = "draw" then
+     if gApplication = "DRAW" then
         Kontext "Documentdraw"
      else '(Impress)
         Kontext "DocumentImpress"
@@ -254,7 +254,7 @@ testcase tCustomshapes
 
      printlog "Change all objects into 3D."
      '/// Change all objects into 3D. ///'
-     if lcase(gApplication) = "draw" then
+     if gApplication = "DRAW" then
         Kontext "Documentdraw"
      else '(Impress)
         Kontext "DocumentImpress"
@@ -306,7 +306,7 @@ testcase tCustomshapes
      hTypeKeys "<TAB><TAB><TAB>"
 
      hTypeKeys "<MOD1 TAB>" ,9
-     if lcase(gApplication) = "impress" then
+     if gApplication = "IMPRESS" then
         hTypeKeys "<RIGHT>" ,86
         hTypeKeys "<UP>", 48
      else
@@ -638,7 +638,7 @@ testcase tFormatPaintbrush
 
       '/// Create a second rectangle, and use the "Paintbrush-icon" to copy the settings for the first rectangle onto the new one ///'
       hRechteckErstellen ( 70, 70, 90, 90 )
-      if lcase(gApplication) = "draw" then
+      if gApplication = "DRAW" then
          kontext "Documentdraw"
          Documentdraw.Mousedown 20, 20
          Documentdraw.Mouseup 20, 20
diff --git a/testautomation/graphics/optional/includes/global/g_edit.inc b/testautomation/graphics/optional/includes/global/g_edit.inc
index 3bbb84c110eb..6dbcb9f2cf14 100755
--- a/testautomation/graphics/optional/includes/global/g_edit.inc
+++ b/testautomation/graphics/optional/includes/global/g_edit.inc
@@ -44,9 +44,9 @@
 ' #1 tEditObjectEdit
 '\*************************************************************************************
 
-'   sDatei = gTesttoolPath + "graphics\required\input\leer.sx"+left(lcase(gApplication),1)
+'   sDatei = gTesttoolPath + "graphics\required\input\leer.sx"+left(gApplication,1)
 '  Call hDateiOeffnen ConvertPath (gTesttoolPath + "graphics\required\input\frame1.htm")	'/// Load html document ///'
-'   sDatei = gTesttoolPath + "graphics\required\input\leer.sx"+left(lcase(gApplication),1)
+'   sDatei = gTesttoolPath + "graphics\required\input\leer.sx"+left(gApplication,1)
 '      Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\graf_inp\enter.bmp")
 
 testcase tEditDuplicate
diff --git a/testautomation/graphics/optional/includes/global/g_export_html.inc b/testautomation/graphics/optional/includes/global/g_export_html.inc
index ca87aa621e68..4b76e9b4be52 100755
--- a/testautomation/graphics/optional/includes/global/g_export_html.inc
+++ b/testautomation/graphics/optional/includes/global/g_export_html.inc
@@ -158,7 +158,7 @@ testcase tHtmlExport
        TitelSeiteErzeugen.Check
        Warnlog  "- 'create Titlepage' should be checked as default :-("
    end if
-   if (lCase(gApplication) = "impress") then
+   if (gApplication = "IMPRESS") then
       '/// if applcation is impress: the checkbox 'Show notes' is enabled by default///'
       If (Notizenanzeigen.IsChecked <> TRUE) Then
           warnlog "- 'Show notes' checked as default :-("
diff --git a/testautomation/graphics/optional/includes/global/g_format.inc b/testautomation/graphics/optional/includes/global/g_format.inc
index f2a96ac53d83..6492d05422e9 100755
--- a/testautomation/graphics/optional/includes/global/g_format.inc
+++ b/testautomation/graphics/optional/includes/global/g_format.inc
@@ -325,7 +325,7 @@ testcase tdFormatConnector
     dim sTemp as string
     dim cDecSep as string
 
-    if (lCase(gApplication) = "impress") then 
+    if (gApplication = "IMPRESS") then 
         ExtensionString = "odp"
     else
         ExtensionString = "odg"
@@ -786,8 +786,8 @@ testcase tiFormat3D_Effekte
     'y = hMenuItemGetCount
     'MenuSelect (0)
     'gMouseClick 90,90
-    'select case lcase(gApplication)
-    '    case "draw" :  if y = 13 then
+    'select case gApplication
+    '    case "DRAW" :  if y = 13 then
 	'                                Printlog "- 3D object created" 
     '                            else 
     '                                Warnlog " Context-menu-entry-number was wrong. Expected 13, but was " + y + "."
diff --git a/testautomation/graphics/optional/includes/global/g_group.inc b/testautomation/graphics/optional/includes/global/g_group.inc
index a7e19e1d858c..61f5c9d3e31f 100755
--- a/testautomation/graphics/optional/includes/global/g_group.inc
+++ b/testautomation/graphics/optional/includes/global/g_group.inc
@@ -55,7 +55,7 @@ testcase tiGruppierung
     Printlog "- Created 3 rectangles for group testing"
   gMouseClick (50,50)                              '/// Put the mouse-marker in the middle of the screen ///'
   EditSelectAll 						   '/// select all rectangles ///'
-  if (lcase(gApplication) = "draw") then
+  if (gApplication = "DRAW") then
      hOpenContextMenu
         sleep(2)
         hMenuSelectNr(12) ' Select "Group"
diff --git a/testautomation/graphics/optional/includes/global/g_insert.inc b/testautomation/graphics/optional/includes/global/g_insert.inc
index a0213de3aefe..8f5a4ea1549d 100755
--- a/testautomation/graphics/optional/includes/global/g_insert.inc
+++ b/testautomation/graphics/optional/includes/global/g_insert.inc
@@ -112,7 +112,7 @@ testcase tInsertFloatingFrame
 
    dim iWaitIndex as integer
 
-    if (lCase(gApplication) = "impress") then 
+    if (gApplication = "IMPRESS") then 
         ExtensionString = "odp"
     else
         ExtensionString = "odg"
@@ -173,7 +173,7 @@ testcase tInsertFields
    dim sFile as string
    dim i as integer
 
-    if (lCase(gApplication) = "impress") then 
+    if (gApplication = "IMPRESS") then 
         ExtensionString = "odp"
     else
         ExtensionString = "odg"
@@ -346,7 +346,7 @@ testcase tdInsertSnapPoint_Line
         printlog " select Grid tab page in application "
         Select Case Ucase(gApplication)
             case "DRAW"         :    hToolsOptions ("Drawing","GRID")
-            case "IMPRESS"     :    hToolsOptions ("Presentation","GRID")
+            case "IMPRESS"     :    hToolsOptions ("IMPRESS","GRID")
         end select
         sGridArea = fangenFangBereich.GetText
         printlog " set metric field 'Snap Range' to Maximum "
@@ -486,7 +486,7 @@ testcase tdInsertSnapPoint_Line
     ToolsOptions
         Select Case Ucase(gApplication)
             case "DRAW"         :    hToolsOptions ("Drawing","GRID")
-            case "IMPRESS"      :    hToolsOptions ("Presentation","GRID")
+            case "IMPRESS"      :    hToolsOptions ("IMPRESS","GRID")
         end select
         fangenFangBereich.SetText sGridArea
         Kontext "ExtrasOptionenDlg"
@@ -505,7 +505,7 @@ testcase tdInsertFile
    dim i as integer
    dim iCut as integer
 
-    if (lCase(gApplication) = "impress") then 
+    if (gApplication = "IMPRESS") then 
         ExtensionString = "odp"
     else
         ExtensionString = "odg"
diff --git a/testautomation/graphics/optional/includes/global/g_line.inc b/testautomation/graphics/optional/includes/global/g_line.inc
index bc60909ff86e..dbd0e06b3370 100755
--- a/testautomation/graphics/optional/includes/global/g_line.inc
+++ b/testautomation/graphics/optional/includes/global/g_line.inc
@@ -303,7 +303,7 @@ testcase tiFormatLine
     'kontext "Toolbar"
     'Kurven.Click
     'sleep 1
-    'if (lcase(gApplication) = "draw") then
+    'if (gApplication = "DRAW") then
     '    Kontext "DocumentDraw"
     '    gMouseMove (30,50, 40,60)
     '    sleep 1
@@ -361,7 +361,7 @@ testcase tLineConnect
     kontext "Toolbar"
     Kurven.Click
     sleep 1
-    if (lcase(gApplication) = "draw") then
+    if (gApplication = "DRAW") then
      Kontext "DocumentDraw"
      gMouseMove (30,50, 40,60)
      sleep 1
@@ -379,14 +379,14 @@ testcase tLineConnect
      gMouseMove (70,50, 60,60)
     endif
     
-    printlog "'" + (lcase(gApplication)) +"'"
+    printlog "'" + (gApplication) +"'"
     
     '/// Check the amount of objects ///'
     gMouseClick (10, 10)
     sleep 1
     EditSelectAll
     sleep 1
-    if (lcase(gApplication) = "impress") then
+    if (gApplication = "IMPRESS") then
         StatusBarText = DocumentImpress.StatusGetText(DocumentImpress.StatusGetItemID(1))
     else
         kontext "DocumentDraw"
@@ -415,7 +415,7 @@ testcase tLineConnect
     sleep 1
     EditSelectAll
     sleep 1
-    if (lcase(gApplication) = "impress") then
+    if (gApplication = "IMPRESS") then
      StatusBarText = DocumentImpress.StatusGetText(DocumentImpress.StatusGetItemID(1))
     else
      kontext "DocumentDraw"
@@ -448,7 +448,7 @@ testcase tLineConnect
     EditSelectAll
     sleep 1
     '/// Check the amount of objects ///'
-    if (lcase(gApplication) = "impress") then
+    if (gApplication = "IMPRESS") then
      StatusBarText = DocumentImpress.StatusGetText(DocumentImpress.StatusGetItemID(1))
     else
      kontext "DocumentDraw"
@@ -499,7 +499,7 @@ testcase tLineConnect
     '/// And a nice finish to make life a bit happier for anyone who looks at the test ///'
     kontext "Toolbar"
     Ellipsen.Click
-    if (lcase(gApplication) = "draw") then
+    if (gApplication = "DRAW") then
     Kontext "DocumentDraw"
     gMouseMove (40,40, 50,30)
     sleep 1
diff --git a/testautomation/graphics/optional/includes/global/g_load_save.inc b/testautomation/graphics/optional/includes/global/g_load_save.inc
index 69321a7797a2..55685cfb9fbf 100755
--- a/testautomation/graphics/optional/includes/global/g_load_save.inc
+++ b/testautomation/graphics/optional/includes/global/g_load_save.inc
@@ -58,7 +58,7 @@ testcase tFileOpenSaveEtc
       Dokument$ = ConvertPath ( gOfficePath + "user\work\test1")
       Dokument2$ = ConvertPath ( gOfficePath + "user\work\test1_2")
 
-    if (lCase(gApplication) = "impress") then 
+    if (gApplication = "IMPRESS") then 
         ExtensionString = "odp"
     else
         ExtensionString = "odg"
@@ -187,7 +187,7 @@ testcase tFileProperties
    Call hNewDocument
    Call hTextrahmenErstellen ("This is a document to test the Menupoint in File/Properties",30,30,60,40)
 
-    if (lCase(gApplication) = "Impress") then 
+    if (gApplication = "IMPRESS") then 
         ExtensionString = "odp"
     else
         ExtensionString = "odg"
@@ -340,7 +340,7 @@ dim q as integer
       warnlog "Documents of Type 'ComputerGraphicsMetafile' can't get loaded :-("
    endcatch
    Call hCloseDocument
-   if (lcase(gApplication)="draw") then
+   if (gApplication="DRAW") then
        Call hCloseDocument
    endif
 endcase
@@ -366,7 +366,7 @@ dim q as integer
       Oeffnen.Click
    Sleep 2
 
-   if lcase(gApplication) = "draw" then
+   if gApplication = "DRAW" then
       Kontext "Documentdraw"
       if Documentdraw.exists(5) then
          Documentdraw.TypeKeys ("<Tab>")
@@ -403,7 +403,7 @@ testcase tDeletedTemplate
     dim SavedActiveMessage as string
     dim found as boolean
 
-    if (lCase(gApplication) = "impress") then 
+    if (gApplication = "IMPRESS") then 
         ExtensionString = "odp"
     else
         ExtensionString = "odg"
@@ -516,7 +516,7 @@ testcase tSaveLoadLayoutEmpty
     '/// Create a new document, add a Layout, Save the document in different Formats, and open the saved files. ///'
 
     '/// Make new Presentation ///'
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call hNewDocument
 
     '/// Choose and Insert an empty Layout. ///'
@@ -562,7 +562,7 @@ testcase tSaveLoadLayoutOLE
     '/// Create a new document, add a Layout, Save the document in different Formats, and open the saved files. ///'
 
     '/// Make new Presentation ///'
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call hNewDocument
 
     '/// Choose and Insert an Layout with an OLE. ///'
@@ -624,7 +624,7 @@ testcase tSaveLoadLayoutText
     '/// Create a new document, add a Layout, Save the document in different Formats, and open the saved files. ///'
 
     '/// Make new Presentation ///'
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call hNewDocument
 
     '/// Choose and Insert an Layout with a Text-field. ///'
@@ -677,7 +677,7 @@ testcase tSaveLoadLayoutOutline
     '/// Create a new document, add a Layout, Save the document in different Formats, and open the saved files. ///'
 
     '/// Make new Presentation ///'
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call hNewDocument
 
     '/// Choose and Insert an Layout with a Outline-field. ///'
@@ -729,7 +729,7 @@ testcase tSaveLoadLayoutPicture
     '/// Create a new document, add a Layout, Save the document in different Formats, and open the saved files. ///'
 
     '/// Make new Presentation ///'
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call hNewDocument
 
     '/// Choose and Insert an Layout with a Graphic-field. ///'
@@ -781,7 +781,7 @@ testcase tSaveLoadLayoutChart
     '/// Create a new document, add a Layout, Save the document in different Formats, and open the saved files. ///'
 
     '/// Make new Presentation ///'
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call hNewDocument
 
     '/// Choose and Insert an Layout with a Chart-field. ///'
@@ -833,7 +833,7 @@ testcase tSaveLoadLayoutSpreadsheet
     '/// Create a new document, add a Layout, Save the document in different Formats, and open the saved files. ///'
 
     '/// Make new Presentation ///'
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call hNewDocument
 
     '/// Choose and Insert an Layout with a Spreadsheet-field. ///'
diff --git a/testautomation/graphics/optional/includes/global/g_mediaplayer.inc b/testautomation/graphics/optional/includes/global/g_mediaplayer.inc
index 22a33f2c33e5..d02383393f9a 100755
--- a/testautomation/graphics/optional/includes/global/g_mediaplayer.inc
+++ b/testautomation/graphics/optional/includes/global/g_mediaplayer.inc
@@ -233,7 +233,7 @@ testcase g_mediaplayer
         ToolsMediaPlayer
         
         '/// Check if there is an object available. ///'
-        if (lcase(gApplication) = "impress") then
+        if (gApplication = "IMPRESS") then
            kontext "DocumentImpress"
         else
            kontext "DocumentDraw"
diff --git a/testautomation/graphics/optional/includes/global/g_navigator.inc b/testautomation/graphics/optional/includes/global/g_navigator.inc
index e33101ebdab0..4b27d6e8226d 100755
--- a/testautomation/graphics/optional/includes/global/g_navigator.inc
+++ b/testautomation/graphics/optional/includes/global/g_navigator.inc
@@ -183,7 +183,7 @@ testcase tViewNavigatorZOrder
 
     '/// Open the Navigator ///'
     Kontext "NavigatorDraw"
-        if (lcase(gApplication) = "impress") then
+        if (gApplication = "IMPRESS") then
             try
                 NavigatorDraw.Close                '/// test if the Navigator is visible. It should not be. ///'
                 warnlog "- the Navigator was open, check earlier ran tests for inconsistency."
diff --git a/testautomation/graphics/optional/includes/global/g_ole.inc b/testautomation/graphics/optional/includes/global/g_ole.inc
index b746c128bc62..0f631de28f2d 100755
--- a/testautomation/graphics/optional/includes/global/g_ole.inc
+++ b/testautomation/graphics/optional/includes/global/g_ole.inc
@@ -76,7 +76,7 @@ testcase tOLE_Copy
 
    '/// Close document. Open new Impress-Document. Paste the OLE-Object. ///'
    Call hCloseDocument
-   gApplication = "Impress"
+   gApplication = "IMPRESS"
    Call hNewDocument
    EditPaste
 
@@ -140,7 +140,7 @@ testcase tOLE_Copy
    sleep 1
    Call hCloseDocument
 
-   gApplication = "Impress"
+   gApplication = "IMPRESS"
    Call hNewDocument
    EditPaste
 
@@ -205,7 +205,7 @@ testcase tOLE_Copy
    sleep 1
    Call hCloseDocument
 
-   gApplication = "Impress"
+   gApplication = "IMPRESS"
    Call hNewDocument
    EditPaste
 
@@ -242,7 +242,7 @@ testcase tOLE_SaveLoad
     dim filetype as string
     dim filetype2 as string
    
-    if (lCase(gApplication) = "impress") then 
+    if (gApplication = "IMPRESS") then 
         ExtensionString = "odp"
     else
         ExtensionString = "odg"
diff --git a/testautomation/graphics/optional/includes/global/g_paragraph.inc b/testautomation/graphics/optional/includes/global/g_paragraph.inc
index b4237a4a6b2c..2d1e5ea449f7 100755
--- a/testautomation/graphics/optional/includes/global/g_paragraph.inc
+++ b/testautomation/graphics/optional/includes/global/g_paragraph.inc
@@ -51,10 +51,10 @@ testcase tdFormatParagraph
    dim iTemp as integer
    dim sApplication as string
 
-   if (lCase(gApplication) = "draw") then
+   if (gApplication = "DRAW") then
       sApplication = "DRAWING"
    else
-      sApplication = "PRESENTATION"
+      sApplication = "IMPRESS"
    endif
 
    iCount = 0
diff --git a/testautomation/graphics/optional/includes/global/g_print.inc b/testautomation/graphics/optional/includes/global/g_print.inc
index 70ecf5e751ca..7339c105f3b2 100755
--- a/testautomation/graphics/optional/includes/global/g_print.inc
+++ b/testautomation/graphics/optional/includes/global/g_print.inc
@@ -64,7 +64,7 @@ testcase tFilePrint
    ' Not yet active since this feature is not build into the master: i85355
    '/// Checking Options for impress, PrintContentBox
 '   printlog "Checking options for impress..."
-'    if (lCase(gApplication) = "impress") then
+'    if (gApplication = "IMPRESS") then
 '        if PrintContent.GetSelIndex <> 1 then
 '            warnlog "Not first entry selected!"
 '       else
diff --git a/testautomation/graphics/optional/includes/global/g_savepictureas.inc b/testautomation/graphics/optional/includes/global/g_savepictureas.inc
index 3d46d6fbba23..240c7355da1a 100755
--- a/testautomation/graphics/optional/includes/global/g_savepictureas.inc
+++ b/testautomation/graphics/optional/includes/global/g_savepictureas.inc
@@ -152,7 +152,7 @@ testcase tContextSaveAsPicture
              Oeffnen.Click
 
             '/// Select all ///'
-             if (lcase(gApplication) = "impress") then
+             if (gApplication = "IMPRESS") then
                 Kontext "DocumentImpress"
              else
                 Kontext "DocumentDraw"
@@ -163,7 +163,7 @@ testcase tContextSaveAsPicture
             '/// The context menu must contain the "save as picture..." entry at 4th position from bottom. (Check it) ///'
             '/// Use the Context-Menu 'Save As Picture' ///'
              hOpenContextMenu
-             if (lcase(gApplication) = "impress") then
+             if (gApplication = "IMPRESS") then
                 Kontext "DocumentImpress"
                 DocumentImpress.OpenContextMenu true
                 WaitSlot(1000)
@@ -326,7 +326,7 @@ testcase tContextSaveAsPicture
                 endif
             endif
             '/// Remove all in the Document. (Impress/Draw) ///'
-             if (lcase(gApplication) = "impress") then
+             if (gApplication = "IMPRESS") then
                 Kontext "DocumentImpress"
              else
                 Kontext "DocumentDraw"
@@ -478,7 +478,7 @@ testcase tContextSavePictureLinkAsPicture
              Oeffnen.Click
 
             '/// Select all ///'
-             if (lcase(gApplication) = "impress") then
+             if (gApplication = "IMPRESS") then
                 Kontext "DocumentImpress"
              else
                 Kontext "DocumentDraw"
@@ -489,7 +489,7 @@ testcase tContextSavePictureLinkAsPicture
             '/// The context menu must contain the "save as picture..." entry at 4th position from bottom. (Check it) ///'
             '/// Use the Context-Menu 'Save As Picture' ///'
              hOpenContextMenu
-             if (lcase(gApplication) = "impress") then
+             if (gApplication = "IMPRESS") then
                 Kontext "DocumentImpress"
                 DocumentImpress.OpenContextMenu true
                 if hMenuFindSelect(27353, true, (MenuGetItemCount - 4), true) = false then
@@ -776,7 +776,7 @@ testcase tContextSavePictureLinkAsPicture
              endif
 
              '/// Remove all in the Document. (Impress/Draw) ///'
-             if (lcase(gApplication) = "impress") then
+             if (gApplication = "IMPRESS") then
                 Kontext "DocumentImpress"
              else
                 Kontext "DocumentDraw"
diff --git a/testautomation/graphics/optional/includes/global/g_shaddow.inc b/testautomation/graphics/optional/includes/global/g_shaddow.inc
index ba80e5fbadfc..47ef12a280f4 100755
--- a/testautomation/graphics/optional/includes/global/g_shaddow.inc
+++ b/testautomation/graphics/optional/includes/global/g_shaddow.inc
@@ -61,7 +61,7 @@ testcase tiShaddow
    dim cornerstyletype as string
 
     '/// Set the file-extension we'll be using when opening the saved file ///'
-    if (lCase(gApplication) = "impress") then
+    if (gApplication = "IMPRESS") then
         ExtensionString = "odp"
     else
         ExtensionString = "odg"
@@ -326,7 +326,7 @@ testcase tiShaddow
       TabLinie.ok
 
    '/// If Impress: Save as Powerpoint-file. If Draw: Save as usual Draw-file. ///'
-    if (lCase(gApplication) = "impress") then
+    if (gApplication = "IMPRESS") then
         ExtensionString = "ppt"
     else
         ExtensionString = "odg"
@@ -337,7 +337,7 @@ testcase tiShaddow
    FileSaveAs
       Kontext "SpeichernDlg"
       Dateiname.SetText sFileName
-      if (lCase(gApplication) = "impress") then
+      if (gApplication = "IMPRESS") then
          Dateityp.Select 5  ' Powerpoint
          printlog "Trying to save with filter: " + Dateityp.GetSelText + sFilter(5)
       else
@@ -386,21 +386,21 @@ testcase tiShaddow
       Kontext
       Messagebox.SetPage TabTransparenz
          kontext "TabTransparenz"
-         if (lCase(gApplication) = "DRAW") then
+         if (gApplication = "DRAW") then
             if LineareTransparenz.Ischecked = FALSE then
                warnlog "Transparency should have been checked!"
                if MFLinTransparenz.GetText <> shadowtransparencyvalue then warnlog "Transparency-value should NOT have changed"
                KeineTransparenz.Check
             end if
          endif
-         if (lCase(gApplication) = "DRAW") then
+         if (gApplication = "DRAW") then
             if LineareTransparenz.Ischecked = FALSE then
                warnlog "Transparency should have been checked!"
                if MFLinTransparenz.GetText <> shadowtransparencyvalue then warnlog "Transparency-value should NOT have changed"
                KeineTransparenz.Check
             end if
          endif
-         if (lCase(gApplication) = "IMPRESS") then
+         if (gApplication = "IMPRESS") then
             if LineareTransparenz.Ischecked <> FALSE then
                warnlog "Transparency should NOT have been checked!"
                if MFLinTransparenz.GetText <> shadowtransparencyvalue then warnlog "Transparency-value should NOT have changed"
@@ -437,7 +437,7 @@ testcase tiShaddow
      TabSchatten.Ok
 
    '/// If Impress: Save as Powerpoint-file. If Draw: Save as usual Draw-file. ///'
-    if (lCase(gApplication) = "impress") then
+    if (gApplication = "IMPRESS") then
         ExtensionString = "ppt"
     else
         ExtensionString = "odg"
@@ -447,7 +447,7 @@ testcase tiShaddow
    FileSaveAs
       Kontext "SpeichernDlg"
       Dateiname.SetText sFileName
-      if (lCase(gApplication) = "impress") then
+      if (gApplication = "IMPRESS") then
          Dateityp.Select 5  ' Powerpoint
          printlog "Trying to save with filter: " + Dateityp.GetSelText + sFilter(5)
       else
diff --git a/testautomation/graphics/optional/includes/global/g_stylist.inc b/testautomation/graphics/optional/includes/global/g_stylist.inc
index 90f072561877..356f2cfdc1ab 100755
--- a/testautomation/graphics/optional/includes/global/g_stylist.inc
+++ b/testautomation/graphics/optional/includes/global/g_stylist.inc
@@ -245,7 +245,7 @@ testcase tFormatStylistTemplatesUse
     endif
     printlog "   - Presentation-templates"
     '/// if application is impress: click on button 'Presentation Styles' ///'
-    if (Lcase (gApplication) = "impress") then
+    if (Lcase (gApplication) = "IMPRESS") then
         TBGestalter.Click Praesentationsvorlagen
     endif
     '/// select every item from the list 'Styles' ///'
diff --git a/testautomation/graphics/optional/includes/global/g_zoom.inc b/testautomation/graphics/optional/includes/global/g_zoom.inc
index c6010535726d..023e30b5c826 100755
--- a/testautomation/graphics/optional/includes/global/g_zoom.inc
+++ b/testautomation/graphics/optional/includes/global/g_zoom.inc
@@ -46,7 +46,7 @@ testcase tViewZoom
  Dim Datei$
    Printlog "- view Zoom"
 
-    if (lCase(gApplication) = "Impress") then 
+    if (gApplication = "IMPRESS") then 
         ExtensionString = "odp"
     else
         ExtensionString = "odg"
diff --git a/testautomation/graphics/optional/includes/global/gallery.inc b/testautomation/graphics/optional/includes/global/gallery.inc
index 5bfca2e9f031..fa81a94330b5 100755
--- a/testautomation/graphics/optional/includes/global/gallery.inc
+++ b/testautomation/graphics/optional/includes/global/gallery.inc
@@ -53,7 +53,7 @@ testcase tGallery_DialogTest
     '///Open a new Writer document
     '///Tools / Gallery
     printlog "- Working with Gallery-Beamer!"
-    gApplication = "Writer"
+    gApplication = "WRITER"
     call hNewDocument
     call hOpenGallery
     Kontext "DocumentWriter"
@@ -88,7 +88,7 @@ testcase tGallery_ActivateAndUpdateAllThemes
     '///+Tools / Gallery
     '///+Click on each theme and update it (via context menu)
     printlog "activate and update all gallery-themes"
-    gApplication = "Writer"
+    gApplication = "WRITER"
     call hNewDocument
     Kontext
     call hOpenGallery
@@ -149,7 +149,7 @@ testcase tGallery_CheckNames
     '///Check the names for the gallery themes
     '///Open a new Writer document
     '///+Tools / Gallery
-    gApplication = "Writer"
+    gApplication = "WRITER"
     call hNewDocument
     Kontext
     call hOpenGallery
@@ -203,7 +203,7 @@ testcase tGallery_CheckContextMenuForGalleryThemes
     '/// Open a new Writer document
     '/// +Tools / Gallery
     printlog "check the contextmenu for the gallery-themes"
-    gApplication = "Writer"
+    gApplication = "WRITER"
     call hNewDocument
     call hOpenGallery
     '/// +Testing <i>rename</i> and <i>properties</i> for each gallery theme (via context-menu)
@@ -271,7 +271,7 @@ testcase tGallery_CreateAndWorkWithANewGalleryThemes
     '/// Open a new Writer document
     '/// Tools / Gallery
     printlog "create a new gallery-theme ( TT-theme )"
-    gApplication = "Writer"
+    gApplication = "WRITER"
     call hNewDocument
     call hOpenGallery
     iMenuEntries = Gallerys.GetItemCount
@@ -514,7 +514,7 @@ testcase tGallery_GalleryView_Preview
     '/// Open a new Writer document
     '/// Tools / Gallery
     printlog "open a writer and the gallery"
-    gApplication = "Writer"
+    gApplication = "WRITER"
     call hNewDocument
     Kontext
     call hOpenGallery
@@ -644,14 +644,14 @@ testcase tGallery_GalleryView_Preview
     '/// If the MediaPlayer exists - close it ///'
     kontext "Mplayer"
         if Mplayer.Exists then
-            if (lcase(gApplication) = "impress") then
+            if (gApplication = "IMPRESS") then
                 kontext "DocumentImpress"
             else
                 kontext "DocumentDraw"
             end if
             ToolsMediaPlayer
         else
-            if (lcase(gApplication) = "impress") then
+            if (gApplication = "IMPRESS") then
                 kontext "DocumentImpress"
             else
                 kontext "DocumentDraw"
@@ -713,10 +713,10 @@ testcase tGallery_GalleryView_Insert
     end if
     '/// Test following for all applications (Writer, Calc, Impress, Draw)
     for i=1 to 4           ' each application
-        if i=1 then gApplication = "Writer"
-        if i=2 then gApplication = "Calc"
-        if i=3 then gApplication = "Impress"
-        if i=4 then gApplication = "Draw"
+        if i=1 then gApplication = "WRITER"
+        if i=2 then gApplication = "CALC"
+        if i=3 then gApplication = "IMPRESS"
+        if i=4 then gApplication = "DRAW"
 
         '/// +Open a new document
         '/// +Open the Gallery
@@ -920,7 +920,7 @@ testcase tGallery_GalleryView_Delete
 
     '/// Open a new writer-doc
     '/// Tools / Gallery
-    gApplication = "Writer"
+    gApplication = "WRITER"
     call hNewDocument
     call hOpenGallery
     '/// Delete one object in list-view and icon-view for 3D, Animation and Sound
diff --git a/testautomation/graphics/optional/includes/global/gallery2.inc b/testautomation/graphics/optional/includes/global/gallery2.inc
index c1f6592404c0..98c8b3448da0 100755
--- a/testautomation/graphics/optional/includes/global/gallery2.inc
+++ b/testautomation/graphics/optional/includes/global/gallery2.inc
@@ -56,7 +56,7 @@ testcase tSettingsToCM
     WaitSlot (10000)
     Call hNewDocument
     ToolsOptions
-    hToolsOptions ( "Textdocument", "General" )
+    hToolsOptions ( "WRITER", "General" )
     iSaveSetting = Masseinheit.GetSelIndex
     Masseinheit.Select 2
     Kontext "ExtrasOptionenDlg"
@@ -286,7 +286,7 @@ testcase tResetSettings
     printlog "+Tools / options / text documents / general"
     call hNewDocument
     ToolsOptions
-    hToolsOptions ( "Textdocument", "General" )
+    hToolsOptions ( "WRITER", "General" )
     Masseinheit.Select iSaveSetting
     Kontext "ExtrasOptionenDlg"
         ExtrasOptionenDlg.OK
diff --git a/testautomation/graphics/optional/includes/global/id_001.inc b/testautomation/graphics/optional/includes/global/id_001.inc
index a54ab85474d4..ebd5f1ca8159 100755
--- a/testautomation/graphics/optional/includes/global/id_001.inc
+++ b/testautomation/graphics/optional/includes/global/id_001.inc
@@ -68,7 +68,7 @@ testcase tiFileSaveAs
     dim sFile as string ' filename to export
     dim sPath as string ' filename to export
 
-    if (lCase(gApplication) = "impress") then 
+    if (gApplication = "IMPRESS") then 
         ExtensionString = "odp"
     else
         ExtensionString = "odg"
@@ -79,12 +79,12 @@ testcase tiFileSaveAs
 
     sFileName = "graphics\required\input\tbo_alf_." + ExtensionString    ' this is the file with all features
     sFile = "isas_"                                ' this is the filename of the export files
-    sPath = ConvertPath ( gOfficePath + "user/work/graphics/required/"+Lcase(gApplication)+"\"+ gPlatform) ' this is the export path
+    sPath = ConvertPath ( gOfficePath + "user/work/graphics/required/"+gApplication+"\"+ gPlatform) ' this is the export path
     if dir (sPath) = "" then
         app.mkdir (sPath)
     end if
 
-    Printlog "'/// deleting all files in output directory: \\user\\work\\graphics\\required\\Lcase(gApplication) gPlatform isas_* ///'"
+    Printlog "'/// deleting all files in output directory: \\user\\work\\graphics\\required\\gApplication gPlatform isas_* ///'"
     if gSamePC = TRUE then ' delete export directory
         GetFileList ( sPath, sFile+"*", Exlist() )
         if KillFileList ( Exlist() ) <> TRUE then
@@ -184,7 +184,7 @@ testcase tiFileReload
   Dim DokumentPfad$
   Dim Datei$
 
-    if (lCase(gApplication) = "impress") then 
+    if (gApplication = "IMPRESS") then 
         ExtensionString = "odp"
     else
         ExtensionString = "odg"
@@ -238,7 +238,7 @@ testcase tiFileVersion
   Dim DokumentPfad$
   Dim Datei$
 
-    if (lCase(gApplication) = "impress") then 
+    if (gApplication = "IMPRESS") then 
         ExtensionString = "odp"
     else
         ExtensionString = "odg"
@@ -304,15 +304,15 @@ testcase tiFilePassword
    dim sFile as string ' filename to export
    dim sPath as string ' and path to export
 
-    if (lCase(gApplication) = "impress") then 
+    if (gApplication = "IMPRESS") then 
         ExtensionString = "odp"
     else
         ExtensionString = "odg"
     end if
 
-'///  save file to:  "graphics\required\output\"+Lcase(gApplication)+"\"+ gPlatform+"\"isp__" ///'
+'///  save file to:  "graphics\required\output\"+gApplication+"\"+ gPlatform+"\"isp__" ///'
    sFile = "isp__"                                                     ' this is the filename of the export files
-   sPath = ConvertPath ( gOfficePath + "user/work/graphics/required/"+Lcase(gApplication)+"\"+ gPlatform+"\") ' this is the export path
+   sPath = ConvertPath ( gOfficePath + "user/work/graphics/required/"+gApplication+"\"+ gPlatform+"\") ' this is the export path
    mkdir (sPath)
    if dir (sPath) = "" then app.mkdir (sPath)
    sFileIn = (sPath + sFile + "." + ExtensionString)
diff --git a/testautomation/graphics/optional/includes/global/id_003.inc b/testautomation/graphics/optional/includes/global/id_003.inc
index 9c8798b3aa77..258ae7504340 100755
--- a/testautomation/graphics/optional/includes/global/id_003.inc
+++ b/testautomation/graphics/optional/includes/global/id_003.inc
@@ -125,7 +125,7 @@ testcase tiViewToolbar
     ViewToolbarsFontwork
     WaitSlot (1000)
 
-    '   if LCase(gApplication) = "impress" then
+    '   if gApplication = "IMPRESS" then
     '/// View->Toolbars->Presentation ///'
     '      ViewToolbarsPresentation ' only in impress, not draw
     '/// View->Toolbars->Presentation ///'
diff --git a/testautomation/graphics/optional/includes/global/id_006.inc b/testautomation/graphics/optional/includes/global/id_006.inc
index 24f5e522ed8c..31ca3e0dce43 100755
--- a/testautomation/graphics/optional/includes/global/id_006.inc
+++ b/testautomation/graphics/optional/includes/global/id_006.inc
@@ -119,7 +119,7 @@ testcase tiToolsThesaurus
         '/// call subroutine 'hSetSpellHypLanguage' for setting the default language in the options, to enable it for languages, which don't provide a dictionary (usually asian ones) ///'
         call hSetSpellHypLanguage
         '/// open application-specific document which contains an American-formatted textframe with text. And select the text ///'
-        if (lCase(gApplication) = "impress") then
+        if (gApplication = "IMPRESS") then
             sFileName = (ConvertPath (gTesttoolPath + "graphics\required\input\engtext.odp"))
         else
             sFileName = (ConvertPath (gTesttoolPath + "graphics\required\input\engtext.odg"))
diff --git a/testautomation/graphics/optional/includes/global/id_011.inc b/testautomation/graphics/optional/includes/global/id_011.inc
index 75f4c1e3a66d..3a17c098ba1a 100755
--- a/testautomation/graphics/optional/includes/global/id_011.inc
+++ b/testautomation/graphics/optional/includes/global/id_011.inc
@@ -373,7 +373,7 @@ testcase tiTextToolbar
         ViewToolbarsTextFormatting
         WaitSlot (2000)    'sleep 1
     '/// Clear the document from content ///'
-    if (lcase(gApplication) = "impress") then
+    if (gApplication = "IMPRESS") then
         Kontext "DocumentImpressOutlineView"
             DocumentImpressOutlineView.TypeKeys "<ESCAPE>"
             EditSelectAll
diff --git a/testautomation/graphics/optional/includes/impress/i_saveloadlayout.inc b/testautomation/graphics/optional/includes/impress/i_saveloadlayout.inc
index 8cfcba8f25b2..de212977d7e2 100755
--- a/testautomation/graphics/optional/includes/impress/i_saveloadlayout.inc
+++ b/testautomation/graphics/optional/includes/impress/i_saveloadlayout.inc
@@ -57,7 +57,7 @@ testcase tSaveLoadLayoutEmpty
     '/// Create a new document, add an empty Layout, Save the document in all available Formats, and open the saved files. ///'
 
     '/// Make new Presentation ///'
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call hNewDocument
 
     '/// Choose and Insert an empty Layout. ///'
@@ -101,7 +101,7 @@ testcase tSaveLoadLayoutOLE
     '/// Create a new document, add a Layout with an OLE-field, Save the document in all available Formats, and open the saved files. ///'
 
     '/// Make new Presentation ///'
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call hNewDocument
 
     '/// Choose and Insert an Layout with an OLE. ///'
@@ -162,7 +162,7 @@ testcase tSaveLoadLayoutText
     '/// Create a new document, add a Layout with a Textfield, Save the document in all available Formats, and open the saved files. ///'
 
     '/// Make new Presentation ///'
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call hNewDocument
 
     '/// Choose and Insert an Layout with a Text-field. ///'
@@ -214,7 +214,7 @@ testcase tSaveLoadLayoutOutline
     '/// Create a new document, add a Layout with an Outline-field, Save the document in all available Formats, and open the saved files. ///'
 
     '/// Make new Presentation ///'
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call hNewDocument
 
     '/// Choose and Insert an Layout with a Outline-field. ///'
@@ -265,7 +265,7 @@ testcase tSaveLoadLayoutPicture
     '/// Create a new document, add a Layout with a Graphic-field, Save the document in all available Formats, and open the saved files. ///'
 
     '/// Make new Presentation ///'
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call hNewDocument
 
     '/// Choose and Insert an Layout with a Graphic-field. ///'
@@ -316,7 +316,7 @@ testcase tSaveLoadLayoutChart
     '/// Create a new document, add a Layout for a Chart, Save the document in all available formats, and open the saved files. ///'
 
     '/// Make new Presentation ///'
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call hNewDocument
 
     '/// Choose and Insert an Layout with a Chart-field. ///'
@@ -367,7 +367,7 @@ testcase tSaveLoadLayoutSpreadsheet
     '/// Create a new document, add a Layout containing a Spreadsheet, Save the document in all available Formats, and open the saved files. ///'
 
     '/// Make new Presentation ///'
-    gApplication = "Impress"
+    gApplication = "IMPRESS"
     Call hNewDocument
 
     '/// Choose and Insert an Layout with a Spreadsheet-field. ///'
diff --git a/testautomation/graphics/optional/includes/impress/i_slidelayer.inc b/testautomation/graphics/optional/includes/impress/i_slidelayer.inc
index d2254637a474..50ddc4e93200 100755
--- a/testautomation/graphics/optional/includes/impress/i_slidelayer.inc
+++ b/testautomation/graphics/optional/includes/impress/i_slidelayer.inc
@@ -378,7 +378,7 @@ testcase t114174
     dim i as integer
     dim sFile as string
     
-    if lCase(gApplication) = "impress" then 
+    if gApplication = "IMPRESS" then 
         ExtensionString = "odp"
     else
         ExtensionString = "odg"
diff --git a/testautomation/graphics/optional/includes/impress/im_011_.inc b/testautomation/graphics/optional/includes/impress/im_011_.inc
index 1632cb39bc82..b7a1bf39c711 100755
--- a/testautomation/graphics/optional/includes/impress/im_011_.inc
+++ b/testautomation/graphics/optional/includes/impress/im_011_.inc
@@ -48,7 +48,7 @@ testcase tiDiaLeiste
    sleep 1
 '/// Change options so the presentation won't start from the current, but the first slide. ///'
    ToolsOptions
-   hToolsOptions ( "Presentation", "General" )
+   hToolsOptions ( "IMPRESS", "General" )
    MitAktuellerSeite.Uncheck
    Kontext "ExtrasOptionenDlg"
    ExtrasOptionenDlg.OK
@@ -167,7 +167,7 @@ testcase tiDiaLeiste
  endif
 '/// Restore default settings in ToolsOptions ///'
    ToolsOptions
-   hToolsOptions ( "Presentation", "General" )
+   hToolsOptions ( "IMPRESS", "General" )
    MitAktuellerSeite.Check
    Kontext "ExtrasOptionenDlg"
    ExtrasOptionenDlg.OK