Automated merge with ssh://hg@hg.services.openoffice.org/cws/tabcontrol

20 files changed, 184 insertions, 142 deletions

diff --git a/testautomation/extensions/optional/includes/online_update.inc b/testautomation/extensions/optional/includes/online_update.inc
index 24739132beaa..ce3da2df0622 100644
--- a/testautomation/extensions/optional/includes/online_update.inc
+++ b/testautomation/extensions/optional/includes/online_update.inc
@@ -82,7 +82,7 @@ testcase tExtensionUpdate
     kontext "ExtensionUpdate"
     if ( ExtensionUpdate.exists() ) then
         printlog( "Close update-dialog. Good." )
-        ExtensionUpdate.cancel()
+        ExtensionUpdate.close()
     else
         warnlog( "Extension update dialog is missing" )
     endif
diff --git a/testautomation/extensions/optional/includes/publisher.inc b/testautomation/extensions/optional/includes/publisher.inc
index 739b28edaef8..4fec6ab1bab2 100644
--- a/testautomation/extensions/optional/includes/publisher.inc
+++ b/testautomation/extensions/optional/includes/publisher.inc
@@ -155,7 +155,7 @@ testcase tExtensionPublisher
                     warnlog( "Update list for extensions is stalled (expected: 7), " & _
                              "found: " & AvailableUpdatesList.getItemCount() )
                     kontext "ExtensionUpdate"
-                    ExtensionUpdate.cancel()
+                    ExtensionUpdate.close()
                     ExtensionUpdate.notExists( 2 )
                     kontext "PackageManager"
                     PackageManager.cancel()
@@ -258,7 +258,7 @@ testcase tExtensionPublisher
             endif
 
             kontext "ExtensionUpdate"
-            ExtensionUpdate.cancel()
+            ExtensionUpdate.close()
             ExtensionUpdate.notExists( 2 )
         else
             warnlog( "Extension Update dialog is not open" )
diff --git a/testautomation/extensions/required/includes/e_update.inc b/testautomation/extensions/required/includes/e_update.inc
index e563b5ae3a45..22fe13395413 100644
--- a/testautomation/extensions/required/includes/e_update.inc
+++ b/testautomation/extensions/required/includes/e_update.inc
@@ -44,7 +44,7 @@ testcase tExtensionManagerResources()
     dim iFilterItems as integer 
     
     const MAX_ITERATIONS = 50
-    const FILTER_ITEMS = 9    ' This is the number of filters/extension types we know
+    const FILTER_ITEMS = 10    ' This is the number of filters/extension types we know
 
     printlog( "Ressource test for the Extension Manager UI" )
     ToolsPackageManager
@@ -76,6 +76,16 @@ testcase tExtensionManagerResources()
                 warnlog( "The file type filter list is incorrect" )
                 printlog( "Expected: " & FILTER_ITEMS )
                 printlog( "Found...: " & iFilterItems )
+                '0: All files (*.*)
+				'1: Configuration Data
+				'2: Configuration Schema
+				'3: Extension
+				'4: UNO Components
+				'5: UNO Dynamic Library Component
+				'6: UNO Java Component
+				'7: UNO Java Type Library
+				'8: UNO Python Component
+				'9: UNO RDB Type Library
             else
                 printlog( "The number of filters in Add Extensions Dialog is ok" )
             endif
@@ -91,7 +101,7 @@ testcase tExtensionManagerResources()
         kontext "ExtensionUpdate"
         if ( ExtensionUpdate.exists( 2 ) ) then
             call dialogtest( ExtensionUpdate )
-            ExtensionUpdate.cancel()
+            ExtensionUpdate.close()
             ExtensionUpdate.notExists( 3 )
         else
             warnlog( "Extenson Update dialog did not open" )      
diff --git a/testautomation/framework/optional/includes/f_usage_tracking.inc b/testautomation/framework/optional/includes/f_usage_tracking.inc
index ef20c2a2f1e5..c52ae61c0945 100644
--- a/testautomation/framework/optional/includes/f_usage_tracking.inc
+++ b/testautomation/framework/optional/includes/f_usage_tracking.inc
@@ -100,7 +100,7 @@ testcase tUsageTracking3
             
             kontext "Active"
             if ( Active.exists( 2 ) ) then
-                qaerrorlog( "Messagebox not required as control should not be enabled (see #i97340#)" )
+                warnlog( "Messagebox not required as control should not be enabled (see #i97340#)" )
                 Active.ok()
             
                 kontext "TextImport"
diff --git a/testautomation/global/required/includes/g_option.inc b/testautomation/global/required/includes/g_option.inc
index 2f7b6aa33ac2..0c40d3c3d08e 100644
--- a/testautomation/global/required/includes/g_option.inc
+++ b/testautomation/global/required/includes/g_option.inc
@@ -756,7 +756,7 @@ testcase tToolsOptionsImprovementProgram
             Active.ok()
         else
             if ( NOT bImportDialogHasBeenDisplayed ) then
