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/configuration.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/configuration.inc')
-rw-r--r--[-rwxr-xr-x] | testautomation/framework/optional/includes/configuration.inc | 66 |
1 files changed, 12 insertions, 54 deletions
diff --git a/testautomation/framework/optional/includes/configuration.inc b/testautomation/framework/optional/includes/configuration.inc index 0fce11bddd1b..9e63a4a9ad7e 100755..100644 --- a/testautomation/framework/optional/includes/configuration.inc +++ b/testautomation/framework/optional/includes/configuration.inc @@ -44,7 +44,8 @@ sub sToolsCustomizeKeyboardFunction for i = 0 to a if ( i = 7 and gtSysName = "Solaris x86" ) then - qaerrorlog( "#i62423# Solaris: Crash when opening new database" ) + '#i62423# + warnlog( "Solaris: Crash when opening new database" ) else gApplication = aApplication(i) tToolsCustomizeKeyboardFunction(lList()) @@ -87,6 +88,7 @@ testcase tToolsCustomizeKeyboardFunction(lList()) dim i92080 as string dim i96322 as string dim i100037 as string + dim i115370 as string i60617 = ".uno:ContinueNumbering" i43969 = ".uno:MacroOrganizer" @@ -94,12 +96,13 @@ testcase tToolsCustomizeKeyboardFunction(lList()) i80850 = ".uno:ToggleFormula.uno:AssignMacro" i84982 = ".uno:FontDialogForParagraph" i84983 = ".uno:DBNewReportWithPreSelection" - i87950 = ".uno:DBMigrateScripts" - i87951 = ".uno:DeleteAllNotes.uno:DeleteAuthor.uno:DeleteNote.uno:HideAllNotes.uno:HideAuthor.uno:HideNote" - i87952 = ".uno:InsertApplet" - i92080 = ".uno:SaveGraphic" - i96322 = ".uno:ActivateStyleApply" - i100037 = ".uno:AcceptTracedChange, .uno:DeleteComment, .uno:RejectTracedChange, .uno:ReplyNote, .uno:TaskPaneInsertPage, .uno:ValidityReference" + i87950 = ".uno:DBMigrateScripts" + i87951 = ".uno:DeleteAllNotes.uno:DeleteAuthor.uno:DeleteNote.uno:HideAllNotes.uno:HideAuthor.uno:HideNote" + i87952 = ".uno:InsertApplet" + i92080 = ".uno:SaveGraphic" + i96322 = ".uno:ActivateStyleApply" + i100037 = ".uno:AcceptTracedChange, .uno:DeleteComment, .uno:RejectTracedChange, .uno:ReplyNote, .uno:TaskPaneInsertPage, .uno:ValidityReference" + i115370 = ".uno:TaskPaneInsertPage" Call hNewDocument sleep 2 @@ -130,53 +133,8 @@ testcase tToolsCustomizeKeyboardFunction(lList()) if (((mid(sTemp2,d+1,1)<>" ")AND(abs(asc(mid(sTemp2,d+1,1)))<128)) AND (abs(asc(mid(sTemp2,d-1,1)))<128))then listAppend(lList(),sTemp2) bErrorFound = false - if (inStr(i60617,sTemp2)>0) then - WarnLog "#i60617# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'" - bErrorFound = true - endif - if (inStr(sTemp2,i64346)>0) then - WarnLog "#i64346# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'" - bErrorFound = true - endif - if (inStr(i43969,sTemp2)>0) then - WarnLog "#i41265# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'" - bErrorFound = true - endif - if (inStr(i80850,sTemp2)>0) then - WarnLog "#i80850# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'" - bErrorFound = true - endif - if (inStr(i84982,sTemp2)>0) then - WarnLog "#i84982# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'" - bErrorFound = true - endif - if (inStr(i84983,sTemp2)>0) then - WarnLog "#i84983# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'" - bErrorFound = true - endif - if (inStr(i87950,sTemp2)>0) then - WarnLog "#i87950# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'" - bErrorFound = true - endif - if (inStr(i87951,sTemp2)>0) then - WarnLog "#i87951# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'" - bErrorFound = true - endif - if (inStr(i87952,sTemp2)>0) then - warnLog "#i87952# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'" - bErrorFound = true - endif - if (inStr(i92080,sTemp2)>0) then - WarnLog "#i92080# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'" - bErrorFound = true - endif - if (inStr(i96322,sTemp2)>0) then - WarnLog "#i96322# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'" - bErrorFound = true - endif - - if (inStr(i100037,sTemp2)>0) then - WarnLog "#i100037# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'" + if (inStr(i115370,sTemp2)>0) then + qaerrorlog "#i115370# ("+c+"/"+a+"/"+b+"): Provide real Name for Function: '"+sTemp+"'::'"+sTemp2+"'" bErrorFound = true endif if ( not bErrorFound ) then |