automationdev300m87: Local merge

11 files changed, 160 insertions, 183 deletions

diff --git a/testautomation/graphics/optional/includes/global/export_graphic.inc b/testautomation/graphics/optional/includes/global/export_graphic.inc
index bde50b3ac..a5ab31c82 100644
--- a/testautomation/graphics/optional/includes/global/export_graphic.inc
+++ b/testautomation/graphics/optional/includes/global/export_graphic.inc
@@ -175,78 +175,6 @@ testcase tPCT
         endif
     endif
 
-    printlog "----------3rd: exporting part of the picture and inserting into new file."
-    hTypeKeys ("<escape><tab>")
-    fGetSizeXY sx1, sY, TRUE
-
-    if ( hCallExport( OutputGrafikTBO + "1", sFilter, TRUE ) ) then
-
-        Kontext "PCTOptions"
-        printlog( "Export options dialog" )
-        if ( PCTOptions.Exists( 2 ) ) then
-            hCloseDialog( PCTOptions, "ok" )
-        else
-            warnlog( "No export options dialog was displayed" )
-        endif
-
-        sOutputFile = OutputGrafikTBO + "1" + sExt
-        if ( hWaitForOutputFile( sOutputFile ) ) then
-            printlog( "Close file and re-insert graphics into new document" )
-            hInsertGraphicsToNewFile( sOutputFile ) ' local helper function, see bottom of this file
-        else
-            warnlog( "File was not saved: " & sOutputFile )
-        endif
-
-        bTemp = fGetSizeXY( sx1, sY, bTemp )
-        if (bTemp = FALSE) then
-            warnlog "Selected original size NOT OK :-("
-        endif
-    endif
-
-    hFileReOpen( "" )
-    printlog "----------4th: exporting rectangle and reload file."
-    hRechteckErstellen ( 10, 10, 30, 40 )
-
-    if ( hCallExport( OutputGrafikTBO + "2" , sFilter, TRUE ) ) then
-
-        Kontext "PCTOptions"
-        printlog( "Export options dialog" )
-        if ( PCTOptions.Exists( 2 ) ) then
-            Exportwidth.SetText "9"
-            if Exportmeasurement.GetSelText = "inches" then
-                sx1 = (Exportwidth.GetText)+ """"
-                printlog "sx1= " & sx1
-            else
-                sx1 = (Exportwidth.GetText)+ "cm"
-            endif
-
-            if Exportmeasurement.GetSelText = "inches" then
-                sY = (Exportheight.GetText)+ """"
-                printlog "sY= " & sY
-            else
-                sY = (Exportheight.GetText)+ "cm"
-            endif
-            hCloseDialog( PCTOptions, "ok" )
-        else
-            warnlog( "No export options dialog was displayed" )
-        endif
-
-        sOutputFile = OutputGrafikTBO + "2" + sExt
-
-        if ( not hWaitForOutputFile( sOutputFile ) ) then
-            warnlog( "File was not saved: " & sOutputFile )
-        endif
-
-        printlog( "Reload file if it exists. Warn if not" )
-        hFileReOpen( sOutputFile )
-
-        kontext "DocumentDraw"
-        DocumentDraw.TypeKeys ("<escape><tab>")
-        ContextOriginalSize
-        bTemp = fGetSizeXY( sx1, sY, bTemp )
-        if ( not bTemp ) then warnlog "Selected original size NOT OK :-("
-    endif
-
     call hCloseDocument
 
 endcase 'tPCT
diff --git a/testautomation/graphics/optional/includes/global/g_clipboard.inc b/testautomation/graphics/optional/includes/global/g_clipboard.inc
index 9d4629f3d..e2ee473df 100644
--- a/testautomation/graphics/optional/includes/global/g_clipboard.inc
+++ b/testautomation/graphics/optional/includes/global/g_clipboard.inc
@@ -42,8 +42,9 @@
 
 testcase tiEditUndo
 
-    Dim sDatei as string
     Dim Ueber_Text_1 as string
+    dim sTestfile as string
+    dim sLocaltestfile as string
     
     if ( gApplication = "IMPRESS" ) then
         ExtensionString = "odp"