-                qaerrorlog( "#i97340# Show Data button enabled but no logged data found" )
+                warnlog( "#i97340# Show Data button enabled but no logged data found" )
             endif
         endif
 
@@ -767,8 +767,13 @@ testcase tToolsOptionsImprovementProgram
         endif
 
         Kontext "OptionenDlg"
-        OptionenDlg.cancel()
-        
+        if OptionenDlg.Exists then
+            OptionenDlg.cancel()
+        endif
+
+        if GetDocumentCount = 1 then
+            Call hCloseDocument
+        endif
     else
         ' hDeleteFile() returns FALSE if the file is still present for some weird reason
         ' We should warn about this because the test breaks at a later point then.
diff --git a/testautomation/global/win/edia_p_s.win b/testautomation/global/win/edia_p_s.win
index da1f30a7f696..7cd8e58ed94e 100755
--- a/testautomation/global/win/edia_p_s.win
+++ b/testautomation/global/win/edia_p_s.win
@@ -114,91 +114,91 @@ Currency sym:WIZARDS_HID_DLGDEPOT_LSTMARKETS
 OKButton sym:WIZARDS_HID_DLGDEPOT_0_CMDGOON_HISTORY
 CancelButton sym:WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_HISTORY
 
-*Printing .HelpId:vcl:PrintDialog:Dialog
-PreviewWindow .HelpId:vcl:PrintDialog:Preview
-PreviewPageNumber .HelpId:vcl:PrintDialog:PageEdit
-ScrollBackward .HelpId:vcl:PrintDialog:BackwardBtn
-ScrollForward .HelpId:vcl:PrintDialog:ForwardBtn
-Print .HelpId:vcl:PrintDialog:OK
-Cancel .HelpId:vcl:PrintDialog:Cancel
+*Printing .HelpID:vcl:PrintDialog:Dialog
+PreviewWindow .HelpID:vcl:PrintDialog:Preview
+PreviewPageNumber .HelpID:vcl:PrintDialog:PageEdit
+ScrollBackward .HelpID:vcl:PrintDialog:BackwardBtn
+ScrollForward .HelpID:vcl:PrintDialog:ForwardBtn
+Print .HelpID:vcl:PrintDialog:OK
+Cancel .HelpID:vcl:PrintDialog:Cancel
    
