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

6 files changed, 45 insertions, 45 deletions

diff --git a/testautomation/writer/tools/includes/w_tool1.inc b/testautomation/writer/tools/includes/w_tool1.inc
index 01d2b6044d80..39148ccf3279 100755
--- a/testautomation/writer/tools/includes/w_tool1.inc
+++ b/testautomation/writer/tools/includes/w_tool1.inc
@@ -281,14 +281,14 @@ sub hMalZeichnenMitSelektion ( xS, yS, xE, yE )
       DocumentWriter.MouseUp   ( xE, yE )
       Sleep 1
 
-   Case "HTMLDOKUMENT"
+   Case "HTML"
       Kontext "DocumentWriterWeb"
       DocumentWriterWeb.MouseDown ( xS, yS )
       DocumentWriterWeb.MouseMove ( xE, yE )
       DocumentWriterWeb.MouseUp   ( xE, yE )
       Sleep 1
 
-   Case "MASTERDOC"
+   Case "MASTERDOCUMENT"
       Kontext "DocumentMasterDoc"
       DocumentMasterDoc.MouseDown ( xS, yS )
       DocumentMasterDoc.MouseMove ( xE, yE )
@@ -310,7 +310,7 @@ sub hMalZeichnen ( xS, yS, xE, yE )
       Sleep 1
       if DocumentWriter.IsEnabled then Call wTypeKeys "<Escape>"
 
-   Case "HTMLDOKUMENT"
+   Case "HTML"
       Kontext "DocumentWriterWeb"
       DocumentWriterWeb.MouseDown ( xS, yS )
       DocumentWriterWeb.MouseMove ( xE, yE )
@@ -318,7 +318,7 @@ sub hMalZeichnen ( xS, yS, xE, yE )
       Sleep 1
       if DocumentWriterWeb.IsEnabled then DocumentWriterWeb.TypeKeys "<Escape>"
 
-   Case "MASTERDOC"
+   Case "MASTERDOCUMENT"
       Kontext "DocumentMasterDoc"
       DocumentMasterDoc.MouseDown ( xS, yS )
       DocumentMasterDoc.MouseMove ( xE, yE )
diff --git a/testautomation/writer/tools/includes/w_tool3.inc b/testautomation/writer/tools/includes/w_tool3.inc
index d8bb7378804b..498956365baa 100755
--- a/testautomation/writer/tools/includes/w_tool3.inc
+++ b/testautomation/writer/tools/includes/w_tool3.inc
@@ -686,7 +686,7 @@ sub wOpenContextMenu ( optional FocusParam as boolean)
 				Kontext "DocumentWriter"
 				Call DocumentWriter.TypeKeys "<SHIFT F10>"  'OpenContextMenu
 
-			Case "MASTERDOC"
+			Case "MASTERDOCUMENT"
 				Kontext "DocumentMasterDoc"
 				Call DocumentMasterDoc.TypeKeys "<SHIFT F10>"  'OpenContextMenu
 
@@ -698,7 +698,7 @@ sub wOpenContextMenu ( optional FocusParam as boolean)
 					Kontext "DocumentWriter"
 					Call DocumentWriter.OpenContextMenu true
 
-				Case "MASTERDOC"
+				Case "MASTERDOCUMENT"
 					Kontext "DocumentMasterDoc"
 					Call DocumentMasterDoc.OpenContextMenu true
 
@@ -709,7 +709,7 @@ sub wOpenContextMenu ( optional FocusParam as boolean)
 					Kontext "DocumentWriter"
 					Call DocumentWriter.OpenContextMenu
 
-				Case "MASTERDOC"
+				Case "MASTERDOCUMENT"
 					Kontext "DocumentMasterDoc"
 					Call DocumentMasterDoc.OpenContextMenu
 			end select
diff --git a/testautomation/writer/tools/includes/w_tool4.inc b/testautomation/writer/tools/includes/w_tool4.inc
index a493f4e3f4ce..805dcac835bf 100755
--- a/testautomation/writer/tools/includes/w_tool4.inc
+++ b/testautomation/writer/tools/includes/w_tool4.inc
@@ -166,8 +166,8 @@ sub wToolsSpellcheckCheckWriter
     '/// This function opens the spellcheck-dialog in all applications
     Select Case Ucase(gApplication)
         Case "WRITER"		: ToolsSpellcheckWriter
