CWS-TOOLING: integrate CWS automationdev300m62cat0

15 files changed, 190 insertions, 259 deletions

diff --git a/testautomation/graphics/optional/g_insert.bas b/testautomation/graphics/optional/g_insert.bas
index 92067c394..62d842292 100755
--- a/testautomation/graphics/optional/g_insert.bas
+++ b/testautomation/graphics/optional/g_insert.bas
@@ -60,7 +60,6 @@ sub main
     Call tInsertSpreadsheet
     Call tInsertGraphics
     Call tInsertObjectPlugIn               ' Doesn't exist in the VCL
-    Call tInsertObjectApplet
     Call tInsertObjectFormula              ' Is in the VCL in InsertObjectOLEObject
     Call tInsertChart
     Call tdInsertFile
@@ -82,7 +81,6 @@ sub main
     Call tInsertSpreadsheet
     Call tInsertGraphics
     Call tInsertObjectPlugIn               ' Doesn't exist in the VCL
-    Call tInsertObjectApplet
     Call tInsertObjectFormula              ' Is in the VCL in InsertObjectOLEObject
     '    Call tInsertChart
     Call tdInsertFile
diff --git a/testautomation/graphics/optional/includes/global/export_graphic_2.inc b/testautomation/graphics/optional/includes/global/export_graphic_2.inc
index c39e12f73..a053bc2df 100755
--- a/testautomation/graphics/optional/includes/global/export_graphic_2.inc
+++ b/testautomation/graphics/optional/includes/global/export_graphic_2.inc
@@ -519,7 +519,7 @@ testcase tPDF_Creator
     gApplication = "WRITER"
     sleep 5 ' wait for document to be loaded
     ' /Creator
-    bTemp = hFindeImDokument ("<</Creator<",true)
+    bTemp = hFindeImDokument ("<</Creator<",true,true)
     if (bTemp = TRUE) then
         Printlog "OK"
     else
@@ -569,22 +569,7 @@ testcase tPDF_Creator
             endif
         endif
     endif
-    ' /CreationDate (
-    bTemp = hFindeImDokument ("/CreationDate(")
-    if (bTemp = TRUE) then
-        Printlog "OK"
-    else
-        warnlog " /CreationDate not found in pdf file :-("
-    endif
-    hTypeKeys("<left><right><shift end>")
-    editcopy
-    sTemp = getClipboardText()
-    sTemp = left(sTemp, inStr(sTemp, ")")-1)
-    printlog sTemp + " -- " + len(sTemp)
-    iCreatorOffset = iCreatorOffset + (len(sTemp) - 23)
-    if (len(sTemp) <> 23) then
-        warnlog "Date is longer than expected; is: '" + sTemp2 + "'"
-    endif
+    
     gApplication = sApp
     call hCloseDocument
     call hCloseDocument
@@ -785,7 +770,7 @@ qaerrorlog
       else
          warnlog "File didn't get saved :-("
       endif
-     
+    hCloseDocument ()
       sleep 5
       hNewDocument()
       sleep 5
@@ -867,7 +852,7 @@ qaerrorlog
 
    call hCloseDocument
 
-endcase
+endcase 'tBMP
 '-------------------------------------------------------------------------------
 testcase tEMF
 
diff --git a/testautomation/graphics/optional/includes/global/g_insert.inc b/testautomation/graphics/optional/includes/global/g_insert.inc
index 87689a73e..c8a77778f 100755
--- a/testautomation/graphics/optional/includes/global/g_insert.inc
+++ b/testautomation/graphics/optional/includes/global/g_insert.inc
@@ -36,19 +36,6 @@
 '* short description :
 '*
 '**************************************************************************************
-' #1 tInsertFloatingFrame
-' #1 tInsertFields
-' #1 tdInsertObjectOleObjects
-' #1 tdInsertSnapPoint_Line
-' #1 tInsertSpecialCharacter
-' #1 tInsertSpreadsheet
-' #1 tInsertGraphics
-' #1 tInsertObjectPlugIn
-' #1 tInsertObjectApplet
-' #1 tInsertObjectFormula
-' #1 tInsertChart
-' #1 tdInsertFile
-'\*************************************************************************************
 
 testcase tdInsertObjectOleObjects
 
@@ -743,48 +730,7 @@ testcase tInsertGraphics
 endcase 'tInsertGraphics
 
 '-------------------------------------------------------------------------------
-testcase tInsertObjectApplet
 
-    printlog " open application "
-    Call hNewDocument
-    printlog " Insert->Object->Applet "
-    sleep 1
-    InsertObjectApplet
-    Kontext "AppletEinfuegen"
-    printlog " press button 'Search' "
-    sleep 2
-    Suchen.Click
-    Kontext "OeffnenDlg"
-    printlog " set filename to 'global\\input\\java\\rocket.class' "
-    Dateiname.SetText ConvertPath (gTesttoolPath + "global\input\java\Clock.class")
-    printlog " close dialog 'Open' by pressing 'Open' "
-    sleep 2
-    Oeffnen.Click
-    Kontext "AppletEinfuegen"
-    printlog " close dialog 'Insert Applet' by pressing OK "
-    sleep 2
-    AppletEinfuegen.OK
-    sleep 3
-    printlog " deselect object by typing key [Escape] "
-    hTypeKeys ("<Escape>")
-    sleep 3
-    try
-        printlog " Edit->Select All "
-        EditSelectAll
-        printlog " delete object by typing key [Delete] "
-        sleep 3
-        hTypeKeys "<DELETE>"
-    catch
-        Warnlog "Delete did not work, maybe some error while creating the object before"
-    endcatch
-    sleep 1
-    '   gMouseclick 70,70
-    printlog " close application "
-    Call hCloseDocument
-
-endcase 'tInsertObjectApplet
-
-'-------------------------------------------------------------------------------
 testcase tInsertObjectFormula
 
     printlog " open application "