@@ -51,69 +52,88 @@ testcase tiEditUndo
         ExtensionString = "odg"
     end if
     
-    sDatei = gTesttoolPath + "graphics\required\input\leer."+ExtensionString
-    
-    hFileOpenLocally( sDatei )
-
+    sTestfile = gTesttoolPath + "graphics\required\input\leer."+ExtensionString
+    printlog "Loading test file.."
+    hFileOpenLocally( sTestfile )
+    sleep 3
+    printlog "Selecting grey rectangle.."
     hTypeKeys "<TAB><TAB>"
     sleep 3
+    printlog "Opening Position and size dialog."
     ContextPositionAndSize
     Kontext
     if Messagebox.exists (5) then
-      Messagebox.SetPage TabPositionAndSize
+        Messagebox.SetPage TabPositionAndSize
     else
-      print "what"
+        printlog "Not the expected Dialog came up. Please check."
     endif
     Kontext "TabPositionAndSize"
-    Ueber_Text_1=PositionX.GetText				'/// defining variable for original position of object ///'
+    printlog "defining variable for original position of object"
+    Ueber_Text_1=PositionX.GetText
+    printlog "Canceling dialog."
     TabPositionAndSize.Cancel
     sleep 2
     Kontext "Toolbar"
     Auswahl.Click
     sleep 1
-    ContextArrangeBringBackward					'/// Bring Object backward ///'
+    printlog "Sending Rectangle backwards."
+    ContextArrangeBringBackward	
     sleep 1
+    printlog "Deselect."
     gMouseClick 60,60
     sleep 1
     Kontext "Toolbar"
     Auswahl.Click
     sleep 1
+    printlog "trying to select blue rectangle in front"
     hTypeKeys "<TAB><TAB>"
     Kontext "Toolbar"
     Auswahl.Click
     sleep 1
-    ContextPositionAndSize					'/// Open Position and Size dialog, checking position ///'
+    printlog "Open Position and Size dialog, checking position"
+    ContextPositionAndSize
     Kontext
     Messagebox.SetPage TabPositionAndSize
     Kontext "TabPositionAndSize"
-    if PositionX=0 Then Warnlog "  Command was not completely executed, and it could not be undone."
+    if PositionX=0 Then Warnlog "Command was not completely executed, and it could not be undone."
     TabPositionAndSize.Cancel
     sleep 2
     gMouseClick 60,60
     sleep 1
-    
-    EditUndo							'/// Edit Undo for BringBackward ///'
+    printlog "Edit Undo for BringBackward"
+    EditUndo
     Sleep 2
     gMouseClick 60,60
     sleep 1
     Kontext "Toolbar"
     Auswahl.Click
+    printlog "Trying to select grey rectangle again."
     hTypeKeys "<TAB><TAB>"
     sleep 1
     Kontext "Toolbar"
     Auswahl.Click
-    ContextPositionAndSize					'/// Again checking position using Position and Size dialog ///'
+    printlog "Again checking position using Position and Size dialog"
+    ContextPositionAndSize
     kontext
     Messagebox.SetPage TabPositionAndSize
     kontext "TabPositionAndSize"
+    printlog "Checking if x Position is like ata the start again."
     if PositionX.GetText = Ueber_Text_1 then
       printlog "OK, last order could be redone"
     else
       warnlog "Last order could not be redone"
     end if
     TabPositionAndSize.Cancel
-    
-    Call hCloseDocument						'/// Close document ///'
+    printlog "Close document"
+    sLocaltestfile = hFileGetLocalPath( gTesttoolPath + "leer."+ExtensionString )
+    printlog sLocaltestfile
+    if (FileExists (sLocaltestfile)) then
+        app.kill (sLocaltestfile)
+        printlog "Deleting used file."
+    else
+        warnlog "File is missing."
+    endif
+    Call hCloseDocument	
 
 endcase
 
