summaryrefslogtreecommitdiff
path: root/testautomation/math
diff options
context:
space:
mode:
authorJoerg Skottke [jsk] <jsk@openoffice.org>2010-03-02 09:10:47 +0100
committerJoerg Skottke [jsk] <jsk@openoffice.org>2010-03-02 09:10:47 +0100
commit263994914d04267498f202dd0a4b528c7dc12800 (patch)
tree6bb3018f9394a9e1659b82163e1119db2182c32d /testautomation/math
parent4e81c9a7435d287477934e2a4d0c60ad0cf7ddb1 (diff)
vitomation01: #i109696 - Removed wrapper function hFileExists() - it does exactly the same as the builtin function FileExists() plus some overhead.
Diffstat (limited to 'testautomation/math')
-rwxr-xr-xtestautomation/math/optional/includes/m_101_.inc20
1 files changed, 6 insertions, 14 deletions
diff --git a/testautomation/math/optional/includes/m_101_.inc b/testautomation/math/optional/includes/m_101_.inc
index 4139e688f1f5..99975aae1dfe 100755
--- a/testautomation/math/optional/includes/m_101_.inc
+++ b/testautomation/math/optional/includes/m_101_.inc
@@ -435,7 +435,7 @@ testcase tFilePrint
DokumentWriter.MouseUp 99,99
sFileName = convertpath( gOfficePath + "user/work/math/level1/ftc_a.odt")
- if (hFileExists(sFileName)) then
+ if (FileExists(sFileName)) then
'/// goto end of page; insert page break ///'
kontext "DokumentWriter"
DokumentWriter.typeKeys "<mod1 end>"
@@ -666,20 +666,12 @@ function hSpeichernUnterMitFilterKillTBO (sFileName as String, sFilterName, opti
Dim bAlienNotAllowed as boolean
sDerName = ConvertPath (sFileName)
-
- if hFileExists (sDerName) = TRUE then
- try
- app.kill (sDerName)
- catch
- Exceptlog
- endcatch
- end if
-
- if FileExists(sDerName) then
- warnlog "file '" & sDerName & "' couldn't be deleted. Exiting function now..."
+ if ( not hDeleteFile( sDerName ) ) then
+ warnlog( "Aborting function because the file could not be deleted: " & sDerName )
+ hSpeichernUnterMitFilterKillTBO() = FALSE
exit function
- end if
-
+ endif
+
sleep (1)
FileSaveAs
Kontext "SpeichernDlg"