automationdev300m87: Local merge with changes from HDE

3 files changed, 41 insertions, 36 deletions

diff --git a/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc b/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc
index c4d79cece29a..4e399309d018 100755..100644
--- a/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc
+++ b/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc
@@ -187,19 +187,12 @@ testcase tPickGraphic
 	Call wTypeKeys "<Escape>"
 	Call wTypeKeys "Don't be afraid !"
 
-	Call DocumentWriter.MouseMove 50,30
+	Call gMouseClick ( 50,30 )
 	Printlog "   Open context menu upon graphic with mouse"
 	Call wOpenContextMenu(true)
 
 	printlog "   Select 'ImageMap' in context menu"
-	try
-            CALL hMenuFindSelect (".uno:ImageMapDialog", true, 9, true)   'Find "ImageMap" and call the slot.
-            wait 500
-	catch
-            Warnlog "Unable to open context menu"
-            Call hCloseDocument
-            goto endsub
-	endcatch
+        Call hMenuSelectNr(9)
 	Printlog "   The graphic has to be selected and the context menu has to show graphics related commands"
 	Kontext "ImageMapEditor"
 	if Not ImageMapEditor.Exists(3) then
@@ -277,19 +270,19 @@ testcase tHyperlinkEdit
 	Call wTypeKeys " "
 	Call wTypeKeys "<HOME>"
     printlog "   Open context menu on hyperlink"
-        Call wTypeKeys "<SHIFT F10>"
+    Call wTypeKeys "<SHIFT F10>"
 
     printlog "   Open contextmenu, find the entry 'Edit Hyperlink', and call the slot..."
-        CALL hMenuFindSelect (21835, true, 18, true)   'Find "Edit Hyperlink" and call the slot.
+    CALL hMenuFindSelect (21835, true, 18, true)   'Find "Edit Hyperlink" and call the slot.
     printlog "   Check if the Hyperlink-dialogue comes up correctly."
-        kontext "TabHyperlinkInternet"
-        if NOT TabHyperlinkInternet.Exists(3) then
-            Warnlog "No Hyperlink-Dialog visible!"
+    kontext "HyperlinkDialog"
+    if NOT HyperlinkDialog.Exists(3) then
+        Warnlog "No Hyperlink-Dialog visible!"
 	else
-	    TabHyperlinkInternet.Close
-        end if
+	    HyperlinkDialog.Close
+    end if
     printlog "   Close text document"
-        CALL hCloseDocument
+    CALL hCloseDocument
 endcase
 
 ' -----------------------------------------------------------------------------
diff --git a/testautomation/writer/optional/w_clipbrd.bas b/testautomation/writer/optional/w_clipbrd.bas
index 5fa732706afc..97d209d7599e 100644..100755
--- a/testautomation/writer/optional/w_clipbrd.bas
+++ b/testautomation/writer/optional/w_clipbrd.bas
@@ -35,22 +35,34 @@ Global CharsetSet as integer
 Global ExportSet as integer
 
 sub main
-  use "writer\tools\includes\w_tools.inc"
-  use "writer\optional\includes\clipboard\clipbrd_func.inc"
-  use "writer\optional\includes\clipboard\w_210_.inc"
-  use "writer\optional\includes\clipboard\w_211_.inc"
-  use "writer\optional\includes\clipboard\w_212_.inc"
-  use "writer\optional\includes\clipboard\w_213_.inc"
-  use "writer\optional\includes\clipboard\w_214_.inc"
-  use "writer\optional\includes\clipboard\w_215_.inc"
-  use "writer\optional\includes\clipboard\w_216_.inc"
-  use "writer\optional\includes\clipboard\w_217_.inc"
-  use "writer\optional\includes\clipboard\w_218_.inc"
-  use "writer\optional\includes\clipboard\w_219_.inc"
-  use "writer\optional\includes\clipboard\w_220_.inc"
-  use "writer\optional\includes\clipboard\w_221_.inc"
-  use "writer\optional\includes\clipboard\w_222_.inc"
-  Dim Start : Start = Now()
+    use "writer\tools\includes\w_tools.inc"
+    use "writer\optional\includes\clipboard\clipbrd_func.inc"
+    use "writer\optional\includes\clipboard\w_210_.inc"
+    use "writer\optional\includes\clipboard\w_211_.inc"
+    use "writer\optional\includes\clipboard\w_212_.inc"
+    use "writer\optional\includes\clipboard\w_213_.inc"
+    use "writer\optional\includes\clipboard\w_214_.inc"
+    use "writer\optional\includes\clipboard\w_215_.inc"
+    use "writer\optional\includes\clipboard\w_216_.inc"
+    use "writer\optional\includes\clipboard\w_217_.inc"
+    use "writer\optional\includes\clipboard\w_218_.inc"
+    use "writer\optional\includes\clipboard\w_219_.inc"
+    use "writer\optional\includes\clipboard\w_220_.inc"
+    use "writer\optional\includes\clipboard\w_221_.inc"
+    use "writer\optional\includes\clipboard\w_222_.inc"
+    Dim Start : Start = Now()
+    Dim lsSourceList(3) as string
+
+    ' copy needed files linked in test documents lo local file system if needed Issue #112208
+    lsSourceList(0) = 3
+    lsSourceList(1) = ConvertPath ( gtesttoolpath & "writer\optional\input\clipboard\dummy.sxw" )
+    lsSourceList(2) = ConvertPath ( gtesttoolpath & "writer\optional\input\clipboard\dummy.txt" )
+    lsSourceList(3) = ConvertPath ( gtesttoolpath & "writer\optional\input\clipboard\flower.gif" )
+
+    if hFileListCopyLocal(lsSourceList()) = false then
+        warnlog "Copying of elementary files failed. Test interrupted!"
+        exit sub
+    end if
 
     ExportSet = wChangeHTMLCompatibilityExport
     CharsetSet = wChangeHTMLCompatibility
@@ -72,9 +84,9 @@ sub main
 
     Call hStatusOut
     Call wChangeHTMLCompatibility(CharsetSet)
-	Call wChangeHTMLCompatibilityExport(ExportSet)
+    Call wChangeHTMLCompatibilityExport(ExportSet)
 
-   printlog "Duration : " +  Wielange ( Start )
+    printlog "Duration : " +  Wielange ( Start )
 end sub
 
 '---------------------------------------------------------
diff --git a/testautomation/writer/required/includes/w_001_.inc b/testautomation/writer/required/includes/w_001_.inc
index b5b6b88d1640..1fc2001e78bb 100644
--- a/testautomation/writer/required/includes/w_001_.inc
+++ b/testautomation/writer/required/includes/w_001_.inc
@@ -1027,7 +1027,7 @@ testcase tFileReload
     Wait (500)
 
     PrintLog "Open previous saved document"
-    hFileOpenLocally(  gOfficePath + "user\work\" + sFile$ )
+    hFileOpen(  gOfficePath + "user\work\" + sFile$ )
     PrintLog "Insert a table in document"
     Call hTabelleEinfuegen
     PrintLog "File / Reload"