diff options
| author | Helge Delfs [hde] <hde@openoffice.org> | 2010-11-08 13:35:49 +0100 |
|---|---|---|
| committer | Helge Delfs [hde] <hde@openoffice.org> | 2010-11-08 13:35:49 +0100 |
| commit | 4ad0c9593bf735d6f8730d8b09a9d7ffde4bca16 (patch) | |
| tree | 92baa79c5bb903fb951e706997929acc97330ac9 /testautomation | |
| parent | 8e1136415c2d0177d1e1f303162ba92f7b3f2354 (diff) | |
automationdev300m91#i115475#added optional bool parameter bLeaveSelected
Diffstat (limited to 'testautomation')
| -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 |