CWS-TOOLING: integrate CWS automationdev300m84_OOO330

30 files changed, 170 insertions, 195 deletions

diff --git a/testautomation/chart2/optional/includes/ch2_datadialogue.inc b/testautomation/chart2/optional/includes/ch2_datadialogue.inc
index fd7876057db5..f7e4078ad911 100644
--- a/testautomation/chart2/optional/includes/ch2_datadialogue.inc
+++ b/testautomation/chart2/optional/includes/ch2_datadialogue.inc
@@ -286,9 +286,6 @@ testcase tChartDataDialogueFieldsUndo
         DatabaseUndo
         '/// And then we enter the dialogue again, to check if the values has returned to what they were before we changed them.
         printlog "And then we enter the dialogue again, to check if the values has returned to what they were before we changed them."
-        '/// One press on 'TAB' to select the object ///'
-        printlog "   Click the button 'TAB', to select the object."
-        DocumentImpress.TypeKeys "<TAB>"
         '/// Followed by one press on "RETURN" / "ENTER" to enter the Chart-Data-dialogue  ///'
         printlog "   Click the button 'Return', to enter the Chart-Data-dialogue."
         DocumentImpress.TypeKeys "<RETURN>"
diff --git a/testautomation/dbaccess/optional/includes/db_hsqldb.inc b/testautomation/dbaccess/optional/includes/db_hsqldb.inc
index 979f0e3e5f29..3ad3016a9eb3 100644..100755
--- a/testautomation/dbaccess/optional/includes/db_hsqldb.inc
+++ b/testautomation/dbaccess/optional/includes/db_hsqldb.inc
@@ -33,12 +33,14 @@
 sub db_hsqldb
 
     call tGeneral
+    call ExitRestartTheOffice
     call tRenameTable
     call tOpenDatabaseWithViews
     call tRenameTableWhichUsedInViews
     
     call tQueryOpenInSQLMode
-                    
+    call ExitRestartTheOffice
+    
     app.FileCopy gTesttoolPath + ConvertPath("dbaccess/optional/input/hsql_datasource/TT_hsqldb.odb") , gOfficePath + ConvertPath("user/work/TT_hsqldb.odb")            
     call db_Query(gOfficePath + "user/work/TT_hsqldb.odb" ,"hsqldb")
    
diff --git a/testautomation/dbaccess/optional/includes/frm_FormFilter.inc b/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
index b8e3ccc2d896..52579da2e15b 100755
--- a/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
+++ b/testautomation/dbaccess/optional/includes/frm_FormFilter.inc
@@ -58,7 +58,9 @@ testcase tLoadForm
 	FM_FormFilter_Start
 	wait(1000)
     '/// insert 2 in the first textbox
-    printlog "insert 2 in the first textbox"    
+    printlog "insert 2 in the first textbox"
+        DocumentWriter.TypeKeys "<MOD1 F5>" , true
+        sleep(1)
 	DocumentWriter.TypeKeys "2" , true
 	'DocumentWriter.TypeKeys "<RETURN>" , true
 	wait(1000)
@@ -91,7 +93,11 @@ testcase tLoadForm
 	FM_FormFilter_Start
 	wait(1000)
     '/// insert into the second textbox like '%2'
-    printlog "insert into the second textbox like '%2'"    
+    printlog "insert into the second textbox like '%2'"
+        DocumentWriter.TypeKeys "<MOD1 F5>" , true
+	sleep(1)
+        DocumentWriter.TypeKeys "<TAB>" , true
+	sleep(1)
 	DocumentWriter.TypeKeys "like '%2'" , true
 	wait(1000)
     '/// execute the filter
diff --git a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
index ba2c8c692d4e..367281d0deaf 100755
--- a/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
+++ b/testautomation/extensions/optional/input/extension_sources/TaskPaneComponent/registry/data/org/openoffice/Office/UI/CalcWindowState.xcu
@@ -4,7 +4,7 @@
     <node oor:name="States">
       <node oor:name="private:resource/toolpanel/com.example.TestPanel1" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">ein Panel</value>
+          <value>ein Panel</value>
         </prop>
         <prop oor:name="Visible" oor:type="xs:boolean">
           <value>true</value>
@@ -12,7 +12,7 @@
       </node>
       <node oor:name="private:resource/toolpanel/com.example.TestPanel2" oor:op="replace">
         <prop oor:name="UIName" oor:type="xs:string">
-          <value xml:lang="en-US">noch ein Panel</value>
+          <value>noch ein Panel</value>
         </prop>
         <prop oor:name="Visible" oor:type="xs:boolean">
           <value>true</value>
diff --git a/testautomation/extensions/optional/input/issues/LoggingOptions.xcs b/testautomation/extensions/optional/input/issues/LoggingOptions.xcs
index e87474bba2a2..ca1ee9a4b6cb 100644
--- a/testautomation/extensions/optional/input/issues/LoggingOptions.xcs
+++ b/testautomation/extensions/optional/input/issues/LoggingOptions.xcs
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="Logging" oor:package="org.openoffice.Office" xml:lang="en-US">
+<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" oor:name="Logging" oor:package="org.openoffice.Office">
   <templates>
     <group oor:name="LoggerSettings">
       <group oor:name="HandlerSettings" oor:extensible="true">
