summaryrefslogtreecommitdiffstats
path: root/testautomation/writer/tools
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2009-09-07 08:30:03 +0000
committerOliver Bolte <obo@openoffice.org>2009-09-07 08:30:03 +0000
commit8d19f8eab1d0da0467616760009049305159b7e5 (patch)
treec395405c40ac14753f61f1a35be32d6bd2e3ba1a /testautomation/writer/tools
parentCWS-TOOLING: integrate CWS sw32bf02 (diff)
downloadcore-8d19f8eab1d0da0467616760009049305159b7e5.tar.gz
core-8d19f8eab1d0da0467616760009049305159b7e5.zip
CWS-TOOLING: integrate CWS automationdev300m55writer_fixes
2009-08-27 12:19:34 +0200 hde r275471 : adding a keypress to testcase 2009-08-27 12:07:20 +0200 hde r275468 : adding a sleep after selection of object 2009-08-27 10:21:42 +0200 hde r275462 : warnlog for i102093 removed 2009-08-26 15:50:43 +0200 wg r275429 : 104520 2009-08-26 15:20:25 +0200 hde r275425 : added checkbox Notes 2009-08-25 15:20:06 +0200 hde r275363 : mouse click is observed as obsolete 2009-08-25 13:47:33 +0200 hde r275350 : maximized document window after opening 2009-08-25 10:43:47 +0200 hde r275340 : maximizes document windowon create 2009-08-25 08:52:33 +0200 hde r275333 : #95266#styles for chineses adapted 2009-08-24 15:34:45 +0200 hde r275321 : #104450#several fixes in object selection 2009-08-24 15:34:03 +0200 hde r275320 : #104450#several fixes in object selection 2009-08-21 14:44:36 +0200 wg r275261 : 104404 2009-08-21 14:40:39 +0200 wg r275259 : 104404 2009-08-21 14:39:03 +0200 wg r275258 : 104404 2009-08-21 14:30:37 +0200 wg r275256 : 104404 2009-08-21 14:24:18 +0200 wg r275253 : 104404 2009-08-21 14:21:44 +0200 wg r275252 : 104404 2009-08-21 14:08:41 +0200 wg r275247 : 104404 2009-08-21 14:05:51 +0200 wg r275246 : 104404 2009-08-21 13:20:44 +0200 wg r275242 : 104398 2009-08-21 13:14:05 +0200 wg r275241 : 104398 2009-08-21 13:00:26 +0200 hde r275240 : 102477-warnlog removed from testcase 2009-08-21 12:52:50 +0200 wg r275238 : 104398 2009-08-21 12:50:26 +0200 wg r275237 : 104398 2009-08-21 12:50:07 +0200 hde r275236 : printlog changed 2009-08-21 12:48:43 +0200 hde r275235 : 100240-testcases renamed to a meaningful name 2009-08-21 12:46:59 +0200 wg r275233 : 104398 2009-08-21 12:37:46 +0200 wg r275231 : 104398 2009-08-21 11:37:20 +0200 oc r275229 : #i104395# sleeps added to avoid timing problems 2009-08-21 11:24:19 +0200 wg r275226 : 104393 2009-08-20 15:49:02 +0200 hde r275187 : i100670-made qaerrorlog from warnlog 2009-08-20 15:44:58 +0200 hde r275186 : 104358..html-export excluded
Diffstat (limited to 'testautomation/writer/tools')
-rwxr-xr-xtestautomation/writer/tools/includes/w_tool6.inc1
-rwxr-xr-xtestautomation/writer/tools/includes/w_tools.inc46
2 files changed, 24 insertions, 23 deletions
diff --git a/testautomation/writer/tools/includes/w_tool6.inc b/testautomation/writer/tools/includes/w_tool6.inc
index 4fbfd5602aa5..860cfb45c5c0 100755
--- a/testautomation/writer/tools/includes/w_tool6.inc
+++ b/testautomation/writer/tools/includes/w_tool6.inc
@@ -760,7 +760,6 @@ function fInsertFrame (x1 as Integer , y1 as Integer , x2 as Integer , y2 as Int
'This function will insert a frame with the coordinate
Call wDocSetContext
- Call gMouseClick (x1, y1)
Call hToolbarSelect("INSERT", true )
Sleep 1
diff --git a/testautomation/writer/tools/includes/w_tools.inc b/testautomation/writer/tools/includes/w_tools.inc
index b1d00fae7393..63e7e3a8ef7d 100755
--- a/testautomation/writer/tools/includes/w_tools.inc
+++ b/testautomation/writer/tools/includes/w_tools.inc
@@ -182,27 +182,28 @@ sub wZeichenobjektEinfuegen ( Objekt$, xStart%, yStart%, xEnde%, yEnde%, optiona
Objekt = UCase( Objekt )
select case Objekt
- case "RECHTECK" : Rechteck.Click
- case "LINIE" : Linie.Click
- case "ELLIPSE" : Ellipse.Click
- case "TEXT" : Textobjekt.Click
- case "VTEXT" :
- try
- VerticalText.Click
- catch
- if gAsianSup = True then
- Warnlog "Unable to insert Vertical Text! Asian Support in Options activated ?"
- end if
- endcatch
- case "LAUFTEXT" : Lauftext.Click
- case "LEGENDE" : Legende.Click
- case "VLEGENDE" :
- try
- VerticalCallout.Click
- catch
- Warnlog "Unable to insert Vertical Callout! Asian Support in Options activated ?"
- endcatch
+ case "RECHTECK" : Rechteck.Click
+ case "LINIE" : Linie.Click
+ case "ELLIPSE" : Ellipse.Click
+ case "TEXT" : Textobjekt.Click
+ case "VTEXT" :
+ try
+ VerticalText.Click
+ catch
+ if gAsianSup = True then
+ Warnlog "Unable to insert Vertical Text! Asian Support in Options activated ?"
+ end if
+ endcatch
+ case "LAUFTEXT" : Lauftext.Click
+ case "LEGENDE" : Legende.Click
+ case "VLEGENDE" :
+ try
+ VerticalCallout.Click
+ catch
+ Warnlog "Unable to insert Vertical Callout! Asian Support in Options activated ?"
+ endcatch
end select
+ Sleep (2)
Select Case gApplication
Case "WRITER"
@@ -219,7 +220,7 @@ sub wZeichenobjektEinfuegen ( Objekt$, xStart%, yStart%, xEnde%, yEnde%, optiona
end if
if Objekt <> "TEXT" and Objekt <> "VTEXT" then
Kontext "DocumentWriter"
- Call gMouseClick (1, 1)
+ Call gMouseClick (10, 10)
wait 100
end if
@@ -237,10 +238,11 @@ sub wZeichenobjektEinfuegen ( Objekt$, xStart%, yStart%, xEnde%, yEnde%, optiona
end if
if Objekt <> "TEXT" and Objekt <> "VTEXT" then
Kontext "DocumentMasterDoc"
- Call gMouseClick (1, 1)
+ Call gMouseClick (10, 10)
wait 100
end if
end select
+ sleep (1)
end sub
' -----------------------------------------------------------------------