merged in DEV300_m49

2009-05-27 10:40:46 +02:00
parent cce880c5d8 0e3881b169
commit 1285af8423
44 changed files with 11496 additions and 11214 deletions
--- a/smoketestoo_native/smoketest.pl
+++ b/smoketestoo_native/smoketest.pl
@@ -117,6 +117,7 @@ if ($gui eq "WNT") {
    $bootstrapini = "bootstrap.ini";
    $bootstrapiniTemp = $bootstrapini . "_";
    $packpackage = "msi";
+    $installpath_without =~ s/\//\\/g;
 }
 elsif ($gui eq "UNX") {
    $is_do_deinstall = 0;
@@ -166,6 +167,7 @@ elsif ($gui eq $cygwin) {
    $WinLineends = "\r\n";
    &SetWinLineends();
    $packpackage = "msi";
+    $installpath_without =~ s/\\/\//g;
 }
 else {
    print_error ("not supported system\n",1);
@@ -238,12 +240,6 @@ $WORK_STAMP_LC=$ENV{WORK_STAMP};
 $WORK_STAMP_LC =~ tr/A-Z/a-z/;
 $ENV{DBGSV_INIT} = $DATA . "dbgsv.ini";
 $ExtensionDir = $ENV{DMAKE_WORK_DIR} . $PathSeparator . $ENV{OUTPATH} . $ENV{PROEXT} . $PathSeparator . "bin" . $PathSeparator;
-if (defined($ENV{INSTALLPATH_SMOKETEST})) {
-    $installpath_without = $ENV{INSTALLPATH_SMOKETEST};
-}
-else {
-    $installpath_without = $temp_path;
-}

 if (defined($vcsid)) {
    $installpath_without .= $PathSeparator . $vcsid;
--- a/testautomation/chart2/optional/ch2_lvl1.bas
+++ b/testautomation/chart2/optional/ch2_lvl1.bas
@@ -0,0 +1,62 @@
+'encoding UTF-8  Do not remove or change this line!
+'**************************************************************************
+'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'* 
+'* Copyright 2009 by Sun Microsystems, Inc.
+'*
+'* OpenOffice.org - a multi-platform office productivity suite
+'*
+'* $RCSfile: ch2_lvl1.bas,v $
+'*
+'* $Revision: 1.0 $
+'*
+'* last change: $Author: hde $ $Date: 2009-04-14 15:12:01 $
+'*
+'* This file is part of OpenOffice.org.
+'*
+'* OpenOffice.org is free software: you can redistribute it and/or modify
+'* it under the terms of the GNU Lesser General Public License version 3
+'* only, as published by the Free Software Foundation.
+'*
+'* OpenOffice.org is distributed in the hope that it will be useful,
+'* but WITHOUT ANY WARRANTY; without even the implied warranty of
+'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+'* GNU Lesser General Public License version 3 for more details
+'* (a copy is included in the LICENSE file that accompanied this code).
+'*
+'* You should have received a copy of the GNU Lesser General Public License
+'* version 3 along with OpenOffice.org.  If not, see
+'* <http://www.openoffice.org/license.html>
+'* for a copy of the LGPLv3 License.
+'*
+'/************************************************************************
+'*
+'* owner : helge.delfs@sun.com
+'*
+'* short description : Chart2 functional tests
+'*
+'\************************************************************************
+
+sub main
+    use "chart2\tools\ch_tools_common.inc"
+    use "chart2\optional\includes\ch2_lvl1a.inc"
+    
+    Call hStatusIn ( "Chart2", "ch2_lvl1.bas" )
+    
+	Call ch2_lvl1a
+    
+	Call hStatusOut
+	
+	
+end sub
+'
+'-------------------------------------------------------------------------------
+'
+sub LoadIncludeFiles
+    use "global\system\includes\master.inc"
+    use "global\system\includes\gvariabl.inc"
+    use "global\tools\includes\optional\t_set_standard_controls.inc"
+    Call GetUseFiles     
+    gApplication = "Calc"
+end sub
+
--- a/testautomation/chart2/optional/includes/ch2_lvl1a.inc
+++ b/testautomation/chart2/optional/includes/ch2_lvl1a.inc
@@ -0,0 +1,147 @@
+'encoding UTF-8  Do not remove or change this line!
+'**************************************************************************
+'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'* 
+'* Copyright 2009 by Sun Microsystems, Inc.
+'*
+'* OpenOffice.org - a multi-platform office productivity suite
+'*
+'* $RCSfile: ch2_lvl1a.inc,v $
+'*
+'* $Revision: 1.0 $
+'*
+'* last change: $Author: hde $ $Date: 2009-04-14 15:12:01 $
+'*
+'* This file is part of OpenOffice.org.
+'*
+'* OpenOffice.org is free software: you can redistribute it and/or modify
+'* it under the terms of the GNU Lesser General Public License version 3
+'* only, as published by the Free Software Foundation.
+'*
+'* OpenOffice.org is distributed in the hope that it will be useful,
+'* but WITHOUT ANY WARRANTY; without even the implied warranty of
+'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+'* GNU Lesser General Public License version 3 for more details
+'* (a copy is included in the LICENSE file that accompanied this code).
+'*
+'* You should have received a copy of the GNU Lesser General Public License
+'* version 3 along with OpenOffice.org.  If not, see
+'* <http://www.openoffice.org/license.html>
+'* for a copy of the LGPLv3 License.
+'*
+'/************************************************************************
+'*
+'* owner : helge.delfs@sun.com
+'*
+'* short description : Chart2 functional tests
+'*
+'\************************************************************************
+
+sub ch2_lvl1a
+
+	Call tPlotOptions
+
+end sub
+
+
+testcase tPlotOptions
+	
+	Dim sOutputFile as string
+	sOutputFile = convertpath(gOfficepath & "user\work\hiddenCells.ods")
+
+	printlog "Load simple chart document"
+	if fLoadVerySimpleChartAndSaveLocal() > 0 then
+		warnlog "Loading test document seems to have failed -> Check this out!"
+		goto endsub
+	endif    
+	printlog "Select chart using navigator"
+	if fSelectFirstOLE = -1 then
+		warnlog "It was not possible to select the chart object!"
+		Call hCloseDocument
+		goto endsub
+	endif	
+
+	printlog "Edit / Object / Edit"
+	EditObjectEdit        
+
+	printlog "Move to third object in Chart using TAB key (data series)"
+	Kontext "DocumentChart"
+	DocumentChart.TypeKeys "<TAB>" , 3        
+
+	printlog "Invoke Format::ObjectProperties"
+	FormatObjectProperties        
+
+	printlog "Select tab page Options"
+	Kontext
+	Active.SetPage TabDataSeriesOptions
+	Kontext "TabDataSeriesOptions"
+	printlog "activate checkbox 'Include values from hidden cells'"
+	try
+		IncludeHiddenCells.Check
+	catch
+		Warnlog "checkbox hidden or disabled"
+		Call hCloseDocument
+		goto endsub
+	endcatch
+		
+	printlog "Close and reopen data series dialog - checkbox should be still activated"
+	TabDataSeriesOptions.Ok	
+	FormatObjectProperties        
+	printlog "Select tab page Options"
+	Kontext
+	Active.SetPage TabDataSeriesOptions
+	Kontext "TabDataSeriesOptions"
+	if Not IncludeHiddenCells.IsChecked then
+		Warnlog "After closing and reopening of Data-Series dialog the checkbox isn't checked anymore"
+		TabDataSeriesOptions.Cancel
+		Kontext "DocumentCalc"
+		DocumentCalc.TypeKeys "<Escape>"		
+		call hCloseDocument
+		goto endsub		
+	endif
+
+	TabDataSeriesOptions.Ok
+	
+	printlog "save and reopen file - checkbox still must be checked"
+	if NOT hFileSaveAsKill (sOutputFile) then
+		warnlog "Saving test document failed -> Aborting"
+		Kontext "DocumentCalc"
+		DocumentCalc.TypeKeys "<Escape>"		
+		call hCloseDocument
+		goto endsub
+	endif    		
+	Call hCloseDocument
+	
+    Call hFileOpen(sOutputFile)
+	if fSelectFirstOLE = -1 then
+		warnlog "It was not possible to select the chart object!"
+		Call hCloseDocument
+		goto endsub
+	endif	
+
+
+	EditObjectEdit        
+	Kontext "DocumentChart"
+	DocumentChart.TypeKeys "<TAB>" , 3        
+	printlog "Invoke Format::ObjectProperties"
+	FormatObjectProperties        	
+	Kontext
+	Active.SetPage TabDataSeriesOptions
+	Kontext "TabDataSeriesOptions"
+	if Not IncludeHiddenCells.IsChecked then
+		Warnlog "After closing and reopening of Data-Series dialog the checkbox isn't checked anymore"
+		TabDataSeriesOptions.Cancel
+		Kontext "DocumentCalc"
+		DocumentCalc.TypeKeys "<Escape>"		
+		call hCloseDocument
+		goto endsub		
+	endif
+	
+	'/// Close dialog with Cancel-button
+	TabDataSeriesOptions.Cancel
+	'/// Close document
+	Kontext "DocumentCalc"
+	DocumentCalc.TypeKeys "<Escape>"
+
+	Call hCloseDocument
+endcase
--- a/testautomation/chart2/required/includes/ch2_format.inc
+++ b/testautomation/chart2/required/includes/ch2_format.inc
@@ -86,9 +86,14 @@ testcase tFormatObjectProperties
        Active.SetPage TabDataSeriesLabels
        '/// Check if tab page series labels exists
        Kontext "TabDataSeriesLabels"
-        call DialogTest ( TabDataSeriesLabels )        
+        call DialogTest ( TabDataSeriesLabels )
+        '/// Check if tab page data series options exists
+        Kontext
+		Active.SetPage TabDataSeriesOptions
+        Kontext "TabDataSeriesOptions"
+        call DialogTest ( TabDataSeriesOptions )        
        '/// Close dialog with Cancel-button
-        TabDataSeriesLabels.Cancel
+        TabDataSeriesOptions.Cancel
        '/// Close document
        Kontext "DocumentCalc"
        DocumentCalc.TypeKeys "<Escape>"
--- a/testautomation/chart2/tools/ch_tools_common.inc
+++ b/testautomation/chart2/tools/ch_tools_common.inc
@@ -57,8 +57,9 @@ sub fInsertOLE as BOOLEAN
    if Objekttyp.getItemcount < 1 then
        warnlog "There are no OLE-Objects in the listbox"
    endif
-    '/// Select first entry in listbox (which should be the chart)
+    '/// Select 3rd entry in listbox (which should be the chart)
    Objekttyp.TypeKeys "<HOME>"
+	Objekttyp.TypeKeys "<Down>", 2
    '/// Quit dialog using OK
    OLEObjektEinfuegen.OK
    sleep(2)
--- a/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc
+++ b/testautomation/dbaccess/optional/includes/ctrl_Wizards.inc
@@ -83,7 +83,7 @@ testcase tGroupBoxWithDatasource
   	 sleep(2)
   	 hMenuSelectNr (1)
   	 sleep(3)
-   	 Liste.TypeKeys "<DOWN>"
+   	 Liste.TypeKeys "<RETURN>",true
  	 sleep(3)
   	 Liste.OpenContextmenu
  	 sleep(2)
@@ -96,7 +96,7 @@ testcase tGroupBoxWithDatasource
   	 '/// set the datasource TT
     printlog "set the datasource TT"
     DataSource.setText(sDSName)
-	 TabDataForm.TypeKeys "<RETURN>" , true
+	 DataSource.TypeKeys "<RETURN>" , true
     '/// insert password 'testtool' into login dialog
     printlog "insert password 'testtool' into login dialog"
     Kontext "LoginDialog"
@@ -118,8 +118,7 @@ testcase tGroupBoxWithDatasource
    Kontext "TabDataForm"         
    '/// set the table TT_Control
     printlog "set the table TT_Control"    
-	 Content.setText("TT_Control")     
- 	 'WORKAROUND: for bug 106538
+	 Content.setText("TT_Control")
     Content.TypeKeys "<RETURN>" , true       
  	Kontext "ControlPropertiesDialog"
   	 ControlPropertiesDialog.Close
@@ -245,7 +244,6 @@ testcase tGroupBoxWithDatasource
     TabGeneralControl.TypeKeys "<TAB>" , true 'this tab is importent, I don't not why but it is.
     sleep(1)
     HelpURL.setText "HID:123456"
-     sleep(1)
     HelpURL.TypeKeys "<RETURN>",true
     sleep(1)
    Kontext "ControlPropertiesDialog" 
@@ -283,8 +281,7 @@ testcase tGroupBoxWithDatasource
 	 TabGeneralControl.TypeKeys "<TAB>" , true 'this tab is importent, I don't not why but it is.
     sleep(1)
     HelpURL.setText "HID:1234567"
-     sleep(1)
-     HelpURL.TypeKeys "<RETURN>",true     
+     HelpURL.TypeKeys "<RETURN>", true
     sleep(1)
    Kontext "ControlPropertiesDialog" 
     ControlPropertiesDialog.close
@@ -320,11 +317,9 @@ testcase tGroupBoxWithDatasource
   	 sleep(5)
     
    Kontext "TabGeneralControl"
-     TabGeneralControl.TypeKeys "<TAB>" , true ' this tab is importent, I don't not why but it is.
-     'sleep(1)
-     HelpURL.setText "HID:12345678"
-     'sleep(1)
-     HelpURL.TypeKeys "<RETURN>",true
+     TabGeneralControl.TypeKeys "<TAB>" , true ' this tab is importent, I don't not why but it is.     
+     HelpURL.setText "HID:12345678"     
+     HelpURL.TypeKeys "<RETURN>", true
     sleep(1)
    Kontext "ControlPropertiesDialog" 
     ControlPropertiesDialog.close     
@@ -541,6 +536,8 @@ testcase tGroupBoxWithoutDatasource
   	ControlPropertiesTabControl.SetPage TabGeneralControl
   	sleep (2)
  	Kontext "TabGeneralControl"
+     TabGeneralControl.mouseDown(1,1)
+     TabGeneralControl.mouseUp(1,1)
 	 TabGeneralControl.TypeKeys "<TAB>" , true
     TabGeneralControl.TypeKeys "<MOD1 C>" , true     
     if getClipboard <> "Group 123" then
--- a/testautomation/dbaccess/optional/includes/db_Dbase.inc
+++ b/testautomation/dbaccess/optional/includes/db_Dbase.inc
@@ -113,11 +113,9 @@ testcase db_Dbase
                       
            call db_Query(sFileName,"dbase")
            
-            'outcomment because of some bugs in forms
-            'use "dbaccess/optional/includes/b_lvl1_Forms.inc"
-            'call b_lvl1_Forms ("TT_dBase")
-            
-                      
+            use "dbaccess/optional/includes/db_IndexDesign.inc"
+            call tIndex(sFileName, sTableName)
+
 		else 
            warnlog "Data Source could not be created - beyond testcases stopped"
 		endif
--- a/testautomation/dbaccess/optional/includes/db_Text.inc
+++ b/testautomation/dbaccess/optional/includes/db_Text.inc
@@ -87,7 +87,7 @@ testcase tOpenUTF8File(sFilename as string)
    
    '/// copy the file TesttoolPath + dbaccess/optional/input/text_datasource/text_Database.txt" to your local wotk directory
    printlog "copy the file TesttoolPath + dbaccess/optional/input/text_datasource/text_Database.txt to your local wotk directory"
-    app.FileCopy gTesttoolPath + ConvertPath("dbaccess/optional/input/text_datasource/text_Database.txt"),gOfficePath + ConvertPath("user/work/text_Database.txt")
+    app.FileCopy gTesttoolPath + ConvertPath("dbaccess/optional/input/text_datasource/text_database.txt"),gOfficePath + ConvertPath("user/work/text_database.txt")

    '/// open the text database create in the bas file
    call fOpendatabase(sFileName)
@@ -123,11 +123,11 @@ testcase tOpenUTF8File(sFilename as string)
    Kontext "DatabaseProperties"
        DatabaseProperties.OK
    
-    '/// switch once the forms container and back to tables
-    printlog "switch once the forms container and back to tables"
-    '/// to refresh the tables
-    printlog "to refresh the tables"
-    ViewForms    
+    '/// save and close the database
+    call fCloseDatabase(true)
+    
+    '/// open the text database again
+    call fOpendatabase(sFileName)    
        
    '/// open the table text_database
    printlog "open the table text_database"    
--- a/testautomation/extensions/optional/includes/meta-inf.inc
+++ b/testautomation/extensions/optional/includes/meta-inf.inc
@@ -38,58 +38,52 @@
 '\******************************************************************************

 testcase tLowerCaseMetaInf
-
-    '///<h3>Case sensitive META-INF in packages</h3>
-    '///<ul>
    
+    printlog( "The filename <META-INF> in lowercase letters may prevent installation" )
+
    dim cExtensionName as string
        cExtensionName = "lowercasemetainf.oxt"
    
    dim cExtensionPath as string
        cExtensionPath = gTesttoolPath & "extensions\optional\input\errors\"
        cExtensionPath = cExtensionPath & cExtensionName
-        cExtensionPath = convertpath( cExtensionPath )

    dim irc as integer
-        
-    '///+<li>Create a new document</li>
-    hCreateDocument()
    
-    '///+<li>Add the problematic extension</li>
-    irc = hExtensionAddGUI( cExtensionPath, "" )
+    printlog( "Install extension: " & cExtensionPath )
+    irc = hExtensionAddGUI( cExtensionPath, "AcceptLicense" )

-    ' the extension comes with a german license only and will trigger
-    ' a localized license warning on any other language
-    if ( irc = 4 ) then
-        if ( iSprache <> 49 ) then
+    if ( irc > 0 ) then
+    
+        printlog( "Check for unexpected messagebox" )
+        kontext "Active"
+        if ( Active.exists( 3 ) ) then
+            warnlog( "Extension should install after license has been displayed" )
+            printlog( Active.getText() )
+            
+            printlog( "Trying to end test gracefully" )
+            Active.ok()

-            printlog( "This test only works with german ui-language" )
-            kontext "active"
-            if ( active.exists() ) then
-                active.ok()
-               
-                kontext "PackageManager"
-                PackageManager.ok()
+            printlog( "Close Extension Manager" )
+            kontext "PackageManager"
+            if ( PackageManager.exists( 3 ) ) then
+                PackageManager.close()
            else
-                warnlog( "Unexpected active" )
+                warnlog( "Cannot access Extension Manager" )
            endif
-        else
-            kontext "active"
-            if ( active.exists() ) then
-                warnlog( "Unexpected active" ) 
-            endif
-        endif
-    endif

-    '///+<li>Remove the problematic extension</li>
-    if ( irc = 0 ) then
+        else
+            printlog( "No messagebox, good." )
+        endif
+        
+        printlog( "Remove extension" )
        hExtensionRemoveGUI( cExtensionName )
+        
+    else
+    
+        warnlog( "The extension was not installed" )
+        
    endif
-    
-    '///+<li>Close the document</li>
-    hDestroyDocument()
-    
-    '///</ul>

 endcase

--- a/testautomation/framework/optional/includes/basic_formcontrols.inc
+++ b/testautomation/framework/optional/includes/basic_formcontrols.inc
@@ -121,6 +121,80 @@ testcase tAllControlsOnDialog( cMajor as string )
        '///+<li>close the BASIC-IDE</li>
        hCloseBasicIde()
        
+        
+        printlog( "" )
+        printlog( "Test case 1: Verify that settings survive a close and reopen of the BASIC IDE" )
+        
+        ToolsMacro_uno
+        kontext "Makro"
+        irc = hSelectNodeByName( MakroAus , CMODULE )
+        if ( irc = 0 ) then
+            qaerrorlog( "Searching node by name failed. Using fallback" )
+            hSelectTheLastnode( MakroAus )
+        else
+            printlog( "The node was found. Good." )
+        endif
+        
+        brc = hIsMacroEditButtonEnabled()
+        if ( not brc ) then
+            warnlog( "Edit-Button is not enabled, the test cannot continue" )
+            kontext "Makro"
+            Makro.cancel()
+            brc = hDestroyDocument()
+            goto endsub
+        endif
+            
+        '///+<li>Click 'Edit' to edit the module</li>
+        printlog( "Edit the module" )
+        Bearbeiten.Click()
+        if ( WaitSlot <> WSFinished ) then
+            warnlog( "Slot not finished after 1 second" )
+        endif
+
+        kontext "BasicIDE"
+        '///+<li>Find the dialog we created before</li>
+        ' try to find our dialog again by stepping through the tabbar
+        bOpen = hFindFirstDialog()
+        if ( not bOpen ) then
+            warnlog( "Could access dialog, aborting test" )
+            hCloseBasicIde()
+            brc = hDestroyDocument()
+            goto endsub
+        endif
+
+        '///+<li>Open the macro controls float</li>
+        ' if the dialog is open, open the macro controls toolbar as well,
+        ' we need access to the "properties" button
+        bOpen = hShowMacroControls()
+        if ( not bOpen ) then
+            warnlog( "Could not open macro controls, aborting" )
+            hCloseBasicIde()
+            brc = hDestroyDocument()
+            goto endsub
+        endif
+        
+        '///+<li>Select every control, open its properties and verify its name, close properties</li>
+        for iCurrentControl = 1 to ICONTROLCOUNT
+
+            if ( instr( gtSysName, "Solaris" ) > 0 ) then
+                qaerrorlog( "Skipping frame control on Solaris" )
+            else
+                hSelectControl( iCurrentControl )
+                hOpenPropertyBrowser()
+                sCurrentControl = lsControlNames( iCurrentControl )
+                hPBGetControlName( sCurrentControl )
+                hClosePropertyBrowser()
+            endif
+            
+        next iCurrentControl
+        
+        ' we need to delete the list-content otherwise we run into index-problems
+        ListAllDelete( lsControlNames() )
+       
+        '///+<li>Cleanup: Close the BASIC-IDE</li>
+        printlog( "Close the BASIC IDE" )
+        hCloseBasicIde()        
+        
        if ( getDocumentCount <> 1 ) then
            warnlog( "Number of open documents is incorrect, expected one only" )
        endif 
@@ -133,6 +207,9 @@ testcase tAllControlsOnDialog( cMajor as string )
        '///+<li>close the document</li>
        '///</ul>
        brc = hDestroyDocument()
+
+        printlog( "" ) 
+        printlog( "Test case 2: Verify that all items keep their names after close and reload of the document" )
        
        '///<b>check all controls in the saved document</b>
        printlog "Open the file again"
--- a/testautomation/framework/optional/includes/options_ooo_view.inc
+++ b/testautomation/framework/optional/includes/options_ooo_view.inc
@@ -76,15 +76,6 @@ sub checkPage( sFile as string , bDisabled as boolean, optional iMiddleMouseButt
    dim iMiddleMouseButtonExtern as integer
    dim iTemp as integer

-<<<<<<< .working
-   checkEntryField( sFile , "*" , FontScale)
-   checkListBox( sFile , "*" , IconScale )
-   checkCheckBox( sFile , "*" , IconsInMenueAnzeigen )
-   checkCheckBox( sFile , "*" , VorschauInSchriftlisten )
-   checkCheckBox( sFile , "*" , SchriftenHistorie )
-   
-   checkListBox( sFile , "*" , MousePositioning)
-=======
    ' depends on if defaults or chnges are checked;
    ' changes : 1
    ' defaults: 0
@@ -134,7 +125,6 @@ sub checkPage( sFile as string , bDisabled as boolean, optional iMiddleMouseButt
    endif
    checkCheckBox( sFile , "*" , UseAntiAliasing )
    checkListBox( sFile , "*" , MousePositioning)
->>>>>>> .merge-right.r270772
    ' needs to get handled differently on platforms!
    iMiddleMouseButton = MausAktion.getSelIndex
    if iMiddleMouseButtonExtern = 1 then
@@ -176,26 +166,6 @@ sub changePage( sFile as string , bInverted as boolean, optional iMiddleMouseBut
    printlog( " * Changing current settings according to the reference list." )
    printlog( " * Using settings from file: " & sFile )

-<<<<<<< .working
-   ' Antialiasing settings only exist for Linux and Solaris
-   if ( gPlatGroup <> "w95" ) then
-      if ( bInverted ) then
-         setEntryField( sFile , "*" , AAPixel )
-         setCheckBox( sFile , "*" , FontAntiAliasing )
-      else
-         setCheckBox( sFile , "*" , FontAntiAliasing )
-         setEntryField( sFile , "*" , AAPixel )
-      endif
-   endif
-       
-   setEntryField( sFile , "*" , FontScale )
-   setListBox( sFile , "*" , IconScale )
-   setCheckBox( sFile , "*" , IconsInMenueAnzeigen )
-   setCheckBox( sFile , "*" , VorschauInSchriftlisten )
-   setCheckBox( sFile , "*" , SchriftenHistorie )
-   
-   setListBox( sFile , "*" , MousePositioning )
-=======
    ToolsOptions
    call hToolsOptions( "StarOffice" , "View" )
    sleep( 2 )
@@ -225,7 +195,6 @@ sub changePage( sFile as string , bInverted as boolean, optional iMiddleMouseBut
    endif
    setCheckBox( sFile , "*" , useantialiasing )
    setListBox( sFile , "*" , MousePositioning )
->>>>>>> .merge-right.r270772
    ' needs to get handled differently on platforms!
    if iMiddleMouseButtonExtern = 1 then
        setListBox( sFile , "*" , MausAktion )
--- a/testautomation/framework/optional/input/help_browser/StarOffice_help_topics_en-US.txt
+++ b/testautomation/framework/optional/input/help_browser/StarOffice_help_topics_en-US.txt
--- a/testautomation/framework/required/includes/first.inc
+++ b/testautomation/framework/required/includes/first.inc
@@ -55,7 +55,7 @@ testcase tAllNew
        gApplication = "WRITER"
        printlog "  - " +  gApplication
        
-        Call hNewDocument (TRUE)
+        hNewDocument()
        
        Kontext "DocumentWriter"
        DocumentWriter.TypeKeys "This is a Writer-document!"
@@ -65,7 +65,7 @@ testcase tAllNew
                "Please check if a Writer document will be opened!")
            end if
        end if
-        Call hCloseDocument (TRUE)
+        hCloseDocument()
    catch
        Exceptlog
        ResetApplication
@@ -79,7 +79,7 @@ testcase tAllNew
        gApplication = "CALC"
        printlog "  - " +  gApplication
        
-        Call hNewDocument (TRUE)
+        hNewDocument
        Kontext "DocumentCalc"
        DocumentCalc.TypeKeys "This is a Calc-document!"
        
@@ -89,7 +89,7 @@ testcase tAllNew
                "Please check if a Calc document will be opened!")
            end if
        end if
-        Call hCloseDocument (TRUE)
+        hCloseDocument
    catch
        Exceptlog
        ResetApplication
@@ -103,7 +103,7 @@ testcase tAllNew
        gApplication = "IMPRESS"
        printlog "  - " +  gApplication
        
-        Call hNewDocument (TRUE)
+        hNewDocument()
        sleep(3)
        InsertDuplicateSlide
        sleep(2)
@@ -113,7 +113,7 @@ testcase tAllNew
                "Please check if an Impress document will be opened!")
            end if
        end if
-        Call hCloseDocument (TRUE)
+        hCloseDocument()
    catch
        Exceptlog
        ResetApplication
@@ -126,14 +126,14 @@ testcase tAllNew
    try
        gApplication = "DRAW"
        printlog "  - " +  gApplication
-        Call hNewDocument (TRUE)
+        hNewDocument()
        InsertSlide
        if gUseSysDlg = FALSE then
            if fDocumentCheck (gDrawFilter) = FALSE then
                warnlog("The filter name (saving) is not correct! Please check if a Draw document will be opened!")
            end if
        end if
-        Call hCloseDocument (TRUE)
+        hCloseDocument()
    catch
        Exceptlog
        ResetApplication
@@ -142,7 +142,7 @@ testcase tAllNew
        gApplication = "HTML"
        printlog "  - " +  gApplication
        '///+<ul><li>Create a new HTML document</li>
-        Call hNewDocument (TRUE)
+        hNewDocument()
        Kontext "DocumentWriter"
        '///+<li>Type some text</li>
        DocumentWriter.TypeKeys "This is a HTML-Document!"
@@ -153,7 +153,7 @@ testcase tAllNew
            end if
        end if
        '///+<li>Close the document window without saving it</li></ul>
-        Call hCloseDocument (TRUE)
+        hCloseDocument()
    catch
        Exceptlog
        ResetApplication
@@ -166,14 +166,14 @@ testcase tAllNew
    try
        gApplication = "MATH"
        printlog "  - " +  gApplication
-        Call hNewDocument (TRUE)
+        hNewDocument()
        Call SchreibenInMathDok("a over b")
        if gUseSysDlg = FALSE then
            if fDocumentCheck (gMathFilter) = FALSE then
                warnlog("The filter name (saving) is not correct! Please check if a Math document will be opened!")
            end if
        end if
-        Call hCloseDocument (TRUE)
+        hCloseDocument
    catch
        Exceptlog
        ResetApplication
@@ -187,7 +187,7 @@ testcase tAllNew
    try
        gApplication = "MASTERDOCUMENT"
        printlog "  - " +  gApplication
-        Call hNewDocument (TRUE)
+        hNewDocument()
        Kontext "DocumentWriter"
        DocumentWriter.TypeKeys "This is a master document!"
        if gUseSysDlg = FALSE then
@@ -199,7 +199,7 @@ testcase tAllNew
        if Navigator.Exists(5) then
            Navigator.Close
        end if
-        Call hCloseDocument (TRUE)
+        hCloseDocument()
    catch
        Exceptlog
        ResetApplication
--- a/testautomation/framework/required/includes/topten.inc
+++ b/testautomation/framework/required/includes/topten.inc
@@ -1,337 +1,328 @@
-'encoding UTF-8  Do not remove or change this line!
-'**************************************************************************
-'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-'* 
-'* Copyright 2008 by Sun Microsystems, Inc.
-'*
-'* OpenOffice.org - a multi-platform office productivity suite
-'*
-'* $RCSfile: topten.inc,v $
-'*
-'* $Revision: 1.1 $
-'*
-'* last change: $Author: jsi $ $Date: 2008-06-16 12:19:04 $
-'*
-'* This file is part of OpenOffice.org.
-'*
-'* OpenOffice.org is free software: you can redistribute it and/or modify
-'* it under the terms of the GNU Lesser General Public License version 3
-'* only, as published by the Free Software Foundation.
-'*
-'* OpenOffice.org is distributed in the hope that it will be useful,
-'* but WITHOUT ANY WARRANTY; without even the implied warranty of
-'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-'* GNU Lesser General Public License version 3 for more details
-'* (a copy is included in the LICENSE file that accompanied this code).
-'*
-'* You should have received a copy of the GNU Lesser General Public License
-'* version 3 along with OpenOffice.org.  If not, see
-'* <http://www.openoffice.org/license.html>
-'* for a copy of the LGPLv3 License.
-'*
-'/************************************************************************
-'*
-'* owner : joerg.skottke@sun.com
-'*
-'* short description : Smoke test (load/save/clipboard)
-'*
-'\***********************************************************************
-
-sub topten
-    gApplication = "WRITER"
-    printlog( "** " + gApplication )
-    call Top_ten_test
-    gApplication = "CALC"
-    printlog( "** " + gApplication )
-    call Top_ten_test
-    gApplication = "IMPRESS"
-    printlog( "** " + gApplication )
-    call Top_ten_test
-    gApplication = "DRAW"
-    printlog( "** " + gApplication )
-    call Top_ten_test
-    gApplication = "MATH"
-    printlog( "** " + gApplication )
-    call Top_ten_test
-    gApplication = "HTML"
-    printlog( "** " + gApplication )
-    call Top_ten_test
-    gApplication = "MASTERDOCUMENT"
-    printlog( "** " + gApplication )
-    call Top_ten_test
-
-end sub
-
-'*******************************************************************************
-
-testcase Top_ten_test
-    '///Top-Ten-Test
-    '///<ul><li>open all document types</li>
-    '///+<li>insert a text or a rectangle (Draw/Impress)</li>
-    '///+<li>cut - paste / copy - paste</li>
-    '///+<li>save as default-format (6.0format (XML))</li>
-    '///+<li>save as 5.2-format</li>
-    '///+<li>close the doc</li>
-    '///+<li>load the 8.0-doc, change it, save this changes and close the doc</li>
-    '///+<li>load the 5.2-doc, change it, save this changes and close the doc</li></ul>
+'encoding UTF-8  Do not remove or change this line!
+'**************************************************************************
+'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'* 
+'* Copyright 2008 by Sun Microsystems, Inc.
+'*
+'* OpenOffice.org - a multi-platform office productivity suite
+'*
+'* $RCSfile: topten.inc,v $
+'*
+'* $Revision: 1.1 $
+'*
+'* last change: $Author: jsi $ $Date: 2008-06-16 12:19:04 $
+'*
+'* This file is part of OpenOffice.org.
+'*
+'* OpenOffice.org is free software: you can redistribute it and/or modify
+'* it under the terms of the GNU Lesser General Public License version 3
+'* only, as published by the Free Software Foundation.
+'*
+'* OpenOffice.org is distributed in the hope that it will be useful,
+'* but WITHOUT ANY WARRANTY; without even the implied warranty of
+'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+'* GNU Lesser General Public License version 3 for more details
+'* (a copy is included in the LICENSE file that accompanied this code).
+'*
+'* You should have received a copy of the GNU Lesser General Public License
+'* version 3 along with OpenOffice.org.  If not, see
+'* <http://www.openoffice.org/license.html>
+'* for a copy of the LGPLv3 License.
+'*
+'/************************************************************************
+'*
+'* owner : joerg.skottke@sun.com
+'*
+'* short description : Smoke test (load/save/clipboard)
+'*
+'\***********************************************************************
+
+sub topten
+
+    gApplication = "WRITER"
+    call Top_ten_test
+    
+    gApplication = "CALC"
+    call Top_ten_test
+    
+    gApplication = "IMPRESS"
+    call Top_ten_test
+    
+    gApplication = "DRAW"
+    call Top_ten_test
+    
+    gApplication = "MATH"
+    call Top_ten_test
+    
+    gApplication = "HTML"
+    call Top_ten_test
+    
+    gApplication = "MASTERDOCUMENT"
+    call Top_ten_test
+
+end sub
+
+'*******************************************************************************
+
+testcase Top_ten_test
+
+    dim sUserWorkDirectory as string
+    dim sFilename_native as String
+    dim sFilename_export as String
+    dim sFilter_native as string
+    dim sFilter_export as String
+    dim bExportFile as boolean
+
+    sUserWorkDirectory = gOfficePath & "user\work\"
    bExportFile = true
-    dim rootdir as string
-    dim vExtension(10) as string
-    dim DokName1 as String
-    dim DokName2 as String
-    dim sFilter1 as string
-    dim sFilter2 as String
-    Dim i as Integer
-    dim bExport as boolean
-
-    rootdir = gOfficePath + "user\work\"
-    bExport = true
+    
+    printlog( "Current document type: " & gApplication )
+    
+    ' set the filenames and their filters. HTML is not exported
+    if ( gApplication = "HTML" ) then
+        sFilename_native = "ls_test.html"
+        sFilename_export = "ls_test.htm"  
+        bExportFile      = FALSE      
+    else
+        sFilename_native = "ls_test" & hGetSuffix( "current" )
+        sFilename_export = "ls_test" & hGetSuffix( "569" )
+    endif
+    
+    printlog( "File (current): " & sFilename_native )
    printlog( "File (src569).: " & sFilename_export )
-    ' set the filenames and their filters
-    if gApplication = "HTML" then
-        'hGetFilternameExtension is able to read more than one extension entry
-        vExtension() = hGetFilternameExtension("writer_web_HTML")
-        DokName1 = "ls_test" & "." & vExtension(0) 
-        Dokname2 = Dokname1        
-    else
-        DokName1 = "ls_test" & hGetSuffix( "current" )
-        DokName2 = "ls_test" & hGetSuffix( "569" )
-    endif
+    
+    ' Delete the workfiles, they might have been left over by prior incomplete testrun
+    hDeleteFile( sUserWorkDirectory & sFilename_native )
    hDeleteFile( sUserWorkDirectory & sFilename_export )
-    printlog( " * File (current): " & DokName1 )
-    printlog( " * File (src569).: " & DokName2 )
-    
-    select case gApplication
-    case "WRITER"     : sFilter1 = "writer8"
-    case "CALC"       : sFilter1 = "calc8"
-    case "DRAW"       : sFilter1 = "draw8"
-    case "IMPRESS"    : sFilter1 = "impress8"
-    case "MATH"       : sFilter1 = "math8"
-    case "MASTERDOCUMENT"  : sFilter1 = "writerglobal8"
-    case "HTML"       : sFilter1 = "HTML" : bExport = FALSE
-    case else         : warnlog "Invalid gApplication: " & gApplication 
-    end select
-
-    printlog( "- create a new document" )
+    
+    ' Set the API filternames for the current application (native XML format)
+    select case gApplication
+    case "WRITER"          : sFilter_native = "writer8"
+    case "CALC"            : sFilter_native = "calc8"
+    case "DRAW"            : sFilter_native = "draw8"
+    case "IMPRESS"         : sFilter_native = "impress8"
+    case "MATH"            : sFilter_native = "math8"
+    case "MASTERDOCUMENT"  : sFilter_native = "writerglobal8"
+    case "HTML"            : sFilter_native = "HTML"
+    case else              : warnlog "Invalid gApplication: " & gApplication 
+    end select
+
    printlog( "Create a new document" )
-    printlog( "- clipboard" )
+    call hNewDocument
+    
    printlog( "Clipboard" )
-    printlog( "- saving => default-fileformat" )
-    call hFileSaveAsKill ( rootdir & DokName1 )
-    if ( gApplication  = "IMPRESS" ) then sleep( 2 )
+    call CutCopyPaste
+    
+    printlog( "Save (default-fileformat): " & sFilename_native )
+    call hFileSaveAsKill ( sUserWorkDirectory & sFilename_native )
+    
+    if ( bExportFile ) then
+    
+        ' Set the API filternames for the current application (StarOffice 5.2 binary format)
+        select case gApplication
+        case "WRITER"          : sFilter_export = "StarWriter 5.0"
+        case "CALC"            : sFilter_export = "StarCalc 5.0"
+        case "DRAW"            : sFilter_export = "StarDraw 5.0"
+        case "IMPRESS"         : sFilter_export = "StarImpress 5.0"
+        case "MATH"            : sFilter_export = "StarMath 5.0"
+        case "MASTERDOCUMENT"  : sFilter_export = "StarWriter 5.0/GlobalDocument"
+        case else              : warnlog "Invalid gApplication: " & gApplication 
+        end select
+        
+        printlog( "Save (5.2-fileformat): " & sFilename_export )
+        hFileSaveAsWithFilterKill( sUserWorkDirectory & sFilename_export , sFilter_export )
+
+        printlog( "Close" )
        FileClose
-    if bExport then
-    
-        ' hFileSaveAsWithFilterKill needs the API filtername. Hardcoded for speed.
-        select case gApplication
-        case "WRITER"     : sFilter2 = "StarWriter 5.0"
-        case "CALC"       : sFilter2 = "StarCalc 5.0"
-        case "DRAW"       : sFilter2 = "StarDraw 5.0"
-        case "IMPRESS"    : sFilter2 = "StarImpress 5.0"
-        case "MATH"       : sFilter2 = "StarMath 5.0"
-        case "MASTERDOCUMENT"  : sFilter2 = "StarWriter 5.0/GlobalDocument"
-        case else         : warnlog "Invalid gApplication: " & gApplication 
-        end select
-        
-        printlog "- saving => 5.2-fileformat"
-        hFileSaveAsWithFilterKill( rootdir & DokName2 , sFilter2 )
+
+        ' There should be no alien warning
+        kontext "active"
+        If ( active.exists( 1 ) ) then
+            warnlog( "Unexpected messagebox: '" & active.getText & "'" )
+            Active.Yes
+        else
+            printlog( "No more alien warning on closing the document. Good." )
+        endif
+    else
+        FileClose
+
+        kontext "active"
+        if ( Active.Exists( 1 ) ) then
+            warnlog( "Unexpected Active after saving: '" & active.getText & "'" )
+            try
+                Active.Yes()
+            catch
+                Active.No()
+            endcatch
+        endif
+    endif
+
+    printlog( "Load (default-fileformat): " & sFilename_native )
    call hFileOpen( sUserWorkDirectory & sFilename_native )
-        printlog "- close"
-        FileClose
-
-        kontext "active"
-        If active.exists(5) then
-            warnlog "Unexpected messagebox: '" + active.getText + "'"
-            Active.Yes
-        else
-            printlog "- no more alien warning on closing the document. Good."
-        end if
-    else
-        FileClose
-
-        kontext "active"
-        if Active.Exists(5) then
-            warnlog "Unexpected Active after saving: '" + active.gettext + "'"
-            try
-                Active.Yes
-            catch
-                Active.No
-            endcatch
-        end if
-    end if
-
-    printlog "- loading => default-fileformat"
-    call hFileOpen (rootdir & DokName1)
-
-    if bExport then
-        printlog "  - change the doc"
-        hChangeDoc()
-        printlog "  - save"
-        hFileSave()
-    endif
-
-    printlog "  - close"
-    call hCloseDocument
-
-    if bExport then
-        printlog "- loading => 5.2-fileformat"
-        call hFileOpen (rootdir & DokName2)
-        if (ucase(gApplication) = "MATH" AND iSprache = 84 AND gPlatform="lin") then
-            try
-                kontext "DocumentMath"
-                DocumentMath.MouseDown(50,50)
-                DocumentMath.MouseUp(50,50)
-                qaErrorLog "Use workaround focus problem for math and language vi/84"
-                ' Needed by AndreSchnabel, not manual reproduceable, only with TestTool
-            catch
-                qaErrorLog "Workaround focus problem failed."
-            endcatch
-        end if
-        printlog "  - change the doc"
-        hChangeDoc()
-        printlog "  - save"
-        hFileSave()
-
-        Kontext "AlienWarning"
-        if AlienWarning.exists() then ' was 5 secs.
-            printlog "- alien warning came up. Good."
-            AlienWarning.OK
-            hFileWait() 
-        else
-            if (gBuild > 8870) then '8871 is CWS alienwarning integrated SRC680m77
-                warnlog "- alien warning didn't came up."
-            endif
+
+    if ( bExportFile ) then
+        printlog( "Change the document" )
+        hChangeDoc()
+        printlog( "Save" )
+        hFileSave()
+    endif
+
+    printlog( "Close" )
+    FileClose
+
+    if ( bExportFile ) then
+    
+        printlog( "Load (5.2-fileformat): " & sFilename_export )
+        call hFileOpen (sUserWorkDirectory & sFilename_export)
+        
+        if ( gApplication = "MATH" AND iSprache = 84 AND gPlatform="lin" ) then
+            try
+                kontext "DocumentMath"
+                DocumentMath.MouseDown(50,50)
+                DocumentMath.MouseUp(50,50)
+                qaErrorLog( "Use workaround focus problem for math and language vi/84" )
+                ' Needed by AndreSchnabel, not manual reproduceable, only with TestTool
+            catch
+                qaErrorLog( "Workaround focus problem failed." )
            endcatch
-
-        kontext "active"
-        if Active.Exists(5) then
-            if (gBuild > 8870) then '8871 is CWS alienwarning integrated SRC680m77
-                warnlog  "Unexpected messagebox: '" + active.gettext + "'"
-            else
-                printlog "  - alien warning for change to current filter. Good. '" + active.gettext + "'"
-            endif
+        endif
+        
+        ' Modify the export document to trigger the alien warning on next save
+        printlog( "Change the document" )
+        hChangeDoc()
+        
+        printlog( "Save" )
+        FileSave
+
+        Kontext "AlienWarning"
+        if ( AlienWarning.exists( 3 ) ) then
+            printlog( "Closing expected alien warning. Good." )
+            AlienWarning.OK()
+        else
+            warnlog( "Alien warning is missing" )
+        endif
+
+        kontext "active"
+        if ( Active.Exists( 3 ) ) then
            warnlog(  "Unexpected messagebox: '" & active.getText & "'" )
-        end if
-
-        printlog "  - close"
-        FileClose
-
-        kontext "active"
-        if Active.Exists(5) then
-            warnlog  "Unexpected messagebox: '" + active.gettext + "'"
-            Active.Yes
            Active.yes
-            printlog "- no more alien warning on closing the document. Good."
-        end if
-    end if
-    
-    if ( FileExists( rootdir & DokName1 ) ) then kill( rootdir & DokName1 )
-    if ( FileExists( rootdir & DokName2 ) ) then kill( rootdir & DokName2 )
-    
-endcase
-
-'*******************************************************************************
-
-sub CutCopyPaste
-    dim sSelectAll as string
-
-    ' In Spain Select All is CTRL+E; CTRL+A is FileOpen
-    if (iSprache=34) then
-        sSelectAll = "<Mod1 e>"
-    else
-        sSelectAll = "<Mod1 a>"
-    endif
-
-    select case gApplication
-        case "WRITER", "HTML", "MASTERDOCUMENT"
-            kontext "documentwriter"
-            DocumentWriter.TypeKeys "This is a test.<Return>"
-            printlog( "   cut" )
-            DocumentWriter.TypeKeys sSelectAll
-            DocumentWriter.TypeKeys "<Mod1 x>"
-            Wait( 500 )
-            printlog( "   paste" )
-            DocumentWriter.TypeKeys "<Mod1 v>"
-            Wait( 500 )
-            printlog( "   copy" )
-            DocumentWriter.TypeKeys sSelectAll
-            DocumentWriter.TypeKeys "<Mod1 c>"
-            Wait( 500 )
-            printlog( "   paste" )
-            DocumentWriter.TypeKeys "<Mod1 v>"
-            Wait( 500 )
-        case "CALC"   : Kontext "DocumentCalc"
-            DocumentCalc.TypeKeys "This is a test.<Return>"
-            DocumentCalc.TypeKeys "<Up>"
-            printlog( "   cut" )
-            DocumentCalc.TypeKeys "<Mod1 x>"
-            Wait( 500 )
-            printlog( "   paste" )
-            DocumentCalc.TypeKeys "<Down>"
-            DocumentCalc.TypeKeys "<Mod1 v>"
-            Wait( 500 )
-            printlog( "   copy" )
-            DocumentCalc.TypeKeys "<Mod1 c>"
-            Wait( 500 )
-            printlog( "   paste" )
-            DocumentCalc.TypeKeys "<Down>"
-            DocumentCalc.TypeKeys "<Mod1 v>"
-            Wait( 500 )
-        case "DRAW"   : Kontext "DocumentDraw"
-            hRechteckErstellen ( 30, 30, 60, 60 )
-            gMouseClick ( 1, 1 )
-            printlog( "   cut" )
-            DocumentDraw.TypeKeys sSelectAll
-            DocumentDraw.TypeKeys "<Mod1 x>"
-            Wait( 500 )
-            printlog( "   paste" )
-            DocumentDraw.TypeKeys "<Mod1 v>"
-            Wait( 500 )
-            printlog( "   copy" )
-            gMouseClick ( 1, 1 )
-            DocumentDraw.TypeKeys sSelectAll
-            DocumentDraw.TypeKeys "<Mod1 c>"
-            Wait( 500 )
-            printlog( "   paste" )
-            gMouseClick ( 1, 1 )
-            DocumentDraw.TypeKeys "<Mod1 v>"
-        case "IMPRESS": Kontext "DocumentImpress"
-            hRechteckErstellen ( 30, 30, 60, 60 )
-            gMouseClick ( 1, 1 )
-            printlog( "   cut" )
-            DocumentImpress.TypeKeys sSelectAll
-            DocumentImpress.TypeKeys "<Mod1 x>"
-            Wait( 500 )
-            printlog( "   paste" )
-            DocumentImpress.TypeKeys "<Mod1 v>"
-            Wait( 500 )
-            printlog( "   copy"
-            gMouseClick ( 1, 1 )
-            DocumentImpress.TypeKeys sSelectAll
-            DocumentImpress.TypeKeys "<Mod1 c>"
-            Wait( 500 )
-            printlog( "   paste" )
-            gMouseClick ( 1, 1 )
-            DocumentImpress.TypeKeys "<Mod1 v>"
-        case "MATH"   : SchreibenInMathdok "a over b"
-            printlog( "   cut" )
-            EditSelectAllMath
-            WaitSlot()
-            EditCut
-            WaitSlot()
-            printlog( "   paste" )
-            EditPaste
-            WaitSlot()
-            printlog( "   copy" )
-            EditSelectAllMath
-            WaitSlot()
-            EditCopy
-            WaitSlot()
-            printlog( "   paste" )
-            EditPaste
-            WaitSlot()
-    end select
-end sub
-
-
-
+        else
+            printlog( "No unexpected messages on save. Good." )
+        endif
+
+        printlog( "Close" )
+        FileClose
+
+        kontext "active"
+        if ( Active.Exists() ) then
+            warnlog( "Unexpected messagebox: '" & active.getText & "'" )
+            Active.Yes()
+        else
+            printlog( "No more alien warning to close. Good." )
+        endif
+    endif
+    
+    hDeleteFile( sUserWorkDirectory & sFilename_native )
+    hDeleteFile( sUserWorkDirectory & sFilename_export )
+    
+endcase
+
+'*******************************************************************************
+
+sub CutCopyPaste
+    dim sSelectAll as string
+
+    ' In Spain Select All is CTRL+E; CTRL+A is FileOpen
+    if (iSprache=34) then
+        sSelectAll = "<Mod1 e>"
+    else
+        sSelectAll = "<Mod1 a>"
+    endif
+
+    select case gApplication
+        case "WRITER", "HTML", "MASTERDOCUMENT"
+            kontext "documentwriter"
+            DocumentWriter.TypeKeys "This is a test.<Return>"
+            printlog( "   cut" )
+            DocumentWriter.TypeKeys sSelectAll
+            DocumentWriter.TypeKeys "<Mod1 x>"
+            Wait( 500 )
+            printlog( "   paste" )
+            DocumentWriter.TypeKeys "<Mod1 v>"
+            Wait( 500 )
+            printlog( "   copy" )
+            DocumentWriter.TypeKeys sSelectAll
+            DocumentWriter.TypeKeys "<Mod1 c>"
+            Wait( 500 )
+            printlog( "   paste" )
+            DocumentWriter.TypeKeys "<Mod1 v>"
+            Wait( 500 )
+        case "CALC"   : Kontext "DocumentCalc"
+            DocumentCalc.TypeKeys "This is a test.<Return>"
+            DocumentCalc.TypeKeys "<Up>"
+            printlog( "   cut" )
+            DocumentCalc.TypeKeys "<Mod1 x>"
+            Wait( 500 )
+            printlog( "   paste" )
+            DocumentCalc.TypeKeys "<Down>"
+            DocumentCalc.TypeKeys "<Mod1 v>"
+            Wait( 500 )
+            printlog( "   copy" )
+            DocumentCalc.TypeKeys "<Mod1 c>"
+            Wait( 500 )
+            printlog( "   paste" )
+            DocumentCalc.TypeKeys "<Down>"
+            DocumentCalc.TypeKeys "<Mod1 v>"
+            Wait( 500 )
+        case "DRAW"   : Kontext "DocumentDraw"
+            hRechteckErstellen ( 30, 30, 60, 60 )
+            gMouseClick ( 1, 1 )
+            printlog( "   cut" )
+            DocumentDraw.TypeKeys sSelectAll
+            DocumentDraw.TypeKeys "<Mod1 x>"
+            Wait( 500 )
+            printlog( "   paste" )
+            DocumentDraw.TypeKeys "<Mod1 v>"
+            Wait( 500 )
+            printlog( "   copy" )
+            gMouseClick ( 1, 1 )
+            DocumentDraw.TypeKeys sSelectAll
+            DocumentDraw.TypeKeys "<Mod1 c>"
+            Wait( 500 )
+            printlog( "   paste" )
+            gMouseClick ( 1, 1 )
+            DocumentDraw.TypeKeys "<Mod1 v>"
+        case "IMPRESS": Kontext "DocumentImpress"
+            hRechteckErstellen ( 30, 30, 60, 60 )
+            gMouseClick ( 1, 1 )
+            printlog( "   cut" )
+            DocumentImpress.TypeKeys sSelectAll
+            DocumentImpress.TypeKeys "<Mod1 x>"
+            Wait( 500 )
+            printlog( "   paste" )
+            DocumentImpress.TypeKeys "<Mod1 v>"
+            Wait( 500 )
+            printlog( "   copy" )
+            gMouseClick ( 1, 1 )
+            DocumentImpress.TypeKeys sSelectAll
+            DocumentImpress.TypeKeys "<Mod1 c>"
+            Wait( 500 )
+            printlog( "   paste" )
+            gMouseClick ( 1, 1 )
+            DocumentImpress.TypeKeys "<Mod1 v>"
+        case "MATH"   : SchreibenInMathdok "a over b"
+            printlog( "   cut" )
+            hUseAsyncSlot( "EditSelectAllMath" )
+            hUseAsyncSlot( "EditCut" )
+            printlog( "   paste" )
+            hUseAsyncSlot( "EditPaste" )
+            printlog( "   copy" )
+            hUseAsyncSlot( "EditSelectAllMath" )
+            hUseAsyncSlot( "EditCopy" )
+            printlog( "   paste" )
+            hUseAsyncSlot( "EditPaste" )
+
+    end select
+end sub
+
+
--- a/testautomation/framework/required/includes/window_functions.inc
+++ b/testautomation/framework/required/includes/window_functions.inc
@@ -226,11 +226,11 @@ sub sAllWindowTitle

    '///+<li>writer</li>
    gApplication = "WRITER"
-    call tCheckWindowTitle("swriter","WRITER")
+    call tCheckWindowTitle("swriter","Writer")

    '///+<li>MasterDoc</li>
    gApplication = "MASTERDOCUMENT"
-    call tCheckWindowTitle("sglobal","WRITER")
+    call tCheckWindowTitle("sglobal","Writer")

    '///+<li>HTML document</li>
    gApplication = "HTML"
@@ -238,19 +238,19 @@ sub sAllWindowTitle

    '///+<li>Calc</li>
    gApplication = "CALC"
-    call tCheckWindowTitle("scalc","CALC")
+    call tCheckWindowTitle("scalc","Calc")

    '///+<li>Impress</li>
    gApplication = "IMPRESS"
-    call tCheckWindowTitle("simpress","IMPRESS")
+    call tCheckWindowTitle("simpress","Impress")

    '///+<li>Draw</li>
    gApplication = "DRAW"
-    call tCheckWindowTitle("sdraw","DRAW")
+    call tCheckWindowTitle("sdraw","Draw")

    '///+<li>Math</li>
    gApplication = "MATH"
-    call tCheckWindowTitle("smath","MATH")
+    call tCheckWindowTitle("smath","Math")

    qaerrorlog( "Excluded BASE and BACKINGWINDOW" )

--- a/testautomation/framework/tools/includes/pbrowser_tools.inc
+++ b/testautomation/framework/tools/includes/pbrowser_tools.inc
@@ -181,12 +181,38 @@ function hPBSetControlName( cControl as string ) as boolean
    kontext "TabGeneralControl"
    if ( NameText.exists() ) then
        '///+<li>Set the new name</li>
-        wait( 100 )
+        WaitSlot()
+        
+        printlog( CFN & "Naming control: " & cControl )
        NameText.setText( cControl )
        TabGeneralControl.typeKeys( "<RETURN>" )
-        wait( 100 )
-        printlog( CFN & "Named control: " & cControl )
-        hPBSetControlName() = true
+        WaitSlot()
+        
+        printlog( CFN & "Verifying rename..." )
+        if ( NameText.getText() = cControl ) then
+            printlog( CFN & "Name is set ok: " & cControl )
+            hPBSetControlName() = true
+            exit function
+        endif
+        
+        ' If the name cannot be set this is in 99% of the cases a timing problem.
+        ' Here is a (costly) workaround.
+        qaerrorlog( CFN & "Name not set correctly, retrying" )
+        Wait( 300 )
+        NameText.setText( cControl )
+        TabGeneralControl.typeKeys( "<RETURN>" )
+        Wait( 300 )
+
+        ' Test again, leave function if good
+        if ( NameText.getText() = cControl ) then
+            printlog( CFN & "Name is set ok: " & cControl )
+            hPBSetControlName() = true
+            exit function
+        endif
+        
+        warnlog( CFN & "Unable to set control name: " & cControl )
+        hPBSetControlName() = false
+            
    else
        warnlog( "Unable to name the control." )
        hPBSetControlName() = false
@@ -234,20 +260,20 @@ function hPBGetControlName( cControl as string ) as boolean
        
            '///+<li>Verify that the name is correct</li>
            if ( cControlName = cControl ) then
-                printlog( CFN & "The correct control is open: " & cControl )
+                printlog( CFN & "The name of the control is correct: " & cControl )
                hPBGetControlName() = true
            else
-                warnlog( CFN & "This is not the correct control." )
+                warnlog( CFN & "Unexpected control name:" )
                printlog( CFN & "Found....: " & cControlName )
                printlog( CFN & "Expected.: " & cControl     )
                hPBGetControlName() = false
            endif
        else
-            warnlog( CFN & "General Tab is not visible" )
+            warnlog( CFN & "Dialog present but tabpage could not be accessed (TabGeneralControl)." )
            hPBGetControlName() = false
        endif
    else
-        warnlog( CFN & "Unable to get the name from the control." )
+        warnlog( CFN & "Unable to get the name from the control, dialog not accessible (TabGeneralControl)." )
        hPBGetControlName() = false
    endif
    '///</ul>
--- a/testautomation/global/hid/hid.lst
+++ b/testautomation/global/hid/hid.lst
--- a/testautomation/global/input/applications.txt
+++ b/testautomation/global/input/applications.txt
@@ -10,7 +10,8 @@
 5=MATH
 6=MASTERDOCUMENT
 7=HTML
-8=INSIGHT
+8=DATABASE
+9=CHART


 [application_names]
@@ -22,7 +23,8 @@ DRAW=Drawing document
 MATH=Formula document
 MASTERDOCUMENT=Master document
 HTML=HTML document
-INSIGHT=Database
+DATABASE=Database
+CHART=Chart


 [DocumentKontext]
@@ -34,5 +36,5 @@ DRAW=DocumentDraw
 MATH=DocumentMath
 MASTERDOCUMENT=DocumentWriter
 HTML=DocumentWriter
-INSIGHT=
-
+DATABASE=Database
+CHART=<not defined>
--- a/testautomation/global/sid/e_all.sid
+++ b/testautomation/global/sid/e_all.sid
@@ -62,6 +62,7 @@ EditRedo SID_REDO
 EditRepeat SID_REPEAT
 EditCut SID_CUT
 EditCopy .uno:Copy
+EditDoc .uno:EditDoc
 EditPaste SID_PASTE
 EditDelete SID_DELETE
 EditSelectAll SID_SELECTALL
--- a/testautomation/global/system/includes/iniinfo.inc
+++ b/testautomation/global/system/includes/iniinfo.inc
@@ -402,6 +402,8 @@ sub GetLanguageInformation
         case "no_no", "no-no", "no" : iSprache = 47        ' Norwegian
         case "pl_pl", "pl-pl", "pl" : iSprache = 48        ' Polish
         case "de_de", "de-de", "de" : iSprache = 49        ' German
+		 case "sr_rs", "sr-rs", "sr" : iSprache = 51        ' Serbian (Cyrillic)
+         case "sh_rs", "sh-rs", "sh" : iSprache = 52        ' Serbian (Latin)		 
         case "pt_br", "pt-br", "br" : iSprache = 55        ' Portuguese (Brazil)
         case "th_th", "th-th", "th" : iSprache = 66        ' Thai
         case "ja_jp", "ja-jp", "ja" : iSprache = 81        ' Japanese
@@ -459,11 +461,13 @@ function ConvertLanguage ( Sprache as String ) as Integer
      case "finisch", "finnish"                             : ConvertLanguage = 35
      case "hungaria", "ungarisch"                          : ConvertLanguage = 36
      case "italienisch", "italian"                         : ConvertLanguage = 39
+	  case "slowak", "slovakisch"                           : ConvertLanguage = 43	  
      case "daenisch", "danish"                             : ConvertLanguage = 45
      case "schwedisch", "swedish"                          : ConvertLanguage = 46
      case "norwegian", "norwegisch"                        : ConvertLanguage = 47
-      case "polnisch", "polish"                             : ConvertLanguage = 48
-      case "slowak", "slovakisch"                           : ConvertLanguage = 51
+      case "polnisch", "polish"                             : ConvertLanguage = 48      
+	  case "serbisch kyrillisch", "serbian cyrillic"        : ConvertLanguage = 51
+	  case "serbisch latein", "serbian latin"               : ConvertLanguage = 52	  
      case "japanisch", "japanese"                          : ConvertLanguage = 81
      case "koreanisch", "korean"                           : ConvertLanguage = 82
      case "vietnamesisch", "vietnamese"                    : ConvertLanguage = 84
@@ -500,6 +504,8 @@ function GetLanguageText ( iLan ) as String
      case 47   : GetLanguageText = "Norwegian"
      case 48   : GetLanguageText = "Polnish"
      case 49   : GetLanguageText = "German"
+      case 51   : GetlanguageText = "Serbian (Cyrillic)"
+      case 52   : GetlanguageText = "Serbian (Latin)"	  
      case 55   : GetLanguageText = "Portuguese (Brazil)"
      case 66   : GetLanguageText = "Thai"
      case 81   : GetLanguageText = "Japanese"
@@ -542,6 +548,8 @@ function ConvertLanguage2 ( sSprache as String, optional bExact ) as Integer
         case "no_no", "no-no", "no" : ConvertLanguage2 = 47        ' Norwegian
         case "pl_pl", "pl-pl", "pl" : ConvertLanguage2 = 48        ' Polish
         case "de_de", "de-de", "de" : ConvertLanguage2 = 49        ' German
+         case "sr_rs", "sr_rs", "sr" : ConvertLanguage2 = 51        ' Serbian (Cyrillic)
+         case "sh_rs", "sh_rs", "sh" : ConvertLanguage2 = 52        ' Serbian (Latin)		 
         case "pt_br", "pt-br", "br" : ConvertLanguage2 = 55        ' Portuguese (Brazil)
         case "th_th", "th-th", "th" : ConvertLanguage2 = 66        ' Thai
         case "ja_jp", "ja-jp", "ja" : ConvertLanguage2 = 81        ' Japanese
@@ -596,6 +604,8 @@ function ConvertCodeToLanguage ( sSprache as String ) as Integer
         case "1045" : ConvertCodeToLanguage = 48        ' Polish
         case "1031" : ConvertCodeToLanguage = 49        ' German
         case "    " : ConvertCodeToLanguage = 55        ' Portuguese (Brazil)
+         case "3098" : ConvertCodeToLanguage = 51        ' Serbian (Cyriliic)
+         case "2074" : ConvertCodeToLanguage = 52        ' Serbian (Latin)		 
         case "    " : ConvertCodeToLanguage = 66        ' Thai
         case "1041" : ConvertCodeToLanguage = 81        ' Japanese
         case "1042" : ConvertCodeToLanguage = 82        ' Korean
--- a/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_basic_ide_tools.inc
@@ -252,6 +252,7 @@ function hFindFirstDialog() as boolean

        if ( DialogWindow.Exists() ) then
            brc = true
+            DialogWindow.typeKeys( "<up>", 5 )
            exit for
        endif

@@ -544,11 +545,11 @@ function hNewDialog() as boolean
    
    '///+<li>Select the first item (insert)</li>
    hMenuSelectNr( 1 )
-    sleep( 1 )
+    WaitSlot( 1000 ) ' sleep( 1 )
    
    '///+<li>Select the second item (new dialog)</li>
    hMenuSelectNr( 2 )
-    sleep( 2 )
+    WaitSlot( 2000 ) ' sleep( 2 )
    
    '///+<li>Verify that a new dialog is opened and has the focus</li>
    if ( DialogWindow.Exists() ) then 
@@ -579,11 +580,11 @@ function hNewModule() as boolean
    
    '///+<li>Select the first item (insert)</li>
    hMenuSelectNr( 1 )
-    sleep( 1 )
+    WaitSlot( 1000 ) ' sleep( 1 )
    
    '///+<li>Select the first item (new module)</li>
    hMenuSelectNr( 1 )
-    sleep( 2 )
+    WaitSlot( 2000 ) ' sleep( 2 )
    
    '///+<li>Verify that a new module is opened and has the focus</li>
    if ( EditWindow.Exists() ) then 
--- a/testautomation/global/tools/includes/required/t_doc2.inc
+++ b/testautomation/global/tools/includes/required/t_doc2.inc
@@ -127,6 +127,7 @@ function sMakeReadOnlyDocumentEditable() as boolean
    ' no action was required (that is: Document was not read-only)

    dim iTry as integer
+    dim rc as integer
    const CFN = "sMakeReadOnlyDocumentEditable::"
    
    if ( VERBOSE ) then printlog( CFN & "Making document editable (create a copy) if it is readonly" )
@@ -136,31 +137,34 @@ function sMakeReadOnlyDocumentEditable() as boolean
        
        if ( Bearbeiten.getState( 2 ) = 0 ) then
            
-            Bearbeiten.Click()
+			rc = hUseAsyncSlot("editdoc")

-            for iTry = 1 to 2
-            
-                sleep( 2 )
-            
-                Kontext "Active"
-                if ( Active.exists( 5 ) ) then
+            if ( rc >= 0 ) then
+                for iTry = 1 to 2
                
-                    printlog( CFN & "Messagebox: " & Active.getText() )
+                
+                    Kontext "Active"
+                    if ( Active.exists( 5 ) ) then
                    
-                    try
-                        if ( VERBOSE ) then printlog( CFN & "Document was read-only. A copy will be used." )
-                        Active.Yes()
-                        if ( VERBOSE ) then printlog( CFN & "Closed 'use copy' message" )
-                    catch
-                        if ( VERBOSE ) then printlog( CFN & "Probing for unexpected messagebox..." )
-                        active.ok()
-                        warnlog( "#i100701 - Object not found message" )
-                    endcatch
-                else
-                    printlog( CFN & "No messagebox informing about a copy being used" )
-                endif
-                sMakeReadOnlyDocumentEditable() = TRUE
-            next iTry
+                        printlog( CFN & "Messagebox: " & Active.getText() )
+                        
+                        try
+                            if ( VERBOSE ) then printlog( CFN & "Document was read-only. A copy will be used." )
+                            Active.Yes()
+                            if ( VERBOSE ) then printlog( CFN & "Closed 'use copy' message" )
+                        catch
+                            if ( VERBOSE ) then printlog( CFN & "Probing for unexpected messagebox..." )
+                            active.ok()
+                            qaerrorlog( "#i100701 - Object not found message" )
+                        endcatch
+                    else
+                        printlog( CFN & "No messagebox informing about a copy being used" )
+                    endif
+                    sMakeReadOnlyDocumentEditable() = TRUE
+                next iTry
+            else
+                printlog( CFN & "Document appears to be editable" )
+            endif
        else
            if ( VERBOSE ) then printlog( CFN & "Button <Bearbeiten> is pressed, document is editable" )
            sMakeReadOnlyDocumentEditable() = FALSE
--- a/testautomation/global/tools/includes/required/t_files.inc
+++ b/testautomation/global/tools/includes/required/t_files.inc
@@ -38,6 +38,7 @@
 '\******************************************************************************

 private const C_INFO = TRUE ' Set this to TRUE to increase verbosity of some functions
+private const VERBOSE = true

 function hGrafikEinfuegen  ( Grafik$ ) as Boolean
    '/// hGrafikEinfuegen hGraphicInsert
@@ -798,7 +799,7 @@ function hFileSave() as boolean
    const CFN = "global::tools::inc::t_files.inc::hFileSave():"
    hFileSave() = FALSE
    if ( C_INFO ) then printlog( CFN & "Save file." )
-    FileSave
+    FileSave( "SynchronMode", TRUE )
    if ( hFileWait( TRUE ) >= 0 ) then hFileSave() = TRUE

 end function
--- a/testautomation/global/tools/includes/required/t_tools1.inc
+++ b/testautomation/global/tools/includes/required/t_tools1.inc
@@ -1201,7 +1201,8 @@ function hUseAsyncSlot( cSlot as string ) as integer

    dim iWait as integer
    dim iTime as integer : iTime = 0
-    const MAX_WAIT = 50
+    const MAX_WAIT = 100
+    const DELAY = 100
    const CFN = "global::tools::includes::required::hUseAsyncSlot():"

    if ( VERBOSE ) then printlog( CFN & "Using slot: " & cSlot )    
@@ -1210,11 +1211,12 @@ function hUseAsyncSlot( cSlot as string ) as integer
        try
            select case ( lcase( cSlot ) )
            case "fileclose"                      : FileClose
-            case "filesaveas"                     : FileSaveAs
-            case "filesaveall"                    : FileSaveAll
+            case "filesaveas"                     : FileSaveAs( "SynchronMode", TRUE )
+            case "filesaveall"                    : FileSaveAll( "SynchronMode", TRUE )
            case "fileexport"                     : FileExport
-            case "filereload"                     : FileReload
+            case "filereload"                     : FileReload( "SynchronMode", TRUE )
            
+            case "editdoc"                        : EditDoc
            case "editcopy"                       : EditCopy
            case "editchangesrecord"              : EditChangesRecord
            case "editchangesshow"                : EditChangesShow
@@ -1252,23 +1254,42 @@ function hUseAsyncSlot( cSlot as string ) as integer
            case "formatfliphorizontally"         : FormatFlipHorizontally
            case "formatline"                     : FormatLine
            case "formatpositionandsize"          : FormatPositionAndSize
+            case "formatfontwork"                 : FormatFontwork
+            case "formatparagraph"                : FormatParagraph
+            case "formatstylebold"                : FormatStyleBold
+            case "formatungroupdraw"              : FormatUngroupDraw
+            case "formatexitgroupdraw"            : FormatExitGroupDraw
+            case "formatgroupgroup"               : FormatGroupGroup
+            case "formatgroupeditgroupcalc"       : FormatGroupEditGroupCalc
+            case "formatalignmentlefttext"        : FormatAlignmentLeftText
+            case "formatgraphics"                 : FormatGraphics
+            case "formatanchortopage"             : FormatAnchorToPage
+            case "formatwrapcontour"              : FormatWrapContour
+            case "formatwrapeditcontour"          : FormatWrapEditContour
+            case "formatpagewriter"               : FormatPageWriter
            
            case "insertindexesbibliographyentry" : InsertIndexesBibliographyEntry
            
            case "contextpositionandsize"         : ContextPositionAndSize
            
+            case "toolslanguagehyphenate"         : ToolsLanguageHyphenate
+            case "toolsupdateallindexes"          : ToolsUpdateAllIndexes
+            case "toolsupdatefields"              : ToolsUpdateFields
+            case "toolsupdatelinks"               : ToolsUpdateLinks
+            case "toolslanguagehangulhanjaconversion" : ToolsLanguageHangulHanjaConversion
+            
            case else : warnlog( "Unknown slot called: " & cSlot )
            end select
            
            exit for
        catch
-            wait( 100 )
-            iTime = iWait * 100
+            wait( DELAY )
+            iTime = iWait * DELAY
        endcatch
    next iWait
    
    ' Timeout is -1
-    if ( iTime = 5000 ) then
+    if ( iTime = MAX_WAIT * DELAY ) then
        iTime = -1 
    endif
    if ( VERBOSE ) then printlog( CFN & "Exit with rc=" & iTime )
--- a/testautomation/global/win/dial_a_c.win
+++ b/testautomation/global/win/dial_a_c.win
@@ -137,6 +137,7 @@ TextField12 SC:EDIT:RID_SCDLG_CONDFORMAT:EDT_COND1_2
 Zellvorlage1 sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND1_TEMPLATE
 Minimieren1 sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND1_1
 Minimieren12 SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND1_2
+NewStyle1 sc:PushButton:RID_SCDLG_CONDFORMAT:BTN_COND1_NEW
 Bedingung2 sc:CheckBox:RID_SCDLG_CONDFORMAT:CBX_COND2
 PopupList2 sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND2_1
 Vergleich2 sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND2_2
@@ -145,6 +146,7 @@ TextField22 SC:EDIT:RID_SCDLG_CONDFORMAT:EDT_COND2_2
 Zellvorlage2 sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND2_TEMPLATE
 Minimieren2 sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND2_1
 Minimieren22 SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND2_2
+NewStyle2 sc:PushButton:RID_SCDLG_CONDFORMAT:BTN_COND2_NEW
 Bedingung3 sc:CheckBox:RID_SCDLG_CONDFORMAT:CBX_COND3
 PopupList3 sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND3_1
 Vergleich3 sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND3_2
@@ -153,6 +155,7 @@ TextField32 SC:EDIT:RID_SCDLG_CONDFORMAT:EDT_COND3_2
 Zellvorlage3 sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND3_TEMPLATE
 Minimieren3 sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND3_1
 Minimieren32 SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND3_2
+NewStyle3 sc:PushButton:RID_SCDLG_CONDFORMAT:BTN_COND3_NEW

 *Bemassung HID_PAGE_MEASURE
 Liniendistanz svx:MetricField:RID_SVXPAGE_MEASURE:MTR_LINE_DIST
--- a/testautomation/global/win/dial_d_h.win
+++ b/testautomation/global/win/dial_d_h.win
@@ -26,6 +26,8 @@ Pfade svx:ListBox:RID_SVXDLG_MULTIPATH:LB_MULTIPATH

 *Datenpilot SID_OPENDLG_PIVOTTABLE
 Zusaetze sc:MoreButton:RID_SCDLG_PIVOT_LAYOUT:BTN_MORE
+DataPilotRange sc:Edit:RID_SCDLG_PIVOT_LAYOUT:ED_INAREA
+DataPilotRangeShrink sc:ImageButton:RID_SCDLG_PIVOT_LAYOUT:RB_INAREA
 AusgabeAb SC:LISTBOX:RID_SCDLG_PIVOT_LAYOUT:LB_OUTAREA
 Bereich SC:EDIT:RID_SCDLG_PIVOT_LAYOUT:ED_OUTAREA
 Minimieren SC:IMAGEBUTTON:RID_SCDLG_PIVOT_LAYOUT:RB_OUTAREA
--- a/testautomation/global/win/dial_p_s.win
+++ b/testautomation/global/win/dial_p_s.win
@@ -354,14 +354,19 @@ Auswahl svx:ListBox:RID_SVXDLG_THES_LANGUAGE:LB_THES_LANGUAGE
 FeldName1 sc:ListBox:RID_SCDLG_FILTER:LB_FIELD1
 Feldname2 sc:ListBox:RID_SCDLG_FILTER:LB_FIELD2
 Feldname3 sc:ListBox:RID_SCDLG_FILTER:LB_FIELD3
+Feldname4 sc:ListBox:RID_SCDLG_FILTER:LB_FIELD4
 Bedingung1 sc:ListBox:RID_SCDLG_FILTER:LB_COND1
 Bedingung2 sc:ListBox:RID_SCDLG_FILTER:LB_COND2
 Bedingung3 sc:ListBox:RID_SCDLG_FILTER:LB_COND3
+Bedingung4 sc:ListBox:RID_SCDLG_FILTER:LB_COND4
 Wert1 sc:ComboBox:RID_SCDLG_FILTER:ED_VAL1
 Wert2 sc:ComboBox:RID_SCDLG_FILTER:ED_VAL2
 Wert3 sc:ComboBox:RID_SCDLG_FILTER:ED_VAL3
-Verknuepfung2 sc:ListBox:RID_SCDLG_FILTER:LB_OP1
-Verknuepfung3 sc:ListBox:RID_SCDLG_FILTER:LB_OP2
+Wert4 sc:ComboBox:RID_SCDLG_FILTER:ED_VAL4
+Verknuepfung1 sc:ListBox:RID_SCDLG_FILTER:LB_OP1
+Verknuepfung2 sc:ListBox:RID_SCDLG_FILTER:LB_OP2
+Verknuepfung3 sc:ListBox:RID_SCDLG_FILTER:LB_OP3
+Verknuepfung4 sc:ListBox:RID_SCDLG_FILTER:LB_OP4
 Zusaetze sc:MoreButton:RID_SCDLG_FILTER:BTN_MORE
 GrossKleinschreibung sc:CheckBox:RID_SCDLG_FILTER:BTN_CASE
 BereicheEnthaeltSpaltenkoepfe sc:CheckBox:RID_SCDLG_FILTER:BTN_HEADER
--- a/testautomation/global/win/etab_a_d.win
+++ b/testautomation/global/win/etab_a_d.win
@@ -444,6 +444,10 @@ Gap                     chart2:MetricField:TP_OPTIONS:MT_GAP
 Overlap                 chart2:MetricField:TP_OPTIONS:MT_OVERLAP
 ConnectionLines         chart2:CheckBox:TP_OPTIONS:CB_CONNECTOR
 ShowBarsSideBySide      chart2:CheckBox:TP_OPTIONS:CB_BARS_SIDE_BY_SIDE
+LeaveGap chart2:RadioButton:TP_OPTIONS:RB_DONT_PAINT
+AssumeZero chart2:RadioButton:TP_OPTIONS:RB_ASSUME_ZERO
+ContinueLine chart2:RadioButton:TP_OPTIONS:RB_CONTINUE_LINE
+IncludeHiddenCells chart2:CheckBox:TP_OPTIONS:CB_INCLUDE_HIDDEN_CELLS

 *TabDataSourceName extensions:TabPage:RID_PAGE_FINAL
 SourceName extensions:Edit:RID_PAGE_FINAL:ET_DATASOURCENAME
--- a/testautomation/global/win/reportdesigner.win
+++ b/testautomation/global/win/reportdesigner.win
@@ -36,8 +36,8 @@ TimeFormat                reportdesign:ListBox:RID_DATETIME_DLG:LB_TIME_TYPE
 *ReportSortingGrouping    HID_RPT_GROUPSSORTING_DLG
 Groups                    HID_RPT_GROUPSBRW
 FieldExpression           HID_RPT_FIELDEXPRESSION
-MoveUp                    reportdesign:ImageButton:RID_GROUPS_SORTING:PB_UP
-MoveDown                  reportdesign:ImageButton:RID_GROUPS_SORTING:PB_DOWN
+MoveUp                    HID_RPT_GROUPSORT_MOVE_UP
+MoveDown                  HID_RPT_GROUPSORT_MOVE_DOWN
 Sorting                   reportdesign:ListBox:RID_GROUPS_SORTING:LST_ORDER
 GroupHeader               reportdesign:ListBox:RID_GROUPS_SORTING:LST_HEADERLST
 GroupFooter               reportdesign:ListBox:RID_GROUPS_SORTING:LST_FOOTERLST
--- a/testautomation/global/win/tab_a_d.win
+++ b/testautomation/global/win/tab_a_d.win
@@ -52,13 +52,9 @@ FontAntiAliasing svx:CheckBox:OFA_TP_VIEW:CB_FONTANTIALIASING
 AAPixel svx:NumericField:OFA_TP_VIEW:NF_AA_POINTLIMIT
 VorschauInSchriftlisten svx:CheckBox:OFA_TP_VIEW:CB_FONT_SHOW
 SchriftenHistorie svx:CheckBox:OFA_TP_VIEW:CB_FONT_HISTORY
-<<<<<<< .working
-IconsInMenueAnzeigen svx:CheckBox:OFA_TP_VIEW:CB_MENU_ICONS
-=======
 UseHardwareAcceleration svx:CheckBox:OFA_TP_VIEW:CB_USE_HARDACCELL
 UseAntiAliasing svx:CheckBox:OFA_TP_VIEW:CB_USE_ANTIALIASE
 IconsInMenueAnzeigen svx:ListBox:OFA_TP_VIEW:LB_MENU_ICONS
->>>>>>> .merge-right.r270772
 MausAktion svx:ListBox:OFA_TP_VIEW:LB_MOUSEMIDDLE
 MousePositioning svx:ListBox:OFA_TP_VIEW:LB_MOUSEPOS
 UseSystemFont svx:CheckBox:OFA_TP_VIEW:CB_SYSTEM_FONT
--- a/testautomation/graphics/optional/includes/global/g_ole.inc
+++ b/testautomation/graphics/optional/includes/global/g_ole.inc
@@ -44,193 +44,193 @@
 testcase tOLE_Copy
    qaerrorlog "not running due to reconstruction"
    goto endsub
-   '/// Test to see if three different OLEs can be copied and identified correctly. ///'
-
-   dim writerfilename1 as string
-   writerfilename1 = ConvertPath (gTesttoolPath + "graphics\required\input\oletest.odg")
-
-   '/// Open draw-file ///'
-   FileOpen
-   Kontext "OeffnenDlg"
-   sleep 1
-   Dateiname.SetText (writerfilename1)
-   Oeffnen.Click
-   Sleep 3
-
-   '/// When messagebox about "Update all links" shows up - press yes. ///'
-   kontext "Messagebox"
-   if Messagebox.exists then
-      Messagebox.Yes
-   endif
-
-   sleep 3
-   gApplication = "DRAW"
-   '/// Select first object. Use EditCopy to copy it to the clipboard ///'
-   sleep 1
-   kontext "DocumentDraw"
-   DocumentDraw.mousedown (10,10)
-   DocumentDraw.mouseup (10,10)
-   sleep 1
-   DocumentDraw.Typekeys "<TAB>"
-   EditCopy
-
-   '/// Close document. Open new Impress-Document. Paste the OLE-Object. ///'
-   Call hCloseDocument
-   gApplication = "IMPRESS"
-   Call hNewDocument
-   EditPaste
-
-   '/// Select object and check via the Context-menu what it has been opened as. ///'
-   sleep 1
-   Kontext "DocumentImpress"
-   hTypekeys "<MOD1> A"
-   hTypekeys "<RETURN>"
-   hOpenContextMenu
-
-   '/// Count the number of entries. If 5 (including a menuseparator), then its a spreadsheet ///'
+    printlog "Test to see if three different OLEs can be copied and identified correctly."
+    
+    dim writerfilename1 as string
+    writerfilename1 = ConvertPath (gTesttoolPath + "graphics\required\input\oletest.odg")
+    
+    printlog "Open draw-file" & writerfilename1
+    FileOpen
+    Kontext "OeffnenDlg"
+    sleep 1
+    Dateiname.SetText (writerfilename1)
+    Oeffnen.Click
+    Sleep 3
+    
+    printlog "When messagebox about Update all links shows up - press yes."
+    kontext "Messagebox"
+    if Messagebox.exists then
+    Messagebox.Yes
+    endif
+    
+    sleep 3
+    gApplication = "DRAW"
+    printlog "Select first object. Use EditCopy to copy it to the clipboard"
+    sleep 1
+    kontext "DocumentDraw"
+    DocumentDraw.mousedown (10,10)
+    DocumentDraw.mouseup (10,10)
+    sleep 1
+    DocumentDraw.Typekeys "<TAB>"
+    EditCopy
+    
+    printlog "Close document. Open new Impress-Document. Paste the OLE-Object."
+    Call hCloseDocument
+    gApplication = "IMPRESS"
+    Call hNewDocument
+    EditPaste
+    
+    printlog "Select object and check via the Context-menu what it has been opened as."
+    sleep 1
+    Kontext "DocumentImpress"
+    hTypekeys "<MOD1> A"
+    hTypekeys "<RETURN>"
+    hOpenContextMenu
+    
+    printlog "Count the number of entries. If 5 (including a menuseparator), then its a spreadsheet"
    if MenuGetItemCount <> 5 then
-       Warnlog "This doesn't seem to be recognized as a Metafile. It has " + MenuGetItemCount + " entries."
+        Warnlog "This doesn't seem to be recognized as a Metafile. It has " + MenuGetItemCount + " entries."
    end if

-   '/// Close Context menu. Then check if a Edit-line for the Cells is visible. ///'
-   sleep 3
-   MenuSelect (1)  'Default
+    printlog "Close Context menu. Then check if a Edit-line for the Cells is visible."
+    sleep 3
+    MenuSelect (1)  'Default
+    
+    Kontext "RechenleisteCalc"
+    if RechenleisteCalc.Exists then
+        Printlog "This is a spreadsheet-Document. Good"
+    endif
+    
+    Kontext "DocumentImpress"
+    printlog "Click outside the OLE to deactivate it. Then close the Document "
+    DocumentImpress.mousedown (10,10)
+    DocumentImpress.mouseup (10,10)
+    sleep 3
+    Call hCloseDocument
+    
+    printlog "Open Draw-file "
+    FileOpen
+    Kontext "OeffnenDlg"
+    sleep 1
+    Dateiname.SetText (writerfilename1)
+    Oeffnen.Click
+    Sleep 3
+    
+    printlog " When messagebox about Update all links shows up - press yes."
+    kontext "Messagebox"
+    if Messagebox.exists then
+        Messagebox.Yes
+    endif
+    sleep 3
+    
+    printlog "Select second object. Use EditCopy to copy it to the clipboard."
+    gApplication = "DRAW"
+    sleep 1
+    kontext "DocumentDraw"
+    DocumentDraw.mousedown (10,10)
+    DocumentDraw.mouseup (10,10)
+    sleep 1
+    DocumentDraw.Typekeys "<TAB><TAB>"
+    EditCopy
+    
+    printlog "Close document. Open new Impress-Document. Paste the OLE-Object."
+    sleep 1
+    DocumentDraw.mousedown (10,10)
+    DocumentDraw.mouseup (10,10)
+    sleep 1
+    Call hCloseDocument
+    
+    gApplication = "IMPRESS"
+    Call hNewDocument
+    EditPaste
+    
+    printlog "Select the object, and check via the Context-menu what it has been opened as."
+    sleep 1
+    Kontext "DocumentImpress"
+    hTypekeys "<MOD1> A"
+    hTypekeys "<RETURN>"
+    hOpenContextMenu

-   Kontext "RechenleisteCalc"
-   if RechenleisteCalc.Exists then
-      Printlog "This is a spreadsheet-Document. Good"
-   endif
-
-   Kontext "DocumentImpress"
-   '/// Click outside the OLE to deactivate it. Then close the Document ///'
-   DocumentImpress.mousedown (10,10)
-   DocumentImpress.mouseup (10,10)
-   sleep 3
-   Call hCloseDocument
-
-   '/// Open Draw-file ///'
-   FileOpen
-   Kontext "OeffnenDlg"
-   sleep 1
-   Dateiname.SetText (writerfilename1)
-   Oeffnen.Click
-   Sleep 3
-
-   '/// When messagebox about "Update all links" shows up - press yes. ///'
-   kontext "Messagebox"
-   if Messagebox.exists then
-      Messagebox.Yes
-   endif
-   sleep 3
-
-   '/// Select second object. Use EditCopy to copy it to the clipboard ///'
-   gApplication = "DRAW"
-   sleep 1
-   kontext "DocumentDraw"
-   DocumentDraw.mousedown (10,10)
-   DocumentDraw.mouseup (10,10)
-   sleep 1
-   DocumentDraw.Typekeys "<TAB><TAB>"
-   EditCopy
-
-   '/// Close document. Open new Impress-Document. Paste the OLE-Object. ///'
-   sleep 1
-   DocumentDraw.mousedown (10,10)
-   DocumentDraw.mouseup (10,10)
-   sleep 1
-   Call hCloseDocument
-
-   gApplication = "IMPRESS"
-   Call hNewDocument
-   EditPaste
-
-   '/// Select the object, and check via the Context-menu what it has been opened as. ///'
-   sleep 1
-   Kontext "DocumentImpress"
-   hTypekeys "<MOD1> A"
-   hTypekeys "<RETURN>"
-   hOpenContextMenu
-
-   '/// Count the number of entries. If 5 (including a menuseparator), then its a spreadsheet ///'
+    printlog "Count the number of entries. If 5 (including a menuseparator), then its a spreadsheet"
    if MenuGetItemCount <> 5 then
-       Warnlog "This doesn't seem to be recognized as a Metafile. It has " + MenuGetItemCount + " entries."
+        Warnlog "This doesn't seem to be recognized as a Metafile. It has " + MenuGetItemCount + " entries."
    end if
+    
+    printlog "Close Context menu. Then check if a Edit-line for the Cells is visible."
+    sleep 3
+    MenuSelect (1)  'Default
+    
+    Kontext "RechenleisteCalc"
+    if RechenleisteCalc.Exists then
+        Printlog "This is a spreadsheet-Document. Good"
+    endif
+    
+    kontext "DocumentImpress"
+    sleep 1
+    DocumentImpress.mousedown (10,10)
+    DocumentImpress.mouseup (10,10)
+    sleep 1
+    
+    printlog "Close document"
+    Call hCloseDocument
+    
+    printlog "Open draw-file"
+    FileOpen
+    Kontext "OeffnenDlg"
+    sleep 1
+    Dateiname.SetText (writerfilename1)
+    Oeffnen.Click
+    Sleep 3
+    kontext "Messagebox"
+    printlog "When messagebox about Update all links shows up - press yes."
+    if Messagebox.exists then
+        Messagebox.Yes
+    endif
+    sleep 3
+    
+    printlog "Select third object. Use EditCopy to copy it to the clipboard."
+    gApplication = "DRAW"
+    sleep 1
+    kontext "DocumentDraw"
+    DocumentDraw.mousedown (10,10)
+    DocumentDraw.mouseup (10,10)
+    sleep 1
+    DocumentDraw.Typekeys "<TAB><TAB><TAB>"
+    EditCopy
+    
+    printlog "Close the Document. Open new Impress-Document. Paste the OLE-Object."
+    sleep 1
+    DocumentDraw.mousedown (10,10)
+    DocumentDraw.mouseup (10,10)
+    sleep 1
+    Call hCloseDocument

-   '/// Close Context menu. Then check if a Edit-line for the Cells is visible. ///'
-   sleep 3
-   MenuSelect (1)  'Default
-
-   Kontext "RechenleisteCalc"
-   if RechenleisteCalc.Exists then
-      Printlog "This is a spreadsheet-Document. Good"
-   endif
-
-   kontext "DocumentImpress"
-   sleep 1
-   DocumentImpress.mousedown (10,10)
-   DocumentImpress.mouseup (10,10)
-   sleep 1
-
-   '/// Close document ///'
-   Call hCloseDocument
-
-   '/// Open draw-file ///'
-   FileOpen
-   Kontext "OeffnenDlg"
-   sleep 1
-   Dateiname.SetText (writerfilename1)
-   Oeffnen.Click
-   Sleep 3
-   kontext "Messagebox"
-   '/// When messagebox about "Update all links" shows up - press yes. ///'
-   if Messagebox.exists then
-      Messagebox.Yes
-   endif
-   sleep 3
-
-   '/// Select third object. Use EditCopy to copy it to the clipboard ///'
-   gApplication = "DRAW"
-   sleep 1
-   kontext "DocumentDraw"
-   DocumentDraw.mousedown (10,10)
-   DocumentDraw.mouseup (10,10)
-   sleep 1
-   DocumentDraw.Typekeys "<TAB><TAB><TAB>"
-   EditCopy
-
-   '/// Close the Document. Open new Impress-Document. Paste the OLE-Object. ///'
-   sleep 1
-   DocumentDraw.mousedown (10,10)
-   DocumentDraw.mouseup (10,10)
-   sleep 1
-   Call hCloseDocument
-
-   gApplication = "IMPRESS"
-   Call hNewDocument
-   EditPaste
-
-   '/// Select the object, and check via the Context-menu what it has been opened as. ///'
-   Kontext "DocumentImpress"
-   hTypekeys "<MOD1> A"
-   hTypekeys "<RETURN>"
-   hOpenContextMenu
-
-   '/// Count the number of entries. If 5 (including a menuseparator), then its a spreadsheet ///'
+    gApplication = "IMPRESS"
+    Call hNewDocument
+    EditPaste
+    
+    printlog "Select the object, and check via the Context-menu what it has been opened as."
+    Kontext "DocumentImpress"
+    hTypekeys "<MOD1> A"
+    hTypekeys "<RETURN>"
+    hOpenContextMenu
+    
+    printlog "Count the number of entries. If 5 (including a menuseparator), then its a spreadsheet"
    if MenuGetItemCount <> 5 then
-       Warnlog "This doesn't seem to be recognized as a Metafile. It has " + MenuGetItemCount + " entries."
+        Warnlog "This doesn't seem to be recognized as a Metafile. It has " + MenuGetItemCount + " entries."
    end if
-
-   '/// Close Context menu. Then check if a Edit-line for the Cells is visible. ///'
-   sleep 3
-   MenuSelect (1)  'Default
-
-   Kontext "RechenleisteCalc"
-   if RechenleisteCalc.Exists then
-      Printlog "This is a spreadsheet-Document. Good"
-   endif
-
-   '/// Close Context menu. Then close the Document ///'
-   Call hCloseDocument
+    
+    printlog "Close Context menu. Then check if a Edit-line for the Cells is visible."
+    sleep 3
+    MenuSelect (1)  'Default
+    
+    Kontext "RechenleisteCalc"
+    if RechenleisteCalc.Exists then
+        Printlog "This is a spreadsheet-Document. Good"
+    endif
+    
+    printlog "Close Context menu. Then close the Document"
+    Call hCloseDocument
 endcase 'tOLE_Copy

 '-----------------------------------------------------------------------------------------------------------'
@@ -241,7 +241,7 @@ testcase tOLE_SaveLoad
    dim filename as string
    dim filetype as string
    dim filetype2 as string
-   
+    
    if (gApplication = "IMPRESS") then 
        ExtensionString = "odp"
    else
@@ -254,13 +254,13 @@ testcase tOLE_SaveLoad
    printlog "Insert->Object->OLE Object..."
    InsertObjectOLEObject
    Kontext "OLEObjektInsert"
-
+    
    printlog "Choose create new. Select Writer."
    Objekttyp.Select 5
-
+    
    printlog "Click OK to close dialog and insert OLE."
    OLEObjektInsert.OK
-
+    
    printlog "Deselect object."
    sleep 1
    kontext "DocumentImpress"
@@ -285,7 +285,7 @@ testcase tOLE_SaveLoad
    Dateiname.Settext (filename)
    printlog "Saving as: " & filename
    Speichern.Click
-
+    
    printlog "If the file already exists - press yes to overwrite it."
    Sleep 3
    kontext "Messagebox"
@@ -328,8 +328,8 @@ testcase tOLE_SaveLoad

    'FHA TODO
    'testcase tOLE_DragDrop
-    '/// Create OLE, drag n drop within the document. ///'
-    '/// If Impress, drag and drop from document to another slide. ///'
+    printlog " Create OLE, drag n drop within the document. "
+    printlog " If Impress, drag and drop from document to another slide. "
    'endcase 'tOLE_DragDrop

 endcase ' tOLE_Save
@@ -337,123 +337,120 @@ endcase ' tOLE_Save
 '-------------------------------------------------------------------------------
 testcase tiOpenOLECrash

-   dim sFileodp as string
-   dim oFile as string
-   dim i as integer
-   '/// Testing for bug nr: i70019 ///'
-
-   '/// Open Application ///'
-   Call hNewDocument
-   sleep 1
-   '/// 1. Open file: generic_de.ppt ///'
-   FileOpen
-      sleep 1
-      Kontext "OeffnenDlg"
-      '/// Use file: "graphics\\optional\\input\\generic_de.ppt" ///'
-      oFile = ConvertPath (gTesttoolPath + "graphics\required\input\generic_de.ppt")
-      Printlog "file:    '" + oFile + "'"
-      Dateiname.SetText (oFile)
-      '/// 2. Save this document as an *.odp -file. ///'
-      Oeffnen.Click
-      kontext "DocumentImpress"
-      i = 0
-      do while (i < 20)
-         try
+    dim sFileodp as string
+    dim oFile as string
+    dim i as integer
+    printlog "Testing for bug nr: i70019"
+    
+    printlog "Open Application"
+    Call hNewDocument
+    sleep 1
+    printlog "1. Open file: generic_de.ppt"
+    FileOpen
+    sleep 1
+    Kontext "OeffnenDlg"
+    printlog " Use file: graphics\\optional\\input\\generic_de.ppt "
+    oFile = ConvertPath (gTesttoolPath + "graphics\required\input\generic_de.ppt")
+    Printlog "file:    '" + oFile + "'"
+    Dateiname.SetText (oFile)
+    printlog "2. Save this document as an *.odp -file."
+    Oeffnen.Click
+    kontext "DocumentImpress"
+    i = 0
+    do while (i < 20)
+        try
            ApplicationBusy
-         catch
+        catch
            sleep (1)
            i = i + 1
-         endcatch
-      loop
-      if DocumentImpress.StatusIsProgress AND i > 19 then
-         warnlog "   Took over 20 seconds to load the document Document. Stalled?"
-      endif
-
-      FileSaveAs
-         Kontext "SpeichernDlg"
-         sFileodp = (ConvertPath(gOfficePath + "user\work\generic_de"))
-         Dateiname.SetText (sFileodp)
-         Dateityp.Select (1)
-         Speichern.Click
-         Kontext "Messagebox"
-         if Messagebox.Exists(2) then
-            Messagebox.Yes
-            Kontext "AlienWarning"
-            if AlienWarning.Exists(2) then
-               Warnlog "Should not be any alienwarning when saving in our own format!"
-               AlienWarning.OK
-            end if
-            printlog "Saved as: " + sFileodp
-         end if
-      Sleep 3
-      kontext "DocumentImpress"
-      '/// 3. Close Impress. ///'
-      Call hCloseDocument
-
-      '/// 4. Reopen the *.odp file again ///'
-      FileOpen
-         Kontext "OeffnenDlg"
-         Dateiname.SetText (sFileodp + ".odp")
-         Oeffnen.Click
-      kontext
-      if Active.exists (5) then
-         Printlog "ACTIVE: "+active.gettext
-         Active.ok
-         Warnlog "failed to open file? :-("
-      end if
-
-      i = 0
-      do while (i < 20)
-         try
+        endcatch
+    loop
+    if DocumentImpress.StatusIsProgress AND i > 19 then
+        warnlog "   Took over 20 seconds to load the document Document. Stalled?"
+    endif
+    
+    FileSaveAs
+    Kontext "SpeichernDlg"
+    sFileodp = (ConvertPath(gOfficePath + "user\work\generic_de"))
+    Dateiname.SetText (sFileodp)
+    Dateityp.Select (1)
+    Speichern.Click
+    Kontext "Messagebox"
+    if Messagebox.Exists(2) then
+        Messagebox.Yes
+        Kontext "AlienWarning"
+    if AlienWarning.Exists(2) then
+        Warnlog "Should not be any alienwarning when saving in our own format!"
+        AlienWarning.OK
+    end if
+    printlog "Saved as: " + sFileodp
+    end if
+    Sleep 3
+    kontext "DocumentImpress"
+    printlog "3. Close Impress."
+    Call hCloseDocument
+    
+    printlog "4.Reopen the *.odp file again"
+    FileOpen
+    Kontext "OeffnenDlg"
+    Dateiname.SetText (sFileodp + ".odp")
+    Oeffnen.Click
+    kontext
+    if Active.exists (5) then
+        Printlog "ACTIVE: "+active.gettext
+        Active.ok
+        Warnlog "failed to open file? :-("
+    end if
+    
+    i = 0
+    do while (i < 20)
+        try
            ApplicationBusy
-         catch
+        catch
            sleep (1)
            i = i + 1
-         endcatch
-      loop
-      if DocumentImpress.StatusIsProgress AND i > 19 then
-         warnlog "   Took over 20 seconds to load the document Document. Stalled?"
-      endif
+        endcatch
+    loop
+    if DocumentImpress.StatusIsProgress AND i > 19 then
+    warnlog "Took over 20 seconds to load the document Document. Stalled?"
+    endif
+    
+    printlog "5. Right-click on the second slide and click on New slide. "
+    Kontext "Slides"
+    SlidesControl.TypeKeys "<PAGEDOWN>" 'Goto second slide. (and get the focus right)
+    SlidesControl.TypeKeys "<SHIFT F10>"  'OpenContextMenu (True)  'Open Context-menu
+    hMenuSelectNr (1) 'New Slide

-      '/// 5. Right-click on the second slide and click on "New slide". ///'
-      Kontext "Slides"
-         SlidesControl.TypeKeys "<PAGEDOWN>" 'Goto second slide. (and get the focus right)
-         SlidesControl.TypeKeys "<SHIFT F10>"  'OpenContextMenu (True)  'Open Context-menu
-         hMenuSelectNr (1) 'New Slide
-
-      '/// 6. Change the title-(the text was "F<>r den TCM-Test", but this should irrelevant... ;) ). ///'
-      hTypeKeys "<TAB>" 'To select the title.
-      hTypeKeys "F<>r den TCM-Test" 'To enter text
-      '/// 7. Clicked two times on the "Click twice to insert object" ///'
-      hTypeKeys "<ESCAPE>"
-      gMouseClick 1,1
-      hTypeKeys "<TAB><TAB>" '(to select the second object)
-      hTypeKeys "<RETURN>"
-         sleep (2)
-
-         '/// 8. Choose "OpenOffice.org 2.0 Formular" ///'
-         Kontext "OLEObjektInsert"
-         Objekttyp.Select (4)
-         sleep (2)
-         PrintLog "    Objeckt: " + Objekttyp.GetSelText + "  will be inserted."
-         '/// Leave dialog 'Insert OLE Object' with OK ///'
-         OLEObjektInsert.OK
-      sleep (2)
-
-      kontext "CommandsMath"
-         Commands.TypeKeys "A over B + FACT 6 = x"
-
-      ''/// Leave edit mode by typing key [Escape] ///'
-      'Comment: If I do this, the bug wont occur...
-      'hTypeKeys "<ESCAPE>"
-
-      '/// 10. Click on the "Save" button. ///'
-      kontext "Standardbar"
-      Speichern.Click
-
-      '/// 11. Click on the "X" to close the window while the OLE-object still in Edit-mode. ///'
-      Call hCloseDocument
+    printlog "6. Change the title-(the text was F<>r den TCM-Test, but this should irrelevant... ;) )."
+    hTypeKeys "<TAB>" 'To select the title.
+    hTypeKeys "Fuer den TCM-Test" 'To enter text
+    printlog " 7. Clicked two times on the Click twice to insert object "
+    hTypeKeys "<ESCAPE>"
+    gMouseClick 1,1
+    hTypeKeys "<TAB><TAB>" '(to select the second object)
+    hTypeKeys "<RETURN>"
+    sleep (2)
+    
+    printlog "8. Choose OpenOffice.org 2.0 Formular"
+    Kontext "OLEObjektInsert"
+    Objekttyp.Select (3)
+    sleep (2)
+    PrintLog "    Object: " + Objekttyp.GetSelText + "  will be inserted."
+    printlog "Leave dialog 'Insert OLE Object' with OK"
+    OLEObjektInsert.OK
+    sleep (2)
+    
+    kontext "CommandsMath"
+    Commands.TypeKeys "A over B + FACT 6 = x"
+    
+    'printlog " Leave edit mode by typing key [Escape] "
+    'Comment: If I do this, the bug wont occur...
+    'hTypeKeys "<ESCAPE>"
+    
+    printlog "10. Click on the Save button."
+    kontext "Standardbar"
+    Speichern.Click
+    
+    printlog "11. Click on the X to close the window while the OLE-object still in Edit-mode."
+    Call hCloseDocument
 endcase
-
-'-----------------oooo-----------------oooo-----------------oooo-----------------
-
--- a/testautomation/graphics/required/includes/global/id_opt_1.inc
+++ b/testautomation/graphics/required/includes/global/id_opt_1.inc
@@ -121,8 +121,9 @@ testcase tToolsOptionsDrawGeneral (sApplication as string)

    printlog "Office quit - start"

-    TBOrestart
-
+    ExitRestartTheOffice
+    printlog "opening new doc to get the Options"
+    Call hNewDocument
    printlog "checking states"
    ToolsOptions
    hToolsOptions (sApplication,"General")
@@ -402,8 +403,9 @@ testcase tToolsOptionsDrawView (sApplication as string)

    printlog "Office quit - start"

-    TBOrestart
-
+    ExitRestartTheOffice
+    printlog "opening new doc to get the Options"
+    Call hNewDocument
    printlog "checking states"
    ToolsOptions
    hToolsOptions (sApplication,"View")
@@ -553,17 +555,18 @@ testcase tToolsOptionsDrawGrid (sApplication as string)
      sTempMetricField(5) = FangenFangbereich.GetText
      sTempMetricField(6) = Punktreduktion.GetText

-   Kontext "ExtrasOptionenDlg"
-   ExtrasOptionenDlg.OK
+    Kontext "ExtrasOptionenDlg"
+    ExtrasOptionenDlg.OK

    printlog "Office quit - start"

-    TBOrestart
-
-   hTypeKeys "OpenNewDoc!"
-  printlog "checking states"
-   ToolsOptions
-   hToolsOptions (sApplication,"Grid")
+    ExitRestartTheOffice
+    printlog "opening new doc to get the Options"
+    Call hNewDocument
+    hTypeKeys "OpenNewDoc!"
+    printlog "checking states"
+    ToolsOptions
+    hToolsOptions (sApplication,"Grid")

      If ( irgendwas(1) = FangrasterBenutzen.IsChecked      ) Then WarnLog "Snap to Grid state changed"
      If ( irgendwas(2) = RasterSichtbar.IsChecked          ) Then WarnLog "Visible Grid state changed"
@@ -911,8 +914,9 @@ testcase tToolsOptionsDrawPrint (sApplication as string)

    printlog "SO quit - start"

-    TBOrestart
-
+    ExitRestartTheOffice
+    printlog "opening new doc to get the Options"
+    Call hNewDocument
    printlog "checking states"
    ToolsOptions
    hToolsOptions (sApplication,"Print")
--- a/testautomation/graphics/tools/id_tools_2.inc
+++ b/testautomation/graphics/tools/id_tools_2.inc
@@ -54,7 +54,6 @@
 ' #1 ResetMeasurement
 ' #1 SetKontextApplication
 ' #1 hSetSpellHypLanguage
-' #1 TBOrestart
 ' #1 hTBOtypeInDoc
 ' #1 Position_Vergleichen
 ' #1 g_demoguide
@@ -484,17 +483,6 @@ sub hSetSpellHypLanguage
    endif
 end sub

-'-------------------------------------------------------------------------------
-sub TBOrestart
-
-    hCloseDocument
-    sleep (5)
-    ExitRestartTheOffice
-    sleep (10)
-    hNewDocument
-    sleep (5)
-end sub
-
 '-------------------------------------------------------------------------------
 sub hTBOtypeInDoc

--- a/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc
+++ b/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc
@@ -167,7 +167,7 @@ testcase tIBIS111158
            warnlog "Wrong string found in Control: " & testString
        end if
    else
-        warnlog "The control seems to be not named in the document?! Verify!"
+        warnlog "The control seems to be not named in the document?! Verify! If Solaris: #i100870#"
    end if
    call hCloseDocument
 endcase
--- a/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc
@@ -796,6 +796,15 @@ testcase tDataDataPilot
    Kontext "Datenpilot"
    Zusaetze.Open
    DialogTest ( Datenpilot )
+	'/// Verify that the 'Selection from' editfield is correct
+	printlog "Verify that the 'Selection from' editfield has content"
+    printlog "The Range is" & DataPilotRange.Gettext
+    '/// Click on 'Shrink' button for 'Selection from' to open rangechooser
+    printlog " Click on 'Shrink' button for 'Selection from' to open rangechooser"
+    DataPilotRangeShrink.Click
+    '/// Close rangechooser by click on 'Maximize' button
+    printlog " Close rangechooser by click on 'Maximize' button"
+    DataPilotRangeShrink.Click
    '/// Verify that the 'Results to' combobox has items
    printlog " Verify that the 'Results to' combobox has items"
    If AusgabeAb.GetItemCount < 1 then
@@ -931,9 +940,9 @@ testcase tDataDataPilot
    Datenfeld.Cancel
    sleep 2
    Kontext "Datenpilot"
-    '/// Select second item (Sum – 2001) in 'Data Fields' by 4 <TAB>
-    printlog " Select second item (Sum – 2001) in 'Data Fields' by 4 <TAB>"
-    Datenpilot.TypeKeys "<TAB><TAB><TAB><TAB>",TRUE
+    '/// Select second item (Sum – 2001) in 'Data Fields' by 3 <TAB>
+    printlog " Select second item (Sum – 2001) in 'Data Fields' by 3 <TAB>"
+    Datenpilot.TypeKeys "<TAB><TAB><TAB>",TRUE
    Sleep 3
    '/// Click on 'Options' button to open 'Data Filed' dialog
    printlog " Click on 'Options' button to open 'Data Filed' dialog"
--- a/testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc
@@ -525,6 +525,14 @@ testcase tFormatConditionalFormatting
    if Zellvorlage1.GetItemCount < 1 then
        warnlog "The 'Cell style' listbox is empty"
    end if
+	printlog " Click on NewStyle button"
+	NewStyle1.Click
+	Kontext
+    active.SetPage TabVerwalten
+	printlog " Close Style dialog"
+    Kontext "TabVerwalten"
+	TabVerwalten.Close
+	Kontext "BedingteFormatierung"
    '/// Check 'Condition 2'
    printlog " Check 'Condition 2'"
    Bedingung2.Check
--- a/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc
+++ b/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc
@@ -71,11 +71,10 @@ testcase i64991
        Call hCloseDocument
        goto endsub
    end if
-    Call sMakeReadOnlyDocumentEditable
-    '/// Now Execute Macro 'Main' in Node 'i64991'->'check_page_style'
-	Kontext "SecurityWarning"
-    if SecurityWarning.Exists(2) then SecurityWarning.OK	
    
+	printlog "Save document to be able to find macro module later"    
+    Call hFileSaveAsKill (gOfficepath + "user\work\i64991.odt")
+	
 	printlog "- execute macro"
    ToolsMacrosRunMacro
    ' Sometimes it lasts long until dialog is shown
--- a/testautomation/writer/optional/w_table.bas
+++ b/testautomation/writer/optional/w_table.bas
@@ -127,7 +127,7 @@ sub TableConfiguration

    mUnit = fSetMeasurementToCM()
    ToolsOptions
-    Call hToolsOptions ("TextDocument","GENERAL")
+    Call hToolsOptions ("WRITER","GENERAL")
    cDecSep = GetDecimalSeperator(Tabulatorenabstand.GetText)
    Kontext "ExtrasOptionenDlg"
    ExtrasOptionenDlg.Ok
--- a/testautomation/writer/required/includes/w_001_.inc
+++ b/testautomation/writer/required/includes/w_001_.inc
@@ -66,6 +66,19 @@ testcase tFileNewLabels
    Dim iType as integer
    Dim sTypes as integer
    Dim vTypes as integer
+    
+    ' The brands have fixed names and should not change
+    dim cBrandList( 10 ) as string
+        cBrandList(  1 ) = "Avery A4" 
+        cBrandList(  2 ) = "Avery A4/Asia"
+        cBrandList(  3 ) = "Avery Letter Size"
+        cBrandlist(  4 ) = "Avery Zweckform"
+        cBrandList(  5 ) = "Herlitz"
+        cBrandList(  6 ) = "Herma A4"
+        cBrandList(  7 ) = "Herma A5"
+        cBrandList(  8 ) = "Herma endlos"
+        cBrandList(  9 ) = "Leitz"
+        cBrandList( 10 ) = "Sigel"

    PrintLog "Open Labels-dialog with File / New / Labels"
    if ( hCreateLabels ) then 
@@ -89,7 +102,7 @@ testcase tFileNewLabels
            PrintLog "There should be 10 brands in list"
            For iBrandIndex = 1 to Marke.GetItemCount
            
-                Marke.Select iBrandIndex
+                Marke.Select( cBrandList( iBrandIndex ) )
                printlog "- Brand: " & Marke.GetSelText
                sTypes = Typ.GetItemCount
                
@@ -244,6 +257,20 @@ testcase tFileNewBusinessCards
    Dim iWait as integer
    Dim sTypes as integer
    Dim vTypes as integer
+    
+    ' The brands have fixed names and should not change
+    dim cBrandList( 10 ) as string
+        cBrandList(  1 ) = "Avery A4" 
+        cBrandList(  2 ) = "Avery A4/Asia"
+        cBrandList(  3 ) = "Avery Letter Size"
+        cBrandlist(  4 ) = "Avery Zweckform"
+        cBrandList(  5 ) = "Herlitz"
+        cBrandList(  6 ) = "Herma A4"
+        cBrandList(  7 ) = "Herma A5"
+        cBrandList(  8 ) = "Herma endlos"
+        cBrandList(  9 ) = "Leitz"
+        cBrandList( 10 ) = "Sigel"
+    

 	PrintLog "Open Business Cards dialog with File / New / Business Cards"
 	if ( hCreateBusinessCards ) then     
@@ -268,7 +295,7 @@ testcase tFileNewBusinessCards
                
                PrintLog "There should be 10 brands in list"
                For iBrand = 1 to Marke.GetItemCount
-                    Marke.Select iBrand
+                    Marke.Select( cBrandList( iBrand ) )
                    printlog "- Brand: " & Marke.GetSelText
                    sTypes = Typ.GetItemCount
                    Select Case iBrand
--- a/testautomation/writer/required/includes/w_001b_.inc
+++ b/testautomation/writer/required/includes/w_001b_.inc
@@ -209,10 +209,10 @@ testcase tFileSendOutlineToClipboard
    WaitSlot(1000)

    PrintLog "Paste outline in new document"
-    EditPaste
+    hUseAsyncSlot( "EditPaste" )
    Call wTypeKeys("<Up>", 6)
    Call wTypeKeys("<Home><Shift End>")
-    EditCopy
+    hUseAsyncSlot( "EditCopy" )
    if GetClipboardText <> "Seite 1." then QAErrorlog "Wrong Outline in Impress Outlinemode"
    WaitSlot(1000)
    PrintLog "Close active document"
--- a/testautomation/writer/required/includes/w_002_.inc
+++ b/testautomation/writer/required/includes/w_002_.inc
@@ -84,7 +84,7 @@ testcase tEditUndoRedo
    PrintLog "- Edit/Undo - Redo"

    PrintLog "Open new document"
-    Call hNewDocument (True)
+    hNewDocument()

    PrintLog "Insert table"
    Call hTabelleEinfuegen
@@ -200,8 +200,9 @@ testcase tEditPasteSpecial
        try
            PrintLog "Edit / Paste / Special"
            hUseAsyncSlot( "EditPasteSpecialWriter" )
+            
            Kontext "InhaltEinfuegen"
-            if InhaltEinfuegen.Exists then
+            if ( InhaltEinfuegen.Exists( 2 ) ) then
                try
                    Auswahl.Select 1
                catch
@@ -245,7 +246,7 @@ testcase tEditPasteSpecial
    
    PrintLog "Edit / Paste / Special"
    Kontext "InhaltEinfuegen"
-    if InhaltEinfuegen.Exists then
+    if ( InhaltEinfuegen.Exists( 2 ) ) then
        DialogTest ( InhaltEinfuegen )
        Auswahl.Select 1
        InhaltEinfuegen.OK
@@ -255,6 +256,7 @@ testcase tEditPasteSpecial
    else
        Warnlog "Dialog 'Paste Special' is not up!"
    end if
+    
    Call hCloseDocument
    PrintLog "Close active document"
    
@@ -1024,6 +1026,10 @@ testcase tEditFields
            Auswahl.Select 1
        case 49 : Feldtyp.Select 1
            Auswahl.Select 1
+        case 51 : Feldtyp.Select 5 
+            Auswahl.Select 1
+        case 52 : Feldtyp.Select 5
+            Auswahl.Select 1			
        case 55 : Feldtyp.Select 7
            Auswahl.Select 1
        case 81 : Feldtyp.Select 4
@@ -1069,6 +1075,10 @@ testcase tEditFields
            Auswahl.Select 1
        case 49 : Feldtyp.Select 1
            Auswahl.Select 1
+        case 51 : Feldtyp.Select 6
+            Auswahl.Select 1
+		case 52 : Feldtyp.Select 6
+            Auswahl.Select 1			
        case 55 : Feldtyp.Select 9
            Auswahl.Select 1
        case 81 : Feldtyp.Select 5
@@ -1412,6 +1422,10 @@ testcase tHtmlDocEditFields
        Auswahl.Select 1
    case 49 : Feldtyp.Select 1
        Auswahl.Select 1
+    case 51 : Feldtyp.Select 5
+        Auswahl.Select 1
+    case 52 : Feldtyp.Select 5
+        Auswahl.Select 1		
    case 55 : Feldtyp.Select 7
        Auswahl.Select 1
    case 81 : Feldtyp.Select 4
--- a/testautomation/writer/required/includes/w_005b_.inc
+++ b/testautomation/writer/required/includes/w_005b_.inc
@@ -96,13 +96,11 @@ testcase tFormatGraphics
    printlog " Insert a graphic (..\writer\required\input\graphics\jolink.jpg)"
    Call hGrafikEinfuegen ( gTesttoolPath + "writer\required\input\graphics\jolink.jpg" )

-    try
-        printlog " Format / Graphic"
-        FormatGraphics
-    catch
+    printlog " Format / Graphic"
+    if ( hUseAsyncSlot( "FormatGraphics" ) = -1 ) then
        Warnlog "- Format / Graphics disabled or hidden!"
        goto endsub
-    endcatch
+    endif

    printlog " Step through all tabpages"
    Kontext
@@ -226,10 +224,10 @@ testcase tFormatAlignment
    Call hNewDocument
    printlog " Insert a graphic from file '..\writer\required\input\graphics\jolink.jpg'"
    Call hGrafikEinfuegen ( gTesttoolPath + "writer\required\input\graphics\jolink.jpg" )
-    if gApplication = "HTML" then
-        wait 500
+    
+    if ( gApplication = "HTML" ) then
        printlog " Format / Anchor / to Page"
-        FormatAnchorToPage
+        hUseAsyncSlot( "FormatAnchorToPage" )
    end if

    try
@@ -363,17 +361,17 @@ testcase tFormatArrangeObject
    printlog " Insert a frame"
    Call wInsertFrame
    printlog " Format / Arrange / Bring to front"
-    FormatArrangeBringToFrontCalc
-    WaitSlot()
+    FormatArrangeBringToFrontCalc : WaitSlot()
+
    printlog " Format / Arrange / Bring forward"
-    FormatArrangeBringForward
-    WaitSlot()
+    FormatArrangeBringForward : WaitSlot()
+
    printlog " Format / Arrange / Set backward"
-    FormatArrangeSetBackward
-    WaitSlot()
+    FormatArrangeSetBackward : WaitSlot()
+
    printlog " Format / Arrange / Send to back "
-    FormatArrangeSendToBack
-    WaitSlot()
+    FormatArrangeSendToBack : WaitSlot()
+
    printlog " Close active document"
    Call hCloseDocument
 endcase
@@ -391,23 +389,23 @@ testcase tFormatAlignmentObject
    printlog " Insert a frame"
    Call wInsertFrame
    printlog " Format / Alignment / Left"
-    FormatAlignmentLeft
-    WaitSlot()
+    FormatAlignmentLeft : WaitSlot()
+
    printlog " Format / Alignment / Centered"
-    FormatAlignmentCentered
-    WaitSlot()
+    FormatAlignmentCentered : WaitSlot()
+
    printlog " Format / Alignment / Right"
-    FormatAlignmentRight
-    WaitSlot()
+    FormatAlignmentRight : WaitSlot()
+
    printlog " Format / Alignment / Top"
-    FormatAlignmentTop
-    WaitSlot()
+    FormatAlignmentTop : WaitSlot()
+
    printlog " Format / Alignment / Center"
-    FormatAlignmentCenter
-    WaitSlot()
+    FormatAlignmentCenter : WaitSlot()
+
    printlog " Format / Alignment / Bottom"
-    FormatAlignmentBottom
-    WaitSlot()
+    FormatAlignmentBottom : WaitSlot()
+
    printlog " Close active document"
    Call hCloseDocument
 endcase
@@ -422,17 +420,17 @@ testcase tFormatAnchorObject
    printlog " Insert a frame"
    Call wInsertFrame
    printlog " Format / Anchor / to page"
-    FormatAnchorToPage
-    WaitSlot()
+    FormatAnchorToPage : WaitSlot()
+
    printlog " Format / Anchor / to paragraph"
-    FormatAnchorToParagraph
-    WaitSlot()
+    FormatAnchorToParagraph : WaitSlot()
+
    printlog " Format / Anchor / to character"
-    FormatAnchorToCharacter
-    WaitSlot()
+    FormatAnchorToCharacter : WaitSlot()
+
    printlog " Format / Anchor / as character"
-    FormatAnchorAsCharacter
-    WaitSlot()
+    FormatAnchorAsCharacter : WaitSlot()
+
    printlog " Close active document"
    Call hCloseDocument
 endcase
@@ -440,57 +438,63 @@ endcase
 '-----------------------------------------------------------

 testcase tFormatWrapObject
+
    PrintLog "- Format / Wrap (Frame)"
-    if gApplication = "HTML" then
+    
+    if ( gApplication = "HTML" ) then
        printlog "Not in WriterWeb!"
        goto endsub
    end if
+    
    printlog " Open new document"
    Call hNewDocument
+    
    printlog " Insert a frame"
    Call wInsertFrame
-    WaitSlot()
+
    printlog " Format / Wrap / no wrap"
-    FormatWrapNoWrap
-    WaitSlot()
+    FormatWrapNoWrap : WaitSlot()
+
    printlog " Format / Wrap / page wrap"
-    FormatWrapPageWrap
-    WaitSlot()
+    FormatWrapPageWrap : WaitSlot()
+
    printlog " Format / Wrap / optimal page wrap"
-    FormatWrapOptimalPageWrap
-    WaitSlot()
+    FormatWrapOptimalPageWrap : WaitSlot()
+
    printlog " Format / Wrap / through"
-    FormatWrapThrough
-    WaitSlot()
+    FormatWrapThrough : WaitSlot()
+
    printlog " Format / Wrap / in background"
-    FormatWrapInBackground
-    WaitSlot()
+    FormatWrapInBackground : WaitSlot()
+
    printlog " Format / Wrap / first paragraph"
-    FormatWrapFirstParagraph
-    WaitSlot()
-    try
-        printlog " Format / Wrap / Contour"
-        FormatWrapContour
-        WaitSlot (500)
-        Warnlog "Wrap / Contour should not be enabled for frames ! (Bug#90964)"
-    catch
-    endcatch
-    Sleep 1
-    try
-        printlog " Format / Wrap / Edit Contour"
-        FormatWrapEditContour
+    FormatWrapFirstParagraph : WaitSlot()
+    
+    if ( hUseAsyncSlot( "FormatWrapContour" ) = -1 ) then
+        printlog( "Format / Wrap / Contour disabled. Good." )
+    else
+        warnlog( "#i90964# Format / Wrap / Contour should not be enabled for frames" )
+    endif
+    
+    printlog " Format / Wrap / Edit Contour"
+    if ( hUseAsyncSlot( "FormatWrapEditContour" ) = -1 ) then
+        printlog( "Format / Wrap / Edit Contour disabled. Good." )
+    else
+        Warnlog( "#i90964# Wrap / Edit Contour should not be enabled for frames" )
+        
        Kontext "KonturEditor"
        if ( KonturEditor.exists( 2 ) ) then
-            Warnlog "Wrap / Edit Contour should not be enabled for frames ! (Bug#90964)"
-            printlog " Close 'Contour Editor'"
-            KonturEditor.Close
+            KonturEditor.Close()
        else
-            warnlog( "Dialog <KonturEditor> is not available" )
+            warnlog( "Slot <FormatWrapEditContour> is enabled but doesn't trigger the dialog" )
        endif
-    catch
-    endcatch
+    endif    
+
    Kontext
-    if Active.Exists (2) then Active.Yes
+    if ( Active.Exists( 2 ) ) then 
+        qaerrorlog( "JSK: Undocumented active handled silently - fix it" )
+        Active.Yes()
+    endif

    printlog " Close active document"
    Call hCloseDocument
@@ -515,7 +519,7 @@ testcase tFormatLine
    hUseAsyncSlot( "EditPaste" )
    

-        printlog " Format / Line"
+    printlog " Format / Line"
    if ( hUseAsyncSlot( "FormatLine" ) = -1 ) then
        Warnlog "Clipboard problem between applications!"
        Call wZeichenobjektEinfuegen ( "Rechteck", 40, 40, 50, 50 )
@@ -529,11 +533,13 @@ testcase tFormatLine
    printlog " Step through all tabpages"
    wait 500
    active.SetPage TabLinie
+    
    kontext "TabLinie"
    Call DialogTest ( TabLinie )

    Kontext
    active.SetPage TabLinienstile
+    
    kontext "TabLinienstile"
    Call DialogTest ( TabLinienstile )
    try
@@ -550,6 +556,7 @@ testcase tFormatLine

    Kontext
    active.SetPage TabLinienenden
+    
    Kontext "Linienstil"
    if Linienstil.Exists then
        Warnlog "Messagebox appears changing to Tabpage 'Arrow Styles!"
@@ -961,10 +968,12 @@ testcase tFormatGroup
    Dim y1%

    PrintLog "- Format / Group drawing objects"
-    if gApplication = "HTML" then
+    
+    if ( gApplication = "HTML" ) then
        printlog "Not in WriterWeb!"
        goto endsub
    end if
+    
    printlog " Open new document"
    Call hNewDocument

@@ -991,54 +1000,37 @@ testcase tFormatGroup
        y1% = 65
    end if

-    Sleep 1
-    try
-        printlog " Format / Group / Group"
-        FormatGroupGroup
-    catch
+    printlog " Format / Group / Group"
+    if ( hUseAsyncSlot( "FormatGroupGroup" ) = -1 ) then
        QAErrorlog "Unable to execute Format / Group / Group. Maybe objects not selected!"
-        printlog " Close active document"
        Call hCloseDocument
        goto endsub
-    endcatch
-    Sleep 2
-    try
-        printlog " Format / Group / Edit Group"
-        FormatGroupEditGroupCalc
-        WaitSlot (2000)
-    catch
+    endif
+    
+    printlog " Format / Group / Edit Group"
+    if ( hUseAsyncSlot( "FormatGroupEditGroupCalc" ) = -1 ) then
        Warnlog "Unable to execute Format / Group / Group. Maybe objects not selected!"
        Call hCloseDocument
-        printlog " Close active document"
        goto endsub
-    endcatch
+    endif

    Call wTypeKeys ( "<Shift F4>" )
-    Sleep 2
-    try
-        printlog " Format / Exit Group"
-        FormatExitGroupDraw
-        WaitSlot (2000)
-    catch
+    
+    printlog " Format / Exit Group"
+    if ( hUseAsyncSlot( "FormatExitGroupDraw" ) = -1 ) then
        Warnlog "Unable to execute Format / Group / Exit Group. Maybe objects not selected!"
        Call hCloseDocument
-        printlog " Close active document"
        goto endsub
-    endcatch
+    endif

    Call wTypeKeys ( "<Shift F4>" )
-    Sleep 2
-    try
-        printlog " Format / Ungroup"
-        FormatUngroupDraw
-        WaitSlot (2000)
-    catch
+    
+    printlog " Format / Ungroup"
+    if ( hUseAsyncSlot( "FormatUngroupDraw" ) = -1 ) then
        Warnlog "Unable to execute Format / Group / Ungroup. Maybe objects not selected!"
        Call hCloseDocument
-        printlog " Close active document"
        goto endsub
-    endcatch
-    Sleep 2
+    endif

    printlog " Close active document"
    Call hCloseDocument
@@ -1047,8 +1039,10 @@ endcase
 '-----------------------------------------------------------

 testcase tFormatFontwork
+
    PrintLog "- Format / Fontwork drawing objects"
-    if gApplication = "HTML" then
+    
+    if ( gApplication = "HTML" ) then
        printlog "Not in WriterWeb!"
        goto endsub
    end if
@@ -1058,27 +1052,25 @@ testcase tFormatFontwork
    printlog " Paste a rectangle from draw via clipboard"
    Call wRectangleToClipboard

-    EditPaste
-    Sleep (1)
+    hUseAsyncSlot( "EditPaste" )

-    try
-        printlog " Format / Font Work"
-        FormatFontwork
-    catch
+    printlog " Format / Font Work"
+    if ( hUseAsyncSlot( "FormatFontWork" ) = -1 ) then
        Warnlog "Clipboard problem between applications!"
        Call wZeichenobjektEinfuegen ( "Rechteck", 40, 40, 50, 50 )
        Call gMouseClick ( 45, 45 )
        FormatFontwork
-    endcatch
+    endif

    Kontext "Fontwork"
-    if Fontwork.Exists then
+    if ( Fontwork.Exists( 1 ) ) then
        call Dialogtest ( Fontwork )
        printlog " Close Fontwork dialog"
        FormatFontwork
    else
        Warnlog "Dialog 'Fontwork' does not exist!"
    end if
+    
    printlog " Close active document"
    Call hCloseDocument
 endcase
@@ -1086,19 +1078,27 @@ endcase
 '-----------------------------------------------------------

 testcase tFormatPositionAndSizeLegend
+
    PrintLog "- Format / Position and Size in Legend"
-    if gApplication = "HTML" then
+    
+    if ( gApplication = "HTML" ) then
        printlog "Not in WriterWeb!"
        goto endsub
    end if
+    
    printlog " Open new document"
    Call hNewDocument
    Call wZeichenobjektEinfuegen ( "Legende", 45, 35, 50, 50 )
+    
    printlog " Insert a legend"
    sleep (1)
    Call wObjektSelektieren(43, 33, 75, 75)

-    if ( hUseAsyncSlot( "FormatPositionAndSize" = -1 ) ) then
+    hUseAsyncSlot( "FormatPositionAndSize" )
+    kontext "active"
+    if ( active.exists( 1 ) ) then
+        printlog( "Dialog open. Good" )
+    else   
        Warnlog "Format / Position and Size does not work! Maybe object not selected!"
        printlog " Close active document"
        Call hCloseDocument
@@ -1108,33 +1108,42 @@ testcase tFormatPositionAndSizeLegend
    printlog " In upcoming dialog step through all tabpages"
    Kontext
    active.setpage TabPositionAndSizeWriter
+    
    Kontext "TabPositionAndSizeWriter"
    call Dialogtest ( TabPositionAndSizeWriter )

    Kontext
    active.setpage TabLegende
+    
    Kontext "TabLegende"
    call Dialogtest ( TabLegende )
+    
    printlog " Close dialog"
    TabLegende.Cancel

    printlog " Close active document"
    Call hCloseDocument
+    
 endcase

 '-----------------------------------------------------------

 testcase tFormatStyleEdit
+
    PrintLog "- Format / Style Text objects"
-    if gApplication = "HTML" then
+    
+    if ( gApplication = "HTML" ) then
        printlog "Not in WriterWeb !"
        goto endsub
    end if
+    
    printlog " Open new document"
    Call hNewDocument

    Kontext "DrawBar"
-    if Not DrawBar.Exists then Call hToolbarSelect("Drawing", true)
+    if Not DrawBar.Exists then 
+        Call hToolbarSelect("Drawing", true)
+    endif

    if Drawbar.Exists then
        Textobjekt.Click
@@ -1142,9 +1151,9 @@ testcase tFormatStyleEdit
        Sleep 2

        Call gMouseMove(50, 20, 70, 40)
-        Sleep 1
+        hUseAsyncSlot( "FormatStyleBold" )

-        FormatStyleBold
+        
        printlog " Format / Style / Bold"
        Call wTypeKeys ("a")
        printlog " Format / Style / Italic"
@@ -1212,12 +1221,11 @@ testcase tFormatAlignmentEdit
    printlog " Insert a textbox via 'Draw functions' toolbar"

    Call gMouseMove(50, 20, 70, 40)
-    Sleep 1
    printlog " Insert some text in document"

    Call wTypeKeys ("Ein Wort")
    printlog " Format / Alignment / Left"
-    FormatAlignmentLeftText
+    hUseAsyncSlot( "FormatAlignmentLeftText" )
    WaitSlot()
    printlog " Format / Alignment / Right"
    FormatAlignmentRightText
@@ -1293,10 +1301,9 @@ testcase tFormatParagraphEdit
    printlog " In a textbox via 'Draw Functions' toolbox"

    Call gMouseMove(50, 20, 70, 40)
-    Sleep 1

    printlog " Format / Paragraph "
-    FormatParagraph
+    hUseAsyncSlot( "FormatParagraph" )
    printlog " Step through all tabpages"
    Kontext
    Active.SetPage TabEinzuegeUndAbstaende
@@ -1336,13 +1343,10 @@ testcase tHtmlDocFormatGraphics
    printlog " Insert a graphic (..\writer\required\input\graphics\jolink.jpg)"
    Call hGrafikEinfuegen ( gTesttoolPath + "writer\required\input\graphics\jolink.jpg" )

-    try
-        printlog " Format / Graphic"
-        FormatGraphics
-    catch
+    if ( hUseAsyncSlot( "FormatGraphics" ) = -1 ) then
        Warnlog "- Format / Graphics disabled or hidden!"
        goto endsub
-    endcatch
+    endif

    printlog " Step through all tabpages"
    Kontext
--- a/testautomation/writer/required/includes/w_007_.inc
+++ b/testautomation/writer/required/includes/w_007_.inc
@@ -80,18 +80,18 @@ testcase tToolsSpellcheck
    Dim IsWriteable as boolean

    ' As long as OOo has no modules for that, disabled
-    if gOOO = True then
+    if ( gOOO ) then
        printlog "No spellchecking in OOo"
        goto endsub
    end if

    printlog " Open document where the formatting is set to the language we wish to test."
    TheFile = Convertpath (gTesttoolpath + "writer\optional\input\spellcheck\spellcheck_" + iSprache + ".odt")
-    if hFileExists ( TheFile ) <> TRUE then
+    if ( not hFileExists ( TheFile ) ) then
        Warnlog "Found no Document for the language you're testing in, Please inform the Test-Developer."
        goto endsub
    end if
-    call hFileOpen (TheFile,false)
+    hFileOpen ( TheFile )
    Call sMakeReadOnlyDocumentEditable

    printlog " Insert some faulty text"
@@ -125,9 +125,9 @@ testcase tToolsSpellcheck
    ToolsSpellcheckWriter

    printlog " Tools / Spellcheck / Check"
-    WaitSlot (500)
+
    Kontext "Active"
-    if Active.Exists then
+    if ( Active.Exists( 1 ) ) then
        if Active.GetRT = 304 then
            try
                Active.Yes  ' Start from beginning ?
@@ -145,14 +145,18 @@ testcase tToolsSpellcheck
            endcatch
        end if
    end if
+
    printlog " Spellcheck dialog has to come up"
    Kontext "Spellcheck"
    DialogTest ( Spellcheck )
+
    printlog " Click 'Options'"
    SpellcheckOptions.Click
    Wait 500
+
    kontext "TabLinguistik"
    DialogTest ( TabLinguistik )
+
    printlog " Step through all options in list and if 'Edit' is enabled click 'Edit'"
    for i = 1 to 12
        kontext "TabLinguistik"
@@ -165,9 +169,11 @@ testcase tToolsSpellcheck
            SilbentrennungOptionen.Cancel
        end if
    next i
+
    printlog " Click 'New' in Options dialog"
    Neu.Click
    wait 500
+
    Kontext "BenutzerwoerterbuchAnlegen"
    Call DialogTest ( BenutzerwoerterbuchAnlegen )
    BenutzerwoerterbuchAnlegen.Close
@@ -196,10 +202,12 @@ testcase tToolsSpellcheck
    else
        Warnlog "All dictionarys are write protected!"
    end if
+
    printlog " Close 'Options' dialog"
    Kontext "TabLinguistik"
    TabLinguistik.Close
    wait 500
+
    Kontext "Spellcheck"
    Spellcheck.Close
    printlog " Close 'Spellcheck' dialog"
@@ -243,11 +251,11 @@ testcase tToolsThesaurus

    printlog " Open document where the formatting is set to the language we wish to test."
    TheFile = Convertpath (gTesttoolpath + "writer\optional\input\spellcheck\spellcheck_" + iSprache + ".odt")
-    if hFileExists ( TheFile ) <> TRUE then
+    if ( not hFileExists ( TheFile ) ) then
        Warnlog "Found no Document for the language you're testing in, Please inform the Test-Developer."
        goto endsub
    end if
-    call hFileOpen (TheFile,false)
+    call hFileOpen( TheFile )
    Call sMakeReadOnlyDocumentEditable

    printlog " Insert some faulty text"
@@ -338,14 +346,14 @@ testcase tToolsHyphenation
        LingFile = str$(iSprache) + "-hyph.dat"
    end select

-    if hFileExists(DieDatei) = False then
+    if ( not hFileExists( DieDatei ) ) then
        Warnlog "No defined Errortext for language: " + isprache + "! Exit!"
        goto endsub
    end if

    Select Case gApplication
    Case "WRITER"
-        Call hFileOpen ( DieDatei )
+        hFileOpen( DieDatei )

    Case "MASTERDOCUMENT"
        if wInsertDocumentinMasterDoc(DieDatei) = False then
@@ -354,7 +362,7 @@ testcase tToolsHyphenation
        else
            Call hNewDocument
            printlog " Open new document"
-            EditPaste
+            hUseAsyncSlot( "EditPaste" )
        end if

    Case "HTML"
@@ -367,25 +375,25 @@ testcase tToolsHyphenation
    Sleep 1
    Call wTypeKeys ("<Mod1 Home>")

-    ToolsLanguageHyphenate
+    hUseAsyncSlot( "ToolsLanguageHyphenate" )
    printlog " Tools / Hyphenate"
    Kontext "Active"
    try
        Active.Yes
    catch
    endcatch
-    if Active.Exists then
+    if ( Active.Exists( 1 ) )then
        if Active.GetRT = 304 then
            Active.Ok
            ' Force pagesize change to bringup Hyphenation-dialog
-            FormatPageWriter
+            hUseAsyncSlot( "FormatPageWriter" )
            Kontext
            active.SetPage TabSeite
            Kontext "TabSeite"
            Breite.Settext "15"
            TabSeite.Ok
-            Sleep 1
-            ToolsLanguageHyphenate
+
+            hUseAsyncSlot( "ToolsLanguageHyphenate" )
        end if
    end if

@@ -420,7 +428,7 @@ testcase tToolsWordCount
    ToolsWordCount
    printlog " If if dialog has been opened"
    Kontext "WordCount"
-    if WordCount.Exists then
+    if ( WordCount.Exists( 1 ) ) then
        Call DialogTest ( WordCount )
        printlog " Close dialog 'WordCount'"
        WordCount.Close
@@ -934,36 +942,36 @@ testcase tToolsUpdate
    
    Kontext
    Active.Setpage TabVerzeichnisseVerzeichnis
+
    printlog " Close upcoming Index dialog"
    Kontext "TabVerzeichnisseVerzeichnis"
    TabVerzeichnisseVerzeichnis.OK
-    Sleep 1
+
    printlog " Tools / Update / All Indexes"
-    ToolsUpdateAllIndexes
-    WaitSlot (1000)
+    hUseAsyncSlot( "ToolsUpdateAllIndexes" )
+
    printlog " Tools / Update / Current Index"
    ToolsUpdateCurrentIndex

    printlog "  - Update Fields"
    Call wTypeKeys ("<Up><Home><Tab>")
-    printlog " Insert / Fields / Author"

+    printlog " Insert / Fields / Author"
    InsertFieldsAuthor
+
    printlog " Insert / Fields / Time"
    InsertFieldsTime
-    WaitSlot (1000)
-    ToolsUpdateFields
+
    printlog " Tools / Update / Fields"
+    hUseAsyncSlot( "ToolsUpdateFields" )
+    

    printlog "  - Update links"
    printlog " Insert a graphic from file"
    Call hGrafikVerknuepftEinfuegen ( gTesttoolPath + "writer\required\input\graphics\jolink.jpg" )
-    try
-        printlog " Tools / Update / Links"
-        ToolsUpdateLinks
-    catch
+    if ( hUseAsyncSlot( "ToolsUpdateLinks" ) = -1 ) then
        Warnlog "Links can't be updated!"
-    endcatch
+    endif

    printlog "  - Update / Reformat Pages  with  Tools / Page formatting"
    ToolsPageFormatting
@@ -972,9 +980,7 @@ testcase tToolsUpdate
    ToolsUpdateUpdateAll

    printlog " Close all active documents"
-    Do Until GetDocumentCount = 0
-        Call hCloseDocument
-    Loop
+    hFileCloseAll()
 endcase

 ' -------------------------------------------
@@ -1053,9 +1059,7 @@ testcase tToolsHangulHanjaConversion
    end if

    printlog " Close all active documents"
-    Do Until GetDocumentCount = 0
-        Call hCloseDocument
-    Loop
+    hFileCloseAll()
 endcase

 ' -------------------------------------------
@@ -1140,22 +1144,20 @@ testcase tHtmlDocToolsHangulHanjaConversion
    bAsianLanguage = ActiveDeactivateAsianSupport(TRUE)

    printlog " Open the test file"
-    Call hFileOpen (sTestFile)
+    hFileOpen (sTestFile)
    Call sMakeReadOnlyDocumentEditable
    Call wTypeKeys("<MOD1 Home>")

    printlog " Tools / HangulHanjaConversion"
-    try
-        ToolsLanguageHangulHanjaConversion
-    catch
+    if ( hUseAsyncSlot( "ToolsLanguageHangulHanjaConversion" ) = -1 ) then
        Warnlog "- Format / HangulHanjaConversion is disabled or hidden!"
        bAsianLanguage = ActiveDeactivateAsianSupport(False)
        Call hCloseDocument
        goto endsub
-    endcatch
+    endif

    Kontext "HangulHanjaConversion"
-    if HangulHanjaConversion.Exists then
+    if ( HangulHanjaConversion.Exists( 1 ) ) then
        Call DialogTest ( HangulHanjaConversion )
    else
        Warnlog "- Format / HangulHanjaConversion doesn't work. Dialog is not up"
@@ -1205,7 +1207,9 @@ testcase tMasterDocToolsHyphenation
    Dim LingFile as string

    gApplication = "MASTERDOCUMENT"
+    
    PrintLog "- Tools / Hyphenation"
+    
    ' As long as OOo has no modules for that, disabled
    if ( gOOO ) then
        printlog "No hyphenation in OOo"
@@ -1258,10 +1262,19 @@ testcase tMasterDocToolsHyphenation
    Sleep 1
    Call wTypeKeys ("<Mod1 Home>")

-    ToolsLanguageHyphenate
+    
    printlog " Tools / Hyphenate"
+    hUseAsyncSlot( "ToolsLanguageHyphenate" )
    
    ' This is probably a workaround to make the hyphenation dialog work in any case.
+    
+    ' We really only know of three possible dialogs (in order of appearance):
+    ' 1: Continue checking at the beginning of the document (Yes/No)
+    ' 2: Hyphenation for language not installed (Ok)
+    ' 3: Hyphenation completed (Ok)
+    
+    ' I have not changed the code, only beautified it a little but i feel the outcome of
+    ' this test is somewhat random.
    Kontext "Active"
    if ( Active.exists( 1 ) ) then
    
@@ -1275,27 +1288,27 @@ testcase tMasterDocToolsHyphenation
            printlog( "<YES> failed... (Whatever that means)" )
        endcatch
        
-        
        if ( Active.Exists() ) then
            printlog( "Messagebx: " & Active.getText() )
            if ( Active.GetRT() = 304 ) then
                Active.Ok
                ' Force pagesize change to bringup Hyphenation-dialog
-                FormatPageWriter
+                hUseAsyncSlot( "FormatPageWriter" )
+                
                Kontext
                active.SetPage TabSeite
+                
                Kontext "TabSeite"
                Breite.Settext "15"
                TabSeite.Ok
-                WaitSlot()
-                ToolsLanguageHyphenate
+                hUseAsyncSlot( "ToolsLanguageHyphenate" )
            end if
        end if
    endif

    Kontext "Silbentrennung"
    printlog " Close upcoming 'Hyphenation' dialog"
-    if ( Silbentrennung.Exists( 2 ) ) then
+    if ( Silbentrennung.Exists() ) then
        Call DialogTest ( Silbentrennung )
        Silbentrennung.Cancel
    else
--- a/testautomation/xml/optional/docbook_losa.bas
+++ b/testautomation/xml/optional/docbook_losa.bas
@@ -51,7 +51,8 @@ sub main
            call CreateWorkXMLExportDir ( "user\work\xml\docbook" )   
            sSourcePath = ConvertPath (gTestToolPath & "xml\optional\input\docbook" )
            sDestinationPath = gOfficePath & ConvertPath("user\work\xml\docbook") 
-            call tDocBookXMLtestdocs    
+            call tDocBookXMLtestdocs  
+            call tToolsXMLFilterSettings
        call hStatusOut   
 end sub