diff --git a/testautomation/framework/required/includes/tools_customize.inc b/testautomation/framework/required/includes/tools_customize.inc
index 6bf31e391f99..2f7064055883 100755
--- a/testautomation/framework/required/includes/tools_customize.inc
+++ b/testautomation/framework/required/includes/tools_customize.inc
@@ -254,7 +254,7 @@ function hUpdtToolsCustomizeToolbars()
     const MENUITEM_DELETE = 2
     const MENUITEM_MODIFY = 4
 
-    const DIALOG_DELAY = 3
+    const DIALOG_DELAY = 1
 
     dim brc as boolean
     dim iCurrentItem as integer
@@ -344,25 +344,7 @@ function hUpdtToolsCustomizeToolbars()
     
     kontext "ScriptSelector"
     if ( ScriptSelector.exists( DIALOG_DELAY ) ) then
-    
-        call dialogtest( ScriptSelector )
-    
-        ' This is a workaround that applies when - for some reason - the menu
-        ' (menubutton: AddCommands) is not open. In this case the ScriptSelector
-        ' will not open. Before this hack the office was left in an unstable state
-        ' and the following tests would have failed. Now we get a  warning
-        ' instead.
-        
-        printlog( CFN & "Add the default item" )
-        try
-            kontext "ScriptSelector"
-            hCloseDialog( ScriptSelector, "ok" )
-        catch
-            qaerrorlog( "#i79207# Could not access ok button on ScriptSelector" )
-            kontext "ScriptSelector"
-            if ( ScriptSelector.exists( DIALOG_DELAY ) ) then printlog( "Scriptselector is open" )
-        endcatch
-        
+        printlog( "ScriptSelector open." )
     else
         LibraryTreeList.typeKeys( "<HOME>" )
         for iCurrentItem = 1 to 5
@@ -372,9 +354,7 @@ function hUpdtToolsCustomizeToolbars()
         next iCurrentItem
     endif
     
-    ' Note: The Customize dialog in the background is updated immediately. This
-    '       means that the cancel-button is active but blocked for a moment
-    'WaitSlot( 2000 )
+    call dialogtest( ScriptSelector )
     
     printlog( CFN & "Close the Script Selector, back to ToolsCustomize dialog" )
     hCloseDialog( ScriptSelector, "cancel" )
@@ -382,75 +362,81 @@ function hUpdtToolsCustomizeToolbars()
     kontext "TabCustomizeToolbars"
     printlog( CFN & "Click the Modify-button" )
 
-    if ( not hClickCommandButton( 1 ) ) then
+    if ( hClickCommandButton( 1 ) ) then
+
+        printlog( CFN & "Command button clicked successfully" )
+        kontext "CustomizeToolbarsRename"
+        UseBindings
+        wait( 100 )
+        if ( CustomizeToolbarsRename.exists( DIALOG_DELAY ) ) then
+
+            printlog( CFN & "Rename dialog is open" )
+            call dialogtest( CustomizeToolbarsRename )
+            EingabeFeld.setText( "Renamed item" )
+
+            printlog( CFN & "Close the dialog" )
+            hCloseDialog( CustomizeToolbarsRename, "ok" )
+        else
+            warnlog( CFN & "CustomizeToolbarsRename could not be accessed" )
+        endif
+    else
         warnlog( CFN & "Something went wrong when accessing the command button" )
     	exit function
     endif
     
-    printlog( CFN & "Rename the item" )
-    UseBindings
-    kontext "CustomizeToolbarsRename"
-    if ( CustomizeToolbarsRename.exists( DIALOG_DELAY ) ) then
-        call dialogtest( CustomizeToolbarsRename )
-        EingabeFeld.setText( "Renamed item" )
-    
-        printlog( CFN & "Close the dialog" )
-        hCloseDialog( CustomizeToolbarsRename, "ok" )
-    else
-        warnlog( CFN & "CustomizeToolbarsRename could not be accessed" )
-    endif
-    
     kontext "TabCustomizeToolbars"
-
-    if ( not hClickCommandButton( 2 ) ) then
+    if ( hClickCommandButton( 2 ) ) then
+        printlog( CFN & "Successfully clicked second item on the command button" )
+    else
         warnlog( CFN & "Something went wrong when accessing the command button" )
         exit function
     endif
     
     kontext "TabCustomizeToolbars"
     waitslot
-    printlog( CFN & "Click the Modify-button" )
-    printlog( "******************** 1 ********************" )
+    printlog( CFN & "Deselect separator (if this is the current object)" )
     hDeselectSeparator()
-    printlog( "******************** 2 ********************" )
 
+    kontext "TabCustomizeToolbars"
     if ( not hClickCommandButton( 3 ) ) then
         warnlog( CFN & "Something went wrong when accessing the command button" )
         exit function
     endif
     
-    kontext "TabCustomizeToolbars"
     waitslot
+    kontext "TabCustomizeToolbars"
     printlog( CFN & "Click the Modify-button" )
-
-if ( not hClickCommandButton( MENUITEM_MODIFY ) ) then
+    if ( hClickCommandButton( MENUITEM_MODIFY ) ) then
+        printlog( CFN & "Successfully selected modify-item on the command button" )
+    else
         warnlog( CFN & "Something went wrong when accessing the command button" )
         exit function
     endif
     
-    kontext "TabCustomizeToolbars"
     WaitSlot
+    kontext "TabCustomizeToolbars"
     printlog( CFN & "Click the Modify-button" )