diff --git a/testautomation/graphics/optional/includes/global/g_spellcheck.inc b/testautomation/graphics/optional/includes/global/g_spellcheck.inc
index c2ab18467..cb3b2f9fe 100755
--- a/testautomation/graphics/optional/includes/global/g_spellcheck.inc
+++ b/testautomation/graphics/optional/includes/global/g_spellcheck.inc
@@ -190,7 +190,7 @@ testcase tiToolsSpellcheckError
     ToolsOptions
     Kontext "ExtrasOptionenDlg"
     hToolsOptions("LANGUAGESETTINGS","Languages")
-    Westlich.Select 32
+    Westlich.Select 34
     Kontext "ExtrasOptionenDlg"
     ExtrasOptionenDlg.OK
     printlog "Create 1 textbox with 1 spelling error (test replace always)"
@@ -489,16 +489,6 @@ testcase tiToolsSpellcheckCheck
         goto endsub
     end if
     Kontext "Spellcheck"
-    printlog "Save the current Dictionary Language."
-    s = DictionaryLanguage.GetSelIndex
-    for i= 1 to DictionaryLanguage.GetItemCount
-        DictionaryLanguage.Select i
-        sleep 1
-        printlog "Dictionary language is: # "+i+": "+DictionaryLanguage.GetSelText
-    next i
-    iWord(1) = 1
-    iWord(2) = 2
-    DictionaryLanguage.Select s
     printlog "Close dialog 'Spellcheck'."
     Spellcheck.Close
     Kontext "Active"
diff --git a/testautomation/graphics/optional/includes/global/g_tables.inc b/testautomation/graphics/optional/includes/global/g_tables.inc
index 6b6479630..99b5a84f9 100755
--- a/testautomation/graphics/optional/includes/global/g_tables.inc
+++ b/testautomation/graphics/optional/includes/global/g_tables.inc
@@ -59,11 +59,11 @@ testcase tiInsertTableUsingMenu
     if (UCase(gApplication)) = "IMPRESS" then
         DocumentImpress.UseMenu
         hMenuSelectNr(4)
-        hMenuSelectNr(13)
+        hMenuSelectNr(14)
     else
         DocumentDraw.UseMenu
         hMenuSelectNr(4)
-        hMenuSelectNr(10)
+        hMenuSelectNr(11)
     endif
 
 
@@ -222,11 +222,11 @@ testcase tiTableObjectBar
     if (UCase(gApplication)) = "IMPRESS" then
         DocumentImpress.UseMenu
         hMenuSelectNr(4)
-        hMenuSelectNr(13)
+        hMenuSelectNr(14)
     else
         DocumentDraw.UseMenu
         hMenuSelectNr(4)
-        hMenuSelectNr(10)
+        hMenuSelectNr(11)
     endif
 
     Kontext "InsertTableImpress"
diff --git a/testautomation/graphics/optional/includes/global/g_tools.inc b/testautomation/graphics/optional/includes/global/g_tools.inc
index 1e58bda65..7602dc98a 100755
--- a/testautomation/graphics/optional/includes/global/g_tools.inc
+++ b/testautomation/graphics/optional/includes/global/g_tools.inc
@@ -126,7 +126,7 @@ testcase tiToolsThesaurus
 ToolsOptions
 Kontext "ExtrasOptionenDlg"
 hToolsOptions("LANGUAGESETTINGS","Languages")
-Westlich.Select 32
+Westlich.Select 34
 Kontext "ExtrasOptionenDlg"
 ExtrasOptionenDlg.OK
 sleep 1
diff --git a/testautomation/graphics/optional/includes/impress/i_us_present.inc b/testautomation/graphics/optional/includes/impress/i_us_present.inc
index 6b95ef90b..26afac12e 100755
--- a/testautomation/graphics/optional/includes/impress/i_us_present.inc
+++ b/testautomation/graphics/optional/includes/impress/i_us_present.inc
@@ -232,10 +232,11 @@ testcase i_us_presentation2
     SlidesControl.FadeIn
 
     printlog "   Did the 'mistake' to FadeIn/Out the Slidepane"
-
-    '/// Make a Mouse Double-Click on the left part of the Layout, to input a picture ///'
+    
+    printlog "activating the input picture area"
     kontext "DocumentImpress"
-    DocumentImpress.MouseDoubleClick 30,50
+    DocumentImpress.TypeKeys "<TAB>",2
+    DocumentImpress.TypeKeys "<RETURN>"
     sleep (1)
 
     '/// Graphics-Import-dialogue. Select "i_us_large.jpg" ///'
