diff options
| author | Joerg Skottke [jsk] <jsk@openoffice.org> | 2010-10-26 08:53:12 +0200 |
|---|---|---|
| committer | Joerg Skottke [jsk] <jsk@openoffice.org> | 2010-10-26 08:53:12 +0200 |
| commit | 786e556374aede52bf2eb683145f3a62b52266c5 (patch) | |
| tree | ff30cb25b9d6d9432622378cda6c8aa81d10b442 /testautomation/framework | |
| parent | e6c2b4149e475067db8e862b5b5bb84eae62a288 (diff) | |
| parent | fb06b52ff1ca7b4077df838cf133e9cd4c8ded66 (diff) | |
automationdev300m87: Rebased to DEV300m90
Diffstat (limited to 'testautomation/framework')
| -rw-r--r--[-rwxr-xr-x] | testautomation/framework/required/includes/script_organizers.inc | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/testautomation/framework/required/includes/script_organizers.inc b/testautomation/framework/required/includes/script_organizers.inc index b9ed84201..3a70c8051 100755..100644 --- a/testautomation/framework/required/includes/script_organizers.inc +++ b/testautomation/framework/required/includes/script_organizers.inc @@ -78,6 +78,7 @@ testcase tUpdtScripts dim iCurrentDialog as integer dim iDiffCount as integer + dim max_diffcount as integer hInitSingleDoc() @@ -109,25 +110,33 @@ testcase tUpdtScripts case DLG_JAVASCRIPT: ToolsMacrosOrganizeMacrosJavaScript kontext "ScriptOrganizer" hGetAllNodeNames( ScriptTreeList, cScriptNamesList() ) + max_diffcount = 0 case DLG_BEANSHELL: ToolsMacrosOrganizeMacrosBeanShell kontext "ScriptOrganizer" hGetAllNodeNames( ScriptTreeList, cScriptNamesList() ) + max_diffcount = 0 case DLG_PYTHON: ToolsMacrosOrganizeMacrosPython kontext "ScriptOrganizer" hGetAllNodeNames( ScriptTreeList, cScriptNamesList() ) + max_diffcount = 0 case DLG_BASIC_ORG: ToolsMacro_uno Kontext "Makro" hGetScriptNames( MakroAus, MakroListe, cScriptNamesList() ) + max_diffcount = 6 case DLG_RUN_MACRO: ToolsMacrosRunMacro kontext "ScriptSelector" hGetScriptNames( LibraryTreeList, ScriptList, cScriptNamesList() ) + max_diffcount = 6 end select printlog( "Compare to reference list, create new one if differences were found" ) - iDiffCount = hManageComparisionList( sFileIn, sFileOut, cScriptNamesList() ) - - if ( iDiffCount <> 0 ) then warnlog( "The number of scripts has changed, please review." ) + iDiffCount = abs( hManageComparisionList( sFileIn, sFileOut, cScriptNamesList() ) ) + ' Usually we should have 0 differences in the list. However, as we do not have + ' a unique way of installing the office (Root-Installation, archives and + ' others) we need a little tolerance here. If a number of bundled extensions + ' are installed, we have more scripts. + if ( iDiffCount > max_diffcount ) then warnlog( "The number of scripts has changed, please review." ) printlog( "Close <" & sDialog & ">" ) select case ( sDialog ) |