1 files changed, 56 insertions, 32 deletions
diff --git a/testautomation/graphics/optional/includes/global/g_tables.inc b/testautomation/graphics/optional/includes/global/g_tables.inc
index 1414a857b598..ca5fc625c4ab 100644
--- a/testautomation/graphics/optional/includes/global/g_tables.inc
+++ b/testautomation/graphics/optional/includes/global/g_tables.inc
@@ -29,13 +29,6 @@
 '*
 '* short description : Testing of impress tables
 '*
-'*******************************************************************
-'*
-' #1 tiInsertTableUsingMenu
-' #1 tiInsertTableUsingButton
-' #1 tiTableObjectBar
-' #1 tiInsertTableUsingToolbarbuttonView
-'*
 '\******************************************************************
 
 'Variables:
@@ -50,7 +43,7 @@ testcase tiInsertTableUsingMenu
     printlog "Inserting table into doc using the menu."
     Call hNewDocument
     printlog "Switching between Draw/Impress"
-    if (UCase(gApplication)) = "IMPRESS" then
+    if ( gApplication = "IMPRESS" ) then
         DocumentImpress.UseMenu
         hMenuSelectNr(4)
         hMenuSelectNr(14)
@@ -213,7 +206,7 @@ testcase tiTableObjectBar
     printlog "Inserting table into doc using the menu."
     Call hNewDocument
     printlog "Switching between Draw/Impress"
-    if (UCase(gApplication)) = "IMPRESS" then
+    if ( gApplication = "IMPRESS" ) then
         DocumentImpress.UseMenu
         hMenuSelectNr(4)
         hMenuSelectNr(14)
@@ -229,7 +222,7 @@ testcase tiTableObjectBar
 
     printlog "Selecting table for geeting the TableObjectBar."
     printlog "Switching between Draw/Impress"
-    if (UCase(gApplication)) = "IMPRESS" then
+    if ( gApplication = "IMPRESS" )then
         Kontext "DocumentImpress"
         DocumentImpress.TypeKeys "<TAB>",3
     else
@@ -258,7 +251,7 @@ testcase tiTableObjectBar
     Kontext "TableObjectBar"
 
     TableObjectBar.Close
-    if (UCase(gApplication)) = "IMPRESS" then
+    if ( gApplication = "IMPRESS" ) then
         Kontext "DocumentImpress"
     else
         Kontext "DocumentDraw"
@@ -278,7 +271,7 @@ testcase tiTableObjectBar
     endif
     Kontext "TableObjectBar"
     TableObjectBar.Close
-    if (UCase(gApplication)) = "IMPRESS" then
+    if ( gApplication = "IMPRESS" ) then
         Kontext "DocumentImpress"
     else
         Kontext "DocumentDraw"
@@ -295,7 +288,7 @@ testcase tiTableObjectBar
     else
         warnlog "BordersTB is not up!"
     endif
-    if (UCase(gApplication)) = "IMPRESS" then
+    if ( gApplication = "IMPRESS" ) then
         Kontext "DocumentImpress"
     else
         Kontext "DocumentDraw"
@@ -303,7 +296,7 @@ testcase tiTableObjectBar
 
     printlog "Checking merge cells."
     printlog "Inserting something into cell and select."
-    if (UCase(gApplication)) = "IMPRESS" then
+    if ( gApplication = "IMPRESS" ) then
         DocumentImpress.TypeKeys ("a")
         DocumentImpress.TypeKeys "<SHIFT RIGHT>"
     else
@@ -312,29 +305,46 @@ testcase tiTableObjectBar
     endif
     Kontext "TableObjectBar"
     if TableObjectBar.NotExists(2) then ViewToolbarsTable
+
+    printlog( "Merge cells" )
+    Wait( 1000 )
     ZellenVerbinden.Click
-    printlog "Cells merged."
 
-    printlog "Checking split cells."
+    printlog( "Split cells" )
+    Wait( 1000 )
     ZelleTeilen.Click
-    printlog "Cells split."
+
     Kontext "ZellenTeilen"
-    WaitSlot(1000)
-    printlog "SplitCells dialog open."
-    Anzahl.ToMax
-    printlog "Maximum SplitCellCount is " & Anzahl.GetText & "."
-    Anzahl.ToMin
-    printlog "Minimum SplitCellCount is " & Anzahl.GetText & "."
-    if Horizontal.IsChecked = TRUE then
-        printlog "Horizontally is clicked."
+    if ( ZellenTeilen.exists( 2 ) ) then
+        
+        printlog "SplitCells dialog open."
+
+        printlog( "Set number to maximum" )
+        Anzahl.ToMax
+        printlog "Maximum SplitCellCount is " & Anzahl.GetText & "."
+
+        printlog( "Set number to minimum" )
+        Anzahl.ToMin
+        printlog "Minimum SplitCellCount is " & Anzahl.GetText & "."
+
+        printlog( "<Horizontal> should be checked" )
+        if ( Horizontal.IsChecked ) then
+            printlog "Horizontally is clicked."
+        else
+            warnlog "Horizontally should be clicked by default!"
+        endif
+
+        printlog( "Distribute/Split equally" )
+        GleichmaessigTeilen.Check
+
+        printlog( "Check <Vertically>" )
+        Vertikal.Check
+
+        printlog( "Close dialog <Split Cells>" )
+        hCloseDialog( ZellenTeilen, "close" )
     else
-        warnlog "Horizontally should be clicked by default!"
+        warnlog( "Dialog <Split Cells> did not open" )
     endif
-    GleichmaessigTeilen.Check
-    printlog "Split Equal checked."
-    Vertikal.Check
-    printlog "Cells vertically checked."
-    ZellenTeilen.OK
     printlog " Checking optimize button   'ToDo: button not working"
     'Kontext "TableObjectBar"
     'Optimieren.TearOff
@@ -364,7 +374,7 @@ testcase tiTableObjectBar
     tabledesign.Click
     
     printlog "Checking for Table Design in Impress TaskBar or for Dialog in Draw."
-    if (UCase(gApplication)) = "IMPRESS" then
+    if ( gApplication = "IMPRESS" ) then
         kontext "Tasks"
         if (NOT Tasks.exists) then
             warnlog "Tasks Panel not visible. Opening now."
@@ -395,6 +405,20 @@ testcase tiTableObjectBar
     kontext "TabFont"
 
     printlog "Checking Fonts Box."
+
+    if ( Font.exists() ) then
+        printlog( "Western dialog layout -> good" )
+    else
+        if ( FontWest.exists() ) then
+            warnlog( "<FontWest> exists, asian support is enabled which this test cannot handle" )
+        else
+            warnlog( "Unknown error while trying to access <Font> listbox" )
+        endif
+        hCloseDialog( TabFont, "close" )
+        hFileCloseAll()
+        goto endsub
+    endif
+
     iItemCount = Font.GetItemCount
     printlog "Fontbox has " & iItemCount & " entries."
     for iItemIndex = 1 to iItemCount