diff --git a/testautomation/graphics/optional/includes/global/g_demoguide.inc b/testautomation/graphics/optional/includes/global/g_demoguide.inc
index 28774e24e..cb0a428d2 100644
--- a/testautomation/graphics/optional/includes/global/g_demoguide.inc
+++ b/testautomation/graphics/optional/includes/global/g_demoguide.inc
@@ -249,7 +249,7 @@ testcase t_Interoperability
     wait(20000)
     Kontext "AvailableForUsePreview"
     AvailableForUsePreview.TypeKeys "<HOME> <RIGHT> <RETURN>"
-    sleep (5)
+    sleep (10)
     printlog "    Verify that the background has changed"
     Kontext "DocumentImpress"
     printlog "    Background is " & DocumentImpress.StatusGetText (6)     'Debugcode
@@ -263,7 +263,7 @@ testcase t_Interoperability
     Kontext "Tasks"
     Kontext "AvailableForUsePreview"
     AvailableForUsePreview.TypeKeys "<HOME> <RETURN>"
-    sleep (5)
+    sleep (10)
     Kontext "DocumentImpress"
     if DocumentImpress.StatusGetText (6) = sTemplatename then
             printlog "    The background has been set back to default"
@@ -275,20 +275,21 @@ testcase t_Interoperability
     Kontext "DocumentImpress"
     Kontext "Slides"
     Kontext "SlidesControl"
-    SlidesControl.TypeKeys "<Mod1 X>"
+    SlidesControl.OpenContextMenu
+    sleep 1
+    hMenuSelectNr (8)
     Kontext "DocumentImpress"
-    DocumentImpress.TypeKeys "<HOME>"
+    DocumentImpress.TypeKeys "<HOME>", true
     Kontext "Slides"
     Kontext "SlidesControl"
-    SlidesControl.TypeKeys "<Mod1 V>"
-    kontext "InsertPaste"
-     if InsertPaste.Exists(1) then
-        Before.Check
-        InsertPaste.OK
-     endif
+    SlidesControl.OpenContextMenu
+    sleep 1
+    hMenuSelectNr (10)
+
      Printlog "    Verify that the slide was moved correctly"
      Kontext "Slides"
-     SlidesControl.TypeKeys "<PAGEUP>"
+     sleep (5)
+
      SlidesControl.TypeKeys "<SHIFT F10>"
      if hMenuFindSelect(27268, true, 3) = false then
         Warnlog "Context-Menu-entry `Rename` was not found. Therefore the test ends."
@@ -311,10 +312,9 @@ testcase t_Interoperability
     setclipboard("")
     try
         Kontext "DocumentImpressOutlineView"
-        DocumentImpressOutlineView.TypeKeys "<MOD1 HOME><SHIFT END>"
         DocumentImpressOutlineView.TypeKeys "<Mod1 C>"
         sleep (5)
-        if getclipboard() <> ".NET Enterprise" then
+        if getclipboard() <> ".NET Enterprise Federation" then
                 warnlog "    Wrong selection in outlineview. Should be '.NET Enterprise', but is '" & getclipboard() +"'."
             else printlog "    Switching to Outlineview was successfull"
         endif
diff --git a/testautomation/graphics/optional/includes/global/g_find_replace.inc b/testautomation/graphics/optional/includes/global/g_find_replace.inc
index 4f6a04557..b96099be7 100644
--- a/testautomation/graphics/optional/includes/global/g_find_replace.inc
+++ b/testautomation/graphics/optional/includes/global/g_find_replace.inc
@@ -36,6 +36,8 @@
 '*
 '\**********************************************************************************
 testcase tiEditSearchAndReplace
+    qaerrorlog "#i115121# Find and replace: wrong replacement"
+    goto endsub
    '/// This test tests the 'Search and Replace' -dialogue. ///'
    Dim sFile  'as string
    Dim sExpression(2) as string  ' Expression to look for: ... Replace with
diff --git a/testautomation/graphics/optional/includes/global/g_paneview.inc b/testautomation/graphics/optional/includes/global/g_paneview.inc
index a2e7bdb87..fb3620496 100644
--- a/testautomation/graphics/optional/includes/global/g_paneview.inc
+++ b/testautomation/graphics/optional/includes/global/g_paneview.inc
@@ -78,7 +78,7 @@ testcase tiMinimize_Maximize_Docking_SlidePane
         Sleep 1
         Slides.Size 300, 400
         Sleep 1
