summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Skottke [jsk] <jsk@openoffice.org>2010-03-01 10:01:37 +0100
committerJoerg Skottke [jsk] <jsk@openoffice.org>2010-03-01 10:01:37 +0100
commit3697606dbd03af835a2186562175e56312003faa (patch)
tree68bb353b270cec88cd51bcf9ac204c9b84fc4b3e
parentc64252acb157aa248b7188661014def86e9d8be3 (diff)
vitomation01: #i109696 - Moved function IsItSaved() to c_import_general.inc as this is the only test still using this function
-rwxr-xr-xtestautomation/global/tools/includes/required/t_files.inc24
-rwxr-xr-xtestautomation/spreadsheet/optional/includes/import_general/c_import_general.inc25
2 files changed, 25 insertions, 24 deletions
diff --git a/testautomation/global/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc
index c425b7ffe752..14e1f99a8105 100755
--- a/testautomation/global/tools/includes/required/t_files.inc
+++ b/testautomation/global/tools/includes/required/t_files.inc
@@ -149,31 +149,7 @@ function hGrafikVerknuepftEinfuegen ( Grafik$ ) as Boolean
'GrafikEinfuegenDlg not open
endif
end function
-'
-'-------------------------------------------------------------------------------
-'
-function IsItLoaded as boolean
- '/// IsItLoaded
- '/// Wait until document is loaded
- Dim iLoop as integer
- IsItLoaded = FALSE
- sleep(3)
- for iLoop =1 to 20
- try
- 'Calling slot 'IsDocLoading'
- IsItLoaded = IsDocLoading
- catch
- IsItLoaded = FALSE
- endcatch
-
- if IsItLoaded = TRUE then
- exit for
- end if
- sleep(1)
- next iLoop
- sleep(2)
-end function
'
'-------------------------------------------------------------------------------
'
diff --git a/testautomation/spreadsheet/optional/includes/import_general/c_import_general.inc b/testautomation/spreadsheet/optional/includes/import_general/c_import_general.inc
index e10ae90d4d18..115e8db17be7 100755
--- a/testautomation/spreadsheet/optional/includes/import_general/c_import_general.inc
+++ b/testautomation/spreadsheet/optional/includes/import_general/c_import_general.inc
@@ -61,6 +61,31 @@ end sub
'
'-------------------------------------------------------------------------------
'
+function IsItLoaded as boolean
+ '/// IsItLoaded
+ '/// Wait until document is loaded
+ Dim iLoop as integer
+
+ IsItLoaded = FALSE
+ sleep(3)
+ for iLoop =1 to 20
+ try
+ 'Calling slot 'IsDocLoading'
+ IsItLoaded = IsDocLoading
+ catch
+ IsItLoaded = FALSE
+ endcatch
+
+ if IsItLoaded = TRUE then
+ exit for
+ end if
+ sleep(1)
+ next iLoop
+ sleep(2)
+end function
+'
+'-------------------------------------------------------------------------------
+'
testcase tLoadSpreadsheetDocument (SourceFile)
Dim sOnlyFileName as string
Dim sOnlyFileExtension as string