-
-    if ( not hClickCommandButton( 1 ) ) then
+    if ( hClickCommandButton( 1 ) ) then
+        printlog( CFN & "Successfully selected modify-item on the command button" )
+    else
         warnlog( CFN & "Something went wrong when accessing the command button" )
         exit function
     endif
     
-    kontext "TabCustomizeToolbars"
     waitslot
+    kontext "TabCustomizeToolbars"
     printlog( CFN & "Click the Modify-button" )
-    printlog( "******************** 3 ********************" )
     hDeselectSeparator()
-    printlog( "******************** 4 ********************" )
 
-    if ( not hClickCommandButton( 5 ) ) then
+    if ( hClickCommandButton( 5 ) ) then
+        printlog( CFN & "Successfully selected modify-item on the command button" )
+    else
         warnlog( CFN & "Something went wrong when accessing the command button" )
         exit function
     endif
     
-    printlog( CFN & "On the Change Icon dialog: Click to import an icon" )
     kontext "ChangeIcon"
+    printlog( CFN & "On the Change Icon dialog: Click to import an icon" )
     if ( ChangeIcon.exists( DIALOG_DELAY ) ) then
         call dialogtest( ChangeIcon )
         import.click()
@@ -467,11 +453,12 @@ if ( not hClickCommandButton( MENUITEM_MODIFY ) ) then
         warnlog( CFN & "Could not access Change Icon dialog" )
     endif
     
-    kontext "TabCustomizeToolbars"
     waitslot
+    kontext "TabCustomizeToolbars"
     printlog( CFN & "Click the Modify-button" )
-
-    if ( not hClickCommandButton( 3 ) ) then
+    if ( hClickCommandButton( 3 ) ) then
+        printlog( CFN & "Successfully selected modify-item on the command button" )
+    else
         warnlog( CFN & "Something went wrong when accessing the command button" )
         exit function
     endif
diff --git a/testautomation/framework/required/includes/window_functions.inc b/testautomation/framework/required/includes/window_functions.inc
index 779ab3c0a8aa..2adb42638d02 100644
--- a/testautomation/framework/required/includes/window_functions.inc
+++ b/testautomation/framework/required/includes/window_functions.inc
@@ -250,7 +250,12 @@ testcase tCheckWindowTitle( sApplication as string, sReference as string )
 
     ' Verify that the productname is contained within the string
     if ( iProductNamePosition = STRING_NOT_FOUND ) then
-        warnlog( "The product name is missing" )
+        if ( lcase( gPlatform ) = "osx" ) then
+            printlog( "The product name is missing" )
+            ' life is different on that platform compared to testtool world
+        else
+            warnlog( "The product name is missing" )
+        endif
     endif
 
     ' Verify that the application name (e.g. "Writer") is contained in the string
diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc
index b14ceca82c9f..fe462038899f 100755
--- a/testautomation/global/required/includes/g_option.inc
+++ b/testautomation/global/required/includes/g_option.inc
@@ -579,14 +579,28 @@ testcase tToolsOptionsInternet
         '///+<ol><li>Proxy</li>
         '///+<li>Search</li>
         '///+<li>Mozilla Plugin</li></ol>
-        EchteAnzahl = OptionTabPageZaehler ( 3 , FALSE )
+        EchteAnzahl = OptionTabPageZaehler ( 3 , TRUE )
+        if (EchteAnzahl > 3) then
+			qaErrorLog ("Due to some installed extensions the tabpage count is not 3 it is: " + EchteAnzahl)
+        else 
+            if (EchteAnzahl < 3) then
+                warnlog "Number of tabpages old :   3   new :  " + EchteAnzahl
+            endif
+        endif
     else
         '/// On Unix systems this section includes four tab pages.
         '///+<ol><li>Proxy</li>
         '///+<li>Search</li>
         '///+<li>E-Mail</li>
         '///+<li>Mozilla Plugin</li></ol>
-        EchteAnzahl = OptionTabPageZaehler ( 4 , FALSE )
+        EchteAnzahl = OptionTabPageZaehler ( 4 , TRUE )
+        if (EchteAnzahl > 4) then
+			qaErrorLog ("Due to some installed extensions the tabpage count is not 3 it is: " + EchteAnzahl)
+        else 
+            if (EchteAnzahl < 4) then
+               warnlog "Number of tabpages old :   3   new :  " + EchteAnzahl
+            endif
+        endif
     endif
 
     for i=1 to EchteAnzahl
@@ -647,6 +661,18 @@ testcase tToolsOptionsInternet
                     Call DialogTest ( TabMozillaPlugin )
                 endif
             endif
+        case 5,6 :  Kontext "TabMediaWiki"
+                    if TabMediaWiki.exists then
+                        qaerrorlog "  - Wiki Publisher"
+                        Call DialogTest ( TabMediaWiki )
+                        gefunden = TRUE
+                    endif
+                    Kontext "TabWeblog"
+                    if TabWeblog.exists then
+                        qaerrorlog "  - Weblog Publisher"
+                        Call DialogTest ( TabWeblog )
+                        gefunden = TRUE
+                    endif
         end select
         if gefunden=FALSE then
             Warnlog "Error with the " + i + ".page, perhaps this page is deleted or change the place!"
