ooo-build r14372 - in trunk: . patches/dev300

[kyoshida svn gnome org]

Author: kyoshida
Date: Tue Oct 21 15:45:21 2008
New Revision: 14372
URL: http://svn.gnome.org/viewvc/ooo-build?rev=14372&view=rev

Log:
2008-10-21  Kohei Yoshida  <kyoshida novell com>

	* patches/dev300/chart-skip-hidden-cells-xmloff.diff: import and export
	the new include-hidden-cells property which is now approved by the ODF
	TC (n#408424).

	* patches/dev300/apply: apply this patch.


Added:
   trunk/patches/dev300/chart-skip-hidden-cells-xmloff.diff
Modified:
   trunk/ChangeLog
   trunk/patches/dev300/apply

Modified: trunk/patches/dev300/apply
==============================================================================
--- trunk/patches/dev300/apply	(original)
+++ trunk/patches/dev300/apply	Tue Oct 21 15:45:21 2008
@@ -789,6 +789,7 @@
 # skip data in hidden cells when rendering charts.
 chart-skip-hidden-cells-chart2.diff, n#404190, i#81209, n#427545, kohei
 chart-skip-hidden-cells-sc.diff, n#404190, i#81209, n#425617, kohei
+chart-skip-hidden-cells-xmloff.diff, n#404190, i#81209, n#425617, kohei
 
 # When filtering by date, strip off the time element from each value.
 calc-filter-by-date-strip-time.diff, n#414303, i#94695, kohei

Added: trunk/patches/dev300/chart-skip-hidden-cells-xmloff.diff
==============================================================================
--- (empty file)
+++ trunk/patches/dev300/chart-skip-hidden-cells-xmloff.diff	Tue Oct 21 15:45:21 2008
@@ -0,0 +1,36 @@
+diff --git xmloff/inc/xmloff/xmltoken.hxx xmloff/inc/xmloff/xmltoken.hxx
+index b012bb7..6f4141c 100644
+--- xmloff/inc/xmloff/xmltoken.hxx
++++ xmloff/inc/xmloff/xmltoken.hxx
+@@ -2972,6 +2972,7 @@ namespace xmloff { namespace token {
+         XML_PERCENTAGE_DATA_STYLE_NAME,
+         XML_VALUE_AND_PERCENTAGE,
+         XML_GROUP_BARS_PER_AXIS,
++        XML_INCLUDE_HIDEEN_CELLS,
+         XML_REVERSE_DIRECTION,
+         XML_LABEL_SEPARATOR,
+         XML_LABEL_POSITION,
+diff --git xmloff/source/chart/PropertyMap.hxx xmloff/source/chart/PropertyMap.hxx
+index c745746..37d9663 100644
+--- xmloff/source/chart/PropertyMap.hxx
++++ xmloff/source/chart/PropertyMap.hxx
+@@ -130,6 +130,7 @@ const XMLPropertyMapEntry aXMLChartPropMap[] =
+   	MAP_CONTEXT( "NumberOfLines", CHART, XML_LINES_USED, XML_TYPE_NUMBER, LINES_USED  ),
+ 	MAP_ENTRY( "StackedBarsConnected", CHART, XML_CONNECT_BARS, XML_TYPE_BOOL ),
+     MAP_ENTRY_ODF12( "GroupBarsPerAxis", CHART, XML_GROUP_BARS_PER_AXIS, XML_TYPE_BOOL ),
++    MAP_ENTRY_ODF12( "IncludeHiddenCells", CHART, XML_INCLUDE_HIDEEN_CELLS, XML_TYPE_BOOL ),
+     MAP_ENTRY_ODF12( "StartingAngle", CHART, XML_ANGLE_OFFSET, XML_TYPE_NUMBER ),
+     // spline settings
+     MAP_ENTRY( "SplineOrder", CHART, XML_SPLINE_ORDER, XML_TYPE_NUMBER ),
+diff --git xmloff/source/core/xmltoken.cxx xmloff/source/core/xmltoken.cxx
+index 651a3d4..e7b035a 100644
+--- xmloff/source/core/xmltoken.cxx
++++ xmloff/source/core/xmltoken.cxx
+@@ -2972,6 +2972,7 @@ namespace xmloff { namespace token {
+         TOKEN( "percentage-data-style-name",      XML_PERCENTAGE_DATA_STYLE_NAME ),
+         TOKEN( "value-and-percentage",            XML_VALUE_AND_PERCENTAGE ),
+         TOKEN( "group-bars-per-axis",             XML_GROUP_BARS_PER_AXIS ),
++        TOKEN( "include-hidden-cells",            XML_INCLUDE_HIDEEN_CELLS ),
+         TOKEN( "reverse-direction",               XML_REVERSE_DIRECTION ),
+         TOKEN( "label-separator",                 XML_LABEL_SEPARATOR ),
+         TOKEN( "label-position",                  XML_LABEL_POSITION ),