cws tl82: merge with DEV300_m86

1 files changed, 9 insertions, 11 deletions

diff --git a/testautomation/framework/optional/includes/basic_delete_modules.inc b/testautomation/framework/optional/includes/basic_delete_modules.inc
index 3fe642ea8ec6..c35900b012e4 100644..100755
--- a/testautomation/framework/optional/includes/basic_delete_modules.inc
+++ b/testautomation/framework/optional/includes/basic_delete_modules.inc
@@ -25,7 +25,7 @@
 '
 '/************************************************************************
 '*
-'*  owner : joerg.skottke@sun.com
+'*  owner : joerg.skottke@oracle.com
 '*
 '*  short description : Delete modules while BASIC is running
 '*
@@ -35,6 +35,8 @@ testcase tDeleteModulesAtRunningBasic
 
     printlog( "Delete BASIC module while BASIC is running" )
 
+    const RAISE_MESSAGEBOX = 1
+
     dim brc as boolean
     const MAX_WAIT = 3000
     dim iMenuItemCount as integer
@@ -44,11 +46,7 @@ testcase tDeleteModulesAtRunningBasic
     Call hNewDocument()
 
     printlog( "Open the BASIC Organizer" )
-    brc = hOpenBasicOrganizerFromDoc()
-    if ( not brc ) then
-        warnlog( "Unable to open BASIC organizer for the document" )
-        goto endsub
-    endif
+    ToolsMacro_uno
 
     printlog( "Create a new module for the current document" )
     brc = hCreateModuleForDoc()
@@ -58,7 +56,7 @@ testcase tDeleteModulesAtRunningBasic
     endif
 
     printlog( "Insert a short script (1. page)" )
-    brc = hInsertMacro( 1 )
+    brc = hInsertMacro( RAISE_MESSAGEBOX )
     if ( not brc ) then
         warnlog( "Unable to create a basic module for the document" )
         goto endsub
@@ -79,10 +77,10 @@ testcase tDeleteModulesAtRunningBasic
         iMenuItemCount = hMenuItemGetCount()
 
         select case ( iMenuItemCount )
-        case 2  : printlog( "Correct number of items in menu: " & iMenuItemCount )
-        case 3  : warnlog ( "Delete is active in context menu for a running macro => BUG!" )
-        case 5  : warnlog ( "#i101972# - Disabled entries are shown in context menu on tab bar" )
-        default : warnlog ( "Incorrect itemcount in context menu: " & iMenuItemCount )
+        case 2    : printlog( "Correct number of items in menu: " & iMenuItemCount )
+        case 3    : warnlog ( "Delete is active in context menu for a running macro => BUG!" )
+        case 5    : warnlog ( "#i101972# - Disabled entries are shown in context menu on tab bar" )
+        case else : warnlog ( "Incorrect itemcount in context menu: " & iMenuItemCount )
         end select
     catch
         warnlog( "Unable to retrieve the number of menuitems" )