[ooo-build-commit] Branch 'ooo/master' - 2 commits - testautomation/chart2 testautomation/graphics
Jan Holesovsky
kendy at kemper.freedesktop.org
Thu Jul 2 19:35:11 PDT 2009
testautomation/chart2/optional/ch2_lvl1_wizard.bas | 8
testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc | 418 ++++++++++
testautomation/chart2/optional/input/ods/BubbleChartData.ods |binary
testautomation/chart2/tools/ch_tools_chart_type.inc | 111 +-
testautomation/graphics/optional/includes/global/export_graphic.inc | 4
testautomation/graphics/optional/includes/global/export_graphic_2.inc | 43 -
6 files changed, 493 insertions(+), 91 deletions(-)
New commits:
commit 35ce9f9a3639201551e0b35ae8b3181927aab4ce
Author: Release Engineers <releng at openoffice.org>
Date: Thu Jul 2 19:17:43 2009 +0000
CWS-TOOLING: integrate CWS bubblechart
2009-06-17 08:41:14 +0200 hde r273051 : i101635: added new charttype bubble
2009-06-17 08:39:37 +0200 hde r273050 : i101635: created new testcase tCreateNewBubbleChart
2009-06-17 08:38:07 +0200 hde r273049 : i101635: created new testcase tCreateNewBubbleChart
2009-06-15 15:22:32 +0200 hde r272991 : 101635
2009-06-11 12:44:01 +0200 iha r272864 : rebase to dev300m50
2009-06-10 23:27:54 +0200 iha r272841 : CWS-TOOLING: rebase CWS bubblechart to trunk at 272827 (milestone: DEV300:m50)
2009-06-04 18:07:35 +0200 iha r272649 : #i64689# Bubble Chart
2009-06-04 17:26:44 +0200 iha r272647 : #i64689# Bubble Chart
2009-06-04 11:24:25 +0200 iha r272618 : #i64689# add more spacing between bubbles and data labels
2009-05-26 18:05:23 +0200 ufi r272314 : i101637
2009-04-22 14:37:50 +0200 iha r271115 : #i64689# bubble chart
2009-04-21 17:52:23 +0200 iha r271052 : #i64689# bubble chart
2009-04-21 17:50:48 +0200 iha r271051 : #i76728# type icon for xy chart
2009-04-21 17:25:52 +0200 iha r271049 : #i76728# type icon for xy chart
2009-04-09 11:18:09 +0200 iha r270685 : #i100977# autoscaling works not correct if missing values should be treated as zero
2009-04-08 16:39:43 +0200 iha r270656 : #i64689# bubble chart - missing value treatment
2009-04-08 15:13:25 +0200 iha r270655 : #i64689# bubble chart - remove unused code
2009-04-08 15:12:19 +0200 iha r270653 : #i64689# bubble chart - determine sereis length correctly on export
2009-04-08 14:22:43 +0200 iha r270650 : #i64689# bubble chart - remove unused code
2009-04-08 14:12:09 +0200 iha r270646 : #i64689# bubble chart - export domains even if no main sequence was found
2009-04-08 14:11:07 +0200 iha r270645 : #i64689# bubble chart - don't replace missing size values with 1.0
2009-04-07 16:20:22 +0200 iha r270602 : #i64689# bubble chart - do not offer percent values for data label display for xy and bubble chart
2009-04-07 16:17:42 +0200 iha r270601 : remove superfluous code
2009-04-06 16:39:32 +0200 iha r270569 : #i64689# bubble chart -correct automatic numberformat detection for axis, data table and data label + transport data label numberformat during copy paste in addition to axis numberformat
2009-04-02 17:33:33 +0200 iha r270427 : use input string for formatting in data table during edit
2009-04-02 16:00:29 +0200 iha r270413 : #i64689# bubble chart - when creating a new series within the data table give it the same number format as the former series, thus the new bubble size values can be edited with the same format immidiately
2009-04-02 11:25:33 +0200 iha r270385 : #i64689# bubble chart -correct automatic numberformat detection for axis, data table and data label + transport data label numberformat during copy paste in addition to axis numberformat
2009-04-01 11:32:03 +0200 iha r270312 : #i64689# bubble chart - add further parameter for view creation
2009-03-31 17:52:08 +0200 iha r270291 : #i64689# bubble chart - scale bubble size with diagram size
2009-03-31 13:38:13 +0200 iha r270278 : #i64689# bubble chart - wrong size for small values < 1
2009-03-27 19:11:07 +0100 iha r270169 : #i64689# bubble chart
2009-03-27 19:07:11 +0100 iha r270168 : #i64689# bubble chart - remove unused code
2009-03-27 18:33:57 +0100 iha r270167 : #i64689# bubble chart - create no shape for invalid sizes
2009-03-27 15:18:21 +0100 iha r270157 : #i76728# type icon for xy chart
2009-03-27 14:34:38 +0100 iha r270156 : #i64689# bubble chart - correct scaling
2009-03-27 14:27:27 +0100 iha r270155 : #i64689# bubble chart - images
2009-03-27 14:25:45 +0100 iha r270154 : #i64689# bubble chart - images
2009-03-27 11:38:57 +0100 iha r270142 : #i64689# bubble chart - values-size is the main series
2009-03-27 11:30:20 +0100 iha r270140 : #i64689# correct order of sequences after load thus switching charttypes afterwards produces expected results now
2009-03-26 10:22:55 +0100 iha r270056 : #i64689# bubble chart
2009-03-24 17:45:15 +0100 iha r269984 : #i64689# bubble chart - user properties from points (not only from the series)
2009-03-24 15:10:57 +0100 dr r269954 : #i64989# export bubble charts to xls
2009-03-24 14:55:29 +0100 dr r269952 : #i64989# import bubble charts from xls
2009-03-24 14:54:46 +0100 dr r269950 : #i64989# import bubble charts from ooxml
2009-03-23 18:59:08 +0100 iha r269895 : further cleanups possible with new member m_aGlobalSeriesImportInfo
2009-03-23 16:54:04 +0100 iha r269886 : #i64689# bubble chart - a single sequence must be interpreted as sizes because of ODF specification
2009-03-23 16:50:43 +0100 iha r269885 : #i64689# save&load bubble chart
2009-03-20 19:30:29 +0100 iha r269826 : CWS-TOOLING: rebase CWS bubblechart to trunk at 269781 (milestone: DEV300:m44)
2009-03-19 11:30:33 +0100 iha r269732 : #i64689# rename SchXMLCategoriesDomainContext to SchXMLCategoriesContext avoid confusion with domains
2009-03-18 17:11:13 +0100 iha r269693 : #i64689# add charttype bubble
2009-03-18 17:09:22 +0100 iha r269692 : #i64689# remove unused code
2009-03-13 12:18:26 +0100 iha r269467 : #i64689# corrected lineends
2009-03-12 11:25:14 +0100 iha r269376 : #i64689# bubble chart (part 1)
diff --git a/testautomation/chart2/optional/ch2_lvl1_wizard.bas b/testautomation/chart2/optional/ch2_lvl1_wizard.bas
index f580be4..db7fcfa 100755
--- a/testautomation/chart2/optional/ch2_lvl1_wizard.bas
+++ b/testautomation/chart2/optional/ch2_lvl1_wizard.bas
@@ -51,9 +51,11 @@ sub main
use "chart2\optional\includes\wizard\ch2_lvl1_wizard.inc"
Call hStatusIn ( "Chart2", "ch2_lvl1_wizard.bas" )
- Call tCreateNew3DChart
- Call tCreateNewLineChart
- Call hStatusOut
+ Call tCreateNew3DChart
+ Call tCreateNewLineChart
+ Call tCreateNewBubbleChart
+ Call hStatusOut
+
end sub
'
'-------------------------------------------------------------------------------
diff --git a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc
index dbf11c6..517c28f 100755
--- a/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc
+++ b/testautomation/chart2/optional/includes/wizard/ch2_lvl1_wizard.inc
@@ -714,4 +714,422 @@ testcase tCreateNewLineChart
printlog "Close document"
Call hCloseDocument
endcase
+'
+'--------------------------------------------------------------------
+'
+testcase tCreateNewBubbleChart
+ dim sInputFile as STRING
+ dim sOutputFile as STRING
+ dim sControlString as STRING
+ sInputFile = convertpath ( gTesttoolPath & "chart2/optional/input/ods/BubbleChartData.ods" )
+ sOutputFile = convertpath ( gOfficepath & "user/work/tCreateNewBubbleChart.ods" )
+ printlog "File / Load TesttoolPath/chart2/optional/input/ods/BubbleChartData.ods"
+ call hFileOpen(sInputFile)
+ sleep(2)
+ printlog "Save document as Officepath/user/work/tCreateNewBubbleChart.ods"
+ if NOT hFileSaveAsWithFilterKill ( sOutputFile , "calc8" ) then
+ warnlog "Saving test document localy failed -> Aborting"
+ call hCloseDocument
+ goto endsub
+ endif
+ printlog "Insert / Chart"
+ InsertChart
+ printlog "Change Chart type to BUBBLE (7th entry from the top)"
+ Kontext "ChartType"
+ if NOT ChartType.Exists(5) then
+ warnlog "Chart Wizard was not visible. EXITING!"
+ goto endsub
+ else
+ printlog "Chart Wizard visible."
+ end if
+ if fSetChartType ( "bubble" ) > 0 then
+ warnlog "Something went wrong setting chart type to Bubble Chart."
+ endif
+ printlog "Select 1st chart type variant (Bubble Chart)"
+ if fSetChartTypeVariant ( 1 ) > 0 then
+ warnlog "Something went wrong setting chart type to 1st variant (Bubble Chart)."
+ endif
+ printlog "Change to Data Range tab-page"
+ Kontext "ChartWizard"
+ GoNext.Click
+ Kontext "TabChartTypeDataRange"
+ printlog "Set Data Range text box to $Sheet1.$A$2:$C$5;$Sheet1.$A$13:$C$16"
+ if fSetTextBox ( DataRange , "$Sheet1.$A$2:$C$5;$Sheet1.$A$13:$C$16" ) > 0 then
+ warnlog "Something went wrong setting Text."
+ endif
+ printlog "Change to Data Series tab-page"
+ Kontext "ChartWizard"
+ GoNext.Click
+ Kontext "TabChartTypeDataSeries"
+ '### Name ###
+ printlog "Select 1st entry in Data Series"
+ if fSetListBoxByItem ( DataSeries , 1 ) > 0 then
+ warnlog "Something went wrong selecting 'Data Series' item No. 1."
+ endif
+ printlog "Select 1st entry in Data Ranges"
+ if fSetListBoxByItem ( DataRanges , 1 ) > 0 then
+ warnlog "Something went wrong selecting 'Data Ranges' item No. 1."
+ endif
+ printlog "Set 'Range for Name' text box to $Sheet1.$C$1"
+ if fSetTextBox ( RangeFor , "$Sheet1.$C$1" ) > 0 then
+ warnlog "Something went wrong setting Text."
+ endif
+ '### Bubble Sizes ###
+ printlog "Select 2nd entry in Data Ranges"
+ if fSetListBoxByItem ( DataRanges , 2 ) > 0 then
+ warnlog "Something went wrong selecting 'Data Ranges' item No. 2."
+ endif
+ printlog "Set 'Range for Bubble Sizes' text box to $Sheet1.$C$2:$C$5"
+ if fSetTextBox ( RangeFor , "$Sheet1.$C$2:$C$5" ) > 0 then
+ warnlog "Something went wrong setting Text."
+ endif
+ '### X-Values ###
+ printlog "Select 3rd entry in Data Ranges"
+ if fSetListBoxByItem ( DataRanges , 3 ) > 0 then
+ warnlog "Something went wrong selecting 'Data Ranges' item No. 3."
+ endif
+ printlog "Set 'X-Values' text box to $Sheet1.$A$2:$A$5"
+ if fSetTextBox ( RangeFor , "$Sheet1.$A$2:$A$5" ) > 0 then
+ warnlog "Something went wrong setting Text."
+ endif
+ '### Y-Values ###
+ printlog "Select 4th entry in Data Ranges"
+ if fSetListBoxByItem ( DataRanges , 4 ) > 0 then
+ warnlog "Something went wrong selecting 'Data Ranges' item No. 4."
+ endif
+ printlog "Set 'Y-Values' text box to $Sheet1.$B$2:$B$5"
+ if fSetTextBox ( RangeFor , "$Sheet1.$B$2:$B$5" ) > 0 then
+ warnlog "Something went wrong setting Text."
+ endif
+ printlog "Add data series"
+ AddButton.Click
+ '### Name ###
+ printlog "Select 1st entry in Data Ranges"
+ if fSetListBoxByItem ( DataRanges , 1 ) > 0 then
+ warnlog "Something went wrong selecting 'Data Ranges' item No. 2."
+ endif
+ printlog "Set 'Range for Name' text box to $Sheet1.$C$12"
+ if fSetTextBox ( RangeFor , "$Sheet1.$C$12" ) > 0 then
+ warnlog "Something went wrong setting Text."
+ endif
+ '### Bubble Sizes ###
+ printlog "Select 2nd entry in Data Ranges"
+ if fSetListBoxByItem ( DataRanges , 2 ) > 0 then
+ warnlog "Something went wrong selecting 'Data Ranges' item No. 2."
+ endif
+ printlog "Set 'Range for Bubble Sizes' text box to $Sheet1.$C$13:$C$16"
+ if fSetTextBox ( RangeFor , "$Sheet1.$C$13:$C$16" ) > 0 then
+ warnlog "Something went wrong setting Text."
+ endif
+ '### X-Values ###
+ printlog "Select 3rd entry in Data Ranges"
+ if fSetListBoxByItem ( DataRanges , 3 ) > 0 then
+ warnlog "Something went wrong selecting 'Data Ranges' item No. 3."
+ endif
+ printlog "Set 'X-Values' text box to $Sheet1.$A$13:$A$16"
+ if fSetTextBox ( RangeFor , "$Sheet1.$A$13:$A$16" ) > 0 then
+ warnlog "Something went wrong setting Text."
+ endif
+ '### Y-Values ###
+ printlog "Select 4th entry in Data Ranges"
+ if fSetListBoxByItem ( DataRanges , 4 ) > 0 then
+ warnlog "Something went wrong selecting 'Data Ranges' item No. 4."
+ endif
+ printlog "Set 'Y-Values' text box to $Sheet1.$B$13:$B$16"
+ if fSetTextBox ( RangeFor , "$Sheet1.$B$13:$B$16" ) > 0 then
+ warnlog "Something went wrong setting Text."
+ endif
+
+ printlog "Change to Chart Elements tab-page"
+ Kontext "ChartWizard"
+ GoNext.Click
+ Kontext "TabChartTypeChartElements"
+ printlog "Uncheck 'Y Axis'"
+ if fSetCheckBox ( GridLinesYAxis , FALSE ) > 0 then
+ warnlog "Something went wrong unselecting 'Y Axis'."
+ endif
+ printlog "Uncheck 'Legend Display'"
+ if fSetCheckBox ( Display , FALSE ) > 0 then
+ warnlog "Something went wrong unselecting 'Legend Display'."
+ endif
+ printlog "Create Chart by clicking Finish-button"
+ Kontext "ChartWizard"
+ ChartWizard.OK
+ sleep(2)
+ printlog "File / Save"
+ FileSave
+ Kontext "DocumentCalc"
+ printlog "Press twice <ESCAPE>-key"
+ DocumentCalc.TypeKeys "<Escape>" , 2
+ printlog "File / Close document"
+ Call hCloseDocument
+ sleep(2)
+ printlog "Open saved file again"
+ call hFileOpen(sOutputFile)
+ sleep(2)
+ printlog "Open the Navigator (F5)"
+ printlog "Select the first OLE object in the Navigator"
+ call fSelectFirstOLE
+ printlog "Edit / Object / Edit to enter Inplace Mode"
+ EditObjectEdit
+ printlog "Format / Chart Type"
+ FormatChartType
+ Kontext "ChartType"
+ if ChartType.Exists(2) then
+ printlog "Check if chart type is BUBBLE CHART"
+ if ChooseType.GetSelIndex <> 7 then
+ warnlog "Selected chart type wasn't preserved after save and reload."
+ endif
+ printlog "Check if chart variant is BUBBLE CHART (1st variant in non-CTL versions from the left)"
+ if Variant.GetSelIndex <> 1 then
+ warnlog "Selected chart type variant wasn't preserved after save and reload."
+ end if
+ printlog "Leave Chart Type dialog with Cancel"
+ Kontext "ChartType"
+ if ChartType.Exists(2) then
+ ChartType.Cancel
+ else
+ warnlog "ChartType dialog was not visible!?"
+ end if
+ else
+ warnlog "Chart Type dialog was not up!"
+ end if
+ printlog "Format / Data Ranges"
+ FormatDataRanges
+ Kontext
+ Active.SetPage TabChartTypeDataRange
+ Kontext "TabChartTypeDataRange"
+ if TabChartTypeDataRange.Exists(2) then
+ printlog "Check substrings '$A$2:$C$5', '$C$1', '$B$13:$C$16', '$C$12' in Data Range"
+ sControlString = DataRange.GetText
+ printlog "Data Range is: " & sControlString
+ if instr ( sControlString , "$A$2:$C$5" ) = 0 Then
+ warnlog "Data range wasn't correctly preserved after save and reload: $A$2:$C$13"
+ endif
+ if instr ( sControlString , "$C$1" ) = 0 Then
+ warnlog "Data range wasn't correctly preserved after save and reload: $A$19"
+ endif
+ if instr ( sControlString , "$B$13:$C$16" ) = 0 Then
+ QAErrorlog "#i100780#Data range wasn't correctly preserved after save and reload: $B$13:$C$16"
+ endif
+ if instr ( sControlString , "$C$12" ) = 0 Then
+ warnlog "Data range wasn't correctly preserved after save and reload: $E$1:$F$13"
+ endif
+ printlog "Check if Radio Button ROWS is checked"
+ if Rows.IsChecked then
+ warnlog "Radio Button ROWS (disabled) wasn't preserved after save and reload."
+ endif
+ printlog "Check if Radio Button COLUMNS is unchecked"
+ if NOT Columns.IsChecked then
+ warnlog "Radio Button COLUMNS (enabled) wasn't preserved after save and reload."
+ endif
+ printlog "Check if 'First row as label' box is checked"
+ if NOT FirstRowAsLabel.IsChecked then
+ warnlog "Check box 'First row as label' (checked) wasn't preserved after save and reload."
+ endif
+ printlog "Check if 'First column as label' box is not checked"
+ if FirstColumnAsLabel.IsChecked then
+ warnlog "Check box 'First column as label' (unchecked) wasn't preserved after save and reload."
+ endif
+ else
+ warnlog "Tab page Data Range was not up!"
+ FormatDataRanges
+ end if
+ printlog "Switch to tab page Data Series"
+ Kontext
+ Active.SetPage TabFormatDataRangesDataSeries
+ Kontext "TabChartTypeDataSeries"
+ if TabChartTypeDataSeries.Exists(2) then
+ printlog "Select 1st entry in Data Series"
+ if fSetListBoxByItem ( DataSeries , 1 ) > 0 then
+ warnlog "Selecting 1st item in Data Series failed. EXITING!"
+ TabChartTypeDataSeries.Cancel
+ call hCloseDocument
+ goto endsub
+ endif
+ printlog "Select Name in Data Ranges"
+ if fSetListBoxByItem ( DataRanges , 1 ) > 0 then
+ warnlog "Something went wrong selecting 'Data Ranges' item No. 1."
+ endif
+ printlog "Check substring '$C$1' in Range for Name"
+ sControlString = RangeFor.GetText
+ printlog "'Range for name' is: " & sControlString
+ if instr ( sControlString , "$C$1" ) = 0 Then
+ warnlog "'Range for name' wasn't correctly preserved after save and reload."
+ endif
+
+ printlog "Select Bubble Sizes in Data Ranges"
+ if fSetListBoxByItem ( DataRanges , 2 ) > 0 then
+ warnlog "Something went wrong selecting 'Data Ranges' item No. 2. EXITING!"
+ TabChartTypeDataSeries.Cancel
+ call hCloseDocument
+ goto endsub
+ endif
+ printlog "Check substring '$C$2:$C$5'in Range for Name"
+ sControlString = RangeFor.GetText
+ if instr ( sControlString , "$C$2:$C$5" ) = 0 Then
+ warnlog "'Range for Bubble Sizes' wasn't correctly preserved after save and reload."
+ endif
+
+ printlog "Select X-Values in Data Ranges"
+ if fSetListBoxByItem ( DataRanges , 3 ) > 0 then
+ warnlog "Something went wrong selecting 'Data Ranges' item No. 3. EXITING!"
+ TabChartTypeDataSeries.Cancel
+ call hCloseDocument
+ goto endsub
+ endif
+ printlog "Check substring '$A$2:$A$5' in Range for Name"
+ sControlString = RangeFor.GetText
+ if instr ( sControlString , "$A$2:$A$5" ) = 0 Then
+ warnlog "'Range for X-Values' wasn't correctly preserved after save and reload."
+ endif
+
+ printlog "Select Y-Values in Data Ranges"
+ if fSetListBoxByItem ( DataRanges , 4 ) > 0 then
+ warnlog "Something went wrong selecting 'Data Ranges' item No. 4. EXITING!"
+ TabChartTypeDataSeries.Cancel
+ call hCloseDocument
+ goto endsub
+ endif
+ printlog "Check substring '$B$2:$B$5' in Range for Name"
+ sControlString = RangeFor.GetText
+ if instr ( sControlString , "$B$2:$B$5" ) = 0 Then
+ warnlog "'Range for Y-Values' wasn't correctly preserved after save and reload."
+ endif
+
+ printlog "Select 2nd entry in Data Series"
+ if fSetListBoxByItem ( DataSeries , 2 ) > 0 then
+ warnlog "Selecting 1st item in Data Series failed. EXITING!"
+ TabChartTypeDataSeries.Cancel
+ call hCloseDocument
+ goto endsub
+ endif
+ printlog "Select Name in Data Ranges"
+ if fSetListBoxByItem ( DataRanges , 1 ) > 0 then
+ warnlog "Something went wrong selecting 'Data Ranges' item No. 1."
+ endif
+ printlog "Check substring '$C$12' in Range for Name"
+ sControlString = RangeFor.GetText
+ printlog "'Range for name' is: " & sControlString
+ if instr ( sControlString , "$C$12" ) = 0 Then
+ warnlog "'Range for name' wasn't correctly preserved after save and reload."
+ endif
+
+ printlog "Select Bubble Sizes in Data Ranges"
+ if fSetListBoxByItem ( DataRanges , 2 ) > 0 then
+ warnlog "Something went wrong selecting 'Data Ranges' item No. 2. EXITING!"
+ TabChartTypeDataSeries.Cancel
+ call hCloseDocument
+ goto endsub
+ endif
+ printlog "Check substring '$C$13:$C$16'in Range for Name"
+ sControlString = RangeFor.GetText
+ if instr ( sControlString , "$C$13:$C$16" ) = 0 Then
+ warnlog "'Range for Bubble Sizes' wasn't correctly preserved after save and reload."
+ endif
+
+ printlog "Select X-Values in Data Ranges"
+ if fSetListBoxByItem ( DataRanges , 3 ) > 0 then
+ warnlog "Something went wrong selecting 'Data Ranges' item No. 3. EXITING!"
+ TabChartTypeDataSeries.Cancel
+ call hCloseDocument
+ goto endsub
+ endif
+ printlog "Check substring '$A$13:$A$16' in Range for Name"
+ sControlString = RangeFor.GetText
+ if instr ( sControlString , "$A$13:$A$16" ) = 0 Then
+ warnlog "'Range for X-Values' wasn't correctly preserved after save and reload."
+ endif
+
+ printlog "Select Y-Values in Data Ranges"
+ if fSetListBoxByItem ( DataRanges , 4 ) > 0 then
+ warnlog "Something went wrong selecting 'Data Ranges' item No. 4. EXITING!"
+ TabChartTypeDataSeries.Cancel
+ call hCloseDocument
+ goto endsub
+ endif
+ printlog "Check substring '$B$13:$B$16' in Range for Name"
+ sControlString = RangeFor.GetText
+ if instr ( sControlString , "$B$13:$B$16" ) = 0 Then
+ warnlog "'Range for Y-Values' wasn't correctly preserved after save and reload."
+ endif
+
+ printlog "Leave tab page data series with CANCEL"
+ TabChartTypeDataSeries.Cancel
+ else
+ warnlog "Tab page Data Series was not up!"
+ end if
+ printlog "Insert / Title"
+ InsertTitle
+ Kontext "InsertTitleDialog"
+ if InsertTitleDialog.Exists(2) then
+ printlog "Check if 'Title' text box is empty"
+ sControlString = MainTitle.GetText
+ if sControlString <> "" then
+ warnlog "Empty Title string wasn't preserved after save and reload."
+ endif
+ printlog "Check if 'Subtitle' text box is empty"
+ sControlString = SubTitle.GetText
+ if sControlString <> "" then
+ warnlog "Empty Subtitle string wasn't preserved after save and reload."
+ endif
+ printlog "Check if 'X Title' text box is empty"
+ sControlString = TitleXaxis.GetText
+ if sControlString <> "" then
+ warnlog "Empty X Title string wasn't preserved after save and reload."
+ endif
+ printlog "Check if 'Y Title' text box is empty"
+ sControlString = TitleYaxis.GetText
+ if sControlString <> "" then
+ warnlog "Empty Y Title string wasn't preserved after save and reload."
+ endif
+ printlog "Check if 'Z Title' text box is empty"
+ sControlString = TitleZaxis.GetText
+ if sControlString <> "" then
+ warnlog "Empty Z Title string wasn't preserved after save and reload."
+ endif
+ printlog "Leaving Title dialog with Cancel"
+ InsertTitleDialog.Cancel
+ else
+ warnlog "Title dialog was not up!"
+ end if
+ printlog "Insert / Grids"
+ If fInvokeGridsDialog = 0 then
+ Kontext "InsertGridsDialog"
+ printlog "Check if 'Gridlines X Axis' box is checked"
+ if MainGridXaxis.IsChecked then
+ warnlog "Check box 'Gridlines X Axis' (disabled) wasn't preserved after save and reload."
+ endif
+ printlog "Check if 'Gridlines Y Axis' box is unchecked"
+ if MainGridYaxis.IsChecked then
+ warnlog "Check box 'Gridlines Y Axis' (disabled) wasn't preserved after save and reload."
+ endif
+ printlog "Check if 'Gridlines Z Axis' box is checked"
+ if MainGridZaxis.IsEnabled then
+ warnlog "Check box 'Gridlines Z Axis' shouldn't be enabled after save and reload."
+ endif
+ printlog "Leave dialog with CANCEL"
+ InsertGridsDialog.Cancel
+ else
+ warnlog "Insert Grids dialog was not up!"
+ end if
+ printlog "Insert / Legend"
+ if fInvokeLegendDialog() = 0 then
+ printlog "Check if 'Legend Display' box is checked"
+ Kontext "InsertLegendDialog"
+ if Display.IsChecked then
+ warnlog "Check box 'Legend Display' (disabled) wasn't preserved after save and reload."
+ endif
+ printlog "Leave dialog with CANCEL."
+ InsertLegendDialog.Cancel
+ else
+ warnlog "Insert Legend dialog was not up!"
+ end if
+ printlog "Press ESCAPE button (deselecting the OLE object)"
+ Kontext "DocumentCalc"
+ DocumentCalc.TypeKeys "<Escape>"
+ printlog "Close document"
+ Call hCloseDocument
+endcase
+
diff --git a/testautomation/chart2/optional/input/ods/BubbleChartData.ods b/testautomation/chart2/optional/input/ods/BubbleChartData.ods
new file mode 100644
index 0000000..68110e1
Binary files /dev/null and b/testautomation/chart2/optional/input/ods/BubbleChartData.ods differ
diff --git a/testautomation/chart2/tools/ch_tools_chart_type.inc b/testautomation/chart2/tools/ch_tools_chart_type.inc
index bd5b02a..bf2aee9 100644
--- a/testautomation/chart2/tools/ch_tools_chart_type.inc
+++ b/testautomation/chart2/tools/ch_tools_chart_type.inc
@@ -160,25 +160,26 @@ end function
'--------------------------------------------------------------------
'
function fSetChartType ( sChartType as STRING ) as INTEGER
-'Function to choose a chart type in 'Chart Type' dialog
+ 'Function to choose a chart type in 'Chart Type' dialog
fSetChartType = 99
-' Input: STRING sChartType (English UI name of chart type to select)
-' column
-' bar
-' pie
-' area
-' line
-' xy
-' net
-' stock
-' column_line
-' Output (Error-codes)
-' 0 = Sucess
-' 1 = Serious problem trying to select chart type
-' 2 = Failure (wrong chart type selected)
-' 42 = User error, unknown chart type
-' 99 = Unexpected error
+ ' Input: STRING sChartType (English UI name of chart type to select)
+ ' column
+ ' bar
+ ' pie
+ ' area
+ ' line
+ ' xy
+ ' bubble
+ ' net
+ ' stock
+ ' column_line
+ ' Output (Error-codes)
+ ' 0 = Sucess
+ ' 1 = Serious problem trying to select chart type
+ ' 2 = Failure (wrong chart type selected)
+ ' 42 = User error, unknown chart type
+ ' 99 = Unexpected error
dim iEntryInList as INTEGER
@@ -191,9 +192,10 @@ function fSetChartType ( sChartType as STRING ) as INTEGER
case "area" : iEntryInList = 4
case "line" : iEntryInList = 5
case "xy" : iEntryInList = 6
- case "net" : iEntryInList = 7
- case "stock" : iEntryInList = 8
- case "column_line" : iEntryInList = 9
+ case "bubble" : iEntryInList = 7
+ case "net" : iEntryInList = 8
+ case "stock" : iEntryInList = 9
+ case "column_line" : iEntryInList = 10
case else
fSetChartType = 42
warnlog "USER ERROR: Input doesn't match!"
@@ -226,14 +228,14 @@ end function
'--------------------------------------------------------------------
'
function fSetChartTypeVariant ( iChartTypeVariant as INTEGER ) as INTEGER
-' Function to select the chart type variant
-' Input: INTEGER iChartTypeVariant (Position in variant control)
-' Posible Values are 1,2,3,4 (depending on the chart type)
-' Output (Error-codes)
-' 0 = Sucess
-' 1 = Serious problem while selecting the variant control
-' 42 = User error, input out of range
-' 99 = Unexpected error
+ ' Function to select the chart type variant
+ ' Input: INTEGER iChartTypeVariant (Position in variant control)
+ ' Posible Values are 1,2,3,4 (depending on the chart type)
+ ' Output (Error-codes)
+ ' 0 = Sucess
+ ' 1 = Serious problem while selecting the variant control
+ ' 42 = User error, input out of range
+ ' 99 = Unexpected error
fSetChartTypeVariant = 99
@@ -251,9 +253,10 @@ function fSetChartTypeVariant ( iChartTypeVariant as INTEGER ) as INTEGER
else
iMaximumVariant = 3
endif
- case 4, 7 : iMaximumVariant = 3
- case 3, 5, 6, 8 : iMaximumVariant = 4
- case 9 : iMaximumVariant = 2
+ case 7 : iMaximumVariant = 1
+ case 4, 8 : iMaximumVariant = 3
+ case 3, 5, 6, 9 : iMaximumVariant = 4
+ case 10 : iMaximumVariant = 2
end select
' Check if input matches this range
@@ -445,19 +448,19 @@ end function
'
function fSetStackSeries ( sStackMode as STRING ) as INTEGER
fSetStackSeries = 99
-' Function to adjust data stacking feature///
-' Input:
-' STRING sStackMode:
-' Select stack mode using three controls
-' <i>disable - Uncheck 'Stack Series' check-box
-' <i>ontop - Check 'Stack Series' check-box and check 'On Top' radio button
-' <i>percent - Check 'Stack Series' check-box and check 'Percent' radio button
-' Returns error-code:
-' 0 := Sucess.
-' 1 := Serious problem while selecting stack mode.
-' 11 := 'Stack Series' not visible
-' 42 := User error, input doesn't match.
-' 99 := Unexpected error.
+ ' Function to adjust data stacking feature///
+ ' Input:
+ ' STRING sStackMode:
+ ' Select stack mode using three controls
+ ' <i>disable - Uncheck 'Stack Series' check-box
+ ' <i>ontop - Check 'Stack Series' check-box and check 'On Top' radio button
+ ' <i>percent - Check 'Stack Series' check-box and check 'Percent' radio button
+ ' Returns error-code:
+ ' 0 := Sucess.
+ ' 1 := Serious problem while selecting stack mode.
+ ' 11 := 'Stack Series' not visible
+ ' 42 := User error, input doesn't match.
+ ' 99 := Unexpected error.
printlog ""
printlog "** Selecting the Stack Series Option"
@@ -503,16 +506,16 @@ end function
'
function fSetSmoothLines ( bEnableSmoothLines as BOOLEAN ) as INTEGER
fSetSmoothLines = 99
-' Function to adjust smooth lines feature
-' Input:
-' BOOLEAN bEnableSmoothLines:
-' Enable (TRUE), Disable (FALSE)'Smooth Lines'
-' Returns error-code:
-' 0 := Sucess.
-' 1 := Serious problem while Enabling/Disable 'Smooth Lines.
-' 11 := 'Smooth lines' not visible
-' 42 := User error, input doesn't match.
-' 99 := Unexpected error.
+ ' Function to adjust smooth lines feature
+ ' Input:
+ ' BOOLEAN bEnableSmoothLines:
+ ' Enable (TRUE), Disable (FALSE)'Smooth Lines'
+ ' Returns error-code:
+ ' 0 := Sucess.
+ ' 1 := Serious problem while Enabling/Disable 'Smooth Lines.
+ ' 11 := 'Smooth lines' not visible
+ ' 42 := User error, input doesn't match.
+ ' 99 := Unexpected error.
printlog ""
printlog "** Selecting the Smooth Lines Option"
commit a058b19971a17fa110923237ffa8967761761b86
Author: Release Engineers <releng at openoffice.org>
Date: Thu Jul 2 14:28:15 2009 +0000
CWS-TOOLING: integrate CWS aw065
2009-06-17 13:48:12 +0200 aw r273068 : #99385# corrected small error in SCs selection visualisation
2009-06-16 15:45:28 +0200 wg r273021 : i102838
2009-06-16 12:46:07 +0200 wg r273016 : i102833
2009-06-11 17:40:29 +0200 aw r272895 : #i98870# added implementation for getPageCount helper
2009-06-11 16:39:54 +0200 aw r272885 : #i102663#, #i102667#, #i98870# incluide file typo corrected
2009-06-11 16:24:07 +0200 aw r272881 : #i102663#, #i102667#, #i98870# changes to SdrText, it's usage in SdrTextPrimitive2D and to OverlayObject base implementation. Also support for PageCountField added
2009-06-11 16:23:52 +0200 aw r272880 : #i102663#, #i102667#, #i98870# changes to SdrText, it's usage in SdrTextPrimitive2D and to OverlayObject base implementation. Also support for PageCountField added
2009-06-09 13:50:29 +0200 aw r272769 : #i98917# added support for the OverlayHatchRectanglePrimitive to follow rotation with it's hatch; simplified OverlayHatchRect
2009-06-09 13:04:06 +0200 aw r272766 : #i98870# re-added PageNumber identification in SdrTextPrimitive2D::get2DDecomposition
2009-06-08 18:56:05 +0200 aw r272744 : #i99385# added some last corrections to OverlayObjects in SD (had to do some merges on resync, needed to optically check and correct)
2009-06-08 11:17:57 +0200 aw r272725 : cws aw065: corrections after resync
2009-06-08 11:02:25 +0200 aw r272723 : cws aw065: corrections after resync
2009-06-08 10:36:22 +0200 aw r272722 : cws aw065: corrections after resync
2009-06-05 18:57:06 +0200 aw r272712 : CWS-TOOLING: rebase CWS aw065 to trunk at 272291 (milestone: DEV300:m49)
2009-06-05 14:56:34 +0200 aw r272690 : #i89784# stripped old stuff no longer needed due to text-to-polygon conversion using primitives
2009-06-05 14:50:07 +0200 aw r272688 : #102091# removed on-model-lock suppression for SdrObject::ActionChanged()
2009-06-05 14:47:29 +0200 aw r272687 : #102091# corrected local value buffering in ScenePrimitive2D::get2DDecomposition
2009-06-03 17:53:32 +0200 aw r272599 : #i89784# version before stripping
2009-06-03 17:52:18 +0200 aw r272598 : #i89784# version before stripping
2009-05-28 17:15:47 +0200 aw r272420 : #i101872# old stuff removed/stripped
2009-05-28 17:15:32 +0200 aw r272419 : #i101872# old stuff removed/stripped
2009-05-28 17:15:15 +0200 aw r272418 : #i101872# old stuff removed/stripped
2009-05-28 17:14:45 +0200 aw r272417 : #i101872# old stuff removed/stripped
2009-05-28 12:13:56 +0200 aw r272396 : #i101872# stable hybrid state
2009-05-28 12:13:46 +0200 aw r272395 : #i101872# stable hybrid state
2009-05-28 12:13:35 +0200 aw r272394 : #i101872# stable hybrid state
2009-05-28 12:13:20 +0200 aw r272393 : #i101872# stable hybrid state
2009-05-28 12:13:05 +0200 aw r272392 : #i101872# stable hybrid state
2009-05-28 12:12:51 +0200 aw r272391 : #i101872# stable hybrid state
2009-05-15 16:56:02 +0200 aw r271952 : #i101872# HitTest unifications
2009-05-15 16:55:22 +0200 aw r271951 : #i101872# HitTest unifications
2009-05-15 16:55:12 +0200 aw r271950 : #i101872# HitTest unifications
2009-05-15 16:55:01 +0200 aw r271949 : #i101872# HitTest unifications
2009-05-15 16:54:51 +0200 aw r271948 : #i101872# HitTest unifications
2009-05-15 16:54:35 +0200 aw r271947 : #i101872# HitTest unifications
2009-05-15 16:54:22 +0200 aw r271946 : #i101872# HitTest unifications
2009-05-12 19:08:38 +0200 aw r271834 : #i101684# corrected AutoShape's preparation of text transformation due to different definitions in TextBounds
2009-05-12 15:44:49 +0200 aw r271827 : #i89784# expanded TextLayouterDevice::getTextOutlines() to support DXArray and X-Font scaling
2009-05-11 19:40:40 +0200 aw r271790 : #i99385# extended HitTest primitive usage, removed IsHdlHit implementations; prepared further HitTest simplifications
2009-05-11 19:40:25 +0200 aw r271789 : #i99385# extended HitTest primitive usage, removed IsHdlHit implementations; prepared further HitTest simplifications
2009-05-11 19:40:12 +0200 aw r271788 : #i99385# extended HitTest primitive usage, removed IsHdlHit implementations; prepared further HitTest simplifications
2009-05-11 13:01:53 +0200 aw r271765 : #i99385# corrections and optimizations
2009-05-08 14:48:40 +0200 aw r271718 : #i1016180# added optimizations in model operations when model is locked
2009-05-08 14:11:45 +0200 aw r271716 : #i101679# added flush() calls to OverlayManager when interaction step is prepared
2009-05-07 17:44:03 +0200 aw r271689 : #i99385# last corrections/changes
2009-05-07 17:43:47 +0200 aw r271688 : #i99385# last corrections/changes
2009-05-07 13:20:09 +0200 aw r271654 : #i99385# added changes from WFH
2009-05-07 13:19:38 +0200 aw r271653 : #i99385# added changes from WFH
2009-05-07 13:19:11 +0200 aw r271652 : #i99385# added changes from WFH
2009-05-07 11:33:17 +0200 aw r271643 : #i99385# corrections after resync
2009-05-07 11:17:31 +0200 aw r271642 : #i99385# corrections after resync
2009-05-06 18:46:53 +0200 aw r271609 : CWS-TOOLING: rebase CWS aw065 to trunk at 271427 (milestone: DEV300:m47)
2009-05-05 18:24:03 +0200 aw r271548 : #i101443# force new text decomposition when TextBackgroundColor has changed
2009-05-05 17:44:42 +0200 aw r271542 : #i99385# 3rd round, simplifications and corrections done
2009-05-05 17:44:32 +0200 aw r271541 : #i99385# 3rd round, simplifications and corrections done
2009-05-05 17:44:20 +0200 aw r271540 : #i99385# 3rd round, simplifications and corrections done
2009-05-05 17:44:09 +0200 aw r271539 : #i99385# 3rd round, simplifications and corrections done
2009-05-05 15:48:38 +0200 aw r271527 : #i99385# 2nd round, usages checked and corrected
2009-05-05 15:48:15 +0200 aw r271526 : #i99385# 2nd round, usages checked and corrected
2009-05-05 15:48:03 +0200 aw r271525 : #i99385# 2nd round, usages checked and corrected
2009-05-05 15:47:51 +0200 aw r271524 : #i99385# 2nd round, usages checked and corrected
2009-04-27 18:33:10 +0200 aw r271300 : #i99385# state commit after all implementations are done
2009-04-27 15:36:53 +0200 aw r271283 : #i99385# state commit after all implementations are done
2009-04-27 15:27:49 +0200 aw r271280 : #i99385# state commit after all implementations are done
2009-04-27 15:27:33 +0200 aw r271279 : #i99385# state commit after all implementations are done
2009-04-27 15:27:00 +0200 aw r271278 : #i99385# state commit after all implementations are done
2009-04-27 15:26:15 +0200 aw r271277 : #i99385# state commit after all implementations are done
2009-04-27 15:25:40 +0200 aw r271275 : #i99385# state commit after all implementations are done
2009-04-27 15:25:19 +0200 aw r271274 : #i99385# state commit after all implementations are done
2009-04-27 15:24:00 +0200 aw r271272 : #i99385# state commit after all implementations are done
2009-03-19 17:12:00 +0100 aw r269757 : #i100360# corrected bitmap's PefSize calculation for bitmap filled objects when Bitmap is Pixel-based on it's mapping
2009-02-19 17:09:47 +0100 aw r268298 : #i98917# corrected attributes
2009-02-19 17:09:30 +0100 aw r268297 : #i98917# corrected attributes
2009-02-19 17:08:22 +0100 aw r268296 : #i98917# corrected attributes
2009-02-19 11:56:25 +0100 aw r268268 : #i98870# added extra code to react on PageNumber change
2009-02-18 16:57:24 +0100 aw r268243 : #i98917# in OverlayHatchRect::getGeometry the rotation was not applied to the TopLeft of the centered rectangle, but to the already extended one, thus the visualisation was rotating around the wrong edge
diff --git a/testautomation/graphics/optional/includes/global/export_graphic.inc b/testautomation/graphics/optional/includes/global/export_graphic.inc
index ef6baa9..e069af9 100755
--- a/testautomation/graphics/optional/includes/global/export_graphic.inc
+++ b/testautomation/graphics/optional/includes/global/export_graphic.inc
@@ -218,6 +218,7 @@ testcase tPCT
hFileOpen (sDocument)
sleep (10)
+<<<<<<< .working
printlog "check if the document is writable"
if fIsDocumentWritable = false then
printlog "make the document writable and check if it's succesfull"
@@ -226,6 +227,9 @@ testcase tPCT
goto endsub
endif
endif
+=======
+ sMakeReadOnlyDocumentEditable
+>>>>>>> .merge-right.r273634
hTypeKeys ("<escape><tab>")
fGetSizeXY sx1, sY, TRUE
diff --git a/testautomation/graphics/optional/includes/global/export_graphic_2.inc b/testautomation/graphics/optional/includes/global/export_graphic_2.inc
index f8fa012..60e72b7 100755
--- a/testautomation/graphics/optional/includes/global/export_graphic_2.inc
+++ b/testautomation/graphics/optional/includes/global/export_graphic_2.inc
@@ -152,14 +152,7 @@ testcase tSVM
hFileOpen (sDocument)
sleep (10)
- ' check if the document is writable
- if fIsDocumentWritable = false then
- ' make the document writable and check if it's succesfull
- if fMakeDocumentWritable = false then
- warnlog "The document can't be make writeable. Test stopped."
- goto endsub
- endif
- endif
+ sMakeReadOnlyDocumentEditable
hTypeKeys ("<escape><tab>")
fGetSizeXY sx1, sY, TRUE
@@ -880,14 +873,8 @@ testcase tEMF
Filterauswahl.Cancel
goto endsub
endif
- ' check if the document is writable
- if fIsDocumentWritable = false then
- ' make the document writable and check if it's succesfull
- if fMakeDocumentWritable = false then
- warnlog "The document can't be make writeable. Test stopped."
- goto endsub
- endif
- endif
+ printlog "making doc editable if it is readonly"
+ sMakeReadOnlyDocumentEditable
hTypeKeys ("<escape><tab>")
fGetSizeXY sx1, sY, TRUE
@@ -1075,15 +1062,9 @@ testcase tMET
hCloseDocument ()
hFileOpen (sDocument)
sleep (10)
-
- ' check if the document is writable
- if fIsDocumentWritable = false then
- ' make the document writable and check if it's succesfull
- if fMakeDocumentWritable = false then
- warnlog "The document can't be make writeable. Test stopped."
- goto endsub
- endif
- endif
+
+ printlog "making doc editable if it is readonly"
+ sMakeReadOnlyDocumentEditable
hTypeKeys ("<escape><tab>")
fGetSizeXY sx1, sY, TRUE
@@ -1283,15 +1264,9 @@ testcase tWMF
hCloseDocument ()
hFileOpen (sDocument)
sleep (10)
-
- ' check if the document is writable
- if fIsDocumentWritable = false then
- ' make the document writable and check if it's succesfull
- if fMakeDocumentWritable = false then
- warnlog "The document can't be make writeable. Test stopped."
- goto endsub
- endif
- endif
+
+ printlog "making doc editable if it is readonly"
+ sMakeReadOnlyDocumentEditable
hTypeKeys ("<escape><tab>")
fGetSizeXY sx1, sY, TRUE
More information about the ooo-build-commit
mailing list