-PrintingTabControl .HelpId:vcl:PrintDialog:TabPages
-TabPrintGeneral .HelpId:vcl:PrintDialog:JobPage
-TabApplication .HelpId:vcl:PrintDialog:TabPage:10
-TabLayout .HelpId:vcl:PrintDialog:NUpPage
-TabOptions .HelpId:vcl:PrintDialog:OptPage
-
-*TabPrintGeneral .HelpId:vcl:PrintDialog:JobPage
-PrinterList .HelpId:vcl:PrintDialog:JobPage:PrinterList
-NumberOfCopies .HelpId:vcl:PrintDialog:JobPage:Copies
-Collate .HelpId:vcl:PrintDialog:JobPage:Collate
-PrintNotes .HelpId:vcl:PrintDialog:PrintAnnotationMode:ListBox
-AllPages .HelpId:vcl:PrintDialog:PrintContent:RadioButton:0
-AllSlides .HelpId:vcl:PrintDialog:PrintContent:RadioButton:0
-AllSheets .HelpId:vcl:PrintDialog:PrintContent:RadioButton:0
-Pages .HelpId:vcl:PrintDialog:PrintContent:RadioButton:1
-Slides .HelpId:vcl:PrintDialog:PrintContent:RadioButton:1
-SelectedSheets .HelpId:vcl:PrintDialog:PrintContent:RadioButton:1
-PrintAllPages .HelpId:vcl:PrintDialog:PrintRange:RadioButton:0
-PrintPages .HelpId:vcl:PrintDialog:PrintRange:RadioButton:1                        
-PageRange .HelpId:vcl:PrintDialog:PageRange:Edit
-Selection .HelpId:vcl:PrintDialog:PrintContent:RadioButton:2
-SelectedCells .HelpId:vcl:PrintDialog:PrintContent:RadioButton:2
-Details .HelpId:vcl:PrintDialog:JobPage:DetailsBtn
-Properties .HelpId:vcl:PrintDialog:JobPage:Properties
-PageCount .HelpId:vcl:PrintDialog:NumPagesText
-PartsToPrint .HelpId:vcl:PrintDialog:PageContentType:ListBox
-SlidesPerPage .HelpId:vcl:PrintDialog:SlidesPerPage:ListBox
-ArrangeSlides .HelpId:vcl:PrintDialog:SlidesPerPageOrder:ListBox            
-
-*TabApplication .HelpId:vcl:PrintDialog:TabPage:10
-PrintPageBackground .HelpId:vcl:PrintDialog:PrintPageBackground:CheckBox
-PrintGraphicsAndDiagrams .HelpId:vcl:PrintDialog:PrintTablesGraphicsAndDiagrams:CheckBox
-PrintPicturesAndObjects .HelpId:vcl:PrintDialog:PrintPicturesAndObjects:CheckBox
-PrintHiddenText .HelpId:vcl:PrintDialog:PrintHiddenText:CheckBox
-PrintTextPlaceholder .HelpId:vcl:PrintDialog:PrintTextPlaceholder:CheckBox
-PrintFormControls .HelpId:vcl:PrintDialog:PrintControls:CheckBox
-PrintTextInBlack .HelpId:vcl:PrintDialog:PrintBlackFonts:CheckBox
-PrintBlankPages .HelpId:vcl:PrintDialog:PrintEmptyPages:CheckBox
-IncludeEmptyPages .HelpId:vcl:PrintDialog:IsIncludeEmptyPages:CheckBox
-SlideName .HelpId:vcl:PrintDialog:IsPrintName:CheckBox
-DateAndTime .HelpId:vcl:PrintDialog:IsPrintDateTime:CheckBox
-HiddenPages .HelpId:vcl:PrintDialog:IsPrintHidden:CheckBox
-TilePaper .HelpId:vcl:PrintDialog:PageOptions:RadioButton:3
-OriginalColors .HelpId:vcl:PrintDialog:Quality:RadioButton:0
-Grayscale .HelpId:vcl:PrintDialog:Quality:RadioButton:1
-BlackAndWhite .HelpId:vcl:PrintDialog:Quality:RadioButton:2
-MultiplePages .HelpId:vcl:PrintDialog:PageOptions:RadioButton:2
-TitleRow .HelpId:vcl:PrintDialog:TitleRow:CheckBox
-FormulaText .HelpId:vcl:PrintDialog:FormulaText:CheckBox
-Borders .HelpId:vcl:PrintDialog:Border:CheckBox
-OriginalSize .HelpId:vcl:PrintDialog:PageOptions:RadioButton:0
-OriginalSizeMath .HelpId:vcl:PrintDialog:PrintFormat:RadioButton:0
-FitToPage .HelpId:vcl:PrintDialog:PageOptions:RadioButton:1
-FitToPageMath .HelpId:vcl:PrintDialog:PrintFormat:RadioButton:1            
-Scaling .HelpId:vcl:PrintDialog:PrintFormat:RadioButton:2
-ScalingFactor .HelpId:vcl:PrintDialog:PrintScale:NumericField
-
-*TabLayout .HelpId:vcl:PrintDialog:NUpPage
-PagesPerSheet .HelpId:vcl:PrintDialog:NUpPage:PagesPerSheet
-NumberOfPages .HelpId:vcl:PrintDialog:NUpPage:PagesPerSheetBox
-NumberOfColumns .HelpId:vcl:PrintDialog:NUpPage:ColumnsBox
-NumberOfRows .HelpId:vcl:PrintDialog:NUpPage:RowsBox
-BorderAroundPages .HelpId:vcl:PrintDialog:NUpPage:BorderBox
-Brochure .HelpId:vcl:PrintDialog:NUpPage:Brochure
-DistanceBetweenPages .HelpId:vcl:PrintDialog:NUpPage:PageMarginBox
-MarginToSheetBorder .HelpId:vcl:PrintDialog:NUpPage:SheetMarginBox
-PaperOrientation .HelpId:vcl:PrintDialog:NUpPage:OrientationBox
-PrintOrder .HelpId:vcl:PrintDialog:NUpPage:OrderBox
-IncludePages .HelpId:vcl:PrintDialog:PrintLeftRightPages:ListBox
-PrintBrochureRTL .HelpId:vcl:PrintDialog:PrintProspectRTL:ListBox
-BrochurePageSides .HelpId:vcl:PrintDialog:PrintProspectInclude:ListBox            
-
-*TabOptions .HelpId:vcl:PrintDialog:OptPage
-PrintToFile .HelpId:vcl:PrintDialog:OptPage:ToFile
-PrintAsSingleJobs .HelpId:vcl:PrintDialog:OptPage:SingleJobs
-PrintReverse .HelpId:vcl:PrintDialog:OptPage:Reverse
-PaperTrayFromPrefs .HelpId:vcl:PrintDialog:PrintPaperFromSetup:CheckBox        
+PrintingTabControl .HelpID:vcl:PrintDialog:TabPages
+TabPrintGeneral .HelpID:vcl:PrintDialog:JobPage
+TabApplication .HelpID:vcl:PrintDialog:TabPage:AppPage
+TabLayout .HelpID:vcl:PrintDialog:NUpPage
+TabOptions .HelpID:vcl:PrintDialog:OptPage
+
+*TabPrintGeneral .HelpID:vcl:PrintDialog:JobPage
+PrinterList .HelpID:vcl:PrintDialog:JobPage:PrinterList
+NumberOfCopies .HelpID:vcl:PrintDialog:JobPage:Copies
+Collate .HelpID:vcl:PrintDialog:JobPage:Collate
+PrintNotes .HelpID:vcl:PrintDialog:PrintAnnotationMode:FixedText
+AllPages .HelpID:vcl:PrintDialog:PrintContent:RadioButton:0
+AllSlides .HelpID:vcl:PrintDialog:PrintContent:RadioButton:0
+AllSheets .HelpID:vcl:PrintDialog:PrintContent:RadioButton:0
+Pages .HelpID:vcl:PrintDialog:PrintContent:RadioButton:1
+Slides .HelpID:vcl:PrintDialog:PrintContent:RadioButton:1
+SelectedSheets .HelpID:vcl:PrintDialog:PrintContent:RadioButton:1
+PrintAllPages .HelpID:vcl:PrintDialog:PrintRange:RadioButton:0
+PrintPages .HelpID:vcl:PrintDialog:PrintRange:RadioButton:1                        
+PageRange .HelpID:vcl:PrintDialog:PageRange:Edit
+Selection .HelpID:vcl:PrintDialog:PrintContent:RadioButton:2
+SelectedCells .HelpID:vcl:PrintDialog:PrintContent:RadioButton:2
+Details .HelpID:vcl:PrintDialog:JobPage:DetailsBtn
+Properties .HelpID:vcl:PrintDialog:JobPage:Properties
+PageCount .HelpID:vcl:PrintDialog:NumPagesText
+PartsToPrint .HelpID:vcl:PrintDialog:PageContentType:ListBox
+SlidesPerPage .HelpID:vcl:PrintDialog:SlidesPerPage:ListBox
+ArrangeSlides .HelpID:vcl:PrintDialog:SlidesPerPageOrder:ListBox            
+
+*TabApplication .HelpID:vcl:PrintDialog:TabPage:AppPage
+PrintPageBackground .HelpID:vcl:PrintDialog:PrintPageBackground:CheckBox
+PrintGraphicsAndDiagrams .HelpID:vcl:PrintDialog:PrintTablesGraphicsAndDiagrams:CheckBox
+PrintPicturesAndObjects .HelpID:vcl:PrintDialog:PrintPicturesAndObjects:CheckBox
+PrintHiddenText .HelpID:vcl:PrintDialog:PrintHiddenText:CheckBox
+PrintTextPlaceholder .HelpID:vcl:PrintDialog:PrintTextPlaceholder:CheckBox
+PrintFormControls .HelpID:vcl:PrintDialog:PrintControls:CheckBox
+PrintTextInBlack .HelpID:vcl:PrintDialog:PrintBlackFonts:CheckBox
+PrintBlankPages .HelpID:vcl:PrintDialog:PrintEmptyPages:CheckBox
+IncludeEmptyPages .HelpID:vcl:PrintDialog:IsIncludeEmptyPages:CheckBox
+SlideName .HelpID:vcl:PrintDialog:IsPrintName:CheckBox
+DateAndTime .HelpID:vcl:PrintDialog:IsPrintDateTime:CheckBox
+HiddenPages .HelpID:vcl:PrintDialog:IsPrintHidden:CheckBox
+TilePaper .HelpID:vcl:PrintDialog:PageOptions:RadioButton:3
+OriginalColors .HelpID:vcl:PrintDialog:Quality:RadioButton:0
+Grayscale .HelpID:vcl:PrintDialog:Quality:RadioButton:1
+BlackAndWhite .HelpID:vcl:PrintDialog:Quality:RadioButton:2
+MultiplePages .HelpID:vcl:PrintDialog:PageOptions:RadioButton:2
+TitleRow .HelpID:vcl:PrintDialog:TitleRow:CheckBox
+FormulaText .HelpID:vcl:PrintDialog:FormulaText:CheckBox
+Borders .HelpID:vcl:PrintDialog:Border:CheckBox
+OriginalSize .HelpID:vcl:PrintDialog:PageOptions:RadioButton:0
+OriginalSizeMath .HelpID:vcl:PrintDialog:PrintFormat:RadioButton:0
+FitToPage .HelpID:vcl:PrintDialog:PageOptions:RadioButton:1
+FitToPageMath .HelpID:vcl:PrintDialog:PrintFormat:RadioButton:1            
+Scaling .HelpID:vcl:PrintDialog:PrintFormat:RadioButton:2
+ScalingFactor .HelpID:vcl:PrintDialog:PrintScale:NumericField
+
+*TabLayout .HelpID:vcl:PrintDialog:NUpPage
+PagesPerSheet .HelpID:vcl:PrintDialog:NUpPage:PagesPerSheet
+NumberOfPages .HelpID:vcl:PrintDialog:NUpPage:PagesPerSheetBox
+NumberOfColumns .HelpID:vcl:PrintDialog:NUpPage:ColumnsBox
+NumberOfRows .HelpID:vcl:PrintDialog:NUpPage:RowsBox
+BorderAroundPages .HelpID:vcl:PrintDialog:NUpPage:BorderBox
+Brochure .HelpID:vcl:PrintDialog:NUpPage:Brochure
+DistanceBetweenPages .HelpID:vcl:PrintDialog:NUpPage:PageMarginBox
+MarginToSheetBorder .HelpID:vcl:PrintDialog:NUpPage:SheetMarginBox
+PaperOrientation .HelpID:vcl:PrintDialog:NUpPage:OrientationBox
+PrintOrder .HelpID:vcl:PrintDialog:NUpPage:OrderBox
+IncludePages .HelpID:vcl:PrintDialog:PrintLeftRightPages:ListBox
+PrintBrochureRTL .HelpID:vcl:PrintDialog:PrintProspectRTL:ListBox
+BrochurePageSides .HelpID:vcl:PrintDialog:PrintProspectInclude:ListBox            
+
+*TabOptions .HelpID:vcl:PrintDialog:OptPage
+PrintToFile .HelpID:vcl:PrintDialog:OptPage:ToFile
+PrintAsSingleJobs .HelpID:vcl:PrintDialog:OptPage:SingleJobs
+PrintReverse .HelpID:vcl:PrintDialog:OptPage:ToReverse
+PaperTrayFromPrefs .HelpID:vcl:PrintDialog:PrintPaperFromSetup:CheckBox        
 
 *PurchaseStarOffice sym:TAB_HID_LICENSING_DIALOG
 TabPurchase sym:TAB_HID_TP_PURCHASE