diff --git a/testautomation/writer/optional/includes/clipboard/w_216_.inc b/testautomation/writer/optional/includes/clipboard/w_216_.inc
index d285a3e12..f85736751 100755
--- a/testautomation/writer/optional/includes/clipboard/w_216_.inc
+++ b/testautomation/writer/optional/includes/clipboard/w_216_.inc
@@ -59,6 +59,9 @@ testcase HTMLToWRITERText
     Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false)
     Call sMakeReadOnlyDocumentEditable
     sleep (3)
+    if GetDocumentCount() = 2 then
+    	Warnlog "#i104365#read only document remains opened"
+    endif        
     printlog "  Jump to beginning of document "
     Call wTypeKeys "<Mod1 Home>"
     Call wTypeKeys "<Shift Down><Shift End>"
@@ -112,7 +115,9 @@ testcase HTMLToWRITERText
         goto endsub
     end if
     printlog "  Close saved document "
-    Call hCloseDocument
+    Do Until GetDocumentCount = 0
+	    Call hCloseDocument
+    Loop
 endcase
 
 ' ----------------------------------------------------------------------------------------------
@@ -125,6 +130,9 @@ testcase HTMLToWRITERField
     printlog "  Copy selected text "
     Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html")
     Call sMakeReadOnlyDocumentEditable
+    if GetDocumentCount() = 2 then
+    	Warnlog "#i104365#read only document remains opened"
+    endif            
     printlog "  Jump to beginning of document "
     Call wTypeKeys "<Mod1 Home>"
     Call wTypeKeys "<Down>",2
@@ -177,7 +185,9 @@ testcase HTMLToWRITERField
             goto endsub
         end if
     printlog "  Close saved document "
-    Call hCloseDocument
+    Do Until GetDocumentCount = 0
+	    Call hCloseDocument
+    Loop
 endcase
 
 ' ----------------------------------------------------------------------------------------------
@@ -190,6 +200,9 @@ testcase HTMLToWRITERTable
     printlog "  Copy selected table "
     Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false)
     Call sMakeReadOnlyDocumentEditable
+    if GetDocumentCount() = 2 then
+    	Warnlog "#i104365#read only document remains opened"
+    endif            
     printlog "  Jump to beginning of document "
     Call wTypeKeys "<Mod1 Home>"
     Call wTypeKeys "<Down>",5
@@ -242,7 +255,9 @@ testcase HTMLToWRITERTable
         goto endsub
     end if
     printlog "  Close saved document "
-    Call hCloseDocument
+    Do Until GetDocumentCount = 0
+	    Call hCloseDocument
+    Loop
 endcase
 
 ' ----------------------------------------------------------------------------------------------
@@ -255,6 +270,9 @@ testcase HTMLToWRITERGraphicLinked
     printlog "  Copy selected Linked Graphic "
     Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false)
     Call sMakeReadOnlyDocumentEditable
+    if GetDocumentCount() = 2 then
+    	Warnlog "#i104365#read only document remains opened"
+    endif            
     printlog "  Jump to beginning of document "
     Call wTypeKeys "<Mod1 Home>"
     Call wTypeKeys ( "<Shift F4>" )
@@ -296,7 +314,9 @@ testcase HTMLToWRITERGraphicLinked
         goto endsub
     end if
     printlog "  Close saved document "
-    Call hCloseDocument
+    Do Until GetDocumentCount = 0
+	    Call hCloseDocument
+    Loop
 endcase
 
 ' ----------------------------------------------------------------------------------------------
@@ -309,6 +329,9 @@ testcase HTMLToWRITERControl
     printlog "  Copy selected Control "
     Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false)
     Call sMakeReadOnlyDocumentEditable
+    if GetDocumentCount() = 2 then
+    	Warnlog "#i104365#read only document remains opened"
+    endif            
     printlog "  Jump to beginning of document "
     Call wTypeKeys "<Mod1 Home>"
     Call wTypeKeys ( "<Shift F4>" )
@@ -351,7 +374,9 @@ testcase HTMLToWRITERControl
         goto endsub
     end if
     printlog "  Close saved document "
-    Call hCloseDocument
+    Do Until GetDocumentCount = 0
+	    Call hCloseDocument
+    Loop
 endcase
 
 ' ----------------------------------------------------------------------------------------------
@@ -364,6 +389,9 @@ testcase HTMLToWRITERFloatingFrame
     printlog "  Copy selected Floating Frame "
     Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false)
     Call sMakeReadOnlyDocumentEditable
+    if GetDocumentCount() = 2 then
+    	Warnlog "#i104365#read only document remains opened"
+    endif            
     printlog "  Jump to beginning of document "
     Call wTypeKeys "<Mod1 Home>"
     Call wTypeKeys ( "<Shift F4>" )
@@ -412,5 +440,7 @@ testcase HTMLToWRITERFloatingFrame
         goto endsub
     end if
     printlog "  Close saved document "
-    Call hCloseDocument
+    Do Until GetDocumentCount = 0
+	    Call hCloseDocument
+    Loop    
 endcase
diff --git a/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc b/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc
index 20b8f62b7..4e648e87d 100755
--- a/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc
+++ b/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc
@@ -138,17 +138,18 @@ testcase tFormatCharacter3
     Dim Vergleich3 as string
     Dim Vergleich4 as string
     Dim vLink as integer
