Insert blanks in reverse order to ease the strain on the scrollbar.

plugins/excel/ChangeLog

+1999-09-29  Jody Goldberg <jgoldberg@home.com>
+
+	* ms-excel-read.c (ms_excel_read_cell:MULBLANK) : Insert blanks in
+	  reverse order, to decrease the load on the insert routines.
+
 1999-09-26  Jody Goldberg <jgoldberg@home.com>
 
 	* ms-excel-read.c (ms_excel_read_cell:COLINFO) : Seems like

plugins/excel/biff-types.h

@@ -3,6 +3,8 @@
  *
  * Author:
  *    Michael Meeks (michael@imaginator.com)
+ *
+ * (C) 1998, 1999 Michael Meeks
  **/
 /**
  * See S59D52.HTM for the spec.

plugins/excel/boot.c

@@ -3,6 +3,8 @@
  *
  * Author:
  *    Michael Meeks (michael@imaginator.com)
+ *
+ * (C) 1998, 1999 Michael Meeks
  **/
 #include <stdio.h>
 #include <sys/stat.h>

plugins/excel/boot.h

+/**
+ * boot.h: Start/Stop support
+ *
+ * Author:
+ *    Michael Meeks (michael@imaginator.com)
+ *
+ * (C) 1998, 1999 Michael Meeks
+ **/
 extern void excel_init (void);
 extern void excel_shutdown (void);

plugins/excel/escher-types.h

@@ -4,6 +4,8 @@
  *
  * Author:
  *    Michael Meeks (michael@imaginator.com)
+ *
+ * (C) 1998, 1999 Michael Meeks
  **/
 /**
  * See S59FDC.HTM for the spec.

plugins/excel/excel.h

@@ -3,6 +3,8 @@
  *
  * Author:
  *    Michael Meeks (michael@imaginator.com)
+ *
+ * (C) 1998, 1999 Michael Meeks
  **/
 #ifndef GNUMERIC_EXCEL_H
 #define GNUMERIC_EXCEL_H

plugins/excel/formula-types.h

@@ -3,6 +3,8 @@
  *
  * Author:
  *    Michael Meeks (michael@imaginator.com)
+ *
+ * (C) 1998, 1999 Michael Meeks
  **/
 /**
  * See S59E2B.HTM for the spec.

plugins/excel/gnumeric-chart.c

@@ -5,6 +5,8 @@
  *
  * Author:
  *    Jody Goldberg (jgoldberg@home.com)
+ *
+ * (C) 1999 Jody Goldberg
  **/
 
 #include "gnumeric-chart.h"

plugins/excel/gnumeric-chart.h

@@ -8,6 +8,8 @@
  *
  * Author:
  *    Jody Goldberg (jgoldberg@home.com)
+ *
+ * (C) 1999 Jody Goldberg
  **/
 
 typedef struct _GnumericChartSeries

plugins/excel/ms-biff.c

@@ -3,6 +3,8 @@
  *
  * Author:
  *    Michael Meeks (michael@imaginator.com)
+ *
+ * (C) 1998, 1999 Michael Meeks
  **/
 
 #include <stdio.h>

plugins/excel/ms-biff.h

@@ -3,6 +3,8 @@
  *
  * Author:
  *    Michael Meeks (michael@imaginator.com)
+ *
+ * (C) 1998, 1999 Michael Meeks
  **/
 #ifndef GNUMERIC_BIFF_H
 #define GNUMERIC_BIFF_H

plugins/excel/ms-chart.c

+/**
+ * ms-chart.c: MS Excel chart support for Gnumeric
+ *
+ * Author:
+ *    Jody Goldberg (jgoldberg@home.com)
+ *
+ * (C) 1999 Jody Goldberg
+ **/
+
 #include "excel.h"
 #include "ms-chart.h"
 #include "ms-formula-read.h"

plugins/excel/ms-chart.h

@@ -6,6 +6,8 @@
  *
  * Author:
  *    Jody Goldberg (jgoldberg@home.com)
+ *
+ * (C) 1999 Jody Goldberg
  **/
 
 #include "ms-excel-read.h"

plugins/excel/ms-escher.c

@@ -5,6 +5,8 @@
  *    Jody Goldberg (jgoldberg@home.com)
  *    Michael Meeks (michael@nuclecu.unam.mx)
  *
+ * (C) 1998, 1999 Jody Goldberg, Michael Meeks
+ *
  * See S59FD6.HTM for an overview...
  **/
 

plugins/excel/ms-escher.h

@@ -5,7 +5,10 @@
  * ms-escher.h: MS Office drawing layer support
  *
  * Author:
+ *    Jody Goldberg (jgoldberg@home.com)
  *    Michael Meeks (michael@imaginator.com)
+ *
+ * (C) 1998, 1999 Jody Goldberg, Michael Meeks
  **/
 #include "ms-excel-read.h"
 

plugins/excel/ms-excel-biff.h

@@ -7,6 +7,8 @@
  *
  * Author:
  *    Michael Meeks (michael@imaginator.com)
+ *
+ * (C) 1998, 1999 Michael Meeks
  **/
 
 #include "excel.h"

plugins/excel/ms-excel-read.c

@@ -4,6 +4,8 @@
  * Author:
  *    Michael Meeks (michael@imaginator.com)
  *    Jody Goldberh (jgoldberg@home.com)
+ *
+ * (C) 1998, 1999 Michael Meeks, Jody Goldberg
  **/
 
 #include "ms-formula-read.h"
