#i108260# get independent from OLE sequenz

2 files changed, 163 insertions, 161 deletions

diff --git a/testautomation/chart2/required/ch2_updt_calc.bas b/testautomation/chart2/required/ch2_updt_calc.bas
index 981d17400fc2..b1deb0fc03f3 100755..100644
--- a/testautomation/chart2/required/ch2_updt_calc.bas
+++ b/testautomation/chart2/required/ch2_updt_calc.bas
@@ -1,158 +1,159 @@
-'encoding UTF-8  Do not remove or change this line!

-'**************************************************************************

-'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

-'* 

-'* Copyright 2008 by Sun Microsystems, Inc.

-'*

-'* OpenOffice.org - a multi-platform office productivity suite

-'*

-'* $RCSfile: ch2_updt_calc.bas,v $

-'*

-'* $Revision: 1.1 $

-'*

-'* last change: $Author: jsi $ $Date: 2008-06-13 14:27:01 $

-'*

-'* This file is part of OpenOffice.org.

-'*

-'* OpenOffice.org is free software: you can redistribute it and/or modify

-'* it under the terms of the GNU Lesser General Public License version 3

-'* only, as published by the Free Software Foundation.

-'*

-'* OpenOffice.org is distributed in the hope that it will be useful,

-'* but WITHOUT ANY WARRANTY; without even the implied warranty of

-'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-'* GNU Lesser General Public License version 3 for more details

-'* (a copy is included in the LICENSE file that accompanied this code).

-'*

-'* You should have received a copy of the GNU Lesser General Public License

-'* version 3 along with OpenOffice.org.  If not, see

-'* <http://www.openoffice.org/license.html>

-'* for a copy of the LGPLv3 License.

-'*

-'/************************************************************************

-'*

-'* owner : oliver.craemer@sun.com

-'*

-'* short description : Resource Test for all chart specific menues

-'*

-'\************************************************************************************************

-

-sub main

-    use "chart2\tools\ch_tools_common.inc"

-    use "chart2\tools\ch_tools_chart_type.inc"

-    use "chart2\tools\ch_tools_titles.inc"

-    use "chart2\tools\ch_tools_axes.inc"

-    use "chart2\tools\ch_tools_grids.inc"

-    use "chart2\tools\ch_tools_legend.inc"

-    use "chart2\tools\ch_tools_data_labels.inc"

-    use "chart2\tools\ch_tools_statistics.inc"

-    use "chart2\tools\ch_tools_tab_pages.inc"

-    use "chart2\tools\ch_tools_select.inc"

-    use "chart2\required\includes\ch2_wizard.inc"

-    use "chart2\required\includes\ch2_file.inc"

-    use "chart2\required\includes\ch2_view.inc"

-    use "chart2\required\includes\ch2_insert_ctl.inc"

-    use "chart2\required\includes\ch2_insert.inc"

-    use "chart2\required\includes\ch2_format.inc"

-    use "chart2\required\includes\ch2_format1.inc"

-    use "chart2\required\includes\ch2_window.inc"

-    use "chart2\required\includes\ch2_toolbars.inc"

-    use "chart2\required\includes\ch2_menu.inc"

-    use "chart2\required\includes\ch2_ole.inc"

-

-    Call hStatusIn("Chart2", "ch2_updt_calc.bas")

-

-    printlog "----------------------------------------"

-    printlog "C h a r t 2   i n  S p r e a d s h e e t"

-    printlog "           U p d a t e t e s t"

-    printlog "----------------------------------------"

-    printLog Chr(13) + "-----------  Chart2 Wizard  ------------"

-    Call tCreateNewChart

-    printLog Chr(13) + "-----------  Chart2 Menu  ------------"

-    call tMainMenu        

-    printLog Chr(13) + "----------  Chart2 File Menu  ----------"

-    call tFileClose

-    call tFileSaveAsOTS

-    call tFileSaveAsSXC

-    call tFileSaveAsSTC

-    call tFileSaveAsXLS

-    call tFileSaveAsXLT

-    call tFileSaveAsSDC

-    call tFileSaveAsVOR

-    call tFileReload                

-    printLog Chr(13) + "----------  Chart2 View Menu -----------"

-    Call tViewToolbars

-    Call tViewToolbarsCustomize

-    Call tViewFullScreen              

-    printLog Chr(13) + "--------  Chart2 Insert Menu  ----------"

-    call tInsertTitle

-    call tInsertAxes

-    call tInsertGrids

-    call tInsertLegend

-    call tInsertDataLabels

-    call tInsertTrendLines

-    call tInsertMeanValueLines

-    call tInsertYErrorBars

-    call tInsertSpecialCharacter

-    printLog Chr(13) + "-------- Chart2 CTL Features  ----------"

-    call tTitleTextDirection