-        Slides.Size 150, 250
+        Slides.Size 170, 250
         Sleep 1
         Slides.Size xSize%, ySize%
         Sleep 1
@@ -451,7 +451,7 @@ testcase tdMinimize_Maximize_Docking_Pagepane
         Sleep 1
         Pagepane.Size 300, 400
         Sleep 1
-        Pagepane.Size 150, 250
+        Pagepane.Size 170, 250
         Sleep 1
         Pagepane.Size xSize%, ySize%
         Sleep 1
diff --git a/testautomation/graphics/optional/includes/global/g_spellcheck.inc b/testautomation/graphics/optional/includes/global/g_spellcheck.inc
index f46c75f3e..a514db14d 100644
--- a/testautomation/graphics/optional/includes/global/g_spellcheck.inc
+++ b/testautomation/graphics/optional/includes/global/g_spellcheck.inc
@@ -136,7 +136,7 @@ endcase 'tiToolsSpellcheckCorrect
 testcase tiToolsSpellcheckError
     if iSprache = 48 then
         qaerrorlog "This test is not adapted for polish, 48."
-        got endsub
+        goto endsub
     endif
     Dim Fehler$
     Dim Sprachenname$
@@ -155,7 +155,7 @@ testcase tiToolsSpellcheckError
     case 39 : FehlerText$ = "Ringrarziamo per l'interessa mostrato a collaborare con la firma." : Fehler$ = "Ringrarziamo" : Sprachenname$ = "Italienisch"
     case 46 : FehlerText$ = "Detd varierar vad som behandlas och ur vilket perspektiv."         : Fehler$ = "Detd"         : Sprachenname$ = "Schwedisch"
     case 49 : FehlerText$ = "Diees ist ein Fehler."                         : Fehler$ = "Diees" : Sprachenname$ = "Deutsch"
-    case 50 : FehlerText$ = "Toje napaka, ker manjka presledek."            : Fehler$ = "Toje" : Sprachenname$ = "SlovenÅ¡Ä?ina"
+    case 50 : FehlerText$ = "Toje napaka, ker manjka presledek."            : Fehler$ = "Toje" : Sprachenname$ = "Slovenš�?ina"
     case 55 : FehlerText$ = "Eesta poderia ser a resposta para suas preces?": Fehler$ = "Eesta" : Sprachenname$ = "Portugiesisch"
     case else :
         if bAsianLan then
@@ -328,7 +328,7 @@ testcase tiToolsSpellcheckCheck_Change
     printlog "Close document"
     Call hCloseDocument
 
-endcase
+endcase 'tiToolsSpellcheckCheck_Change
 '-------------------------------------------------------------------------------
 testcase tiToolsSpellcheckCheck_ChangeAll
 
@@ -374,8 +374,10 @@ testcase tiToolsSpellcheckCheck_ChangeAll
     printlog "Close document"
     Call hCloseDocument
 
-endcase
+endcase 'tiToolsSpellcheckCheck_ChangeAll
+
 '-------------------------------------------------------------------------------
+
 function delete_all_added_words(aWords)
 
     '/// this function delete the words in sWords in all user dictionaries
@@ -384,44 +386,7 @@ function delete_all_added_words(aWords)
     Dim iWordCounter as integer
     Dim iBooks as integer
 