-    '/// Format / Character ///
-    PrintLog "- Format / Character"
-    
-    '/// New document ///
+
+    printlog "New document"
     Call hNewDocument
-    printlog "  - adjust character"
-    '/// Select Format / Character ///
+	printlog "add some text to document => 	'formatted text with hyperlink'"
+	Call wTypeKeys ("formatted text with hyperlink")
+	printlog "select text"
+	Call wTypeKeys ("<Shift Home>")
+
     FormatCharacter
     WaitSlot (5)
     Kontext
-    '/// On Tabpage 'Font' adjust settings ///
+    printlog "On Tabpage 'Font' adjust settings"
     active.SetPage TabFont
     kontext "TabFont"
     try
@@ -168,20 +169,20 @@ testcase tFormatCharacter3
     endcatch
     wait 100
     Kontext
-    '/// On Tabpage 'Font Effects' adjust settings ///
+    printlog "On Tabpage 'Font Effects' adjust settings"
     active.SetPage TabFontEffects
     kontext "TabFontEffects"
     Blinking.Check
     Kontext
     Active.Setpage TabFontPosition
-    '/// On Tabpage 'Font Position ' adjust settings ///
+    printlog "On Tabpage 'Font Position ' adjust settings"
     Kontext "TabFontPosition"
     Spacing.Select 2
     SpacingBy.More 3
     Vergleich4 = SpacingBy.GetText
     if Right ( Vergleich4, 2 ) <> "pt" then Warnlog "Wrong Unit at Spacing by"
     Kontext
-    '/// On Tabpage 'Hyperlink' adjust settings ///
+    printlog "On Tabpage 'Hyperlink' adjust settings"
     active.SetPage TabHyperlinkZeichen
     kontext "TabHyperlinkZeichen"
     URLName.SetText "www.mikeportnoy.com"
@@ -200,13 +201,9 @@ testcase tFormatCharacter3
     Sleep 1
     Hintergrundfarbe.Typekeys "<Down><Left>", 4
     TabHintergrund.OK
-    '/// Close dialog and reopen with Format / Character ///
+    printlog "Close dialog"
 
-    Call wTypeKeys "This is formatted text <Home><Right>"
-
-    printlog "  - check character"
-
-    '/// Check settings made ///
+    printlog "Reopen with Format / Character and check settings made"
     Call wTypeKeys "<Home><Right>"
     FormatCharacter
     Kontext
@@ -234,38 +231,30 @@ testcase tFormatCharacter3
     Kontext
     active.SetPage TabHyperlinkZeichen
     kontext "TabHyperlinkZeichen"
-    if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "#i41171#Wrong URL : " + URLName.GetText
+    if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "##i105855##Wrong URL : " + URLName.GetText
     SetClipboard UrlName.Gettext
-    if NameText.GetText <> "A hyperlink with testtool" then Warnlog "Wrong Linkname : " + NameText.GetText
-    if TargetFrame.GetSelIndex <> 2 then Warnlog "Wrong Target selected : " + TargetFrame.GetSelText
-    if UnbesuchterLink.GetSelIndex <> vLink then Warnlog "Wrong Style for unused Link :" + UnbesuchterLink.GetSelIndex
+    if NameText.GetText <> "A hyperlink with testtool" then Warnlog "#i105855#Wrong Linkname : " + NameText.GetText
+    if TargetFrame.GetSelIndex <> 2 then Warnlog "#i105855#Wrong Target selected : " + TargetFrame.GetSelText
+    if UnbesuchterLink.GetSelIndex <> vLink then Warnlog "#i105855#Wrong Style for unused Link :" + UnbesuchterLink.GetSelIndex
     TabHyperlinkZeichen.OK
 
+    printlog "Save document as '../user/work/format1.sxw' and close it"
     if gApplication = "WRITER" then
         Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\format1.odt", "writer8")
     else
         Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\format1.odm", "writer8")  'gMasterDocFilter
-    end if
-    '/// Save document as '../user/work/format1.sxw' and close it ///
+    end if    
 
-    if getclipboardtext="http://www.mikeportnoy.com/" then
-        printlog "  - activate Link"
-    end if
-    Sleep 20
-
-    printlog "  - check saved character format"
-    Sleep 1
+    printlog "Close document"
     Call hCloseDocument
-    Sleep 2
+    printlog "reopen previous saved document and check saved character format"    
     if gApplication = "WRITER" then
         Call hFileOpen ( gOfficePath + "user\work\format1.odt" )
     else
         Call hFileOpen ( gOfficePath + "user\work\format1.odm" )
     end if
-    Call wTypeKeys "<Home><Right>"
+    Call wTypeKeys "<Mod1 Home><Right>"
     Wait 500
-    '/// Reopen previous saved documentand check settings made under Format / Character ///
-
     FormatCharacter
     WaitSlot (3)
     Kontext
@@ -292,9 +281,9 @@ testcase tFormatCharacter3
     Kontext
     active.SetPage TabHyperlinkZeichen
     kontext "TabHyperlinkZeichen"
