chartmultiline: merge with DEV300_m74

6 files changed, 258 insertions, 15 deletions

diff --git a/testautomation/chart2/optional/ch2_lvl1.bas b/testautomation/chart2/optional/ch2_lvl1.bas
index 026ba32f1c6c..7d13d601ec18 100755
--- a/testautomation/chart2/optional/ch2_lvl1.bas
+++ b/testautomation/chart2/optional/ch2_lvl1.bas
@@ -33,14 +33,14 @@
 
 sub main
     use "chart2\tools\ch_tools_common.inc"
-	use "chart2\tools\ch_tools_select.inc"
+    use "chart2\tools\ch_tools_select.inc"
     use "chart2\optional\includes\ch2_lvl1a.inc"
     
     Call hStatusIn ( "Chart2", "ch2_lvl1.bas" )
     
-	Call ch2_lvl1a
+    Call ch2_lvl1a
     
-	Call hStatusOut
+    Call hStatusOut
 	
 	
 end sub
diff --git a/testautomation/chart2/optional/includes/ch2_lvl1a.inc b/testautomation/chart2/optional/includes/ch2_lvl1a.inc
index 952c75a37f22..42ee8ff48bd1 100644
--- a/testautomation/chart2/optional/includes/ch2_lvl1a.inc
+++ b/testautomation/chart2/optional/includes/ch2_lvl1a.inc
@@ -33,7 +33,8 @@
 
 sub ch2_lvl1a
 
-	Call tPlotOptions
+    Call tPlotOptions
+    Call tChartShapes
 
 end sub
 
@@ -143,3 +144,117 @@ testcase tPlotOptions
 
 	Call hCloseDocument
 endcase