-    Select Case Ucase(gApplication)
-    case "DRAW"         : sExt = ".odg"
-    case "IMPRESS"      : sExt = ".odp"
-    end select
-
-    printlog "Load prepared document containing 4 errors : graphics\\required\\input\\recht_" & iSprache & sExt
-    if (not bAsianLan) then
-        printlog "Check if the document is writable."
-        Call hFileOpen (gTesttoolpath + "graphics\required\input\recht_"+iSprache+sExt)
-    else
-        Call hFileOpen (gTesttoolpath + "graphics\required\input\recht_1"+sExt)
-    end if
-    if fIsDocumentWritable = false then
-        printlog "Make the document writable and check if it's succesfull."
-        if fMakeDocumentWritable = false then
-            warnlog "The document can't be make writeable. Test stopped."
-            goto endsub
-        end if
-    end if
-    select case iSprache  ' sWord(1)=red     : sWord(2)=turquoise
-    case 01 : sWord(1) = "documente"     : sWord(2) = "expriss"
-    case 33 : sWord(1) = "intercu"       : sWord(2) = "Lees"
-    case 34 : sWord(1) = "afekto"        : sWord(2) = "fratternal"
-    case 36 : sWord(1) = "szeerint"       : sWord(2) = "tervvezi"
-    case 39 : sWord(1) = "Millano"       : sWord(2) = "tarrget"
-    case 46 : sWord(1) = "desa"          : sWord(2) = "occh"
-    case 49 : sWord(1) = "Texxt"         : sWord(2) = "reichtt"
-    case 50 : sWord(1) = "Bsedilo"       : sWord(2) = "zadosÄ?a"
-    case 55 : sWord(1) = "esktava"         : sWord(2) = "noitee"
-    case else :
-        if bAsianLan then
-            sWord(1) = "documente"     : sWord(2) = "expriss"
-        else
-            Warnlog "For the language  " + iSprache +" nothing is prepared yet: insert text here and create the file"
-        end if
-    end select
-    sleep 2
-
+    Printlog "Delete the given words from dictionaries."
     printlog "Call Tools->Options."
     ToolsOptions
     printlog "Select in category 'Languagesettings' entry 'Writing Aids.'"
@@ -436,7 +401,7 @@ function delete_all_added_words(aWords)
     Kontext "BenutzerwoerterbuchBearbeiten"
     sleep 1
     printlog "Check every book, if it contains the words."
-    iBooks = Buch.getItemCount    
+    iBooks = Buch.getItemCount
     for iBookCounter = 1 to iBooks
         Buch.select(iBookCounter)
         printlog "Items in Booklist: " & WordList.getItemCount
@@ -457,8 +422,10 @@ function delete_all_added_words(aWords)
     printlog "Press button 'OK' on dialog 'Writing Aids'."
     ExtrasOptionenDlg.OK
     
-end function
+end function 'delete_all_added_words
+
 '-------------------------------------------------------------------------------
+
 function delete_word_from_dictionary(sWord as String, sDictionary as String)
 
     '/// this function delete the words in sWords in all user dictionaries
@@ -498,7 +465,9 @@ function delete_word_from_dictionary(sWord as String, sDictionary as String)
     printlog "Press button 'OK' on dialog 'Writing Aids'."
     ExtrasOptionenDlg.OK
 
-end function
+end function 'delete_word_from_dictionary
+
+'-------------------------------------------------------------------------------
 
 function fSelectWithString(oControl as Object,sText as String)
 
@@ -513,8 +482,9 @@ function fSelectWithString(oControl as Object,sText as String)
         endif
     next
 
-end function
+end function 'fSelectWithString
 
+'-------------------------------------------------------------------------------
 
 function getWordsForLanguage()
 
@@ -563,4 +533,4 @@ function getWordsForLanguage()
 
     getWordsForLanguage = aWords
 
-end function
+end function 'getWordsForLanguage
diff --git a/testautomation/graphics/optional/includes/global/g_stylist.inc b/testautomation/graphics/optional/includes/global/g_stylist.inc
index fab547eb5..f09e6c0fd 100644
--- a/testautomation/graphics/optional/includes/global/g_stylist.inc
+++ b/testautomation/graphics/optional/includes/global/g_stylist.inc
@@ -518,8 +518,10 @@ testcase tiFormatStylist
         goto endsub
     end select
 
+    printlog "Open new doc"
     Call hNewDocument
     sleep 2
+    printlog "call the navigator"
     Kontext "Gestalter"
     if Gestalter.Exists Then
         Warnlog "- Stylist exists, perhaps not closed last time a Impress doc was open"
@@ -529,11 +531,14 @@ testcase tiFormatStylist
 
     FormatStylist
     Kontext "Gestalter"