diff --git a/testautomation/graphics/optional/includes/global/g_arrangealign.inc b/testautomation/graphics/optional/includes/global/g_arrangealign.inc
index 1023ab88fd0a..929f139ed1ef 100644
--- a/testautomation/graphics/optional/includes/global/g_arrangealign.inc
+++ b/testautomation/graphics/optional/includes/global/g_arrangealign.inc
@@ -41,15 +41,15 @@ testcase tiDatei_Fuer_Anordnen_Erstellen
     call hNewDocument
     if gApplication = "DRAW" then
         kontext "DocumentDraw"
-        DocumentDraw.UseMenu
     else
         kontext "DocumentImpress"
         DocumentImpress.UseMenu
+        hMenuSelectNr(4)
+        hMenuSelectNr(13)
+        call sSelectEmptyLayout
     end if
     
-    hMenuSelectNr(4)
-    hMenuSelectNr(13)
-    call sSelectEmptyLayout								'/// new document  ///'
+    								
     if Dir(Datei)<>"" then app.Kill(Datei) ' kill old file
     printlog "create 3 overlapping objects "
     for Zaehler = 1 to 3
diff --git a/testautomation/graphics/optional/includes/global/g_character.inc b/testautomation/graphics/optional/includes/global/g_character.inc
index 8d58263c74d4..a1ee4285036b 100644
--- a/testautomation/graphics/optional/includes/global/g_character.inc
+++ b/testautomation/graphics/optional/includes/global/g_character.inc
@@ -404,35 +404,35 @@ testcase tSetFormatCharacter
         Call  hNewDocument
 
         printlog "activate all languages in options "