diff --git a/testautomation/global/system/includes/iniinfo.inc b/testautomation/global/system/includes/iniinfo.inc
index 552102588405..aa305b9a1a21 100755
--- a/testautomation/global/system/includes/iniinfo.inc
+++ b/testautomation/global/system/includes/iniinfo.inc
@@ -125,9 +125,9 @@ sub GetIniInformation
     if (gPrivateEnvironmentLocation <> "" AND gPrivateEnvironmentLocation <> ".") then
         if NOT fileExists(gPrivateEnvironmentLocation) then
             qaErrorLog "[PrivateEnvironment] defined in: '"+gTesttoolIni+"', but the path '"+gPrivateEnvironmentLocation+"'does not exist!"
-        else
             gPrivateEnvironmentLocation = ""
         end if
+    else
        gPrivateEnvironmentLocation = ""
    end if
 end sub
diff --git a/testautomation/global/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc
index 42b575c1187a..d9da7ce5191a 100755
--- a/testautomation/global/tools/includes/required/t_files.inc
+++ b/testautomation/global/tools/includes/required/t_files.inc
@@ -114,11 +114,28 @@ function hIsNamedDocLoaded( cFileName as string ) as boolean
 
     dim cDocumentName as string
     dim iDocumentNameLength as integer
+    dim bTemplateDocument as boolean
 
     hIsNamedDocLoaded() = false
 
+    ' If the requested document is a template, we cannot use its filename to
+    ' identify the document as it is named "Untitled 1" or "Untitled" in the
+    ' FileSave dialog and the document properties dialog. The string is locale
+    ' dependent. So we do a shortcut here, the calling tests fail at a later
+    ' point if this function does not work properly
+    
+    select case( right( cFileName, 4 ) )
+    case ".vor", ".dot", ".sti", ".pot", ".std", ".xlt", ".stc", ".ots", "xltm", "xltx"
+        if ( GVERBOSE ) then printlog( CFN & "Template document filtered" )
+        hIsNamedDocLoaded() = true
+        exit function
+    end select
+
     if ( hUseAsyncSlot( "FileProperties" ) <> RC_FAILURE ) then
 
+        kontext
+        active.setpage(tabdokument)
+
         kontext "TabDokument"
         if ( TabDokument.exists( 2 ) ) then
 
diff --git a/testautomation/global/tools/includes/required/t_tools3.inc b/testautomation/global/tools/includes/required/t_tools3.inc
index 27ac128437ee..987a6ded6bb6 100755
--- a/testautomation/global/tools/includes/required/t_tools3.inc
+++ b/testautomation/global/tools/includes/required/t_tools3.inc
@@ -1108,7 +1108,7 @@ function hUseAsyncSlot( cSlot as string ) as integer
     iTime = iRetries * DELAY
 
     ' Timeout is -1
-    if ( iRetries = MAX_RETRIES ) then iTime = RC_TIMEOUT
+    if ( iRetries >= MAX_RETRIES ) then iTime = RC_TIMEOUT
 
     if ( GVERBOSE ) then printlog( CFN & "Exit with rc=" & iTime )
     hUseAsyncSlot() = iTime
@@ -1142,7 +1142,7 @@ function hClickButton( oButton as object ) as integer
     ' Total time used
     iTime = iRetries * DELAY
 
-    if ( iRetries = MAX_RETRIES ) then iTime = RC_TIMEOUT
+    if ( iRetries >= MAX_RETRIES ) then iTime = RC_TIMEOUT
 
     if ( GVERBOSE ) then printlog( CFN & "Exit with rc=" & iTime )
     hClickButton() = iTime
diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win
index 35869e0c2b72..19ba11ec6695 100755
--- a/testautomation/global/win/edia_d_h.win
+++ b/testautomation/global/win/edia_d_h.win
@@ -503,3 +503,6 @@ CustomLanguage sc:ListBox:RID_SCDLG_TEXT_IMPORT_OPTIONS:LB_CUSTOM_LANG
 DetectSpecialNumbers sc:CheckBox:RID_SCDLG_TEXT_IMPORT_OPTIONS:BTN_CONVERT_DATE
 
 *HyperlinkDialog HID_HYPERLINK_DIALOG
+CloseButton HID_ICCDIALOG_CANCEL_BTN
+ApplyButton HID_ICCDIALOG_OK_BTN
+BackButton HID_ICCDIALOG_RESET_BTN
diff --git a/testautomation/global/win/edia_t_z.win b/testautomation/global/win/edia_t_z.win
index 4104b70f0f2a..4e3e0cd2a1be 100755
--- a/testautomation/global/win/edia_t_z.win
+++ b/testautomation/global/win/edia_t_z.win
@@ -159,11 +159,6 @@ Preview HID_SC_ASCII_TABCTR
 *UnsatisfiedDependencies desktop:ModalDialog:RID_DLG_DEPENDENCIES
 UnsatisfiedDependencyList desktop:ListBox:RID_DLG_DEPENDENCIES:RID_DLG_DEPENDENCIES_LIST
 
-*WarningPrintOptions sd:ModalDialog:DLG_PRINT_WARNINGS
-FitPage sd:RadioButton:DLG_PRINT_WARNINGS:RBT_SCALE
-Posterize sd:RadioButton:DLG_PRINT_WARNINGS:RBT_POSTER
-TrimPage sd:RadioButton:DLG_PRINT_WARNINGS:RBT_CUT
-
 *WarningPrintTransparency sfx2:ModalDialog:RID_WARN_PRINTTRANSPARENCY
 NoButton sfx2:PushButton:RID_WARN_PRINTTRANSPARENCY:BTN_PRINTTRANS_NO
 DoNotShowAgain sfx2:CheckBox:RID_WARN_PRINTTRANSPARENCY:CBX_NOPRINTTRANSWARN