-    if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "#i41171#Wrong URL : " + URLName.GetText
-    if NameText.GetText <> "A hyperlink with testtool" then Warnlog "Wrong Linkname : " + NameText.GetText
-    if TargetFrame.GetSelIndex <> 2 then Warnlog "Wrong Target selected : " + TargetFrame.GetSelText
+    if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "#i105855#Wrong URL : " + URLName.GetText
+    if NameText.GetText <> "A hyperlink with testtool" then Warnlog "#i105855#Wrong Linkname : " + NameText.GetText
+    if TargetFrame.GetSelIndex <> 2 then Warnlog "#i105855#Wrong Target selected : " + TargetFrame.GetSelText
     TabHyperlinkZeichen.OK
     '/// Close document ///
     Call hCloseDocument
@@ -487,18 +476,21 @@ endcase
 
 testcase tFormatCharacter
   	Dim Vergleich1%, Vergleich2$, Vergleich3$, Vergleich4$
-    
-	'/// Format / Character ///
+    	
 	PrintLog "- Format / Character"
-
-	'/// New document ///
 	Call hNewDocument
+	
+	printlog "add some text to document => 	'formatted text with hyperlink'"
+	Call wTypeKeys ("formatted text with hyperlink")
+	printlog "select text"
+	Call wTypeKeys ("<Shift Home>")
+	
 	printlog "  - adjust character"
-	'/// Select Format / Character ///
+	printlog "Format->Character"
 	FormatCharacter
 	Sleep 5
 	Kontext
-	'/// On Tabpage 'Font' adjust settings ///
+	printlog "On Tabpage 'Font' adjust settings"
 	active.SetPage TabFont
 	kontext "TabFont"
 	try
@@ -518,24 +510,24 @@ testcase tFormatCharacter
 	endcatch
 	wait 100
 	Kontext
-	'/// On Tabpage 'Font Effects' adjust settings ///
+	printlog "On Tabpage 'Font Effects' adjust settings"
 	active.SetPage TabFontEffects
 	kontext "TabFontEffects"
 	Blinking.Check
 	Kontext
 	Active.Setpage TabFontPosition
-	'/// On Tabpage 'Font Position ' adjust settings ///
+	printlog "On Tabpage 'Font Position ' adjust settings"
 	Kontext "TabFontPosition"
 	Spacing.Select 2
 	SpacingBy.More 3
 	Vergleich4$ = SpacingBy.GetText
 	if Right ( Vergleich4$, 2 ) <> "pt" then Warnlog "Wrong Unit at Spacing by"
 	Kontext
-	'/// On Tabpage 'Hyperlink' adjust settings ///
+	printlog "On Tabpage 'Hyperlink' adjust settings"
 	active.SetPage TabHyperlinkZeichen
 	kontext "TabHyperlinkZeichen"
 	URLName.SetText "www.mikeportnoy.com"
-	NameText.SetText "Ein Link mit dem Testtool"
+	NameText.SetText "Link created by testtool"
 	TargetFrame.Select 2
 
 	UnbesuchterLink.Select 6
@@ -545,14 +537,12 @@ testcase tFormatCharacter
 	Sleep 1
 	Hintergrundfarbe.Typekeys "<Down><Left>", 4
 	TabHintergrund.OK
-	'/// Close dialog and reopen with Format / Character ///
-
-	Call wTypeKeys "Dies ist ein formatierter Text <Home><Right>"
-
-	printlog "  - check character"
+	printlog "Close dialog"
 
-	'/// Check settings made ///
-	Call wTypeKeys "<Home><Right>"
+	printlog " Type Home- and Right-Key"
+	Call wTypeKeys "<Home><Right>"	
+	
+	printlog "recheck settings made with opening Format->Character"
 	FormatCharacter
 	Kontext
 	active.SetPage TabFont
@@ -579,38 +569,30 @@ testcase tFormatCharacter
 	Kontext
 	active.SetPage TabHyperlinkZeichen
 	kontext "TabHyperlinkZeichen"
-	if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "Wrong URL : " + URLName.GetText + " (#BugID:90982)"
+	if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "#i105855#Wrong URL : " + URLName.GetText + " (#BugID:90982)"
 	SetClipboard UrlName.Gettext
-	if NameText.GetText <> "Ein Link mit dem Testtool" then Warnlog "Wrong Linkname : " + NameText.GetText
-	if TargetFrame.GetSelIndex <> 2 then Warnlog "Wrong Target selected : " + TargetFrame.GetSelText
-	if UnbesuchterLink.GetSelIndex <> 6 then Warnlog "Wrong Style for unused Link :" + UnbesuchterLink.GetSelIndex
+	if NameText.GetText <> "Link created by testtool" then Warnlog "#i105855#Wrong Linkname : " + NameText.GetText
+	if TargetFrame.GetSelIndex <> 2 then Warnlog "#i105855#Wrong Target selected : " + TargetFrame.GetSelText
+	if UnbesuchterLink.GetSelIndex <> 6 then Warnlog "#i105855#Wrong Style for unused Link :" + UnbesuchterLink.GetSelIndex
 	TabHyperlinkZeichen.OK
 
+	printlog "Save document as '../user/work/format1.sxw' and close it"
 	if gApplication = "WRITER" then
     	Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\format1.odt", "writer8" )
 	else
     	Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\format1.odm", "writer8" ) 'gMasterDocFilter
-	end if
-	'/// Save document as '../user/work/format1.sxw' and close it ///
-
-	if getclipboardtext="http://www.mikeportnoy.com/" then
-    	printlog "  - activate Link"
-	end if
-	Sleep 20
-
-	printlog "  - check saved character format"
-	Sleep 1
+	end if	
 	Call hCloseDocument