-        '///+ Tools->Options "
+        printlog " Tools->Options "
         ToolsOptions
-        '///+ select tabpage 'Languages' from set 'Language Settings' "
+        printlog " select tabpage 'Languages' from set 'Language Settings' "
         hToolsOptions("LANGUAGESETTINGS","Languages")
         kontext "TabSprachen"
-        '///+ save state and check checkbox 'Asian languages support' "
+        printlog " save state and check checkbox 'Asian languages support' "
         printlog "if the language is Asian, skip this part "
         printlog "iSprache = " + iSprache
         if bAsianLan = FALSE then
            bAsian = Aktivieren.isEnabled
            Aktivieren.check
         endif
-        '///+ save state and  check checkbox 'Complex text layout (CTL) support' "
+        printlog " save state and  check checkbox 'Complex text layout (CTL) support' "
         bComplex = ComplexScriptEnabled.isEnabled
         ComplexScriptEnabled.check
-        '///+ close dialog 'Options' with OK "
+        printlog "close dialog 'Options' with OK "
         Kontext "ExtrasOptionenDlg"
         ExtrasOptionenDlg.OK
 
         printlog "get count of languages "
-        '///+ Format->Character "
+        printlog " Format->Character "
         FormatCharacter
         sleep 1
         Kontext
-        '///+ switch to tabpage 'Font' "
+        printlog "switch to tabpage 'Font' "
         Messagebox.SetPage TabFont
         kontext "TabFont"
         sleep 1
-        '///+ get count of languages for Western/Asian/CTL fonts "
+        printlog " get count of languages for Western/Asian/CTL fonts "
         iWest    = LanguageWest.getItemCount
         iAsian   = LanguageEast.getItemCount
         iComplex = LanguageCTL.getItemCount
diff --git a/testautomation/graphics/optional/includes/global/g_clipboard.inc b/testautomation/graphics/optional/includes/global/g_clipboard.inc
index 70b387581329..d43c49610c26 100644
--- a/testautomation/graphics/optional/includes/global/g_clipboard.inc
+++ b/testautomation/graphics/optional/includes/global/g_clipboard.inc
@@ -136,7 +136,6 @@ testcase tiEditUndo
     else
         warnlog "File is missing."
     endif
-    Call hCloseDocument	
 
     printlog "Close document"
     Call hCloseDocument						
@@ -259,14 +258,14 @@ testcase tiEditClipboard
     printlog "Get values for position variables"
     Ueber_Text_4 = fGetPositionX()				
     Sleep 1
-    printlog "<b> Edit->Copy </b>"
+    printlog " Edit->Copy"
     EditCopy
-    '///+ Type Key [Deletee]"
+    printlog " Type Key [Delete]"
     hTypeKeys "<DELETE>"
-    '///+ <i> Edit->Paste </i>"
+    printlog "Edit->Paste"
     EditPaste
     sleep 1
-    '///+   Edit->Select All"
+    printlog "Edit->Select All"
     EditSelectAll
     sTemp = fGetPositionX()
     printlog "TabPositionAndSize: comparing position with original position"
diff --git a/testautomation/graphics/optional/includes/global/g_line.inc b/testautomation/graphics/optional/includes/global/g_line.inc
index 2a6d5b315f89..eb672b3b9716 100644
--- a/testautomation/graphics/optional/includes/global/g_line.inc
+++ b/testautomation/graphics/optional/includes/global/g_line.inc
@@ -325,7 +325,7 @@ ZentriertLinks.Check
     TabLinienenden.Cancel
     sleep 2
     
-    '///New part for line
+    'New part for line
     'EditSelectAll     printlog "Select all objects in document"
     'sleep 2
     'hTypeKeys "<DELETE>"     printlog "Delete objects"
diff --git a/testautomation/graphics/optional/includes/global/g_tables.inc b/testautomation/graphics/optional/includes/global/g_tables.inc
index 10774ab43d76..c3c8f99c551c 100644
--- a/testautomation/graphics/optional/includes/global/g_tables.inc
+++ b/testautomation/graphics/optional/includes/global/g_tables.inc
@@ -40,6 +40,9 @@ dim iItemIndex AS integer           'Counter for/next
 
 testcase tiInsertTableUsingMenu
 
+qaerrorlog "#i116013# No table toolbar when inserting table via insert/table"
+goto endsub
+
     printlog "Inserting table into doc using the menu."
     Call hNewDocument
     printlog "Switching between Draw/Impress"
@@ -60,6 +63,7 @@ testcase tiInsertTableUsingMenu
     Kontext "InsertTableImpress"
     if InsertTableImpress.Exists then
         printlog "InsertTable Dialog is up."
+        InsertTableImpress.OK
     else
         warnlog "InsertTableDialog did not come up!"
     endif
@@ -125,6 +129,9 @@ endcase 'tiInsertTableUsingMenu
 
 testcase tiInsertTableUsingButton
 
+qaerrorlog "#i116013# No table toolbar when inserting table via insert/table"
+goto endsub
+
     printlog " Inserting table using the button in standard toolbar."
     Call hNewDocument
     printlog "Open New Document."
@@ -204,6 +211,9 @@ endcase 'tiInsertTableUsingToolbarbutton
 '-------------------------------------------------------------------------------
 testcase tiTableObjectBar
 
+qaerrorlog "#i116013# No table toolbar when inserting table via insert/table"
+goto endsub
+
     printlog "Testing TableObjectBar."
     printlog "Inserting table into doc using the menu."
     Call hNewDocument
@@ -244,6 +254,7 @@ testcase tiTableObjectBar
         printlog "Table bar visible."
     else
         warnlog "Table bar is not up!"
+        ViewToolbarsTable
     endif
 
     printlog "Checking LinienStil."
diff --git a/testautomation/graphics/optional/includes/global/g_tools.inc b/testautomation/graphics/optional/includes/global/g_tools.inc
index 9faee3508c1b..e8e918b95cbb 100644
--- a/testautomation/graphics/optional/includes/global/g_tools.inc
+++ b/testautomation/graphics/optional/includes/global/g_tools.inc
@@ -459,11 +459,16 @@ endcase 'tiToolsHyphenation2
 '-------------------------------------------------------------------------------
 testcase tToolsMacro
 
+qaerrorlog( "#i116017# - [Automation]: TypeKeys executes wrong commands" )
+    goto endsub
+
+
     Dim i as integer
     Dim j as integer
     Dim Zaehler as integer
     Dim ZaehlerListe as integer
 
+    printlog "New document"
     Call hNewDocument
 
     ToolsMacro
@@ -474,7 +479,9 @@ testcase tToolsMacro
         Zaehler=MakroAus.GetItemCount
         MakroAus.typeKeys "<end>"
         for i = 1 to Zaehler
-            MakroAus.typeKeys "<+><up>"
+            MakroAus.typeKeys "<+>"
+            sleep 1
+            MakroAus.typeKeys "<up>"
         next i
     next j
     Zaehler=MakroAus.GetItemCount
diff --git a/testautomation/graphics/optional/includes/impress/i_pengine.inc b/testautomation/graphics/optional/includes/impress/i_pengine.inc
index aed79a6ce827..2374ff28f572 100644
--- a/testautomation/graphics/optional/includes/impress/i_pengine.inc
+++ b/testautomation/graphics/optional/includes/impress/i_pengine.inc
@@ -210,7 +210,6 @@ testcase tSlideShowInteraction
    setStartCurrentPage(FALSE)   printlog "Set "start with current page to OFF"
 
    printlog "call 'Insert->Slide' three times and name the slides 2, 3, 4 and create a rectangle on it "
