Commit 4192a6d7 authored by Ivan, Wong Yat Cheung's avatar Ivan, Wong Yat Cheung Committed by Ivan Wong Yat Cheung

use opcode instead of esheet_ver to determine the offset and bit count of

2006-06-29  Ivan, Wong Yat Cheung <ivanwong@gnome.org>

	* plugins/excel/ms-excel-read.c (excel_read_LABEL): use opcode instead
	  of esheet_ver to determine the offset and bit count of LABEl text
	  length.
parent 93e13be3
2006-06-29 Ivan, Wong Yat Cheung <ivanwong@gnome.org>
* plugins/excel/ms-excel-read.c (excel_read_LABEL): use opcode instead
of esheet_ver to determine the offset and bit count of LABEl text
length.
2006-04-17 Kjartan Maraas <kmaraas@gnome.org>
* configure.in: Remove obsolete entry for no_NO
......
......@@ -5370,11 +5370,15 @@ excel_read_LABEL (BiffQuery *q, ExcelReadSheet *esheet, gboolean has_markup)
GnmValue *v;
guint16 const col = XL_GETCOL (q);
guint16 const row = XL_GETROW (q);
unsigned str_len;
char *txt = excel_get_text (esheet->container.importer, q->data + 8,
(esheet_ver (esheet) == MS_BIFF_V2)
? GSF_LE_GET_GUINT8 (q->data + 7)
: GSF_LE_GET_GUINT16 (q->data + 6), &str_len);
guint in_len, str_len;
gchar *txt;
in_len = q->opcode == BIFF_LABEL_v0 ?
GSF_LE_GET_GUINT8 (q->data + 7) : GSF_LE_GET_GUINT16 (q->data + 6);
g_return_if_fail (q->length - 8 >= in_len);
txt = excel_get_text (esheet->container.importer, q->data + 8,
in_len, &str_len);
d (0, fprintf (stderr,"%s in %s%d;\n",
has_markup ? "formatted string" : "string",
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment