diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:41 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-23 16:59:41 +0100 |
| commit | f2574337dbf0d5d22d18ddbf0e8295c2ee6f4f3e (patch) | |
| tree | 2421fa506d7678110b547679b5b60473f44238b1 /testautomation/graphics | |
| parent | a3e3f719efe2d7ca6afff7acea0dd3d264419865 (diff) | |
| parent | 5d7f1bb1e74ae49ae7215588d836bd1ca2004b10 (diff) | |
Merge commit 'ooo/DEV300_m103'
Conflicts:
smoketestdoc/com/sun/star/comp/smoketest/makefile.mk
smoketestdoc/data/Global.xml
smoketestdoc/data/OptionsDlg.xml
smoketestdoc/data/Test_10er.xml
smoketestoo_native/data/content.xml
smoketestoo_native/makefile.mk
Diffstat (limited to 'testautomation/graphics')
3 files changed, 14 insertions, 3 deletions
diff --git a/testautomation/graphics/optional/includes/global/g_stylist.inc b/testautomation/graphics/optional/includes/global/g_stylist.inc index 71d05f7d704c..0c03e0738abe 100644 --- a/testautomation/graphics/optional/includes/global/g_stylist.inc +++ b/testautomation/graphics/optional/includes/global/g_stylist.inc @@ -486,6 +486,8 @@ testcase tFormatStylistTemplateNew endcase 'tFormatStylistTemplateNew '-------------------------------------------------------- testcase tiFormatStylist +warnlog "#i116803# - Crash when closing stylist with closer" +goto endsub Dim Num1 as integer ' graphics : first line indent ; the one with 0,6cm in the summary Dim Num2 as integer ' presentations : background ; just one tabpage pops up: Area @@ -530,6 +532,8 @@ testcase tiFormatStylist end if sleep 1 + + FormatStylist Kontext "Gestalter" printlog "opening graphics styles" @@ -559,7 +563,7 @@ testcase tiFormatStylist sleep 1 printlog "presentation styles" Praesentationsvorlagen.Click - + printlog "Select number 2" Vorlagenliste.Select Num2 sleep 1 printlog "opening context menu" @@ -681,6 +685,10 @@ testcase tiFormatStylist TabOptionenNumerierung.Cancel sleep 1 endif + + + + kontext "DocumentImpress" printlog "Closing Stylist" if lcase(gPlatform) = "osx" then diff --git a/testautomation/graphics/optional/includes/impress/i_us2_present.inc b/testautomation/graphics/optional/includes/impress/i_us2_present.inc index 1db9740b577a..9ec6ceffeba4 100644 --- a/testautomation/graphics/optional/includes/impress/i_us2_present.inc +++ b/testautomation/graphics/optional/includes/impress/i_us2_present.inc @@ -172,8 +172,11 @@ testcase i_us2_pres1 SlidesControl.TypeKeys "<DOWN>" kontext "DocumentImpress" printlog "Insert three lines with text, all with different formatting." + sleep (1) call hTextrahmenErstellen ("First line with text",20,50,70,50) + sleep (1) call hTextrahmenErstellen ("Second line with text",20,60,70,60) + sleep (1) call hTextrahmenErstellen ("Third line with text",20,70,70,70) printlog "Go down to the third slide." kontext "Slides" diff --git a/testautomation/graphics/required/includes/global/id_004.inc b/testautomation/graphics/required/includes/global/id_004.inc index c06f88c682b8..fbcfde707710 100644 --- a/testautomation/graphics/required/includes/global/id_004.inc +++ b/testautomation/graphics/required/includes/global/id_004.inc @@ -45,8 +45,6 @@ sub id_004 call tiInsertGraphic call tiInsertObjectSound call tiInsertObjectVideo - call tiInsertObjectSound - call tiInsertObjectVideo call tiInsertChart call tiInsertObjectOLEObjects call tiInsertSpreadsheet @@ -244,8 +242,10 @@ testcase tiInsertGraphic DialogTest (GrafikEinfuegenDlg) printlog " use file: global\input\graf_inp\stabler.tif) " Dateiname.settext Convertpath (gTesttoolPath + "global\input\graf_inp\stabler.tif") + wait(1000) printlog "click 'open' " Oeffnen.click + wait(1000) catch Warnlog "Insert graphic doesn't work :-(" endcatch |