-   '///+ we now have 4 slides ?! :-)"
    for i = 2 to 4
       InsertSlide
       sleep 2
diff --git a/testautomation/graphics/optional/includes/impress/i_slidelayer.inc b/testautomation/graphics/optional/includes/impress/i_slidelayer.inc
index 724aaa8b70a4..508394144663 100644
--- a/testautomation/graphics/optional/includes/impress/i_slidelayer.inc
+++ b/testautomation/graphics/optional/includes/impress/i_slidelayer.inc
@@ -49,23 +49,23 @@ testcase tiInsertExpandSlide
     ViewWorkspaceOutlineView
     Sleep 1
     Kontext "DocumentImpressOutlineView"
-    '///+ create a slide with some levels...and some more slides with just one level...  "
-    '///+ it should look like this: "
-    '///+-------------------------------------------------- "
-    '///+ Slide 1"
-    '///+ - A "
-    '///+ - - B"
-    '///+ - - - C"
-    '///+ - - - - D"
-    '///+ - - - - - - F"
-    '///+ - B"
-    '///+ - C"
-    '///+ - D"
-    '///+ Slide 2 "
-    '///+ Slide 3 "
-    '///+ Slide 4 "
-    '///+ Slide 5 "
-    '///+-------------------------------------------------- "
+    'create a slide with some levels...and some more slides with just one level...  "
+    'it should look like this: "
+    '-------------------------------------------------- "
+    'Slide 1"
+    ' - A "
+    '- - B"
+    ' - - - C"
+    ' - - - - D"
+    ' - - - - - - F"
+    ' - B"
+    ' - C"
+    ' - D"
+    ' Slide 2 "
+    ' Slide 3 "
+    ' Slide 4 "
+    ' Slide 5 "
+    '-------------------------------------------------- "
     DocumentImpressOutlineView.TypeKeys "Slide 1"
     for i = 1 to 6
      DocumentImpressOutlineView.TypeKeys "<return><tab>"
diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow.inc b/testautomation/graphics/optional/includes/impress/i_slideshow.inc
index 2c51a83a509a..da96b13cc47d 100644
--- a/testautomation/graphics/optional/includes/impress/i_slideshow.inc
+++ b/testautomation/graphics/optional/includes/impress/i_slideshow.inc
@@ -1092,7 +1092,7 @@ testcase tSlideShowSlideTransition
          select case i
             case 1: printlog " click button 'Automatic Transition' "
                     if (TransitionAutomaticallyAfter.IsEnabled) then
-                       '///+ -  + +  Check Time '1' OR "
+                       printlog " Check Time '1' OR "
                        sTemp = TransitionAutomaticallyAfterTime.GetText
                        if (sTemp <> TimerValue) then
                           Warnlog "   Time is different :-( is: '" + sTemp + "' should be: '" + TimerValue + "'" '"00:00:01"
@@ -1101,11 +1101,11 @@ testcase tSlideShowSlideTransition
                        Warnlog "   button 'Automatic Transition' not pressed ?"
                     end if
             case 2: if (TransitionAutomaticallyAfter.IsChecked <> FALSE) then
-                       '///+ - + check button 'SemiAutomatic Transition' OR "
+                        printlog " check button 'SemiAutomatic Transition' OR "
                        Warnlog "   button 'Automatic Transition' is pressed ?"
                     end if
             case 3: if (TransitionAutomaticallyAfter.IsChecked <> FALSE) then
-                      '///+ - + click button 'Manual Transition' "
+                      printlog "click button 'Manual Transition' "
                        Warnlog "   button 'Automatic Transition' is pressed ?"
                     end if
          end select
diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow3.inc b/testautomation/graphics/optional/includes/impress/i_slideshow3.inc
index 07ac2f0d9def..52858e22e7cf 100644
--- a/testautomation/graphics/optional/includes/impress/i_slideshow3.inc
+++ b/testautomation/graphics/optional/includes/impress/i_slideshow3.inc
@@ -560,7 +560,7 @@ testcase tExtrasPraesentationseinstellungen
     printlog " Check state of navigator ! Expected: closed"
     Kontext "Navigator"
     if Navigator.exists then
-        '///+ Close Navigator !"
+        printlog " Close Navigator !"
         Navigator.Close
         Warnlog "Navigator: Should have been closed. Closing now."
     else
diff --git a/testautomation/graphics/required/includes/global/id_opt_1.inc b/testautomation/graphics/required/includes/global/id_opt_1.inc
index dcb6c38795bb..35874fe0495f 100644
--- a/testautomation/graphics/required/includes/global/id_opt_1.inc
+++ b/testautomation/graphics/required/includes/global/id_opt_1.inc
@@ -84,13 +84,17 @@ testcase tToolsOptionsDrawGeneral (sApplication as string)
         Tabulatorabstand.SetText (sTabAbstand)
 
         if (gApplication = "DRAW") then