+    printlog "opening graphics styles"
     Grafikvorlagen.Click
     sleep 1
+    printlog "Select number 1"
     Vorlagenliste.Select Num1        ' num1
     sleep 1
     Printlog "- open Grafic template Dialogs using the context menue , checking if all resources exist"
+    printlog "Opening context menu"
     Vorlagenliste.OpenContextMenu
     sleep 1
     hMenuSelectNr (2)
@@ -543,6 +548,7 @@ testcase tiFormatStylist
     Messagebox.SetPage TabText
     Kontext "TabText"
     sleep 1
+    printlog "Canceling dialog"
     TabText.Cancel
     sleep 1
 
@@ -550,18 +556,21 @@ testcase tiFormatStylist
         Kontext "Gestalter"
         Printlog "- presentation templates"
         sleep 1
+        printlog "presentation styles"
         Praesentationsvorlagen.Click
 
         Vorlagenliste.Select Num2
         sleep 1
+        printlog "opening context menu"
         Vorlagenliste.OpenContextMenu
         sleep 1
+        printlog "selecting modify"
         hMenuSelectNr (1)
         sleep 1
         Kontext
         if Messagebox.exists (5) then
             try
-                '                    Messagebox.SetPage TabArea
+                printlog "Messagebox.SetPage TabArea"
                 Kontext "TabArea"
                 if TabArea.Exists = false then
                     warnlog "Where is TabArea?"
@@ -578,86 +587,111 @@ testcase tiFormatStylist
         Kontext "Gestalter"
         sleep 1
 
+        printlog "Select number 3"
         Vorlagenliste.Select Num3
         sleep 1
+        printlog "opening context menu of number 3"
         Vorlagenliste.OpenContextMenu
         sleep 1
         hMenuSelectNr (1)
         sleep 1
+        printlog "Check the styles..."
         call hWalkTheStyles (1,1)
         Kontext
+        printlog "setting tabpage indents and spacing"
         Messagebox.SetPage TabEinzuegeUndAbstaende
         Kontext "TabEinzuegeUndAbstaende"
         sleep 1
+        printlog "Canceling tabpage"
         TabEinzuegeUndAbstaende.Cancel
         sleep 1
         Kontext "Gestalter"
         sleep 1
 
+        printlog "Select number 4"
         Vorlagenliste.Select Num4
         sleep 1
+        printlog "opening context menu of number 4"
         Vorlagenliste.OpenContextMenu
         sleep 1
         hMenuSelectNr (1)
         sleep 1
         Kontext
+        printlog "setting tabpage TabFont"
         Messagebox.SetPage TabFont
         kontext "TabFont"
         Kontext
+        printlog "setting tabpage TabFontEffects"
         Messagebox.SetPage TabFontEffects
         kontext "TabFontEffects"
         Kontext
+        printlog "setting tabpage TabIndents and Spacing"
         Messagebox.SetPage TabEinzuegeUndAbstaende
         kontext "TabEinzuegeUndAbstaende"
         sleep 1
+        printlog "canceling TabIndents and Spacing"
         TabEinzuegeUndAbstaende.Cancel
         sleep 1
         Kontext "Gestalter"
         sleep 1
 
+        printlog "opening context menu of number 5"
         Vorlagenliste.Select Num5
         sleep 1
+        printlog "opening context menu of number 5"
         Vorlagenliste.OpenContextMenu
         sleep 1
         hMenuSelectNr (1)
         sleep 1
         Kontext
+        printlog "setting tabpage Tab Font"
         Messagebox.SetPage TabFont
         kontext "TabFont"
         Kontext
+        printlog "setting tabpage Tab FontEffects"
         Messagebox.SetPage TabFontEffects
         kontext "TabFontEffects"
         Kontext
+        printlog "setting tabpage TabIndents and Spacing"
         Messagebox.SetPage TabEinzuegeUndAbstaende
         kontext "TabEinzuegeUndAbstaende"
         sleep 1
         Kontext
+        printlog "setting tabpage Tab Bullets"
         Messagebox.SetPage TabBullet
         Kontext "TabBullet"
         sleep 1
         Kontext