diff --git a/testautomation/global/win/etab_h_o.win b/testautomation/global/win/etab_h_o.win
index 244e02f717bc..de5481e2e3c2 100755
--- a/testautomation/global/win/etab_h_o.win
+++ b/testautomation/global/win/etab_h_o.win
@@ -180,6 +180,7 @@ LastRecordButton sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_LAST
 ExcludeCheckBox sw:CheckBox:DLG_MM_PREPAREMERGE_PAGE:CB_EXCLUDE
 EditButton sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_EDIT
 
+*TabMediaWiki sym:vnd.com.sun.star.wiki:settings
 
 *TabMemory HID_OFA_TP_MEMORY
 UndoSteps cui:NumericField:OFA_TP_MEMORY:ED_UNDO
diff --git a/testautomation/global/win/etab_t_z.win b/testautomation/global/win/etab_t_z.win
index aa0155908c5d..b7db16fd1ef4 100755
--- a/testautomation/global/win/etab_t_z.win
+++ b/testautomation/global/win/etab_t_z.win
@@ -101,6 +101,8 @@ ColumnLength HID_TAB_ENT_TEXT_LEN
 ColumnAutoValue dbaccess:NumericField:TAB_WIZ_TYPE_SELECT:ET_AUTO
 ColumnAuto dbaccess:PushButton:TAB_WIZ_TYPE_SELECT:PB_AUTO
 
+*TabWeblog sym:vnd.com.sun.star.blogger:settings
+
 *TabXMLGeneral HID_XML_FILTER_TABPAGE_BASIC
 FilterName HID_XML_FILTER_NAME
 Application HID_XML_FILTER_APPLICATION
diff --git a/testautomation/graphics/required/includes/global/id_006.inc b/testautomation/graphics/required/includes/global/id_006.inc
index c7de07588367..57990c2a16b0 100644
--- a/testautomation/graphics/required/includes/global/id_006.inc
+++ b/testautomation/graphics/required/includes/global/id_006.inc
@@ -31,7 +31,6 @@
 '*
 '\**********************************************************************************
 
-'------------------------------------------------------------------------------
 sub id_Tools
     printLog "---------    id_006    ----------"
     call tiToolsSpellchecking
@@ -105,9 +104,9 @@ testcase tiToolsSpellcheckingAutomatic
 endcase
 '-------------------------------------------------------------------------------
 testcase tiToolsThesaurus
-
     Dim sWord as string
     Dim sExt as string
+    Dim sFileName as string
 
     'for normal text, the thesaurus is enabled,
     'if the format->character->language of the word has a thesaurus
@@ -195,55 +194,9 @@ testcase tiToolsThesaurus
     if Thesaurus.Exists(3) then
         Thesaurus.Cancel
     else
-        sFileName = (ConvertPath (gTesttoolPath + "graphics\required\input\engtext.odg"))
-    end if
-    if FileExists ( sFileName ) = FALSE then
-        warnlog "The language-file was not found or accessible! The test ends."
-        goto endsub
+         warnlog "the thesaurus does not appear"
     end if
-    Call hFileOpen (sFileName)
-        
-        sleep (2)
-    
-        hTypeKeys "<TAB><RETURN>"
-        hTypeKeys "<END><SHIFT HOME>"
-    
-        '   Call hTextrahmenErstellen ("SimpleTest" + "<Mod1 Shift left>", 10, 10, 30, 40)
-        try
-            '/// Tools->Thesaurus ///'
-            ExtrasThesaurusDraw
-            Kontext "Thesaurus"
-                Call DialogTest ( Thesaurus )
-                '/// click button 'language' ///'
-                Sprache.Click
-                Kontext "SpracheAuswaehlen"
-                    Call DialogTest ( SpracheAuswaehlen )
-                    '/// cancel dialog 'select language' ///'
-                    SpracheAuswaehlen.cancel
-            Kontext "Thesaurus"
-                '/// click button 'search' ///'
-                Nachschlagen.Click
-                kontext
-                '/// if messagebox exist, say OK; (word not found) ///'
-                if Messagebox.exists (5) then
-                    printlog "Messagebox: word not in thesaurus: '"+Messagebox.gettext+"'"
-                    Messagebox.ok
-                end if
-                sleep 1
-                Kontext "Thesaurus"
-                    '/// cancel dialog 'Thesaurus' ///'
-                    Thesaurus.Cancel
-        catch
-            warnlog "Thesaurus didn't work :-("
-        endcatch
-        sleep 1
-        '/// close application ///'
-        Call hCloseDocument
-    else
-        goto endsub
-    endif
     Call hCloseDocument
-
 endcase
 '-------------------------------------------------------------------------------
 testcase tiToolsHyphenation
@@ -519,4 +472,4 @@ testcase tiToolsEyedropper
     '/// close application ///'
     Call hCloseDocument
 endcase
-'-------------------------------------------------------------------------------
\ No newline at end of file
+
diff --git a/testautomation/graphics/required/includes/impress/i_opt_1_.inc b/testautomation/graphics/required/includes/impress/i_opt_1_.inc
index ad62c64acf50..148bbe980424 100644
--- a/testautomation/graphics/required/includes/impress/i_opt_1_.inc
+++ b/testautomation/graphics/required/includes/impress/i_opt_1_.inc
@@ -31,14 +31,6 @@
 '*
 '\******************************************************************************
 