-	Sleep 2
+	printlog "re-open previous saved document"
 	if gApplication = "WRITER" then
-    	    Call hFileOpen ( gOfficePath + "user\work\format1.odt" )
+    	Call hFileOpen ( gOfficePath + "user\work\format1.odt" )
 	else
-    	    Call hFileOpen ( gOfficePath + "user\work\format1.odm" )
+  	    Call hFileOpen ( gOfficePath + "user\work\format1.odm" )
 	end if
-   	Call wTypeKeys "<Home><Right>"
+   	Call wTypeKeys "<Mod1 Home><Right>"
 	Wait 500
-	'/// Reopen previous saved documentand check settings made under Format / Character ///
 
+	printlog "Execute Format->Character and re-check settings made"
 	FormatCharacter
 
 	Sleep 3
@@ -618,13 +600,13 @@ testcase tFormatCharacter
 	active.SetPage TabFont
 	kontext "TabFont"
 	try
-            if FontWest.GetSelText <> Vergleich2$ then Warnlog "Font should "+ Vergleich2$ +" is "+ FontWest.GetSelText
-            if StyleWest.GetSelIndex <> Vergleich1% then Warnlog "FontStyle should " +Vergleich3$+" is "+ StyleWest.GetSelText
-            if SizeWest.GetSelIndex <> 24 then Warnlog "Wrong Font Size : " + SizeWest.GetSelText
+		if FontWest.GetSelText <> Vergleich2$ then Warnlog "Font should "+ Vergleich2$ +" is "+ FontWest.GetSelText
+		if StyleWest.GetSelIndex <> Vergleich1% then Warnlog "FontStyle should " +Vergleich3$+" is "+ StyleWest.GetSelText
+		if SizeWest.GetSelIndex <> 24 then Warnlog "Wrong Font Size : " + SizeWest.GetSelText
 	catch
-            if Font.GetSelText <> Vergleich2$ then Warnlog "Font should "+ Vergleich2$ +" is "+ Font.GetSelText
-            if Style.GetSelIndex <> Vergleich1% then Warnlog "FontStyle should " +Vergleich3$+" is "+ Style.GetSelText
-            if Size.GetSelIndex <> 24 then Warnlog "Wrong Font Size : " + Size.GetSelText
+		if Font.GetSelText <> Vergleich2$ then Warnlog "Font should "+ Vergleich2$ +" is "+ Font.GetSelText
+		if Style.GetSelIndex <> Vergleich1% then Warnlog "FontStyle should " +Vergleich3$+" is "+ Style.GetSelText
+		if Size.GetSelIndex <> 24 then Warnlog "Wrong Font Size : " + Size.GetSelText
 	endcatch
 	Kontext
 	active.SetPage TabFontEffects
@@ -638,11 +620,11 @@ testcase tFormatCharacter
 	Kontext
 	active.SetPage TabHyperlinkZeichen
 	kontext "TabHyperlinkZeichen"
-	if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "Wrong URL : " + URLName.GetText
-	if NameText.GetText <> "Ein Link mit dem Testtool" then Warnlog "Wrong Linkname : " + NameText.GetText
-	if TargetFrame.GetSelIndex <> 2 then Warnlog "Wrong Target selected : " + TargetFrame.GetSelText
+	if URLName.GetText <> "http://www.mikeportnoy.com/" then Warnlog "#i105855#Wrong URL : " + URLName.GetText
+	if NameText.GetText <> "Link created by testtool" then Warnlog "#i105855#Wrong Linkname : " + NameText.GetText
+	if TargetFrame.GetSelIndex <> 2 then Warnlog "#i105855#Wrong Target selected : " + TargetFrame.GetSelText
 	TabHyperlinkZeichen.OK
-	'/// Close document ///
+	printlog "Close document"
 	Call hCloseDocument
 endcase
 
diff --git a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc
index cdd4bc0b9..5dabe72ff 100755
--- a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc
+++ b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc
@@ -1162,58 +1162,60 @@ endcase
 
 testcase tParagraphIndent17
 
