diff options
author | Vladimir Glazunov <vg@openoffice.org> | 2010-11-11 09:36:28 +0100 |
---|---|---|
committer | Vladimir Glazunov <vg@openoffice.org> | 2010-11-11 09:36:28 +0100 |
commit | fd8af45f19e3d0acc4887f3b07239875485647b5 (patch) | |
tree | b32259007ec6cd0d28b44b95a1b3f3f003af0a79 /testautomation/writer/tools/includes/w_tools.inc | |
parent | 613bb74489551580b417968af125de803c684a39 (diff) | |
parent | 02582fe488fb679284c108413c7d2f6fd3d730cc (diff) |
CWS-TOOLING: integrate CWS automationdev300m91
Notes
Notes:
split repo tag: testing_ooo/DEV300_m93
Diffstat (limited to 'testautomation/writer/tools/includes/w_tools.inc')
-rwxr-xr-x | testautomation/writer/tools/includes/w_tools.inc | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/testautomation/writer/tools/includes/w_tools.inc b/testautomation/writer/tools/includes/w_tools.inc index e6bd4f92afa0..cfe0aa6e07f3 100755 --- a/testautomation/writer/tools/includes/w_tools.inc +++ b/testautomation/writer/tools/includes/w_tools.inc @@ -141,11 +141,14 @@ end function ' ----------------------------------------------------------------------- -sub wZeichenobjektEinfuegen ( Objekt$, xStart%, yStart%, xEnde%, yEnde%, optional sCloseToolbar as boolean ) +sub wZeichenobjektEinfuegen ( Objekt$, xStart%, yStart%, xEnde%, yEnde%, optional sCloseToolbar as boolean, optional bLeaveSelected as boolean ) Kontext "DrawBar" if Not DrawBar.Exists then Call hToolbarSelect("Drawing", true) Sleep 2 + if IsMissing(bLeaveSelected) then + bLeaveSelected = false + endif Objekt = UCase( Objekt ) select case Objekt @@ -187,8 +190,10 @@ sub wZeichenobjektEinfuegen ( Objekt$, xStart%, yStart%, xEnde%, yEnde%, optiona end if if Objekt <> "TEXT" and Objekt <> "VTEXT" then Kontext "DocumentWriter" - Call gMouseClick (10, 10) - wait 100 + if bLeaveSelected = false then + Call gMouseClick (10, 10) + wait 100 + endif end if Case "MASTERDOCUMENT" @@ -205,8 +210,10 @@ sub wZeichenobjektEinfuegen ( Objekt$, xStart%, yStart%, xEnde%, yEnde%, optiona end if if Objekt <> "TEXT" and Objekt <> "VTEXT" then Kontext "DocumentMasterDoc" - Call gMouseClick (10, 10) - wait 100 + if bLeaveSelected = false then + Call gMouseClick (10, 10) + wait 100 + endif end if end select sleep (1) @@ -215,18 +222,21 @@ end sub ' ----------------------------------------------------------------------- sub wObjektSelektieren ( xStart%, yStart%, xEnde%, yEnde% ) - ' Call gMouseClick(90,90) Call hToolbarSelect("DRAWING",true) - Auswahl.Click + if Auswahl.Getstate(2) = 0 then + Auswahl.Click + endif Select Case gApplication Case "WRITER" Kontext "DocumentWriter" DocumentWriter.MouseDown xStart%, yStart% + wait 500 DocumentWriter.MouseMove xEnde%, yEnde% DocumentWriter.MouseUp xEnde%, yEnde% Case "MASTERDOCUMENT" Kontext "DocumentMasterDoc" DocumentMasterDoc.MouseDown xStart%, yStart% + wait 500 DocumentMasterDoc.MouseMove xEnde%, yEnde% DocumentMasterDoc.MouseUp xEnde%, yEnde% end select |