diff options
author | Joerg Skottke [jsk] <jsk@openoffice.org> | 2010-09-13 15:08:32 +0200 |
---|---|---|
committer | Joerg Skottke [jsk] <jsk@openoffice.org> | 2010-09-13 15:08:32 +0200 |
commit | acb32fd8134af541ac82661b49ce1888a2c90350 (patch) | |
tree | ec2aba03f9d53c9fcd9e37a748a862d9f3759079 /testautomation/graphics/optional/includes | |
parent | af4863656d0385d0f05a72a2ae1444993e52f05e (diff) |
automationdev300m87: #i112208# - Eliminate sMakeReadonlyDocumentEditable() and affiliated functions from global, removed any calls to these functions
Diffstat (limited to 'testautomation/graphics/optional/includes')
4 files changed, 15 insertions, 37 deletions
diff --git a/testautomation/graphics/optional/includes/global/g_clipboard.inc b/testautomation/graphics/optional/includes/global/g_clipboard.inc index 4c1900876565..9d4629f3d262 100644 --- a/testautomation/graphics/optional/includes/global/g_clipboard.inc +++ b/testautomation/graphics/optional/includes/global/g_clipboard.inc @@ -45,7 +45,7 @@ testcase tiEditUndo Dim sDatei as string Dim Ueber_Text_1 as string - if (gApplication = "IMPRESS") then + if ( gApplication = "IMPRESS" ) then ExtensionString = "odp" else ExtensionString = "odg" @@ -53,10 +53,7 @@ testcase tiEditUndo sDatei = gTesttoolPath + "graphics\required\input\leer."+ExtensionString - hFileOpen ConvertPath (sDatei) - sleep 5 - printlog "Checking for readonly state. If so, make it editable." - sMakeReadOnlyDocumentEditable + hFileOpenLocally( sDatei ) hTypeKeys "<TAB><TAB>" sleep 3 diff --git a/testautomation/graphics/optional/includes/global/g_demoguide.inc b/testautomation/graphics/optional/includes/global/g_demoguide.inc index 54a3a67c58d0..71bfb2ac11eb 100644 --- a/testautomation/graphics/optional/includes/global/g_demoguide.inc +++ b/testautomation/graphics/optional/includes/global/g_demoguide.inc @@ -224,10 +224,8 @@ testcase t_Interoperability '///Open PowerPoint presentation printlog "Open PowerPoint presentation" - hFileOpen (Convertpath (gTesttoolPath + "graphics/required/input/dotNetOverview.ppt")) + hFileOpenLocally( gTesttoolPath + "graphics/required/input/dotNetOverview.ppt" ) - Call sMakeReadOnlyDocumentEditable - 'Save the name of the origin background (taken from last slide) Kontext "DocumentImpress" DocumentImpress.TypeKeys "<END>" diff --git a/testautomation/graphics/optional/includes/global/g_tools.inc b/testautomation/graphics/optional/includes/global/g_tools.inc index c54881a0b68e..35b53c07c1cd 100644 --- a/testautomation/graphics/optional/includes/global/g_tools.inc +++ b/testautomation/graphics/optional/includes/global/g_tools.inc @@ -107,14 +107,13 @@ testcase tiToolsThesaurus PrintLog "Thesaurus with 1 word: " + sWord - if( Ucase(gApplication) = "DRAW" ) then + if( gApplication = "DRAW" ) then sExt = ".odg" - elseif( Ucase(gApplication) = "IMPRESS" ) then + elseif( gApplication = "IMPRESS" ) then sExt = ".odp" endif - Call hFileOpen (gTesttoolpath + "graphics\required\input\recht_" + iSprache + sExt) - Call sMakeReadOnlyDocumentEditable() + Call hFileOpenLocally(gTesttoolpath + "graphics\required\input\recht_" + iSprache + sExt) Call hTextrahmenErstellen (sWord,20,20,50,30) sleep 1 @@ -280,16 +279,15 @@ testcase tiToolsThesaurusContextMenu PrintLog "Thesaurus with 1 word: " + sWord - if( Ucase(gApplication) = "DRAW" ) then + if( gApplication = "DRAW" ) then sExt = ".odg" Kontext "DrawDocument" - elseif( Ucase(gApplication) = "IMPRESS" ) then + elseif( gApplication = "IMPRESS" ) then sExt = ".odp" Kontext "ImpressDocument" endif - Call hFileOpen (gTesttoolpath + "graphics\required\input\recht_" + iSprache + sExt) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally(gTesttoolpath + "graphics\required\input\recht_" + iSprache + sExt) Call hTextrahmenErstellen (sWord,20,20,50,30) sleep 1 @@ -384,14 +382,14 @@ testcase tiToolsHyphenation2 dim sDraw as string dim sFile as string PrintLog "- Tools/Hyphenation2" - Select Case Ucase(gApplication) + Select Case gApplication case "DRAW" : sExt = ".odg" case "IMPRESS" : sExt = ".odp" end select if ((not bAsianLan) AND (iSprache <> 07)) then sFile = gTesttoolpath + "graphics\required\input\silben_"+iSprache+sExt - Call hFileOpen (sFile) + hFileOpenLocally( sFile ) endif select case iSprache '/// Open prepared document ///' @@ -411,7 +409,7 @@ testcase tiToolsHyphenation2 case else : if bAsianLan then printlog "For the language " + iSprache +" nothing is prepared yet, but is AsianLan, so OK :-)" printlog " :-) will use English instead" - Call hFileOpen (gTesttoolpath + "graphics\required\input\silben_"+"1"+sExt) + hFileOpenLocally( gTesttoolpath + "graphics\required\input\silben_"+"1"+sExt ) DasWort = "ation" : DasWort2 = "tion" : DasWort3 = "ion" : DasWort4 = "on" '+Chr(34) else Warnlog "For the language " + iSprache +" nothing is prepared yet: insert text here and create file: "+sFile @@ -419,8 +417,6 @@ testcase tiToolsHyphenation2 endif end select - Call sMakeReadOnlyDocumentEditable - printlog " - Test hyphenation" EditSelectAll '/// Press CTRL + A to select all ///' '/// press return to go into the edit mode ///' diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow.inc b/testautomation/graphics/optional/includes/impress/i_slideshow.inc index d313f444994b..c9fec2c44ea8 100644 --- a/testautomation/graphics/optional/includes/impress/i_slideshow.inc +++ b/testautomation/graphics/optional/includes/impress/i_slideshow.inc @@ -29,28 +29,17 @@ '* '* short description : '* -'******************************************************************* -'* -' #1 tSlideShowSlideShow -' #1 tSlideShowRehearseTimings -' #1 tSlideShowSlideShowSettings -' #1 tSlideShowCustomSlideShow -' #1 tSlideShowSlideTransition -' #1 tSlideShowShowHideSlide -'* '\****************************************************************** + testcase tSlideShowSlideShow dim bLoaded as boolean dim i as integer '/// open file 'graphics\\input\\diashow.odp' ///' - hFileOpen ConvertPath (gTesttoolPath + "graphics\required\input\diashow.odp") + hFileOpenLocally( gTesttoolPath + "graphics\required\input\diashow.odp" ) sleep 30 - printlog "check if the document is writable" - sMakeReadOnlyDocumentEditable - bLoaded = false Kontext "Navigator" @@ -292,10 +281,8 @@ testcase tSlideShowSlideShowSettings bLoaded = false '/// open file 'graphics\\input\\diashow.odp' (Slide Show with 4 Slides) ///' - hFileOpen ConvertPath (gTesttoolPath + "graphics\required\input\diashow.odp") + hFileOpenLocally( gTesttoolPath + "graphics\required\input\diashow.odp" ) sleep 10 - printlog "check if the document is writable" - sMakeReadOnlyDocumentEditable try Kontext "DocumentImpress" |