CWS-TOOLING: integrate CWS automationdev300m86graphicsooo/DEV300_m87

6 files changed, 52 insertions, 90 deletions

diff --git a/testautomation/graphics/optional/includes/global/g_edit.inc b/testautomation/graphics/optional/includes/global/g_edit.inc
index 869e6730c..fdff948d0 100644
--- a/testautomation/graphics/optional/includes/global/g_edit.inc
+++ b/testautomation/graphics/optional/includes/global/g_edit.inc
@@ -258,6 +258,7 @@ testcase tEditObjectEdit
   else
 
       Call hNewDocument
+      call sSelectEmptyLayout
       sleep 1               '/// new document ///'
       InsertObjectOLEObject             '/// insert writer ole object ///'
       Kontext "OLEObjektEinfuegen"
diff --git a/testautomation/graphics/optional/includes/global/g_tools.inc b/testautomation/graphics/optional/includes/global/g_tools.inc
index b760ad7b1..c54881a0b 100644
--- a/testautomation/graphics/optional/includes/global/g_tools.inc
+++ b/testautomation/graphics/optional/includes/global/g_tools.inc
@@ -289,7 +289,7 @@ testcase tiToolsThesaurusContextMenu
     endif
 
     Call hFileOpen (gTesttoolpath + "graphics\required\input\recht_" + iSprache + sExt)
-
+    Call sMakeReadOnlyDocumentEditable
     Call hTextrahmenErstellen (sWord,20,20,50,30)
     sleep 1
 
diff --git a/testautomation/graphics/optional/includes/impress/i_us2_present.inc b/testautomation/graphics/optional/includes/impress/i_us2_present.inc
index 1a844f299..eeeeb5eff 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 4a711cf0a..41ccd1366 100644
--- a/testautomation/graphics/optional/includes/impress/i_us_present.inc
+++ b/testautomation/graphics/optional/includes/impress/i_us_present.inc
@@ -52,12 +52,6 @@ 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"
 
 
@@ -120,7 +114,6 @@ testcase i_us_presentation1
     if ExportierenDlg.IsVisible(5) then
         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,14 +139,7 @@ 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
 
@@ -254,7 +214,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 +235,16 @@ 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"
diff --git a/testautomation/graphics/tools/id_tools.inc b/testautomation/graphics/tools/id_tools.inc
index 99bb30a41..4f919dfe3 100644
--- a/testautomation/graphics/tools/id_tools.inc
+++ b/testautomation/graphics/tools/id_tools.inc
@@ -269,48 +269,42 @@ end function
 
 '-------------------------------------------------------------------------------
 
-function fGetSizeXY (sX as string, sY as string, bRetrieveOnly as boolean) as Boolean
-
-    const RC_FAILURE = -1
-
-    dim sTx as string
-    dim sTy as string
-
-    fGetSizeXY() = True
-
-    if ( hUseAsyncSlot( "ContextPositionAndSize" ) <> RC_FAILURE ) then
-
-        kontext
-        active.SetPage TabPositionAndSize
-
-        kontext "TabPositionAndSize"
-        if ( TabPositionAndSize.exists( 2 ) ) then
-            sTx = Width.GetText()
-            sTy = Height.GetText()
-            hCloseDialog( TabPositionAndSize, "ok" )
-        else
-            warnlog "Couldn't switch tab page :-( "
-        endif
-
-        if ( bRetrieveOnly ) then  ' Get the Values only
-            sY = sTy
-            sX = sTx
-        else          ' Get the Values and compare them
-            if ( not LiberalMeasurement (sX,sTx) ) then
-                warnlog "width is different :-( should: '"+sX+"' is: '"+sTx+"'" + "eventually a result of i35519"
-                fGetSizeXY() = False
-            endif
-            if (not LiberalMeasurement (sY,sTy) ) then
-                warnlog "hight is different :-( should: '"+sY+"' is: '"+sTy+"'" + "eventually a result of i35519"
-                fGetSizeXY() = False
-            endif
-        endif
-    else
-        warnlog( "Failed to open <Position And Size> dialog" )
-    endif
-
+function fGetSizeXY (sX as string, sY as string, bGet as boolean) as Boolean
+   dim sTx as string
+   dim sTy as string
+   dim bReturn as boolean
+
+   bReturn = True
+   try
+      ContextPositionAndSize
+   catch
+      warnlog "couldn't call 'ContextPositionAndSize' no object selected ?"
+   endcatch
+   kontext
+   active.SetPage TabPositionAndSize
+   kontext "TabPositionAndSize"
+   if TabPositionAndSize.exists (5) then
+      sTx = Width.GetText
+      sTy = Height.GetText
+      TabPositionAndSize.OK
+   else
+      warnlog "Couldn't switch tab page :-( "
+   endif
+   if bGet then  ' Get the Values only
+      sY = sTy
+      sX = sTx
+   else          ' Get the Values and COMPARE them
+      if (LiberalMeasurement (sX,sTx) <> TRUE) then
+         warnlog "width is different :-( should: '"+sX+"' is: '"+sTx+"'" + "eventually a result of i35519"
+         bReturn = False
+      endif
+      if (LiberalMeasurement (sY,sTy) <> TRUE) then
+         warnlog "hight is different :-( should: '"+sY+"' is: '"+sTy+"'" + "eventually a result of i35519"
+         bReturn = False
+      endif
+      bGet = bReturn
+   endif
 end function
-
 '-------------------------------------------------------------------------
 
 function hCallExport ( cFileName as String , sFilter as String, optional bSelection as boolean ) as Boolean
diff --git a/testautomation/graphics/tools/id_tools_2.inc b/testautomation/graphics/tools/id_tools_2.inc
index cbb12e545..60836bdb2 100644
--- a/testautomation/graphics/tools/id_tools_2.inc
+++ b/testautomation/graphics/tools/id_tools_2.inc
@@ -522,6 +522,7 @@ sub LoadGraphic ( sFile as String, bOK as Boolean ) as boolean
     Dim iHMax
     if app.FileLen(sFile) = "0" then warnlog "   the file (" + (sFile) + ") seems to be zero bytes large."
     call hGrafikEinfuegen ( sFile )
+    sleep (1)
     FormatGraphics
     Kontext
     Active.SetPage TabType