-  Dim sTestFile1 as String
-  Dim sTestFile2 as String
-
-  sTestFile1 = Convertpath (gTesttoolpath + "writer\optional\input\formatparagraph\AddSpacingShouldCheck.doc")
-  sTestFile2 = Convertpath (gTesttoolpath + "writer\optional\input\formatparagraph\AddSpacingShouldNotCheck.doc")
-
-  PrintLog "- Test 'Add spacing between paragarph and talbes' when importing from MS-Word"
-  '/// <b>Test 'Add spacing between paragarph and talbes' when importing from MS-Word</b>
-
-   Call hNewDocument
-
-   '/// 1.Open the test file - AddSpacingShouldCheck.doc
-   '///   In Tools/Optionis/Text Document/Compatibility,
-   '/// + the 'Add spacing between paragarph and talbes'
-   '/// + should be checked
-    Call hFileOpen(sTestFile1)
-    Call sMakeReadOnlyDocumentEditable
-
-    ToolsOptions
-    Call hToolsOptions("WRITER","COMPATIBILITY")
-        Kontext "TabCompatibility"
-        Sleep 2
-        Options.TypeKeys "<Down>"
-        if Options.IsChecked <> TRUE then
-            warnlog "'Add spacing between paragarph and talbes' should be checked"
-        end if
-        Kontext "ExtrasOptionenDlg"
-    ExtrasOptionenDlg.OK
-
-   Call hCloseDocument
-
-   Call hNewDocument
-
-   '/// 2.Open the test file - AddSpacingShouldNotCheck.doc
-   '///   In Tools/Optionis/Text Document/Compatibility,
-   '/// + the 'Add spacing between paragarph and talbes'
-   '/// + should NOT be checked
-    Call hFileOpen(sTestFile2)
-    Call sMakeReadOnlyDocumentEditable
-
-    ToolsOptions
-    Call hToolsOptions("WRITER","COMPATIBILITY")
-        Kontext "TabCompatibility"
-        Sleep 2
-        Options.TypeKeys "<Down>"
-        if Options.IsChecked = TRUE then
-            warnlog "'Add spacing between paragarph and talbes' should NOT be checked"
-        end if
-        Kontext "ExtrasOptionenDlg"
-    ExtrasOptionenDlg.OK
-
-   Call hCloseDocument
+	Dim sTestFile1 as String
+	Dim sTestFile2 as String
+	
+	sTestFile1 = Convertpath (gTesttoolpath + "writer\optional\input\formatparagraph\AddSpacingShouldCheck.doc")
+	sTestFile2 = Convertpath (gTesttoolpath + "writer\optional\input\formatparagraph\AddSpacingShouldNotCheck.doc")
+	
+	PrintLog "- Test 'Add spacing between paragarph and talbes' when importing from MS-Word"
+	'/// <b>Test 'Add spacing between paragarph and talbes' when importing from MS-Word</b>
+	
+	Call hNewDocument
+	
+	'/// 1.Open the test file - AddSpacingShouldCheck.doc
+	'///   In Tools/Optionis/Text Document/Compatibility,
+	'/// + the 'Add spacing between paragarph and talbes'
+	'/// + should be checked
+	Call hFileOpen(sTestFile1)
+	Call sMakeReadOnlyDocumentEditable
+	
+	ToolsOptions
+	Call hToolsOptions("WRITER","COMPATIBILITY")
+	Kontext "TabCompatibility"
+	Sleep 2
+	Options.TypeKeys "<Down>"
+	if Options.IsChecked <> TRUE then
+		warnlog "'Add spacing between paragarph and talbes' should be checked"
+	end if
+	Kontext "ExtrasOptionenDlg"
+	ExtrasOptionenDlg.OK
+	
+	Call hCloseDocument
+	
+	Call hNewDocument
+	
+	'/// 2.Open the test file - AddSpacingShouldNotCheck.doc
+	'///   In Tools/Optionis/Text Document/Compatibility,
+	'/// + the 'Add spacing between paragarph and talbes'
+	'/// + should NOT be checked
+	Call hFileOpen(sTestFile2)
+	Call sMakeReadOnlyDocumentEditable
+	
+	ToolsOptions
+	Call hToolsOptions("WRITER","COMPATIBILITY")
+	Kontext "TabCompatibility"
+	Sleep 2
+	Options.TypeKeys "<Down>"
+	if Options.IsChecked = TRUE then
+		warnlog "'Add spacing between paragarph and talbes' should NOT be checked"
+	end if
+	Kontext "ExtrasOptionenDlg"
+	ExtrasOptionenDlg.OK
+	
+	Do Until GetDocumentCount = 0
+        Call hCloseDocument
+    Loop
 
 endcase
 
diff --git a/testautomation/writer/optional/includes/navigator/w_navigator.inc b/testautomation/writer/optional/includes/navigator/w_navigator.inc
index 21dc8ec9a..31f146fb7 100755
--- a/testautomation/writer/optional/includes/navigator/w_navigator.inc
+++ b/testautomation/writer/optional/includes/navigator/w_navigator.inc
@@ -217,7 +217,7 @@ endcase
 ' **********************************************************************
 
 testcase tViewNavigator3
-    WarnLog "#i94614# - tViewNavigator3 outcommented"
+    QAErrorlog "#i94614# - tViewNavigator3 outcommented"
     goto endsub
 
     Dim NavigationTearOff as boolean
diff --git a/testautomation/writer/optional/includes/undo/w_undo_history_3.inc b/testautomation/writer/optional/includes/undo/w_undo_history_3.inc
index f0e3d8966..0edd49e1f 100755
--- a/testautomation/writer/optional/includes/undo/w_undo_history_3.inc
+++ b/testautomation/writer/optional/includes/undo/w_undo_history_3.inc
@@ -45,7 +45,7 @@ sub w_undo_history_3
 	Call tUndoCaption			' Insert Caption
 	Call tUndoAutoText			' Insert Autotext	
 	Call tUndoBookmark			' Bookmark (Insert/Rename/Delete)
-	Call tUndoNote			' Note (Insert/Delete)
+	Call tUndoComment			' Comment (Insert/Delete)
 	Call tUndoScript			' Script (Insert/Delete)
 	Call tUndoIndexes			' Index/Bibliography entrys (Insert/Delete)
 	Call tUndoFrames			' Frames (Insert/Rename/Delete)