-    call tLegendTextDirection

-    call tXAxisTextDirection

-    call tDataSeriesTextDirection

-    call tEquationTextDirection

-    call tDataPointTextDirection

-    printlog Chr(13) + "---------  Chart2 Format Menu  ---------"

-    call tFormatObjectProperties

-    call tFormatObjectPropertiesPieChart

-    call tFormatPositonAndSize

-    call tFormatArrangement

-    Call tFormatTitleMaintitle

-    Call tFormatTitleSubtitle

-    Call tFormatTitleXAxistitle

-    Call tFormatTitleYAxistitle

-    Call tFormatTitleZAxistitle

-    Call tFormatTitleAllTitles

-    Call tFormatAxisXAxis

-    Call tFormatAxisYAxis

-    Call tFormatAxisZAxis

-    Call tFormatAxisSecondaryXAxis

-    Call tFormatAxisSecondaryYAxis

-    Call tFormatAxisAllAxes

-    Call tFormatXAxisMainGrid

-    Call tFormatYAxisMainGrid

-    Call tFormatZAxisMainGrid

-    call tFormatXAxisMinorGrid

-    Call tFormatYAxisMinorGrid

-    Call tFormatAllAxesGrids

-    Call tFormatLegend

-    Call tFormatChartWall

-    Call tFormatChartFloor

-    Call tFormatChartArea

-    Call tFormatChartType

-    call tFormatDataRanges

-    Call tFormat3DView                

-    printlog Chr(13) + "---------  Chart2 Window Menu  ---------"

-    Call tWindowNewWindowAndClose

-    printLog Chr(13) + "----------  Chart2 Toolbars  -----------"      

-    Call tdummyToolbar

-    printLog Chr(13) + "--------- Chart2 as OLE object ---------"

-    Call tChartOLE("WRITER")

-    Call tChartOLE("CALC")

-    Call tChartOLE("IMPRESS")

-    Call tChartOLE("DRAW")

-    Call tChartOLE("HTML")

-    Call tChartOLE("MASTERDOCUMENT")       

-    Call hStatusOut

-    

-end sub

-'

-'-------------------------------------------------------------------------------

-'

-sub LoadIncludeFiles             

-    use "global\system\includes\master.inc"

-    use "global\system\includes\gvariabl.inc"

-    use "global\tools\includes\optional\t_set_standard_controls.inc"

-    Call GetUseFiles 

-    gApplication = "CALC"

-end sub

-