+        printlog "setting tabpage Tab Numbering Type"
         Messagebox.SetPage TabNumerierungsart
         Kontext "TabNumerierungsart"
         sleep 1
         Kontext
+        printlog "setting tabpage Tab Graphics"
         Messagebox.SetPage TabGrafiken
         Kontext "TabGrafiken"
         sleep 1
         Kontext
+        printlog "setting tabpage Tab Numbering options"
         Messagebox.SetPage TabOptionenNumerierung
         Kontext "TabOptionenNumerierung"
         sleep 1
+        printlog "Canceling..."
         TabOptionenNumerierung.Cancel
         sleep 1
     endif
+    kontext "DocumentImpress"
+    printlog "Closing Stylist"
     if lcase(gPlatform) = "osx" then
         hTypekeys "<mod1 t>"
     else
-        hTypeKeys "<F11>"
+        Kontext "Gestalter"
+        Gestalter.Close 
     end if
     sleep 1
     Kontext "Gestalter"
     if Gestalter.Exists Then Warnlog "- Stylist could not be closed pressing F11"
+    printlog "Closing doc."
     Call hCloseDocument
 
 endcase 'tiFormatStylist
diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow.inc b/testautomation/graphics/optional/includes/impress/i_slideshow.inc
index c9fec2c44..cfcc0fbd2 100644
--- a/testautomation/graphics/optional/includes/impress/i_slideshow.inc
+++ b/testautomation/graphics/optional/includes/impress/i_slideshow.inc
@@ -35,9 +35,12 @@ testcase tSlideShowSlideShow
 
     dim bLoaded as boolean
     dim i as integer
+    dim testfile as string
+    dim localtestfile as string
 
     '/// open file 'graphics\\input\\diashow.odp' ///'
-    hFileOpenLocally( gTesttoolPath + "graphics\required\input\diashow.odp" )
+    testfile = ( gTesttoolPath + "graphics\required\input\diashow.odp" )
+    hFileOpenLocally( testfile )
     sleep 30
 
    bLoaded = false
@@ -126,8 +129,15 @@ testcase tSlideShowSlideShow
    '/// Set "Start with current page" back to default = on, in ToolsOptions ///'
    setStartCurrentPage(TRUE)
    '/// close the application ///'
-   Call hCloseDocument
-   
+    Call hCloseDocument
+    localtestfile = hFileGetLocalPath( gTesttoolPath + "diashow.odp" )
+    printlog localtestfile
+    if (FileExists (localtestfile)) then
+        app.kill (localtestfile)
+        printlog "Deleting used file."
+    else
+        warnlog "File is missing."
+    endif
 endcase 'tSlideShowSlideShow
 
 '-------------------------------------------------------------------------------
@@ -216,6 +226,8 @@ testcase tSlideShowSlideShowSettings
    dim sTemp as string
    dim saSlideNames(4) as string
    dim bCurrentPage as boolean
+   dim sTestfile as string
+   dim sLocaltestfile as string
 
    S1 = glLocale (2) + " 1"
    S2 = glLocale (2) + " 2"
@@ -279,9 +291,10 @@ testcase tSlideShowSlideShowSettings
    Call hCloseDocument
    sleep 5
 
-   bLoaded = false
-   '/// open file 'graphics\\input\\diashow.odp' (Slide Show with 4 Slides) ///'
-   hFileOpenLocally( gTesttoolPath + "graphics\required\input\diashow.odp" )
+    bLoaded = false
+    '/// open file 'graphics\\input\\diashow.odp' (Slide Show with 4 Slides) ///'
+    sTestfile = ( gTesttoolPath + "graphics\required\input\diashow.odp" )
+    hFileOpenLocally( sTestfile )
    sleep 10
 
    try
@@ -681,7 +694,15 @@ testcase tSlideShowSlideShowSettings
    setStartCurrentPage(TRUE)
    '/// Close the document ///'
    call hCloseDocument
