[gnumeric] 2009-06-09 Jody Goldberg <jody gnome org>

[Jody Goldberg <jody src gnome org>]

commit eaed9bdf936b70a24de9acf50330cf601af8008c
Author: Jody Goldberg <jody gnome org>
Date:   Tue Jun 9 20:15:26 2009 -0400

    2009-06-09  Jody Goldberg <jody gnome org>
    
    	* xls-read-pivot.c (xls_read_SXIVD) : ignore magic index of 0xfffe.
    	  Need to figure out what it does.
---
 NEWS                           |    7 +++++++
 plugins/excel/ChangeLog        |    5 +++++
 plugins/excel/xls-read-pivot.c |   16 ++++++++++------
 samples/excel/operator.xls     |  Bin 662528 -> 662528 bytes
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index f8ad026..2ee4273 100644
--- a/NEWS
+++ b/NEWS
@@ -13,6 +13,13 @@ Andreas:
 	* Added Tests for Independence and Homogeneity
 	* Make imported manual page breaks work
 
+Jody:
+	* GOString start of richtext and phonetic support.
+	* Extend cell combo to allow support for toggles
+	* XLS/XLSX import/export for data slicer caches.
+	* Hooks for data slicer UI.
+	* Break GnmCommand out to allow commands in multiple files.
+
 Morten:
 	* Add search-for-number.
 	* Fix format-as-currency action.
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index e47a40a..ee1f0fe 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,8 @@
+2009-06-09  Jody Goldberg <jody gnome org>
+
+	* xls-read-pivot.c (xls_read_SXIVD) : ignore magic index of 0xfffe.
+	  Need to figure out what it does.
+
 2009-06-07  Andreas J. Guelzow <aguelzow pyrshep ca>
 
 	* ms-excel-write.c (excel_write_PAGE_BREAK): don't save automatic
diff --git a/plugins/excel/xls-read-pivot.c b/plugins/excel/xls-read-pivot.c
index 8571612..b6dd671 100644
--- a/plugins/excel/xls-read-pivot.c
+++ b/plugins/excel/xls-read-pivot.c
@@ -600,17 +600,21 @@ xls_read_SXIVD (BiffQuery *q, ExcelReadSheet *esheet)
 
 	d(3, ms_biff_query_dump (q););
 
-	for (i = 0 ; 2*i < q->length ; i++)
-		go_data_slicer_field_set_field_type_pos (
-			go_data_slicer_get_field ((GODataSlicer *)imp->pivot.slicer,
-				GSF_LE_GET_GUINT16 (q->data + i*2)),
-			t, i);
+	for (i = 0 ; 2*i < q->length ; i++) {
+		guint16 const indx = GSF_LE_GET_GUINT16 (q->data + i*2);
+		/* ignore special orientation index. */
+		if (0xfffe != indx) {
+			go_data_slicer_field_set_field_type_pos (
+				go_data_slicer_get_field ((GODataSlicer *)imp->pivot.slicer, indx),
+				t, i);
+		}
+	}
 }
 
 void
 xls_read_SXVD (BiffQuery *q, ExcelReadSheet *esheet)
 {
-	static GODataSlicerFieldType axis_bits[] = {
+	static GODataSlicerFieldType const axis_bits[] = {
 		GDS_FIELD_TYPE_ROW,	GDS_FIELD_TYPE_COL,
 		GDS_FIELD_TYPE_PAGE,	GDS_FIELD_TYPE_DATA
 	};
diff --git a/samples/excel/operator.xls b/samples/excel/operator.xls
index 54eaddf..17cde35 100644
Binary files a/samples/excel/operator.xls and b/samples/excel/operator.xls differ