+            printlog "Index Zeichnungsmasstab= " & iZeichnungsmasstab
+            printlog "Zeichnungsmasstab Item Count= " & (Zeichnungsmasstab.GetItemCount)
             If ( Zeichnungsmasstab.GetItemCount <> iZeichnungsmasstab ) Then
-                Zeichnungsmasstab.Select (Zeichnungsmasstab.GetItemCount) _
-            Else Zeichnungsmasstab.Select (1)
-                iTemp2 = Zeichnungsmasstab.GetSelIndex
-                if irgendwas(6) Then SetzenAufKreis.UnCheck Else           SetzenAufKreis.Check
+                Zeichnungsmasstab.Select (Zeichnungsmasstab.GetItemCount)
+            Else 
+                Zeichnungsmasstab.Select (1)
             endif
-            else ' IMPRESS
+            iTemp2 = Zeichnungsmasstab.GetSelIndex
+            printlog "iTemp2= " & iTemp2
+            if irgendwas(6) Then SetzenAufKreis.UnCheck Else           SetzenAufKreis.Check
+        else ' IMPRESS
             if irgendwas(7) Then MitAutopilotStarten.UnCheck         Else  MitAutopilotStarten.Check
             if irgendwas(8) Then MitAktuellerSeite.UnCheck           Else  MitAktuellerSeite.Check
             if irgendwas(9) Then AlleAbsatzabstaendeAddieren.UnCheck Else  AlleAbsatzabstaendeAddieren.Check
@@ -110,7 +114,7 @@ testcase tToolsOptionsDrawGeneral (sApplication as string)
         Kontext "ExtrasOptionenDlg"
         ExtrasOptionenDlg.OK
 
-        printlog "Office quit - start"
+        printlog "-------> Office quit - start"
 
         ExitRestartTheOffice
         printlog "opening new doc to get the Options"
@@ -127,6 +131,8 @@ testcase tToolsOptionsDrawGeneral (sApplication as string)
         If ( irgendwas(5) = ObjekteImmerVerschiebbar.IsChecked   ) Then WarnLog "Objects Always Movable state changed"
 
         if (gApplication = "DRAW") then
+        printlog "Index Zeichnungsmasstab= " & (Zeichnungsmasstab.GetSelIndex)
+        printlog "iTemp2= " & iTemp2
          If ( Zeichnungsmasstab.GetSelIndex <> iTemp2 ) Then WarnLog "Drawing Scale state changed BUG #97391 is:"+Zeichnungsmasstab.GetSelIndex+"; should: "+iTemp2
          If ( irgendwas(6) = SetzenAufKreis.IsChecked             ) Then WarnLog "'Do not disort objects in curve' state changed"
         else ' IMPRESS
diff --git a/testautomation/writer/optional/includes/textframes/w_textframes2.inc b/testautomation/writer/optional/includes/textframes/w_textframes2.inc
index 4fca2bdbddb6..466b0c99ab15 100644
--- a/testautomation/writer/optional/includes/textframes/w_textframes2.inc
+++ b/testautomation/writer/optional/includes/textframes/w_textframes2.inc
@@ -868,7 +868,7 @@ testcase tTextframes_28
     
     printlog "Insert a frame"
     Call fInsertFrame(30, 30, 60, 60)
-    
+    Sleep 2
     printlog "Naming the frame"
     Call fFormatFrame("TabZusaetze")
     ObjektName.SetText sFrameName1
@@ -885,7 +885,7 @@ testcase tTextframes_28
     
     printlog "Insert another frame"
     Call fInsertFrame(50, 50, 80, 80)
-    
+    Sleep 2
     printlog "Naming the frame"
     Call fFormatFrame("TabZusaetze")
     ObjektName.SetText sFrameName2
diff --git a/testautomation/writer/required/includes/w_007_.inc b/testautomation/writer/required/includes/w_007_.inc
index 20b468c9605c..466328026d9b 100644
--- a/testautomation/writer/required/includes/w_007_.inc
+++ b/testautomation/writer/required/includes/w_007_.inc
@@ -910,6 +910,7 @@ testcase tToolsUpdate
     Call wTypeKeys ("Dieser Text ist zur Aktualisierung")
     printlog " Insert / Indexes"
     InsertIndexes
+    sleep 1
 
     Kontext "Active"
     if ( Active.Exists( 2 ) ) then
diff --git a/testautomation/writer/tools/includes/w_tool6.inc b/testautomation/writer/tools/includes/w_tool6.inc
index 33ddca87709e..9bc7ed688d9b 100644
--- a/testautomation/writer/tools/includes/w_tool6.inc
+++ b/testautomation/writer/tools/includes/w_tool6.inc
@@ -38,6 +38,10 @@ sub wOfficeRestart
     FileExit "SynchronMode", TRUE
 
     Call hStartTheOffice
+
+    ' Open new document
+    Call hNewDocument
+
 end sub
 
 '--------------------------------------------------------------