diff options
Diffstat (limited to 'testautomation/graphics')
5 files changed, 5 insertions, 17 deletions
diff --git a/testautomation/graphics/optional/includes/impress/i_pengine2.inc b/testautomation/graphics/optional/includes/impress/i_pengine2.inc index 06ea08adbafc..5c16f43722be 100755 --- a/testautomation/graphics/optional/includes/impress/i_pengine2.inc +++ b/testautomation/graphics/optional/includes/impress/i_pengine2.inc @@ -558,13 +558,7 @@ testcase tiPengine2ObjectsGetsEffects DocumentPresentation.TypeKeys "<SPACE>" Sleep (5) DocumentPresentation.TypeKeys "<SPACE>" - printlog "Trying to end presentation with mouseclick on black endscreen." - try - DocumentPresentation.mousedown (50,50,1) - DocumentPresentation.mouseup (50,50,1) - catch - warnlog "TimeOut on pressing mouse button." - endcatch + if DocumentPresentation.Exists(5) then warnlog "Presentation should have ended. Check why it didn't." end if diff --git a/testautomation/graphics/required/d_updt.bas b/testautomation/graphics/required/d_updt.bas index 427a1ae91b4e..df13533464fa 100755 --- a/testautomation/graphics/required/d_updt.bas +++ b/testautomation/graphics/required/d_updt.bas @@ -88,7 +88,6 @@ sub LoadIncludeFiles use "global\required\includes\g_option.inc" use "global\required\includes\g_customize.inc" use "global\required\includes\g_001.inc" - use "global\required\includes\g_009.inc" Call GetUseFiles gApplication = "Draw" end sub diff --git a/testautomation/graphics/required/i_updt_1.bas b/testautomation/graphics/required/i_updt_1.bas index 671b348b8b93..665143276e4f 100755 --- a/testautomation/graphics/required/i_updt_1.bas +++ b/testautomation/graphics/required/i_updt_1.bas @@ -76,8 +76,6 @@ sub LoadIncludeFiles use "global\required\includes\g_option.inc" use "global\required\includes\g_option2.inc" use "global\required\includes\g_customize.inc" - use "global\required\includes\g_001.inc" - use "global\required\includes\g_009.inc" gApplication = "IMPRESS" Call GetUseFiles() end sub diff --git a/testautomation/graphics/required/i_updt_2.bas b/testautomation/graphics/required/i_updt_2.bas index b6274e804bad..c0da23879d21 100755 --- a/testautomation/graphics/required/i_updt_2.bas +++ b/testautomation/graphics/required/i_updt_2.bas @@ -73,12 +73,9 @@ end sub sub LoadIncludeFiles use "global\system\includes\master.inc" use "global\system\includes\gvariabl.inc" - use "global\required\includes\g_option.inc" - use "global\required\includes\g_option2.inc" - use "global\required\includes\g_customize.inc" use "global\required\includes\g_001.inc" use "global\required\includes\g_009.inc" - gApplication = "IMPRESS" + gApplication = "IMPRESS" Call GetUseFiles() end sub diff --git a/testautomation/graphics/tools/id_tools_2.inc b/testautomation/graphics/tools/id_tools_2.inc index 420577894486..5e9cdc255c37 100755 --- a/testautomation/graphics/tools/id_tools_2.inc +++ b/testautomation/graphics/tools/id_tools_2.inc @@ -119,7 +119,7 @@ sub sFileExport end if catch Warnlog "An error at creating the export-dir, the test ends!" - goto endsub + exit sub endcatch '///+ open the test document qatesttool/graphics/required/input/graphicexport.od ? ] ///' @@ -284,12 +284,12 @@ sub tClipboardFromDrawTest if gApplication = "WRITER" then call writertest - goto endsub + exit sub end if if gApplication = "CALC" then call calctest - goto endsub + exit sub end if end sub |