vitomation01: #i111247 - Fixing glitches

7 files changed, 12 insertions, 2 deletions

diff --git a/testautomation/framework/optional/f_basic_documents.bas b/testautomation/framework/optional/f_basic_documents.bas
index 9572aac6e2dd..da5445442149 100755
--- a/testautomation/framework/optional/f_basic_documents.bas
+++ b/testautomation/framework/optional/f_basic_documents.bas
@@ -56,6 +56,7 @@ sub LoadIncludeFiles
     use "global\tools\includes\optional\t_accels.inc"
     use "global\tools\includes\optional\t_security_tools.inc"
     use "global\tools\includes\optional\t_listfuncs.inc"
+    use "global\tools\includes\optional\t_stringtools.inc
 
     gApplication = "WRITER"
     call GetUseFiles()
diff --git a/testautomation/framework/optional/includes/basic_dialog_i18n_copy_control.inc b/testautomation/framework/optional/includes/basic_dialog_i18n_copy_control.inc
index 8f7db31fed08..c3db79efc08d 100755
--- a/testautomation/framework/optional/includes/basic_dialog_i18n_copy_control.inc
+++ b/testautomation/framework/optional/includes/basic_dialog_i18n_copy_control.inc
@@ -62,9 +62,11 @@ testcase tBasicDialogI18nCopyControl
 
     printlog( "Test init: Setting up environment" )
     if ( hInitFormControls( DIALOG_NAME ) ) then
-    
+
+        printlog( "Draw a commandbutton on the dialog" )
         hDrawControlOnDialog( COMMAND_BUTTON )
 
+        printlog( "Open the property browser" )
         hOpenPropertyBrowser()
         kontext "TabGeneralControl"
         printlog( "Get internal coordinates for the control" )
@@ -81,11 +83,13 @@ testcase tBasicDialogI18nCopyControl
         qaerrorlog( "#i80456# properties button not enabled when a formcontrol is inserted via keyboard" )
 
         kontext "ToolsCollectionBar"
+        printlog( "Click <Manage Languages>" )
         ManageLanguage.click()
 
         kontext "ManageUILanguages"
         if ( ManageUILanguages.exists( DEFAULT_TIMEOUT ) ) then
 
+            printlog( "Click <Add>" )
             hClickButton( Add )
 
             kontext "SetDefaultLanguage"
@@ -101,6 +105,7 @@ testcase tBasicDialogI18nCopyControl
         kontext "ManageUILanguages"
         if ( ManageUILanguages.exists( DEFAULT_TIMEOUT ) ) then
 
+            printlog( "Click <Add>" )
             hClickButton( Add )
 
             kontext "AddUserInterface"
diff --git a/testautomation/framework/optional/includes/basic_usertemplate.inc b/testautomation/framework/optional/includes/basic_usertemplate.inc
index 9f8400c45f8b..275be2557abf 100755
--- a/testautomation/framework/optional/includes/basic_usertemplate.inc
+++ b/testautomation/framework/optional/includes/basic_usertemplate.inc
@@ -69,6 +69,7 @@ testcase tMacroUsertemplate
     ToolsMacro_uno
 
     printlog( "Search for the module" )
+    kontext "Makro"
     iCurrentNode = hSelectNodeByName( MakroAus, "Module1" )
     if ( iCurrentNode = 0 ) then    
         warnlog( "#i73521# - The expected node could not be found. Aborting test" )
diff --git a/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc b/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc
index 5a82a6d87b2b..682045da8139 100755
--- a/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc
+++ b/testautomation/framework/optional/includes/basic_vba-compat_import_disabled.inc
@@ -81,6 +81,7 @@ testcase tBasicVBACompatImportDisabled()
     ToolsMacro_uno
     
     printlog( "Expand all nodes" )
+    kontext "Makro"
     cNodeCount = hExpandAllNodes( MakroAus )
     
     printlog( "Verify that we have the correct node count for the current mode" )
diff --git a/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc b/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc
index bf1e24af9eda..243c31bb7fc5 100755
--- a/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc
+++ b/testautomation/framework/optional/includes/basic_vba-compat_import_enabled.inc
@@ -85,6 +85,7 @@ testcase tBasicVBACompatImportEnabled()
     ToolsMacro_uno
     
     printlog( "Expand all nodes" )
+    kontext "Makro"
     cNodeCount = hExpandAllNodes( MakroAus )
     
     printlog( "Verify that we have the correct node count for the current mode." )
diff --git a/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc b/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc
index f02644814ad0..d118b646c833 100755
--- a/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc
+++ b/testautomation/framework/optional/includes/basic_vba-compat_import_nothing.inc
@@ -67,6 +67,7 @@ testcase tBasicVBACompatImportNothing()
     ToolsMacro_uno
     
     printlog( "Expand all nodes" )
+    kontext "Makro"
     cNodeCount = hExpandAllNodes( MakroAus )
     
     printlog( "Verify that we have the correct node count for the current mode" )
diff --git a/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc b/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc
index 29bc681c2ce5..b813ee2bf706 100755
--- a/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc
+++ b/testautomation/global/tools/includes/optional/t_basic_organizer_tools.inc
@@ -229,7 +229,7 @@ function hDeleteLibrary( iLocation as integer, cLibName as string ) as boolean
     dim cCurrentObjectName as string
 
     '///+<li>Open Macro Organizer</li>
-    ToolsMakro_uno
+    ToolsMacro_uno
     
     '///+<li>Click Manage-button</li>
     Kontext "Makro"