diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-03-11 11:35:29 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-03-11 11:35:29 +0000 |
| commit | 8c59580b88a33d7f0c892c9c53776716ad661fcf (patch) | |
| tree | da43a9c8f3ba7cba7afca05894acc8712f6e36ce /testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc | |
| parent | e62f74cabe9558e003d3105df7a69e3841dfc9ce (diff) | |
| parent | 36979f1c9e43c42e62b0ad5a32b7abb2fc425b5b (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Conflicts:
smoketestoo_native/data/Global.xml
smoketestoo_native/data/OptionsDlg.xml
smoketestoo_native/data/Test_10er.xml
smoketestoo_native/data/content.xml
smoketestoo_native/smoketest.cxx
test/source/cpp/getargument.cxx
test/source/cpp/officeconnection.cxx
testautomation/framework/optional/includes/basic_vba-compat_security_check.inc
testautomation/framework/optional/includes/filedlg_cjk_folders.inc
testautomation/global/sid/all.sid
testautomation/global/sid/bars.sid
testautomation/global/sid/e_all.sid
testautomation/global/win/bars.win
testautomation/graphics/optional/includes/impress/i_slideshow2.inc
testautomation/graphics/optional/includes/impress/i_slideshow3.inc
testtools/source/bridgetest/bridgetest.cxx
testtools/source/bridgetest/constructors.cxx
testtools/source/bridgetest/makefile.mk
testtools/source/bridgetest/testComponent.component
Diffstat (limited to 'testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc')
| -rwxr-xr-x | testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc b/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc index 081b35f322ec..63f552df63bf 100755 --- a/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc +++ b/testautomation/framework/optional/includes/CJK_FeatureSwitchTest_1.inc @@ -346,7 +346,8 @@ testcase tWriterUIChangesTest7 Kontext "RubyDialog" DialogClose.Click Sleep 2 - QAErrorlog "#i40913# Something wrong in menu format/Ruby when Asian Language support is off" + '#i40913# + warnlog "Something wrong in menu format/Ruby when Asian Language support is off" catch endcatch end if @@ -398,25 +399,29 @@ testcase tWriterUIChangesTest8 try FormatChangeCaseHalfWidth - QAErrorlog "#i43434# Something wrong in submenu format/change case -> Half width when Asian Language support is off" + '#i43434# + warnlog "Something wrong in submenu format/change case -> Half width when Asian Language support is off" catch endcatch try FormatChangeCaseFullWidth - QAErrorlog "#i43434# Something wrong in submenu format/change case -> Full width when Asian Language support is off" + '#i43434# + warnlog "Something wrong in submenu format/change case -> Full width when Asian Language support is off" catch endcatch try FormatChangeCaseHiragana - QAErrorlog "#i43434# Something wrong in submenu format/change case -> Hiragana when Asian Language support is off" + '#i43434# + warnlog "Something wrong in submenu format/change case -> Hiragana when Asian Language support is off" catch endcatch try FormatChangeCaseKatagana - QAErrorlog "#i43434# Something wrong in submenu format/change case -> Katagana when Asian Language support is off" + '#i43434# + warnlog "Something wrong in submenu format/change case -> Katagana when Asian Language support is off" catch endcatch end if @@ -740,4 +745,4 @@ function hSystemHasAsianLocale() as boolean case else : hSystemHasAsianLocale() = false end select -end function
\ No newline at end of file +end function |