+
+'
+'-------------------------------------------------------------------------
+'
+testcase tChartShapes
+
+	Dim sLocalFile as string
+	Dim sLocalFileXLS as string
+	Dim sFormatXLS as string
+	sLocalFile = convertpath(gOfficepath & "user\work\chartshapes.ods")
+	sLocalFileXLS = convertpath(gOfficepath & "user\work\chartshapes.xls")
+	sFormatXLS = "MS Excel 97"
+	
+	printlog " Load simple chart document"
+    if fLoadVerySimpleChartAndSaveLocal() > 0 then
+        warnlog "Loading test document seems to have failed -> Check this out!"
+        goto endsub
+    endif
+    printlog " Select chart using navigator"
+    call fSelectFirstOLE
+    printlog " Invoke Edit::Object::Edit to enter Inplace Mode"
+    EditObjectEdit
+    printlog " Verify that the drawbar is visible"
+    Kontext "DrawBar"
+    
+    qaerrorlog "#i107003# disabled because of bug in toolbars"
+'    if Not DrawBar.Exists then 
+'    	Call hToolbarSelect("Drawing", true)
+'    endif
+
+	    printlog " Insert a shape to the chart by <STRG-RETURN>"
+    Kontext "DrawBar"
+    sleep (1)
+    DrawBar.typekeys "<TAB>",TRUE
+    DrawBar.typekeys "<TAB>",TRUE
+    DrawBar.typekeys "<TAB>",TRUE
+    DrawBar.typekeys "<TAB>",TRUE
+    DrawBar.typekeys "<MOD1 RETURN>",TRUE
+    printlog " Rename inserted shape"
+    Kontext "DocumentChart"
+    sleep (1)
+    DocumentChart.OpenContextMenu
+    sleep (1)
+    hMenuSelectNr (6)
+    Kontext "NameDlgObject"
+    NameField.SetText "ChartShape1"
+    NameDlgObject.OK
+    printlog " Leave Chart"
+    Kontext "DocumentCalc"
+    DocumentCalc.TypeKeys "<Escape>"
+    printlog "Select chart using navigator"
+    call fSelectFirstOLE   
+    printlog "Invoke Edit::Object::Edit to enter Inplace Mode"
+    EditObjectEdit
+    printlog " Check if shape is still there"
+    Kontext "DocumentChart"
+    DocumentChart.typekeys "<SHIFT TAB>"
+    Sleep (1)
+    Kontext "Toolbar"
+    if ChartElementSelector.GetSelText <> "ChartShape1" then
+    	warnlog "Something is wrong with the shape"
+    endif
+    printlog " Leave Chart"
+    Kontext "DocumentCalc"
+    DocumentCalc.TypeKeys "<Escape>"
+    printlog " Save document with the default calc filter"
+    call hFileSaveAsKill ( sLocalFile )
+    printlog " Save document to xls"
+    if NOT hFileSaveAsWithFilterKill ( sLocalFileXLS , sFormatXLS ) then
+        warnlog "Saving test document localy failed -> Aborting"
+        call hCloseDocument
+        goto endsub
+    end if
+	printlog " Close document"
+    call hCloseDocument
+    printlog " Open document"
+    call hFileOpen ( sLocalFile )
+	printlog "Select chart using navigator"
+    call fSelectFirstOLE   
+    printlog "Invoke Edit::Object::Edit to enter Inplace Mode"
+    EditObjectEdit
+    printlog " Check if shape is still there"
+    Kontext "DocumentChart"
+    DocumentChart.typekeys "<SHIFT TAB>"
+    Sleep (1)
+    Kontext "Toolbar"
+    if ChartElementSelector.GetSelText <> "ChartShape1" then
+    	warnlog "Something is wrong with the shape"
+    endif
+    printlog " Leave Chart"
+    Kontext "DocumentCalc"
+    DocumentCalc.TypeKeys "<Escape>"
+    printlog " Close document"
+    Call hCloseDocument
+	call hFileOpen ( sLocalFileXLS )
+	printlog "Select chart using navigator"
+    call fSelectFirstOLE   
+    printlog "Invoke Edit::Object::Edit to enter Inplace Mode"
+    EditObjectEdit
+    printlog " Check if shape is still there"
+    Kontext "DocumentChart"
+    DocumentChart.typekeys "<SHIFT TAB>"
+    Sleep (1)
+    Kontext "Toolbar"
+    if ChartElementSelector.GetSelText <> "ChartShape1" then
+    	warnlog "Something is wrong with the shape"
+    endif
+    printlog " Leave Chart"
+    Kontext "DocumentCalc"
+    DocumentCalc.TypeKeys "<Escape>"
+    printlog " Close document"
+    Call hCloseDocument
+    
+endcase
diff --git a/testautomation/chart2/required/ch2_updt_calc.bas b/testautomation/chart2/required/ch2_updt_calc.bas
index 261424c87cd9..7dba15ead84f 100755..100644
--- a/testautomation/chart2/required/ch2_updt_calc.bas
+++ b/testautomation/chart2/required/ch2_updt_calc.bas
@@ -128,7 +128,7 @@ sub main
     printlog Chr(13) + "---------  Chart2 Window Menu  ---------"
     Call tWindowNewWindowAndClose
     printLog Chr(13) + "----------  Chart2 Toolbars  -----------"      
-    Call tdummyToolbar
+    Call tDrawBar
     printLog Chr(13) + "--------- Chart2 as OLE object ---------"
     Call tChartOLE("WRITER")
     Call tChartOLE("CALC")
@@ -146,7 +146,7 @@ sub LoadIncludeFiles
     use "global\system\includes\master.inc"
     use "global\system\includes\gvariabl.inc"
     use "global\tools\includes\optional\t_set_standard_controls.inc"
+    use "global\tools\includes\optional\t_ole.inc"
     Call GetUseFiles 
     gApplication = "CALC"
 end sub
-
diff --git a/testautomation/chart2/required/includes/ch2_menu.inc b/testautomation/chart2/required/includes/ch2_menu.inc
index 7c24c3857b60..7461fbc1461c 100644
--- a/testautomation/chart2/required/includes/ch2_menu.inc
+++ b/testautomation/chart2/required/includes/ch2_menu.inc
@@ -108,13 +108,13 @@ testcase tMainMenu
         end if
         call hMenuClose()
                