@@ -293,26 +293,23 @@ goto endsub
 endcase
 
 
-testcase tUndoNote
+testcase tUndoComment
 
-	'/// <B>Note (Insert/Delete)</B>
-	printlog "- Insert Note"
-	'/// new document
+	printlog "New document"
 	Call hNewDocument
-	'/// Insert / Note
+	printlog "Insert / Comment"
 	InsertNoteWriter
-	'///  string in Undo-list has to be: "Insert note") 
-	Call CheckUndoStringInUndoList ( 10, "InsertNote" )
-    printlog "- Delete Note"
-    '/// Bring up the Navigator, find the entry "Notes", expand it, and select the expanded section.
+	printlog "String in Undo-list has to be: 'Insert Comment'" 
+	Call CheckUndoStringInUndoList ( 10, "InsertComment" )
+    printlog "- Delete Comment"
+    printlog "Bring up the Navigator, find the entry 'Comments', expand it, and select the expanded section."
     Call wNavigatorAuswahl( 11, 1 )
-	'/// Enter 'Delete'      'Backspace'
     kontext "Navigator"
     Navigator.TypeKeys "<DELETE>"
     '/// Close the Navigator
     ViewNavigator
-    '///  string in Undo-list has to be: "Delete: 'This is a note'") 
-	Call CheckUndoStringInUndoList ( 10, "DeleteNote" )
+    '///  string in Undo-list has to be: "Delete comment") 
+	Call CheckUndoStringInUndoList ( 10, "DeleteComment" )
 
 	'/// Close document
 	Call hCloseDocument
diff --git a/testautomation/writer/required/includes/w_004_.inc b/testautomation/writer/required/includes/w_004_.inc
index 85768207f..88322855a 100755
--- a/testautomation/writer/required/includes/w_004_.inc
+++ b/testautomation/writer/required/includes/w_004_.inc
@@ -55,7 +55,7 @@ sub w_004_
     Call tInsertCaption
     Call tInsertBookmark
     Call tInsertCrossReference
-    Call tInsertNote
+    Call tInsertComment
     Call tInsertScript
     Call tInsertIndexesEntry
     Call tInsertIndexesIndex
@@ -479,22 +479,22 @@ endcase
 
 '-----------------------------------------------------------
 
-testcase tInsertNote
+testcase tInsertComment
     dim sNoteText as String
-    PrintLog "- Insert / Note"
+    PrintLog "- Insert / Comment"
 
     Call hNewDocument
 
-    printlog " Insert / Note"
+    printlog " Insert / Comment"
     InsertNoteWriter
     Kontext "DocumentWriter"
-    sNoteText = "Testnote inserted by testtool !"
+    sNoteText = "Comment inserted by testtool !"
     Call wTypeKeys (sNoteText)
 
     Call wNavigatorAuswahl( 11, 1 )
     Kontext "NavigatorWriter"
     if Auswahlliste.Gettext <> sNoteText then
-        warnlog ("Note was not inserted correctly (Focus problem?")
+        warnlog ("Comment was not inserted correctly (Focus problem?")
     end if
 
     printlog " Close active document"
diff --git a/testautomation/writer/tools/includes/w_tools_undo.inc b/testautomation/writer/tools/includes/w_tools_undo.inc
index d896d8d13..11b4756bb 100644
--- a/testautomation/writer/tools/includes/w_tools_undo.inc
+++ b/testautomation/writer/tools/includes/w_tools_undo.inc
@@ -414,17 +414,17 @@ sub CheckUndoStringInUndoList(vType as integer, optional vShould as string)
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
-				Case "InsertNote"
+				Case "InsertComment"
 					Select Case iSprache
-						Case 01: if UndoStringFromUndoList <> "Insert note" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 01: if UndoStringFromUndoList <> "Insert comment" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case 34: if UndoStringFromUndoList <> "Insertar nota" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case 86: if UndoStringFromUndoList <> "插入 批注" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
 					end select
 
-				Case "DeleteNote"
+				Case "DeleteComment"
 					Select Case iSprache
-						Case 01: if UndoStringFromUndoList <> "Delete note" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
+						Case 01: if UndoStringFromUndoList <> "Delete comment" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case 34: if UndoStringFromUndoList <> "Eliminar nota" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case 86: if UndoStringFromUndoList <> "删除 批注" then Warnlog "Wrong text in Undo-List: " & UndoStringFromUndoList
 						Case else: QAErrorlog "Please adapt test for this language: "  & UndoStringFromUndoList
diff --git a/testautomation/xml/optional/includes/f_xml_save_ms_ole.inc b/testautomation/xml/optional/includes/f_xml_save_ms_ole.inc
index d57626d32..5f61ba73c 100755
--- a/testautomation/xml/optional/includes/f_xml_save_ms_ole.inc
+++ b/testautomation/xml/optional/includes/f_xml_save_ms_ole.inc
@@ -172,7 +172,7 @@ testcase tXML_OLE_Conversion ( sCurrentTestDocument as STRING )
             select case sCurrentOLE
                    case "mat"
                         SAXSeekElement( 1 )
-                        if SAXGetElementName() <> "math:math" then
+                        if SAXGetElementName() <> "math" then
                             warnlog "A Math object was expected here -> Check this out!"
                         endif
                    case else