i114404, correct errors in i_us_presentation.bas

2 files changed, 18 insertions, 59 deletions

diff --git a/testautomation/graphics/optional/includes/impress/i_us2_present.inc b/testautomation/graphics/optional/includes/impress/i_us2_present.inc
index 1a844f299c2d..eeeeb5effb6b 100644
--- a/testautomation/graphics/optional/includes/impress/i_us2_present.inc
+++ b/testautomation/graphics/optional/includes/impress/i_us2_present.inc
@@ -145,6 +145,7 @@ testcase i_us2_pres1
     DocumentImpress.UseMenu
     hMenuSelectNr (4)
     hMenuSelectNr (1)
+    call sSelectEmptyLayout
     sleep (1)
 
     kontext "Slides"
diff --git a/testautomation/graphics/optional/includes/impress/i_us_present.inc b/testautomation/graphics/optional/includes/impress/i_us_present.inc
index 4a711cf0a902..ee0019586d14 100644
--- a/testautomation/graphics/optional/includes/impress/i_us_present.inc
+++ b/testautomation/graphics/optional/includes/impress/i_us_present.inc
@@ -52,19 +52,13 @@ testcase i_us_presentation1
     printlog "New master"
     MenuSelect(MenuGetItemID(1))
     sleep (1)
-    ViewMasterPage
-    kontext "Slides"
-    SlidesControl.OpenContextMenu(true)
-    sleep (2)
-    MenuSelect(MenuGetItemID(1)) 'New Master
-    sleep (1)
-    printlog "   Inserted second Master-Slide"
+    printlog "Inserted second Master-Slide"
 
 
     printlog "set background to picture(Gallery)"
     Kontext "Gallery"
     if Gallery.Exists(2) then
-        warnlog "   The Gallery was already visible. Check earlier ran tests for inconsistency."
+        warnlog "The Gallery was already visible. Check earlier ran tests for inconsistency."
         sleep (2)
     else
         ToolsGallery
@@ -118,9 +112,8 @@ testcase i_us_presentation1
     sleep (2)
     Kontext "ExportierenDlg"
     if ExportierenDlg.IsVisible(5) then
-        printlog "   Gallery-object correctly copied into Slide."
+        printlog "Gallery-object correctly copied into Slide."
         ExportierenDlg.Close
-        ToolsGallery
         WaitSlot (2000)
     end if
     kontext "GraphicObjectbar"
@@ -128,33 +121,7 @@ testcase i_us_presentation1
         kontext "DocumentImpress"
         ViewToolbarsPicture
     end if
-    Kontext "Gallery"
-    View.TypeKeys "<HOME><RIGHT><RIGHT>"
-    printlog "'OpenContextMenu"
-    View.TypeKeys "<SHIFT F10>"
-    sleep (2)
-    MenuSelect(MenuGetItemID(1))   'Insert
-    sleep (2)
-    MenuSelect(MenuGetItemID(1))   'Copy
-    sleep (2)
-    printlog "Check that we really got a copy of the object "
-    kontext "DocumentImpress"
-    DocumentImpress.OpenContextMenu(true)
-    sleep (2)
-    MenuSelect 27353
-    sleep (2)
-    Kontext "ExportierenDlg"
-    if ExportierenDlg.IsVisible(5) then
-        printlog "   Gallery-object correctly copied into Slide."
-        ExportierenDlg.Close
-    else
-        warnlog "   Doesn't seem like we copied anything from the Gallery... ?"
-    end if
-    kontext "GraphicObjectbar"
-    if GraphicObjectbar.Exists(5) = FALSE then
-        kontext "DocumentImpress"
-        ViewToolbarsPicture
-    end if
+
     kontext "Gallery"
     Gallerys.Select (iPictures)
     printlog " 50% Transparency"
@@ -172,17 +139,9 @@ testcase i_us_presentation1
     Width.SetText "16"
     Height.SetText "16"
     Mosaic.OK
-    kontext "GraphicFilterBar"
-    GraphicFilterBar.Close
-    ToolsGallery
-    WaitSlot (1000)
-    kontext "DocumentImpress"
-    hTypeKeys "<TAB>"
-    sleep (1)
 
     kontext "GraphicFilterBar"
     Mosaic.Click
-
     kontext "Mosaic"
     if ( Mosaic.exists( 2 ) ) then
         Width.SetText "16"
@@ -191,25 +150,21 @@ testcase i_us_presentation1
     else
         warnlog( "Dialog <Mosaic> did not open" )
     endif
-
     kontext "GraphicFilterBar"
     GraphicFilterBar.Close
-
     ToolsGallery
     WaitSlot (1000)
-
     kontext "DocumentImpress"
     gMouseClick 50,50
     sleep (1)
-
     FormatPositionAndSize
 
     kontext
     if ( Active.exists( 2 ) ) then
         active.setPage(TabPositionAndSize)
         kontext "TabPositionAndSize"
-        Width.SetText "800"
-        Height.SetText "600"
+        Width.SetText "15"
+        Height.SetText "11"
         SizePosition.TypeKeys "<RIGHT><DOWN>"
         TabPositionAndSize.OK
     else
@@ -239,13 +194,13 @@ testcase i_us_presentation2
     PresentationFile1 = ConvertPath( gOfficePath + "user\work\PowerPes1.odp" )
     PresentationFile2 = ConvertPath( gOfficePath + "user\work\PowerPes2.odp" )
 
-    if ( FileExists( PresentationFile1 ) ) then 'if file exists...
+     if ( FileExists( PresentationFile1 ) ) then 'if file exists...
         hFileOpen (PresentationFile1)
     else
         warnlog "   This test is supposed to run after the previous testcase has been run. Notify the Automatic-tester."
         goto endsub
     end if
-
+    sleep (2)
     printlog "New Slide"
     kontext "slides"
     SlidesControl.TypeKeys( "<PAGEDOWN>", 3 )
@@ -254,7 +209,7 @@ testcase i_us_presentation2
 
     MenuSelect(MenuGetItemID(1)) 'New Slide  'No 2
     printlog "   Inserted second normal Slide"
-
+    call sSelectEmptyLayout
     printlog "2. Layouts: Text. Bild: Gallery: Animation - Gif"
     Kontext "Tasks"
     printlog "to get to the very first position"
@@ -275,11 +230,14 @@ testcase i_us_presentation2
 
     printlog "   Did the 'mistake' to FadeIn/Out the Slidepane"
 
-    printlog "activating the input picture area"
-    kontext "DocumentImpress"
-    DocumentImpress.TypeKeys "<TAB>",2
-    DocumentImpress.TypeKeys "<RETURN>"
-    sleep (1)
+InsertGraphicsFromFile
+Kontext "GrafikEinfuegenDlg"
+if GrafikEinfuegenDlg.exists(5) then
+printlog "   The Insertgraphics-dialogue showed up correctly."
+sleep (5)
+else
+warnlog "   The Insertgraphics-dialogue didn't show up."
+endif
 
     printlog "Graphics-Import-dialogue. Select i_us_large.jpg"
     Kontext "GrafikEinfuegenDlg"