-sub i_opt_1_.inc
-
-    call tiAlwaysWithCurrentPage()
-
-end sub
-
-'*******************************************************************************
-
 testcase tiAlwaysWithCurrentPage()
     dim i as integer
 
@@ -202,4 +194,4 @@ testcase tiAlwaysWithCurrentPage()
     setStartCurrentPage(true)
     Call hCloseDocument
 endcase
-'-------------------------------------------------------------------------------
+
diff --git a/testautomation/graphics/required/includes/impress/im_003_.inc b/testautomation/graphics/required/includes/impress/im_003_.inc
index 87052558b8f9..a160699d74ca 100644
--- a/testautomation/graphics/required/includes/impress/im_003_.inc
+++ b/testautomation/graphics/required/includes/impress/im_003_.inc
@@ -132,31 +132,23 @@ testcase tiViewPanes
 endcase 'tiViewPanes
 '---------------------------------------------------------
 testcase tiViewMasterView
-
     printlog "open application"
     Call hNewDocument
-
     printlog "View->Master View->Drawing View"
     hUseAsyncSlot( "ViewWorkspaceDrawingView" )
-
     printlog "View->Master View->Outline View "
     hUseAsyncSlot( "ViewWorkspaceOutlineView" )
-
     printlog "View->Master View->Slides View "
-    hUseAsyncSlot( "ViewWorkspaceSlidesView" )
-
+    ViewWorkspaceSlidesView
+    sleep 1
     printlog "View->Master View->Notes View "
     hUseAsyncSlot( "ViewWorkspaceNotesView" )
-
     printlog "View->Master View->Handout View "
     hUseAsyncSlot( "ViewWorkspaceHandoutView" )
-
     printlog "View->Master View->Drawing View "
     hUseAsyncSlot( "ViewWorkspaceDrawingView" )
-
     printlog "close application "
     Call hCloseDocument
-
 endcase 'tiViewMasterView
 '---------------------------------------------------------
 testcase tiViewSlideMaster
diff --git a/testautomation/graphics/required/includes/impress/im_007_.inc b/testautomation/graphics/required/includes/impress/im_007_.inc
index 9d4860a0ba56..0a598f59c520 100644
--- a/testautomation/graphics/required/includes/impress/im_007_.inc
+++ b/testautomation/graphics/required/includes/impress/im_007_.inc
@@ -41,6 +41,7 @@ sub im_007_
     call tSlideShowShowHideSlide()
     call tSlideShowCustomAnimation()
     call tSlideShowInteraction()
+    call tSlideShowAnimation()
 
 end sub
 
diff --git a/testautomation/math/optional/includes/m_101_.inc b/testautomation/math/optional/includes/m_101_.inc
index 2fc34b5c1f01..254dfc3b2eed 100755
--- a/testautomation/math/optional/includes/m_101_.inc
+++ b/testautomation/math/optional/includes/m_101_.inc
@@ -280,7 +280,11 @@ testcase tFilePassword
       printlog "   Check: (" + i + "/" + x +"): " +sTemp
       if Passwort.isEnabled then
          if NOT((instr(sTemp,gMathFilter) = 1)OR(instr(sTemp," (.sxm)") > 1)) then 
-             warnlog "(" + i + "/" + x +"): '"+sTemp+"' Password Checkbox: Enabled"
+             if (4=i) then
+                warnlog "#i112895# (" + i + "/" + x +"): '"+sTemp+"' Password Checkbox: Enabled"
+             else
+                warnlog "(" + i + "/" + x +"): '"+sTemp+"' Password Checkbox: Enabled"
+            endif
          endif
       else
          if (instr(sTemp,gMathFilter) = 1)OR(instr(sTemp," (.sxm)") > 1) then 
diff --git a/testautomation/math/optional/includes/m_105.inc b/testautomation/math/optional/includes/m_105.inc
index 3bfac36f6f25..8c0bdf773050 100644..100755
--- a/testautomation/math/optional/includes/m_105.inc
+++ b/testautomation/math/optional/includes/m_105.inc
@@ -487,8 +487,6 @@ testcase tToolsCatalog
 endcase
 
 testcase tToolsCatalogNew
-   qaerrorlog "#i64504# Symbol set name is not saved on exiting OOo"
-goto endsub
     dim i, j as integer
     dim sTemp as string
     dim iStartingSymbolSetCount as integer
@@ -626,7 +624,7 @@ goto endsub
                         SymbolSet.select ""
                     endcatch
                     i = Symbol.getItemCount
-                    if i <> 1 then
+                    if i < 2 then
                         warnlog "Symbol not available in new Symbolset: intsead of 1: " + i
                     endif
                     SymbolSet.setText "TBOnewSymbolSetdelete"
diff --git a/testautomation/spreadsheet/optional/includes/import_general/c_import_general.inc b/testautomation/spreadsheet/optional/includes/import_general/c_import_general.inc
index 87c6d899b7bb..6f8392adf93d 100755
--- a/testautomation/spreadsheet/optional/includes/import_general/c_import_general.inc
+++ b/testautomation/spreadsheet/optional/includes/import_general/c_import_general.inc
@@ -41,6 +41,8 @@ sub tLoadAllDocuments ( gsSourcePath as string )
     Dim i as integer 
     Dim x as integer
 