+'encoding UTF-8  Do not remove or change this line!
+'**************************************************************************
+'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'* 
+'* Copyright 2008 by Sun Microsystems, Inc.
+'*
+'* OpenOffice.org - a multi-platform office productivity suite
+'*
+'* $RCSfile: ch2_updt_calc.bas,v $
+'*
+'* $Revision: 1.1 $
+'*
+'* last change: $Author: jsi $ $Date: 2008-06-13 14:27:01 $
+'*
+'* This file is part of OpenOffice.org.
+'*
+'* OpenOffice.org is free software: you can redistribute it and/or modify
+'* it under the terms of the GNU Lesser General Public License version 3
+'* only, as published by the Free Software Foundation.
+'*
+'* OpenOffice.org is distributed in the hope that it will be useful,
+'* but WITHOUT ANY WARRANTY; without even the implied warranty of
+'* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+'* GNU Lesser General Public License version 3 for more details
+'* (a copy is included in the LICENSE file that accompanied this code).
+'*
+'* You should have received a copy of the GNU Lesser General Public License
+'* version 3 along with OpenOffice.org.  If not, see
+'* <http://www.openoffice.org/license.html>
+'* for a copy of the LGPLv3 License.
+'*
+'/************************************************************************
+'*
+'* owner : oliver.craemer@sun.com
+'*
+'* short description : Resource Test for all chart specific menues
+'*
+'\************************************************************************************************
+
+sub main
+    use "chart2\tools\ch_tools_common.inc"
+    use "chart2\tools\ch_tools_chart_type.inc"
+    use "chart2\tools\ch_tools_titles.inc"
+    use "chart2\tools\ch_tools_axes.inc"
+    use "chart2\tools\ch_tools_grids.inc"
+    use "chart2\tools\ch_tools_legend.inc"
+    use "chart2\tools\ch_tools_data_labels.inc"
+    use "chart2\tools\ch_tools_statistics.inc"
+    use "chart2\tools\ch_tools_tab_pages.inc"
+    use "chart2\tools\ch_tools_select.inc"
+    use "chart2\required\includes\ch2_wizard.inc"
+    use "chart2\required\includes\ch2_file.inc"
+    use "chart2\required\includes\ch2_view.inc"
+    use "chart2\required\includes\ch2_insert_ctl.inc"
+    use "chart2\required\includes\ch2_insert.inc"
+    use "chart2\required\includes\ch2_format.inc"
+    use "chart2\required\includes\ch2_format1.inc"
+    use "chart2\required\includes\ch2_window.inc"
+    use "chart2\required\includes\ch2_toolbars.inc"
+    use "chart2\required\includes\ch2_menu.inc"
+    use "chart2\required\includes\ch2_ole.inc"
+
+    Call hStatusIn("Chart2", "ch2_updt_calc.bas")
+
+    printlog "----------------------------------------"
+    printlog "C h a r t 2   i n  S p r e a d s h e e t"
+    printlog "           U p d a t e t e s t"
+    printlog "----------------------------------------"
+    printLog Chr(13) + "-----------  Chart2 Wizard  ------------"
+    Call tCreateNewChart
+    printLog Chr(13) + "-----------  Chart2 Menu  ------------"
+    call tMainMenu        
+    printLog Chr(13) + "----------  Chart2 File Menu  ----------"
+    call tFileClose
+    call tFileSaveAsOTS
+    call tFileSaveAsSXC
+    call tFileSaveAsSTC
+    call tFileSaveAsXLS
+    call tFileSaveAsXLT
+    call tFileSaveAsSDC
+    call tFileSaveAsVOR
+    call tFileReload                
+    printLog Chr(13) + "----------  Chart2 View Menu -----------"
+    Call tViewToolbars
+    Call tViewToolbarsCustomize
+    Call tViewFullScreen              
+    printLog Chr(13) + "--------  Chart2 Insert Menu  ----------"
+    call tInsertTitle
+    call tInsertAxes
+    call tInsertGrids
+    call tInsertLegend
+    call tInsertDataLabels
+    call tInsertTrendLines
+    call tInsertMeanValueLines
+    call tInsertYErrorBars
+    call tInsertSpecialCharacter
+    printLog Chr(13) + "-------- Chart2 CTL Features  ----------"
+    call tTitleTextDirection
+    call tLegendTextDirection
+    call tXAxisTextDirection
+    call tDataSeriesTextDirection
+    call tEquationTextDirection
+    call tDataPointTextDirection
+    printlog Chr(13) + "---------  Chart2 Format Menu  ---------"
+    call tFormatObjectProperties
+    call tFormatObjectPropertiesPieChart
+    call tFormatPositonAndSize
+    call tFormatArrangement
+    Call tFormatTitleMaintitle
+    Call tFormatTitleSubtitle
+    Call tFormatTitleXAxistitle
+    Call tFormatTitleYAxistitle
+    Call tFormatTitleZAxistitle
+    Call tFormatTitleAllTitles
+    Call tFormatAxisXAxis
+    Call tFormatAxisYAxis
+    Call tFormatAxisZAxis
+    Call tFormatAxisSecondaryXAxis
+    Call tFormatAxisSecondaryYAxis
+    Call tFormatAxisAllAxes
+    Call tFormatXAxisMainGrid
+    Call tFormatYAxisMainGrid
+    Call tFormatZAxisMainGrid
+    call tFormatXAxisMinorGrid
+    Call tFormatYAxisMinorGrid
+    Call tFormatAllAxesGrids
+    Call tFormatLegend
+    Call tFormatChartWall
+    Call tFormatChartFloor
+    Call tFormatChartArea
+    Call tFormatChartType
+    call tFormatDataRanges
+    Call tFormat3DView                
+    printlog Chr(13) + "---------  Chart2 Window Menu  ---------"
+    Call tWindowNewWindowAndClose
+    printLog Chr(13) + "----------  Chart2 Toolbars  -----------"      
+    Call tdummyToolbar
+    printLog Chr(13) + "--------- Chart2 as OLE object ---------"
+    Call tChartOLE("WRITER")
+    Call tChartOLE("CALC")
+    Call tChartOLE("IMPRESS")
+    Call tChartOLE("DRAW")
+    Call tChartOLE("HTML")
+    Call tChartOLE("MASTERDOCUMENT")       
+    Call hStatusOut
+    
+end sub
+'
+'-------------------------------------------------------------------------------
+'
+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/tools/ch_tools_common.inc b/testautomation/chart2/tools/ch_tools_common.inc
index 3385960456b3..b9568d0edb38 100644
--- a/testautomation/chart2/tools/ch_tools_common.inc
+++ b/testautomation/chart2/tools/ch_tools_common.inc
@@ -48,6 +48,8 @@
 
 sub fInsertOLE as BOOLEAN
 'Insert Chart OLE in Document
+	'Get localised OLE names
+	call GetOleDefaultNames()
     fInsertOLE = FALSE
     '/// Insert / Object / OLE
     InsertObjectOLEObject
@@ -57,9 +59,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)