-        printlog "check if there are 4 items in the VIEW/TOOLBAR menu."        
+        printlog "check if there are 5 items in the VIEW/TOOLBAR menu."        
         DocumentCalc.UseMenu 
         hMenuSelectNr(3) ' VIEW        
         hMenuSelectNr(1) ' TOOLBAR
         iCount = hMenuItemGetCount()
-        if (iCount <> 4) then
-            warnlog "There should 4 items in the VIEW/TOOLBAR menu but there are " + iCount + " items."
+        if (iCount <> 5) then
+            warnlog "There should 5 items in the VIEW/TOOLBAR menu but there are " + iCount + " items."
         end if
         call hMenuClose()
         
diff --git a/testautomation/chart2/required/includes/ch2_toolbars.inc b/testautomation/chart2/required/includes/ch2_toolbars.inc
index c1cf8f195584..c447078131fc 100644
--- a/testautomation/chart2/required/includes/ch2_toolbars.inc
+++ b/testautomation/chart2/required/includes/ch2_toolbars.inc
@@ -31,11 +31,138 @@
 '*
 '************************************************************************
 '*
-' #1 tdummyToolbar
+' #1 tDrawBar
 '*
 '\************************************************************************
 
-testcase tdummyToolbar
-    QAErrorLog "Implement test for toolbar features when toolbars are ready" 
+testcase tDrawBar
+
+    printlog " Load simple chart document"
+    if fLoadVerySimpleChartAndSaveLocal() > 0 then
+        warnlog "Loading test document seems to have failed -> Check this out!"
+        goto endsub
+    endif
+    printlog " Select chart using navigator"
+    call fSelectFirstOLE
+    printlog " Invoke Edit::Object::Edit to enter Inplace Mode"
+    EditObjectEdit
+    printlog " Verify that the drawbar is visible"
+    Kontext "DrawBar"
+    
+    qaerrorlog "#i107003# disabled because of bug in toolbars"
+'    if Not DrawBar.Exists then 
+'    	Call hToolbarSelect("Drawing", true)
+'    endif
+
+    printlog " Check if all items on drawbar are available"
+    if DrawBar.GetItemCount <> 16 then
+    	warnlog "There are " & DrawBar.GetItemCount & " instead of 16 items on drawbar"
+    endif
+    printlog " Click on every button on the Drawingbar"
+    Auswahl.click
+    Linie.click
+    LineArrowEnd.click
+    Rechteck.click
+    Ellipse.click
+    Freihand.click
+    Textobjekt.click
+    Legende.click
+    BasicShapes.click
+    SymbolShapes.click
+    BlockArrows.click
+    Flowcharts.click
+    Callouts.click
+    Stars.click
+    printlog " Open menubutton BasicShapes"
+    BasicShapes.TearOff
+    Kontext "BasicShapes"
+    printlog " Check that there are 25 BasicShapes"
+    if BasicShapes.GetItemCount <> 25 then
+    	warnlog "There are " & BasicShapes.GetItemCount & " instead of 25 BasicShapes"
+    endif
+    BasicShapes.close
+    Kontext "DrawBar"
+    printlog " Open menubutton SymbolShapes"
+    SymbolShapes.TearOff
+    Kontext "SymbolShapes"
+    printlog " Check that there are 20 SymbolShapes"
+    if SymbolShapes.GetItemCount <> 20 then
+    	warnlog "There are " & SymbolShapes.GetItemCount & " instead of 25 SymbolShapes"
+    endif
+    SymbolShapes.close
+    Kontext "DrawBar"
+    printlog " Open menubutton BlockArrows"
+    BlockArrows.TearOff
+    Kontext "ArrowShapes"
+    printlog " Check that there are 30 ArrowShapes"
+    if ArrowShapes.GetItemCount <> 30 then
+    	warnlog "There are " & ArrowShapes.GetItemCount & " instead of 25 ArrowShapes"
+    endif
+    ArrowShapes.close
+    Kontext "DrawBar"
+    printlog " Open menubutton Flowcharts"
+    Flowcharts.TearOff
+    Kontext "Flowchart"
+    printlog " Check that there are 32 FlowChartShapes"
+    if Flowchart.GetItemCount <> 32 then
+    	warnlog "There are " & Flowchart.GetItemCount & " instead of 32 Flowchartshapes"
+    endif
+    Flowchart.close
+    Kontext "DrawBar"
+    printlog " Open menubutton Callouts"
+    Callouts.TearOff
+    Kontext "Callouts"
+    printlog " Check that there are 7 Callouts"
+    if Callouts.GetItemCount <> 7 then
+    	warnlog "There are " & Callouts.GetItemCount & " instead of 7 Callouts"
+    endif
+    Callouts.close
+    Kontext "DrawBar"
+    printlog " Open menubutton Stars"
+    Stars.TearOff
+    Kontext "Starshapes"
+    printlog " Check that there are 13 StarShapes"
+    if Starshapes.GetItemCount <> 13 then
+    	warnlog "There are " & Starshapes.GetItemCount & " instead of 13 StarShapes"
+    endif
+    Starshapes.close
+    printlog " Insert a shape to the chart by <STRG-RETURN>"
+    Kontext "DrawBar"
+    sleep (1)
+    DrawBar.typekeys "<TAB>",TRUE
+    DrawBar.typekeys "<TAB>",TRUE
+    DrawBar.typekeys "<TAB>",TRUE
+    DrawBar.typekeys "<TAB>",TRUE
+    DrawBar.typekeys "<MOD1 RETURN>",TRUE
+    printlog " Rename inserted shape"
+    Kontext "DocumentChart"
+    DocumentChart.OpenContextMenu
+    sleep (1)
+    hMenuSelectNr (6)
+    sleep (1)
+    Kontext "NameDlgObject"
+    NameField.SetText "ChartShape1"
+    NameDlgObject.OK
+    printlog " Leave Chart"
+    Kontext "DocumentCalc"
+    DocumentCalc.TypeKeys "<Escape>"
+    printlog "Select chart using navigator"
+    call fSelectFirstOLE   
+    printlog "Invoke Edit::Object::Edit to enter Inplace Mode"
+    EditObjectEdit
+    printlog " Check if shape is still there"
+    Kontext "DocumentChart"
+    DocumentChart.typekeys "<SHIFT TAB>",TRUE
+    Sleep (1)
+    Kontext "Toolbar"
+    if ChartElementSelector.GetSelText <> "ChartShape1" then
+    	warnlog "Something is wrong with the shape"
+    endif
+    printlog " Leave Chart"
+    Kontext "DocumentCalc"
+    DocumentCalc.TypeKeys "<Escape>"
+    printlog " Close document"
+    Call hCloseDocument
+    
 endcase
 
diff --git a/testautomation/chart2/tools/ch_tools_common.inc b/testautomation/chart2/tools/ch_tools_common.inc
index 67f67d3e3f23..311e8c354f74 100644
--- a/testautomation/chart2/tools/ch_tools_common.inc
+++ b/testautomation/chart2/tools/ch_tools_common.inc
@@ -42,6 +42,8 @@
 
 sub fInsertOLE as BOOLEAN
 'Insert Chart OLE in Document
+	'Get localised OLE names
+	call GetOleDefaultNames()
     fInsertOLE = FALSE
     '/// Insert / Object / OLE
     InsertObjectOLEObject
@@ -51,9 +53,8 @@ sub fInsertOLE as BOOLEAN
     if Objekttyp.getItemcount < 1 then
         warnlog "There are no OLE-Objects in the listbox"
     endif
-    '/// Select 3rd entry in listbox (which should be the chart)
-    Objekttyp.TypeKeys "<HOME>"
-	Objekttyp.TypeKeys "<Down>", 2
+    '/// Select chart in listbox
+	Objekttyp.Select gOLEChart
     '/// Quit dialog using OK
     OLEObjektEinfuegen.OK
     sleep(2)