@@ -2094,27 +2096,29 @@ ms_excel_read_cell (BiffQuery *q, ExcelSheet *sheet)
 	case BIFF_MULBLANK:
 	{
 		/* S59DA7.HTM is extremely unclear, this is an educated guess */
-		int col = EX_GETCOL (q);
+		int firstcol = EX_GETCOL (q);
 		int const row = EX_GETROW (q);
-		int lastcol = MS_OLE_GET_GUINT16 (q->data + q->length - 2);
-		guint8 const *ptr = (q->data + 4);
+		guint8 const *ptr = (q->data + q->length - 2);
+		int lastcol = MS_OLE_GET_GUINT16 (ptr);
+		int i;
 #ifndef NO_DEBUG_EXCEL
 		if (ms_excel_read_debug > 0) {
 			printf ("Cells in row %d are blank starting at col %s until col ",
-				row+1, col_name(col));
+				row+1, col_name(firstcol));
 			printf ("%s;\n",
 				col_name(lastcol));
 		}
 #endif
-		if (lastcol < col) {
-			int const tmp = col;
-			col = lastcol;
+		if (lastcol < firstcol) {
+			int const tmp = firstcol;
+			firstcol = lastcol;
 			lastcol = tmp;
 		}
-		for (; col <= lastcol ; ++col, ptr += 2) {
+		for (i = lastcol; i >= firstcol ; --i) {
+			ptr -= 2;
 			ms_excel_sheet_insert_val (sheet,
 						   MS_OLE_GET_GUINT16 (ptr),
-						   col, EX_GETROW (q),
+						   i, row,
 						   value_new_empty());
 		}
 		break;

plugins/excel/ms-excel-read.h

@@ -3,6 +3,8 @@
  *
  * Author:
  *    Michael Meeks (michael@imaginator.com)
+ *
+ * (C) 1998, 1999 Michael Meeks
  **/
 #ifndef GNUMERIC_MS_EXCEL_H
 #define GNUMERIC_MS_EXCEL_H

plugins/excel/ms-excel-write.c

@@ -3,6 +3,8 @@
  *
  * Author:
  *    Michael Meeks (michael@imaginator.com)
+ *
+ * (C) 1998, 1999 Michael Meeks
  **/
 
 #include <stdio.h>
@@ -1470,8 +1472,8 @@ new_sheet (ExcelWorkbook *wb, Sheet *value)
 	sheet->gnum_sheet = value;
 	sheet->streamPos  = 0x0deadbee;
 	sheet->wb         = wb;
-	sheet->maxx       = sheet->gnum_sheet->max_col_used + 1;
-	sheet->maxy       = sheet->gnum_sheet->max_row_used + 1;
+	sheet->maxx       = sheet->gnum_sheet->cols.max_used + 1;
+	sheet->maxy       = sheet->gnum_sheet->cols.max_used + 1;
 	sheet->dbcells    = g_array_new (FALSE, FALSE, sizeof (MsOlePos));
 
 	g_ptr_array_add (wb->sheets, sheet);

plugins/excel/ms-excel-write.h

@@ -3,6 +3,8 @@
  *
  * Author:
  *    Michael Meeks (michael@imaginator.com)
+ *
+ * (C) 1998, 1999 Michael Meeks
  **/
 #ifndef GNUMERIC_MS_EXCEL_WRITE_H
 #define GNUMERIC_MS_EXCEL_WRITE_H

plugins/excel/ms-formula-read.c

@@ -3,6 +3,8 @@
  *
  * Author:
  *    Michael Meeks (michael@imaginator.com)
+ *
+ * (C) 1998, 1999 Michael Meeks
  */
 
 #include <fcntl.h>

plugins/excel/ms-formula-read.h

@@ -3,6 +3,8 @@
  *
  * Author:
  *    Michael Meeks (michael@imaginator.com)
+ *
+ * (C) 1998, 1999 Michael Meeks
  */
 #ifndef GNUMERIC_MS_FORMULA_R_H
 #define GNUMERIC_MS_FORMULA_R_H

plugins/excel/ms-formula-write.c

@@ -4,6 +4,8 @@
  *
  * Author:
  *    Michael Meeks (michael@imaginator.com)
+ *
+ * (C) 1998, 1999 Michael Meeks
  */
 
 #include <fcntl.h>

plugins/excel/ms-formula-write.h

@@ -3,6 +3,8 @@
  *
  * Author:
  *    Michael Meeks (michael@imaginator.com)
+ *
+ * (C) 1998, 1999 Michael Meeks
  */
 #ifndef GNUMERIC_MS_FORMULA_W_H
 #define GNUMERIC_MS_FORMULA_W_H

plugins/excel/ms-obj.c

@@ -4,6 +4,8 @@
  * Author:
  *    Jody Goldberg (jgoldberg@home.com)
  *    Michael Meeks (mmeeks@gnu.org)
+ *
+ * (C) 1998, 1999 Jody Goldberg, Michael Meeks
  **/
 
 #include "ms-obj.h"

plugins/excel/ms-obj.h

@@ -6,7 +6,9 @@
  *
  * Author:
  *    Michael Meeks (michael@imaginator.com)
+ *    Jody Goldberg (jgoldberg@home.com)
  *
+ * (C) 1998, 1999 Michael Meeks, Jody Goldberg
  **/
 
 #include "config.h"

plugins/excel/ms-summary.c

@@ -3,6 +3,8 @@
  *
  * Author:
  *    Michael Meeks (michael@imaginator.com)
+ *
+ * (C) 1998, 1999 Michael Meeks
  **/
 
 #include <stdio.h>

plugins/excel/ms-summary.h

@@ -3,6 +3,8 @@
  *
  * Author:
  *    Michael Meeks (michael@imaginator.com)
+ *
+ * (C) 1999 Michael Meeks
  **/
 
 #include "summary.h"