summaryrefslogtreecommitdiffstats
path: root/testautomation/writer/tools
diff options
context:
space:
mode:
authorVladimir Glazounov <vg@openoffice.org>2009-10-01 11:19:42 +0000
committerVladimir Glazounov <vg@openoffice.org>2009-10-01 11:19:42 +0000
commite6c0c6f0a6fc392d3e4775cfba57cd29ed74a29e (patch)
tree604a32e31f01fe50a59d1a04c112b01f719cb572 /testautomation/writer/tools
parentCWS-TOOLING: integrate CWS mba32issues02 (diff)
downloadcore-e6c0c6f0a6fc392d3e4775cfba57cd29ed74a29e.tar.gz
core-e6c0c6f0a6fc392d3e4775cfba57cd29ed74a29e.zip
CWS-TOOLING: integrate CWS automationdev300m58cat0
2009-09-29 14:46:30 +0200 oc r276530 : #i105448# sleep added to resolv timingproblem 2009-09-28 10:29:46 +0200 oc r276482 : #i105404# t_ToolsMacro needs saved file 2009-09-27 10:51:09 +0200 tbo r276478 : #105393# on MacOS X only 3 items in tools menu 2009-09-25 18:02:25 +0200 oc r276473 : CWS-TOOLING: rebase CWS automationdev300m58cat0 to trunk@276429 (milestone: DEV300:m60) 2009-09-24 11:06:00 +0200 hde r276411 : save test-files locally 2009-09-23 15:40:07 +0200 hde r276400 : deleting of autotext optimized 2009-09-23 15:39:20 +0200 hde r276399 : Dialog 'Bereiche' opened after deleting autotext 2009-09-23 10:42:26 +0200 jsk r276370 : Added warnlog for exceeded timeout, i want the test to warn instead of aborting. Connected issue is #i105289# 2009-09-22 10:41:22 +0200 oc r276347 : #i105254# c_arrayconstants.inc enhanced 2009-09-21 20:37:26 +0200 tbo r276344 : #i105249# workaround firststartwizard regression by calling hDisableQuickstarterAPI() 2009-09-17 10:55:59 +0200 wg r276231 : i105141 2009-09-16 09:20:58 +0200 oc r276191 : #i105109# sleeps increased
Diffstat (limited to 'testautomation/writer/tools')
-rwxr-xr-xtestautomation/writer/tools/includes/w_tool2.inc67
1 files changed, 41 insertions, 26 deletions
diff --git a/testautomation/writer/tools/includes/w_tool2.inc b/testautomation/writer/tools/includes/w_tool2.inc
index e9c9df318a53..280d18b51677 100755
--- a/testautomation/writer/tools/includes/w_tool2.inc
+++ b/testautomation/writer/tools/includes/w_tool2.inc
@@ -347,7 +347,12 @@ function wDeleteAutotext(vAutotextName as string) as boolean
'/// returns true if Autotext could be deleted
'/// Attention: Autotext-Dialog leaves open after deleting autotext
- Dim j as integer, sAll as integer
+ Dim j as integer
+ Dim ik as integer
+ Dim bDeleted as boolean
+ Dim sAllGroups as integer
+ Dim sAllInGroups as integer
+
Kontext "Autotext"
if Not Autotext.Exists then EditAutotext
@@ -367,30 +372,40 @@ function wDeleteAutotext(vAutotextName as string) as boolean
wait 500
next j
- Liste.Select 1
- Liste.TypeKeys "+"
- sAll = Liste.GetItemCount
- For j = 1 to sAll
- Liste.TypeKeys "<Down>"
- if Liste.Gettext = vAutotextName then
- try
- Menue.Click
- wait 500
- Call hMenuSelectNr ( 3 )
- Kontext "Active"
- if Active.Exists and Active.GetRT = 304 then
- Active.yes
- wDeleteAutotext = true
- else
- Warnlog "No messages to confirm deleting the Autotext!"
- end if
- exit for
- catch
- Warnlog "Menu Autotext->'Delete' disabled ! Test failed !"
- endcatch
- end if
- Liste.TypeKeys "+"
- sAll = Liste.GetItemCount
- next j
+ bDeleted = false
+ ' count all groups
+ sAllGroups = Liste.GetItemCount
+ ' travel through all groups
+ For ik = 1 to sAllGroups
+ Liste.Select ik
+ Liste.TypeKeys "+"
+
+ sAllInGroups = Liste.GetItemCount - sAllGroups
+ For j = 1 to sAllInGroups
+ Liste.TypeKeys "<Down>"
+ if Liste.Gettext = vAutotextName then
+ try
+ Menue.Click
+ wait 500
+ Call hMenuSelectNr ( 3 )
+ Kontext "Active"
+ if Active.Exists and Active.GetRT = 304 then
+ Active.yes
+ wDeleteAutotext = true
+ else
+ Warnlog "No messages to confirm deleting the Autotext!"
+ end if
+ bDeleted = true
+ exit for
+ catch
+ Warnlog "Menu Autotext->'Delete' disabled ! Test failed !"
+ endcatch
+ end if
+ next j
+ if bDeleted = true then exit for
+ ' close group
+ Liste.Select ik
+ Liste.TypeKeys "-"
+ next ik
end function