+    dim gsSourceDocument( 50 ) as string
+
     printlog "Source path: " & gsSourcePath
     'Get the files into a list.    
     Call GetAllFileList(gsSourcePath, "*.*" , gsSourceDocument())
@@ -81,6 +83,7 @@ end function
 '-------------------------------------------------------------------------------
 '
 testcase tLoadSpreadsheetDocument (SourceFile)
+
     Dim sOnlyFileName as string
     Dim sOnlyFileExtension as string
     Dim sTempFileName as String
@@ -88,13 +91,13 @@ testcase tLoadSpreadsheetDocument (SourceFile)
 
     sTempFileName = SourceFile
     sOnlyFileName = DateiOhneExt(DateiExtract(SourceFile)
-    sOnlyFileExtension = GetExtention(sTempFileName)        
-    select case sOnlyFileName
-        case "so3tmpl", "so4tmpl", "so5tmpl" :
-                                printlog  "Test case: " & sOnlyFileName & "." & sOnlyFileExtension
-                                
-        case else               printlog  "Test case: " & sOnlyFileName & "." & sOnlyFileExtension
+    sOnlyFileExtension = GetExtention(sTempFileName)
+
+    select case ( sOnlyFileName )
+    case "so3tmpl", "so4tmpl", "so5tmpl" : printlog  "Test case: " & sOnlyFileName & "." & sOnlyFileExtension
+    case else :              printlog  "Test case: " & sOnlyFileName & "." & sOnlyFileExtension
     end select
+
     'Maybe file name is empty
     if sOnlyFileName > "" then
         'Some extensions make no sense to load
@@ -106,27 +109,15 @@ testcase tLoadSpreadsheetDocument (SourceFile)
                     Call hCloseDocument
                 else
                     warnlog sOnlyFileName + " document has not been loaded correctly [hIsNamedDocLoaded]!"                    
-                    if GetDocumentCount > 1 then
-                        Do Until GetDocumentCount = 1
-                            Call hCloseDocument
-                        Loop
-                    endif
+                    hFileCloseAll()
                 endif
             else
                 warnlog sOnlyFileName + " document has not been loaded correctly [fCalcFileOpen; IsItLoaded]!"                
-                if GetDocumentCount > 1 then
-                    Do Until GetDocumentCount = 1
-                        Call hCloseDocument
-                    Loop
-                endif
+                hFileCloseAll()
             endif
         else
             printlog "(" + sOnlyFileName + "." + sOnlyFileExtension + ") won't be loaded because of excluded extensions .so and .tmp."
-            if GetDocumentCount > 1 then
-                Do Until GetDocumentCount = 1
-                    Call hCloseDocument
-                Loop
-            endif
+            hFileCloseAll()
         endif
     endif
 endcase
diff --git a/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc b/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc
index dc54ca10361e..ee96ffadb6fd 100644..100755
--- a/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc
@@ -583,15 +583,15 @@ testcase tEditImageMap
     printlog " Click on 'Active'-button"
     Aktiv.Click
     '/// Click on 'Macro...'-button
-	printlog " Click on 'Macro...'-button"
-	warnlog "#i102720# => crash, therefor this functionality is outcommented"
-'		Makro.Click
-'		Kontext "MakroZuweisen"
-'		Call DialogTest ( MakroZuweisen )
-'		'/// Close 'Assign Macro'-dialog with Cancel
-'		printlog " Close 'Assign Macro'-dialog with Cancel"
-'		MakroZuweisen.Cancel
-'		Kontext "ImageMapEditor"
+    printlog " Click on 'Macro...'-button"
+'    warnlog "#i102720# => crash, therefor this functionality is outcommented"
+    Makro.Click
+    Kontext "MakroZuweisen"
+    Call DialogTest ( MakroZuweisen )
+    '/// Close 'Assign Macro'-dialog with Cancel
+    printlog " Close 'Assign Macro'-dialog with Cancel"
+    MakroZuweisen.Cancel
+    Kontext "ImageMapEditor"
     '/// Click on 'Properties'-button
     printlog " Click on 'Properties'-button"
     Eigenschaften.Click
diff --git a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc
index 32eee7e6040c..ad543b5c97f7 100755
--- a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc
@@ -355,6 +355,11 @@ endcase
 '-----------------------------------------------------------
 
 testcase tFileRecentDocuments
+
+if gPlatform = "lin" then
+    warnlog "#110649# Due to bug this testcase is not available"
+    goto endsub
+end if
     
     dim sTestFile as string
       
diff --git a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu2.inc b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu2.inc
index 91a806fd33ae..78dbcb0ae18b 100755
--- a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu2.inc
+++ b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu2.inc
@@ -166,7 +166,6 @@ testcase tToolsMacro
     printlog " Close Select Certificate' dialog with 'Cancel'"
     SelectCertificate.Cancel
     Kontext "DigitalSignature"
-    add.click
     '/// Close 'Digital Signatures' dialog with 'Cancel'
     printlog " Close 'Digital Signatures' dialog with 'Cancel'"
     DigitalSignature.ok
diff --git a/testautomation/writer/optional/includes/fields/w_fields2.inc b/testautomation/writer/optional/includes/fields/w_fields2.inc
index 4023480ff7dd..422be7088a14 100755
--- a/testautomation/writer/optional/includes/fields/w_fields2.inc
+++ b/testautomation/writer/optional/includes/fields/w_fields2.inc
@@ -879,7 +879,7 @@ testcase tDocumentStatistics
     ' document has to be copied to local file system to avoid opening a read-only file
     ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable'
     FileCopy (sOriginalFile, sTestFile)
-    if hFileExists ( sTestFile ) = false then
+    if FileExists ( sTestFile ) = false then
         Warnlog "Test document couldn't be copied to local file system. Test aborted!"
         goto endsub
     end if
@@ -942,7 +942,7 @@ testcase tDocumentTemplate
     ' document has to be copied to local file system to avoid opening a read-only file
     ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable'
     FileCopy (sOriginalFile, sTestFile)
-    if hFileExists ( sTestFile ) = false then
+    if FileExists ( sTestFile ) = false then
         Warnlog "Test document couldn't be copied to local file system. Test aborted!"
         goto endsub
     end if
diff --git a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc
index 07c0dc4628d0..a8e5565e5eba 100755
--- a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc
+++ b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc
@@ -43,6 +43,7 @@ sub w_spellcheck
     Call tToolsThesaurus
     Call tToolsSpellcheckButtonChange
     Call tToolsSpellcheckButtonChangeAll
+    Call tToolsThesaurusSynonyms
 
 end sub
 
@@ -1286,7 +1287,7 @@ testcase tToolsThesaurus
     printlog "Set language dependent word in textfield Current Word"
     CurrentWord.Settext sWordInitial
 
-    wait 500
+    Sleep 2
     if Alternatives.GetItemCount = 0 then
         Warnlog "No alternatives text"
     else
@@ -1390,7 +1391,7 @@ testcase tToolsThesaurusSynonyms
 
     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 FileExists ( TheFile ) <> TRUE then
        Warnlog "Found no Document for the language you're testing in, Please inform the Test-Developer."
        exit sub
     end if
diff --git a/testautomation/writer/required/includes/w_002_.inc b/testautomation/writer/required/includes/w_002_.inc
index d19c563526ce..d4b6952840b2 100755
--- a/testautomation/writer/required/includes/w_002_.inc
+++ b/testautomation/writer/required/includes/w_002_.inc
@@ -948,8 +948,9 @@ testcase tEditHyperlink
         PrintLog "Click 'Apply'"
         Uebernehmen.Click
 
+        kontext "HyperlinkDialog"
         PrintLog "Close Hyperlink dialog"
-        hCloseDialog( Hyperlink, "close" )
+        hClickButton( CloseButton )
     else
         warnlog( "Dialog <Hyperlink> did not open" )
         hCloseDocument()
@@ -972,8 +973,8 @@ testcase tEditHyperlink
 
     PrintLog "Edit / Hyperlink has to be enabled"
     if ( hUseAsyncSlot( "EditHyperlink" ) > -1 ) then
-        Kontext "Hyperlink"
-        hCloseDialog( Hyperlink, "close" )
+        kontext "HyperlinkDialog"
+        hClickButton( CloseButton )
     else
         warnlog( "Slot <EditHyperlink> could not be called" )
     endif
diff --git a/testautomation/writer/required/includes/w_005b_.inc b/testautomation/writer/required/includes/w_005b_.inc
index ad7c69346cf8..46ad8e610587 100644..100755
--- a/testautomation/writer/required/includes/w_005b_.inc
+++ b/testautomation/writer/required/includes/w_005b_.inc
@@ -176,7 +176,7 @@ testcase tFormatArrange
 
     printlog " Insert a graphic from file '..\writer\required\input\graphics\jolink.jpg'"
     Call hGrafikEinfuegen ( gTesttoolPath + "writer\required\input\graphics\jolink.jpg" )
-
+    sleep(2)
     try
         printlog " Format / Arrange / Bring to front"
         FormatArrangeBringToFrontCalc
@@ -219,12 +219,12 @@ 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" )
-
+    sleep(2)
     if ( gApplication = "HTML" ) then
         printlog " Format / Anchor / to Page"
         hUseAsyncSlot( "FormatAnchorToPage" )
     end if
-
+    
     try
         printlog " Format / Alignment / Left"
         FormatAlignmentLeft
@@ -469,14 +469,14 @@ testcase tFormatWrapObject
     if ( hUseAsyncSlot( "FormatWrapContour" ) = -1 ) then
         printlog( "Format / Wrap / Contour disabled. Good." )
     else
-        warnlog( "#i90964# Format / Wrap / Contour should not be enabled for frames" )
+        warnlog( "Format / Wrap / Contour should not be enabled for frames" )
     end if
 
     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" )
+        Warnlog( "Wrap / Edit Contour should not be enabled for frames" )
 
         Kontext "KonturEditor"
         if ( KonturEditor.exists( 2 ) ) then
diff --git a/testautomation/writer/required/includes/w_007_.inc b/testautomation/writer/required/includes/w_007_.inc
index 4551ee1c2390..33b0ef4f2ff9 100755
--- a/testautomation/writer/required/includes/w_007_.inc
+++ b/testautomation/writer/required/includes/w_007_.inc
@@ -1115,9 +1115,6 @@ endcase
 
 testcase tHtmlDocToolsHangulHanjaConversion
 
-    warnlog( "#i112523# - Hangul Hanya Conversion dialog causes crash." )
-    goto endsub
-
     Dim bAsianLanguage as Boolean
     Dim sTestFile as String