-        Case "MASTERDOC"	: ToolsSpellcheckWriter
-        Case "HTMLDOKUMENT" : ToolsSpellcheckWriter
+        Case "MASTERDOCUMENT"	: ToolsSpellcheckWriter
+        Case "HTML" : ToolsSpellcheckWriter
         case "DRAW"         : ToolsSpellcheck
         case "IMPRESS"     	: ToolsSpellcheck
     end select
diff --git a/testautomation/writer/tools/includes/w_tool6.inc b/testautomation/writer/tools/includes/w_tool6.inc
index 331286c4c1b8..57cfb8670423 100755
--- a/testautomation/writer/tools/includes/w_tool6.inc
+++ b/testautomation/writer/tools/includes/w_tool6.inc
@@ -490,10 +490,10 @@ sub TBOhTabelleEinfuegen (optional tName as string, optional tHeader as boolean,
         Case "WRITER"
             Kontext "DocumentWriter"
 
-        Case "GLOBALDOKUMENT"
+        Case "MASTERDOCUMENT"
             Kontext "DocumentMasterDoc"
 
-        Case "HTMLDOKUMENT"
+        Case "HTML"
             Kontext "DocumentWriterWeb"
 
     end select
diff --git a/testautomation/writer/tools/includes/w_tools.inc b/testautomation/writer/tools/includes/w_tools.inc
index 64b64a58e427..f9c0d459d377 100755
--- a/testautomation/writer/tools/includes/w_tools.inc
+++ b/testautomation/writer/tools/includes/w_tools.inc
@@ -76,11 +76,11 @@ If IsMissing(iLoop) = True then iLoop = 1
         Kontext "DocumentWriter"
         DocumentWriter.TypeKeys OutputText
 
-        Case "MASTERDOC"
+        Case "MASTERDOCUMENT"
         Kontext "DocumentMasterDoc"
         DocumentMasterDoc.TypeKeys OutputText
 
-        Case "HTMLDOKUMENT"
+        Case "HTML"
         Kontext "DocumentWriterWeb"
         DocumentWriterWeb.TypeKeys OutputText
 
@@ -108,11 +108,11 @@ If IsMissing(iLoop) = True then iLoop = 1
         Kontext "DocumentWriter"
         DocumentWriter.TypeKeys OutputText
 
-        Case "MASTERDOC"
+        Case "MASTERDOCUMENT"
         Kontext "DocumentMasterDoc"
         DocumentMasterDoc.TypeKeys OutputText
 
-        Case "HTMLDOKUMENT"
+        Case "HTML"
         Kontext "DocumentWriterWeb"
         DocumentWriterWeb.TypeKeys OutputText
 
@@ -132,10 +132,10 @@ sub wDocSetContext
         Case "WRITER"
         Kontext "DocumentWriter"
 
-        Case "MASTERDOC"
+        Case "MASTERDOCUMENT"
         Kontext "DocumentMasterDoc"
 
-        Case "HTMLDOKUMENT"
+        Case "HTML"
         Kontext "DocumentWriterWeb"
 
         Case "IMPRESS"
@@ -250,7 +250,7 @@ sub wZeichenobjektEinfuegen ( Objekt$, xStart%, yStart%, xEnde%, yEnde%, optiona
              wait 100
          end if
 
-     Case "MASTERDOC"
+     Case "MASTERDOCUMENT"
          Kontext "DocumentMasterDoc"
          DocumentMasterDoc.MouseDown xStart%, yStart%
          DocumentMasterDoc.MouseMove xEnde%, yEnde%
@@ -282,7 +282,7 @@ sub wObjektSelektieren ( xStart%, yStart%, xEnde%, yEnde% )
         DocumentWriter.MouseDown xStart%, yStart%
         DocumentWriter.MouseMove xEnde%, yEnde%
         DocumentWriter.MouseUp xEnde%, yEnde%
-    Case "MASTERDOC"
+    Case "MASTERDOCUMENT"
         Kontext "DocumentMasterDoc"
         DocumentMasterDoc.MouseDown xStart%, yStart%
         DocumentMasterDoc.MouseMove xEnde%, yEnde%
@@ -316,7 +316,7 @@ sub wFindSelectObjectBelow ( xStart%, yStart%, xEnde%, yEnde% )
         if (getMouseStyle <> 0) then i = 80
     wend
     
-    Case "MASTERDOC"
+    Case "MASTERDOCUMENT"
         Kontext "DocumentMasterDoc"
         DocumentMasterDoc.MouseDown xStart%, yStart%
         DocumentMasterDoc.MouseMove xEnde%, yEnde%
@@ -422,7 +422,7 @@ sub hLeisteUmschalten(welche as integer)
         catch
         endcatch
         Sleep 1
-        if gApplication = "HTMLDOKUMENT" then
+        if gApplication = "HTML" then
             Kontext "TextObjectbar"
         else
             Kontext "TextObjectbar"
@@ -440,7 +440,7 @@ sub hLeisteUmschalten(welche as integer)
         case 2:
         Select Case gApplication
         ' Numbering-Objectbar
-            Case "HTMLDOKUMENT"
+            Case "HTML"
                 Kontext "TextObjectbar"
                 try
                     TextObjectbar.SetNextToolbox
@@ -541,13 +541,13 @@ sub wNavigatorAuswahl(Gruppe as integer, Eintrag as integer,optional LeaveFocus
             wait 500
             Kontext "NavigatorCalc"
             MinEntrys = 8
-        Case "WRITER", "HTMLDOKUMENT", "HTML"
+        Case "WRITER", "HTML", "HTML"
             Kontext "NavigatorWriter"
             if NavigatorWriter.NotExists then ViewNavigator
             wait 500
             Kontext "NavigatorWriter"
             MinEntrys = 11
-        Case "MASTERDOC"
+        Case "MASTERDOCUMENT"
             Kontext "NavigatorGlobalDoc"
             if NavigatorGlobalDoc.NotExists then ViewNavigator
             wait 500
@@ -583,7 +583,7 @@ sub wNavigatorAuswahl(Gruppe as integer, Eintrag as integer,optional LeaveFocus
           Liste.TypeKeys "<Return>"
         end if
 
-        Case "WRITER","HTMLDOKUMENT", "HTML"
+        Case "WRITER","HTML", "HTML"
         if (Auswahlliste.GetItemCount < MinEntrys) then
             try
                 Inhaltsansicht.Click
@@ -605,7 +605,7 @@ sub wNavigatorAuswahl(Gruppe as integer, Eintrag as integer,optional LeaveFocus
             Auswahlliste.TypeKeys "<Return>"
         end if
 
-        Case "MASTERDOC"
+        Case "MASTERDOCUMENT"
         if Liste.IsVisible = True then
             Umschalten.Click
         end if
@@ -630,11 +630,11 @@ sub wNavigatorAuswahl(Gruppe as integer, Eintrag as integer,optional LeaveFocus
         Select Case Ucase(gApplication)
             Case "CALC"
                 Kontext "DocumentCalc"
-            Case "HTMLDOKUMENT", "HTML"
+            Case "HTML", "HTML"
                 Kontext "DocumentWriter"
             Case "WRITER"
                 Kontext "DocumentWriter"
-            Case "MASTERDOC"
+            Case "MASTERDOCUMENT"
                 Kontext "DocumentMasterDoc"
         end select
     end if
@@ -722,9 +722,9 @@ sub wMarkObjects(delete as boolean)
     Select Case gApplication
         Case "WRITER"
             Kontext "DocumentWriter"
-        Case "MASTERDOC"
+        Case "MASTERDOCUMENT"
             Kontext "DocumentMasterDoc"
-        Case "HTMLDOKUMENT"
+        Case "HTML"
             Kontext "DocumentWriterWeb"
     end select
 
@@ -736,10 +736,10 @@ sub wMarkObjects(delete as boolean)
         Case "WRITER"
             DocumentWriter.TypeKeys "<Shift F4>"
 
-        Case "MASTERDOC"
+        Case "MASTERDOCUMENT"
             DocumentMasterDoc.TypeKeys "<Shift F4>"
 
-        Case "HTMLDOKUMENT"
+        Case "HTML"
             DocumentWriterWeb.TypeKeys "<Shift F4>"
     end select
 
@@ -753,7 +753,7 @@ end sub
 ' -----------------------------------------------------------------------
 
 sub hExportUmstellung ( WasDenn as Boolean )
-    if Ucase(gApplication) = "HTMLDOKUMENT" then
+    if Ucase(gApplication) = "HTML" then
         ToolsOptions
         Call hToolsOptions("LoadSave","HTMLCompatibility")
         if WasDenn = TRUE then
@@ -845,7 +845,7 @@ sub wRectangleToClipboard
     Select Case gApplication
         Case "WRITER"
             Kontext "DocumentWriter"
-        Case "MASTERDOC"
+        Case "MASTERDOCUMENT"
             Kontext "DocumentMasterDoc"
     end select
     Call gMouseClick 10,10
@@ -860,7 +860,7 @@ sub wRectangleToClipboardHTML
     EditSelectAll
     EditCopy
     Call hCloseDocument
-    gApplication = "HTMLDokument"
+    gApplication = "HTML"
     Kontext "DocumentWriterWeb"
     Call gMouseClick
 end sub
@@ -898,7 +898,7 @@ sub wOptionenUndo ( sOption$ )
         ToolsOptions
     end if
 
-    Call hToolsOptions("Textdocument","General")
+    Call hToolsOptions("WRITER","General")
     if Instr(Tabulatorenabstand.Gettext, ",") then
         sTempSeparator = ","
     else
@@ -926,7 +926,7 @@ sub wOptionenUndo ( sOption$ )
         end select
     end if
 
-    Call hToolsOptions("Textdocument","View")
+    Call hToolsOptions("WRITER","View")
     if sOption$ = "Inhalte" OR sOption$ = "Alle" then
         ' Guides
         Hilfslinien.Uncheck
@@ -948,7 +948,7 @@ sub wOptionenUndo ( sOption$ )
     end if
 
     if sOption$ = "Cursor" OR sOption$ = "Alle" then
-        Call hToolsOptions("Textdocument","FormattingAids")
+        Call hToolsOptions("WRITER","FormattingAids")
         ' Display of
         Absatzenden.UnCheck
         WeicheTrenner.Check
@@ -966,7 +966,7 @@ sub wOptionenUndo ( sOption$ )
     end if
 
     if sOption$ = "Raster" OR sOption$ = "Alle" then
-        Call hToolsOptions("Textdocument","Grid")
+        Call hToolsOptions("WRITER","Grid")
         ' Grid
         FangrasterBenutzen.Uncheck
         RasterSichtbar.Uncheck
@@ -996,13 +996,13 @@ sub wOptionenUndo ( sOption$ )
     end if
 
     if sOption$ = "Grundschriften" OR sOption$ = "Alle" then
-        Call hToolsOptions("Textdocument","BasicFonts")
+        Call hToolsOptions("WRITER","BasicFonts")
         Standard.Click
         AktuellesDokument.Uncheck
     end if
 
     if sOption$ = "Drucken" OR sOption$ = "Alle" then
-        Call hToolsOptions("Textdocument","Print")
+        Call hToolsOptions("WRITER","Print")
         ' Contents
         Grafiken.Check
         Tabellen.Check
@@ -1024,7 +1024,7 @@ sub wOptionenUndo ( sOption$ )
     end if
 
     if sOption$ = "Tabelle" OR sOption$ = "Alle" then
-        Call hToolsOptions("Textdocument","Table")
+        Call hToolsOptions("WRITER","Table")
         ' Default
         Ueberschrift.Check
         Wiederholen.Check
@@ -1069,7 +1069,7 @@ sub wOptionenUndo ( sOption$ )
     end if
 
     if sOption$ = "Aenderung" OR sOption$ = "Alle" then
-        Call hToolsOptions("Textdocument","Changes")
+        Call hToolsOptions("WRITER","Changes")
         ' Text display
         EinfuegenAttribute.Select 4
         EinfuegenFarbe.Select 2
@@ -1083,7 +1083,7 @@ sub wOptionenUndo ( sOption$ )
     end if
 
     if sOption$ = "AutoCaption" OR sOption$ = "Alle" then
-        Call hToolsOptions("Textdocument","Autocaption")
+        Call hToolsOptions("WRITER","Autocaption")
 		for i = 1 to ObjectList.GetItemCount
 			ObjectList.Select i
 			ObjectList.UnCheck
diff --git a/testautomation/writer/tools/w_get_locale_strings.bas b/testautomation/writer/tools/w_get_locale_strings.bas
index e49889e8789a..30bfb96cfcae 100755
--- a/testautomation/writer/tools/w_get_locale_strings.bas
+++ b/testautomation/writer/tools/w_get_locale_strings.bas
@@ -52,5 +52,5 @@ sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
     Call GetUseFiles
-    gApplication = "Writer"
+    gApplication = "WRITER"
 end sub