CWS-TOOLING: integrate CWS koheichart01

2009-05-15 06:32:38 +0200 hde  r271925 : header fixed
2009-04-14 16:23:35 +0200 hde  r270792 : #100231#
2009-04-14 16:13:48 +0200 hde  r270790 : #100231#
2009-04-14 15:56:14 +0200 hde  r270787 : #100231#
2009-04-14 14:28:40 +0200 hde  r270767 : #100231#
2009-04-14 14:27:30 +0200 hde  r270766 : #100231#
2009-04-14 09:43:07 +0200 hde  r270749 : #100231#
2009-04-14 09:25:52 +0200 hde  r270748 : #100231#
2009-03-25 16:18:26 +0100 iha  r270034 : #i91578# removed compiler warning
2009-03-25 03:20:36 +0100 kohei  r269992 : fixed a silly typo in in-line comment.
2009-03-24 17:03:57 +0100 kohei  r269977 : Let's use row and column's hidden flags, instead of width/height, to determine cell's
hidden state.
2009-03-24 16:53:10 +0100 kohei  r269973 : The chart positioner no longer needs to skip hidden cells, as hidden cells are handled
elsewhere.
2009-03-24 16:50:12 +0100 kohei  r269971 : the index should be 0-based (although chart2 doesn't appear to make use of this data any more).
2009-03-24 16:47:56 +0100 kohei  r269969 : Skip hidden cells during cache (re-)build, when the include hidden cells flag is
false.  Also avoid adding data cache when the cell is hidden.
2009-03-24 06:05:53 +0100 kohei  r269909 : fixed the build breakage after the resync.
2009-03-24 06:05:34 +0100 kohei  r269908 : fixed the build breakage after the resync.
2009-03-23 23:38:36 +0100 kohei  r269900 : CWS-TOOLING: rebase CWS koheichart01 to trunk@269781 (milestone: DEV300:m44)
2009-03-17 13:11:40 +0100 iha  r269597 : #i91578# import IncludeHiddenCells from xlsx
2009-03-17 12:56:09 +0100 iha  r269594 : #i91578# import IncludeHiddenCells from xls correctly
2009-03-17 12:49:13 +0100 iha  r269592 : #i91578# import IncludeHiddenCells from xls correctly
2009-03-16 17:03:55 +0100 iha  r269561 : #i91578# remove unused variable
2009-03-16 10:22:30 +0100 iha  r269509 : #i91578# changed wording
2009-03-04 17:07:16 +0100 iha  r268846 : #i91578# display of hidden cells - remove unused property 'IsHidden'
2009-03-04 17:04:22 +0100 iha  r268845 : #i91578# display of hidden cells - remove unused property 'IsHidden'
2009-03-04 17:03:43 +0100 iha  r268844 : #i91578# display of hidden cells - remove unused property 'IsHidden'
2009-03-04 16:24:30 +0100 iha  r268843 : #i91578# display of hidden cells - added missing property description
2009-03-04 15:13:04 +0100 iha  r268835 : #i91578# display of hidden cells - remove unused code
2009-03-04 14:38:44 +0100 iha  r268832 : #i91578# display of hidden cells - reset state corretly when doing undo/redo
2009-03-04 13:42:10 +0100 iha  r268822 : #i81209# #i91578# display of hidden cells - don't show hidden cells per default but keep the hidden ranges
2009-03-04 13:40:10 +0100 iha  r268821 : #i81209# #i91578# display of hidden cells - don't show hidden cells per default but keep the hidden ranges
2009-03-04 13:37:05 +0100 iha  r268820 : #i81209# #i91578# display of hidden cells - don't show hidden cells per default but keep the hidden ranges
2009-03-03 11:18:39 +0100 iha  r268713 : #i91578# display of hidden cells - hide control if the functionality is not offered by the data provider
2009-03-02 17:41:37 +0100 kohei  r268684 : removed unintended change from DEV300_m38, which was probably introduced due to some sort of
problem during rebase.
2009-02-27 18:51:34 +0100 iha  r268613 : #i91578# display of hidden cells - interface redesign: data provider+sequences are now controlled by the chart via a new parameter 'IncludeHiddenCells' thus unwanted values can be removed early in the communication
2009-02-27 18:45:48 +0100 iha  r268612 : #i91578# display of hidden cells - interface redesign: data provider+sequences are now controlled by the chart via a new parameter 'IncludeHiddenCells' thus unwanted values can be removed early in the communication
2009-02-27 18:44:17 +0100 iha  r268611 : #i91578# display of hidden cells - interface redesign: data provider+sequences are now controlled by the chart via a new parameter 'IncludeHiddenCells' thus unwanted values can be removed early in the communication
2009-02-27 18:35:09 +0100 iha  r268610 : #i91578# display of hidden cells - copy-paste-scenario: export hidden flag per column on copy for migration to locale table during import upon paste
2009-02-19 06:47:56 +0100 kohei  r268257 : also, set the default value of a cached cell to NaN just in case.
2009-02-19 06:42:08 +0100 kohei  r268256 : Set the IsValue flag to false by default so that an empty cell is properly flaged as non-value.
This fixes the broken missing value treatment.
2009-02-18 20:16:30 +0100 iha  r268255 : #i91578# display of hidden cells - radio button 'leave gap' was not clickable anymore
2009-02-17 17:57:24 +0100 iha  r268185 : #i91578# display of hidden cells - corrected range highlighting
2009-02-17 15:39:52 +0100 iha  r268174 : #i91578# display of hidden cells - still display data point value in tip help of data points in writer
2009-02-17 11:21:00 +0100 iha  r267861 : #i91578# display of hidden cells - do not show a space nor a legend entry for hidden series
2009-02-17 11:15:14 +0100 iha  r267853 : #i91578# display of hidden cells - do not show a space nor a legend entry for hidden series
2009-02-16 16:48:10 +0100 iha  r267826 : #i91578# display of hidden cells - group related ids and minimize changes
2009-02-16 14:32:11 +0100 iha  r267813 : #i91578# display of hidden cells - don't share resource identifier as this easily produces conflicts -> move IDs for series options page into a separate file
2009-02-16 13:21:44 +0100 iha  r267795 : #i91578# display of hidden cells - remove unused member
2009-02-16 13:13:40 +0100 iha  r267794 : #i91578# display of hidden cells - remove unused methods
2009-02-16 13:00:10 +0100 iha  r267792 : #i91578# display of hidden - avoid unnecessary data copy
2009-02-16 11:40:41 +0100 iha  r267785 : #i91578# display of hidden - corrected typo
2009-02-16 11:28:39 +0100 iha  r267783 : #i91578# display of hidden - set correct dirty state in method setIncludeHiddenCells
2009-02-13 17:04:50 +0100 iha  r267734 : #i91578# corrected position and visibility of the controls for display of hidden cells in case of stock charts
2009-02-13 15:30:17 +0100 iha  r267724 : #i91578# charts without category range and charts with data from writer table were broken causes by features changes for display of hidden cells
2009-01-14 19:47:28 +0100 kohei  r266330 : #i91578# Fixed the issue with incorrect tooltip category values.
2009-01-05 22:27:03 +0100 kohei  r265887 : fixed a regression where the x-axis failed to display values when they were numeric or dates.
2008-12-24 17:01:15 +0100 kohei  r265800 : CWS-TOOLING: rebase CWS koheichart01 to trunk@265758 (milestone: DEV300:m38)
2008-12-24 16:03:08 +0100 kohei  r265799 : a little more code cleanup, mostly on tab to whitespace conversion on
modified lines and removal of unnecessary 'using' statements.
2008-12-24 15:52:00 +0100 kohei  r265798 : removed unnecessary header inclusion & remove hidden data *only when* the 'include hidden cells'
options it false!  I'm glad I caught this.
2008-12-24 07:41:23 +0100 kohei  r265796 : replaced duplicated local functions with a single template function.
2008-12-24 06:37:15 +0100 kohei  r265795 : reverted my last commit, because it was not the right approach.
Instead of using the original data point index in the object name,
leave that index alone, and remove hidden data in the tooltip text
value lookup code.
2008-12-23 23:10:42 +0100 kohei  r265793 : fixed the tooltips so that they would display correct values, taking into account
the hidden data points (if any).
2008-12-20 05:26:07 +0100 kohei  r265739 : CWS-TOOLING: rebase CWS koheichart01 to trunk@264807 (milestone: DEV300:m37)
2008-12-18 15:49:59 +0100 kohei  r265696 : removed markRangeDirty() for now, since that method is still a bit controvertial per Niklas's comment in i#91578.
2008-12-05 20:27:24 +0100 kohei  r264918 : removed a compiler warning.
2008-12-05 20:24:02 +0100 kohei  r264917 : removed a compilar warning.
2008-12-03 17:06:22 +0100 kohei  r264800 : recovered the original keyword file before it was stripped.
2008-12-01 22:00:24 +0100 kohei  r264640 : by default, "include hidden cells" attribute is true.
2008-12-01 19:03:07 +0100 kohei  r264628 : added accelerator for the plot hidden values check box.
2008-12-01 18:32:02 +0100 kohei  r264626 : changed wording per Ingrid's suggestion.
2008-11-26 08:09:36 +0100 kohei  r264341 : the 'Starnding angle' fixed line was 6 pixel short.
2008-11-26 08:02:47 +0100 kohei  r264340 : added include-hidden-cells check box for the pie chart type too & some code cleanup.
2008-11-26 07:41:45 +0100 kohei  r264339 : relocate the controls correctly for line chart types.
2008-11-26 07:14:26 +0100 kohei  r264337 : #i95714# fixed typos that caused incorrect scaling of the y-axis under some conditions.
2008-11-26 07:11:54 +0100 kohei  r264336 : added "Include hidden cells" check box in the data series options tab page.
2008-11-25 21:04:58 +0100 kohei  r264333 : don't check for the number of charts; when importing from xls, the count may be
zero even when the document has charts.
2008-11-25 19:55:50 +0100 kohei  r264332 : patch from ooo-build applied.  This implements chart listener
that listens on cells show/hide state for the chart's data areas.
2008-11-25 19:52:38 +0100 kohei  r264331 : patch from ooo-build applied.
2008-11-25 19:29:54 +0100 kohei  r264329 : new xml token for include-hidden-cells attribute.

4 files changed, 220 insertions, 2 deletions

diff --git a/testautomation/chart2/optional/ch2_lvl1.bas b/testautomation/chart2/optional/ch2_lvl1.bas
new file mode 100755
index 000000000000..8b9b415c300e
--- /dev/null
+++ b/testautomation/chart2/optional/ch2_lvl1.bas
@@ -0,0 +1,62 @@
+'encoding UTF-8  Do not remove or change this line!
+'**************************************************************************
+'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'* 
+'* Copyright 2009 by Sun Microsystems, Inc.
+'*
+'* OpenOffice.org - a multi-platform office productivity suite
+'*
+'* $RCSfile: ch2_lvl1.bas,v $
+'*
+'* $Revision: 1.0 $
+'*
+'* last change: $Author: hde $ $Date: 2009-04-14 15:12: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 : helge.delfs@sun.com
+'*
+'* short description : Chart2 functional tests
+'*
+'\************************************************************************
+
+sub main
+    use "chart2\tools\ch_tools_common.inc"
+    use "chart2\optional\includes\ch2_lvl1a.inc"
+    
+    Call hStatusIn ( "Chart2", "ch2_lvl1.bas" )
+    
+	Call ch2_lvl1a
+    
+	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
+
diff --git a/testautomation/chart2/optional/includes/ch2_lvl1a.inc b/testautomation/chart2/optional/includes/ch2_lvl1a.inc
new file mode 100755
index 000000000000..3c19d5d0ea91
--- /dev/null
+++ b/testautomation/chart2/optional/includes/ch2_lvl1a.inc
@@ -0,0 +1,147 @@
+'encoding UTF-8  Do not remove or change this line!
+'**************************************************************************
+'* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+'* 
+'* Copyright 2009 by Sun Microsystems, Inc.
+'*
+'* OpenOffice.org - a multi-platform office productivity suite
+'*
+'* $RCSfile: ch2_lvl1a.inc,v $
+'*
+'* $Revision: 1.0 $
+'*
+'* last change: $Author: hde $ $Date: 2009-04-14 15:12: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 : helge.delfs@sun.com
+'*
+'* short description : Chart2 functional tests
+'*
+'\************************************************************************
+
+sub ch2_lvl1a
+
+	Call tPlotOptions
+
+end sub
+
+
+testcase tPlotOptions
+	
+	Dim sOutputFile as string
+	sOutputFile = convertpath(gOfficepath & "user\work\hiddenCells.ods")
+
+	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"
+	if fSelectFirstOLE = -1 then
+		warnlog "It was not possible to select the chart object!"
+		Call hCloseDocument
+		goto endsub
+	endif	
+
+	printlog "Edit / Object / Edit"
+	EditObjectEdit        
+
+	printlog "Move to third object in Chart using TAB key (data series)"
+	Kontext "DocumentChart"
+	DocumentChart.TypeKeys "<TAB>" , 3        
+
+	printlog "Invoke Format::ObjectProperties"
+	FormatObjectProperties        
+
+	printlog "Select tab page Options"
+	Kontext
+	Active.SetPage TabDataSeriesOptions
+	Kontext "TabDataSeriesOptions"
+	printlog "activate checkbox 'Include values from hidden cells'"
+	try
+		IncludeHiddenCells.Check
+	catch
+		Warnlog "checkbox hidden or disabled"
+		Call hCloseDocument
+		goto endsub
+	endcatch
+		
+	printlog "Close and reopen data series dialog - checkbox should be still activated"
+	TabDataSeriesOptions.Ok	
+	FormatObjectProperties        
+	printlog "Select tab page Options"
+	Kontext
+	Active.SetPage TabDataSeriesOptions
+	Kontext "TabDataSeriesOptions"
+	if Not IncludeHiddenCells.IsChecked then
+		Warnlog "After closing and reopening of Data-Series dialog the checkbox isn't checked anymore"
+		TabDataSeriesOptions.Cancel
+		Kontext "DocumentCalc"
+		DocumentCalc.TypeKeys "<Escape>"		
+		call hCloseDocument
+		goto endsub		
+	endif
+
+	TabDataSeriesOptions.Ok
+	
+	printlog "save and reopen file - checkbox still must be checked"
+	if NOT hFileSaveAsKill (sOutputFile) then
+		warnlog "Saving test document failed -> Aborting"
+		Kontext "DocumentCalc"
+		DocumentCalc.TypeKeys "<Escape>"		
+		call hCloseDocument
+		goto endsub
+	endif    		
+	Call hCloseDocument
+	
+    Call hFileOpen(sOutputFile)
+	if fSelectFirstOLE = -1 then
+		warnlog "It was not possible to select the chart object!"
+		Call hCloseDocument
+		goto endsub
+	endif	
+
+
+	EditObjectEdit        
+	Kontext "DocumentChart"
+	DocumentChart.TypeKeys "<TAB>" , 3        
+	printlog "Invoke Format::ObjectProperties"
+	FormatObjectProperties        	
+	Kontext
+	Active.SetPage TabDataSeriesOptions
+	Kontext "TabDataSeriesOptions"
+	if Not IncludeHiddenCells.IsChecked then
+		Warnlog "After closing and reopening of Data-Series dialog the checkbox isn't checked anymore"
+		TabDataSeriesOptions.Cancel
+		Kontext "DocumentCalc"
+		DocumentCalc.TypeKeys "<Escape>"		
+		call hCloseDocument
+		goto endsub		
+	endif
+	
+	'/// Close dialog with Cancel-button
+	TabDataSeriesOptions.Cancel
+	'/// Close document
+	Kontext "DocumentCalc"
+	DocumentCalc.TypeKeys "<Escape>"
+
+	Call hCloseDocument
+endcase
diff --git a/testautomation/chart2/required/includes/ch2_format.inc b/testautomation/chart2/required/includes/ch2_format.inc
index 37aa9bf17ca7..096c66e2885a 100755
--- a/testautomation/chart2/required/includes/ch2_format.inc
+++ b/testautomation/chart2/required/includes/ch2_format.inc
@@ -86,9 +86,14 @@ testcase tFormatObjectProperties
         Active.SetPage TabDataSeriesLabels
         '/// Check if tab page series labels exists
         Kontext "TabDataSeriesLabels"
-        call DialogTest ( TabDataSeriesLabels )        
+        call DialogTest ( TabDataSeriesLabels )
+        '/// Check if tab page data series options exists
+        Kontext
+		Active.SetPage TabDataSeriesOptions
+        Kontext "TabDataSeriesOptions"
+        call DialogTest ( TabDataSeriesOptions )        
         '/// Close dialog with Cancel-button
-        TabDataSeriesLabels.Cancel
+        TabDataSeriesOptions.Cancel
         '/// Close document
         Kontext "DocumentCalc"
         DocumentCalc.TypeKeys "<Escape>"
diff --git a/testautomation/global/win/etab_a_d.win b/testautomation/global/win/etab_a_d.win
index 47223264aad3..319423eaadc2 100755
--- a/testautomation/global/win/etab_a_d.win
+++ b/testautomation/global/win/etab_a_d.win
@@ -444,6 +444,10 @@ Gap                     chart2:MetricField:TP_OPTIONS:MT_GAP
 Overlap                 chart2:MetricField:TP_OPTIONS:MT_OVERLAP
 ConnectionLines         chart2:CheckBox:TP_OPTIONS:CB_CONNECTOR
 ShowBarsSideBySide      chart2:CheckBox:TP_OPTIONS:CB_BARS_SIDE_BY_SIDE
+LeaveGap chart2:RadioButton:TP_OPTIONS:RB_DONT_PAINT
+AssumeZero chart2:RadioButton:TP_OPTIONS:RB_ASSUME_ZERO
+ContinueLine chart2:RadioButton:TP_OPTIONS:RB_CONTINUE_LINE
+IncludeHiddenCells chart2:CheckBox:TP_OPTIONS:CB_INCLUDE_HIDDEN_CELLS
 
 *TabDataSourceName extensions:TabPage:RID_PAGE_FINAL
 SourceName extensions:Edit:RID_PAGE_FINAL:ET_DATASOURCENAME