-   
+    sLocaltestfile = hFileGetLocalPath(  gTesttoolPath + "diashow.odp" )
+    printlog sLocaltestfile
+    if (FileExists (sLocaltestfile)) then
+        app.kill (sLocaltestfile)
+        printlog "Deleting used file."
+    else
+        warnlog "File is missing."
+    endif
+
 endcase 'tSlideShowSlideShowSettings
 
 '-------------------------------------------------------------------------------
diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow3.inc b/testautomation/graphics/optional/includes/impress/i_slideshow3.inc
index 63a04aa6f..bc138fef4 100644
--- a/testautomation/graphics/optional/includes/impress/i_slideshow3.inc
+++ b/testautomation/graphics/optional/includes/impress/i_slideshow3.inc
@@ -529,7 +529,8 @@ endcase
 
 testcase tExtrasIndividuellePraesentation
     Printlog "- Slideshow/Individual slideshow"
- Call hNewDocument							'/// new impress document ///'
+    Call hNewDocument
+    Call sSelectEmptyLayout						'/// new impress document ///'
      '/// Deactivate "Start with current page" in ToolsOptions ///'
      setStartCurrentPage(FALSE)
    '///  check state of navigator ! expected: closed ///'
@@ -546,24 +547,27 @@ testcase tExtrasIndividuellePraesentation
        Kontext "Bildschirmpraesentation"
        Fenster.Check
        Bildschirmpraesentation.OK
-  InsertSlide                                                           '/// insert slide ///'
-  sleep 2
-  hTypekeys "<Pagedown>"
-  sleep 2
-  InsertSlide
-  sleep 2
-  hTypekeys "<Pagedown>"
-  sleep 2
-  InsertSlide								'/// insert another slide ///'
-  sleep 2
-  hTypekeys "<Pagedown>"
-  sleep 2
-  Printlog "  - Slides added"
-  sleep 1
-  Kontext "DocumentImpress"
-  DocumentImpress.TypeKeys "<MOD1 SHIFT F5>"		'/// open navigator ///'
-  sleep 1
-  Kontext "NavigatorDraw"
+    InsertSlide                                                           '/// insert slide ///'
+    sleep 2
+    Call sSelectEmptyLayout
+    hTypekeys "<Pagedown>"
+    sleep 2
+    InsertSlide
+    sleep 2
+    Call sSelectEmptyLayout
+    hTypekeys "<Pagedown>"
+    sleep 2
+    InsertSlide								'/// insert another slide ///'
+    sleep 2
+    Call sSelectEmptyLayout
+    hTypekeys "<Pagedown>"
+    sleep 2
+    Printlog "  - Slides added"
+    sleep 1
+    Kontext "DocumentImpress"
+    DocumentImpress.TypeKeys "<MOD1 SHIFT F5>"		'/// open navigator ///'
+    sleep 1
+    Kontext "NavigatorDraw"
    if NavigatorDraw.Exists Then
       Printlog "  - Navigator exists"
       Erste.Click							'/// switch to 1st slide ///'
diff --git a/testautomation/graphics/optional/includes/impress/i_view.inc b/testautomation/graphics/optional/includes/impress/i_view.inc
index 54ba5132d..e82ec2ec3 100644
--- a/testautomation/graphics/optional/includes/impress/i_view.inc
+++ b/testautomation/graphics/optional/includes/impress/i_view.inc
@@ -61,11 +61,9 @@ testcase tViewWorkspaceHandoutView
     Call hNewDocument						'/// new document ///'
     sleep 2
     Kontext "DocumentImpress"
-    if NOT documentImpress.Exists then
-        hNewDocument
-        sleep 1
-    end if
-    sleep 2
+    DocumentImpress.UseMenu
+    hMenuSelectNr (5)
+    hMenuSelectNr (13)
     Printlog "  ViewWorkspaceHandoutView"
     ViewWorkspaceHandoutView						'/// view background handout ///'
     sleep 2
diff --git a/testautomation/graphics/required/input/recht_1.odp b/testautomation/graphics/required/input/recht_1.odp
index fbad5296d..998668d43 100755
--- a/testautomation/graphics/required/input/recht_1.odp
+++ b/testautomation/graphics/required/input/recht_1.odp