[gnumeric] xls: fix UMRs.

[Morten Welinder <mortenw src gnome org>]

commit a48bb893dbc01e21aa2265315f82666820d02440
Author: Morten Welinder <terra gnome org>
Date:   Mon Apr 22 13:34:55 2013 -0400

    xls: fix UMRs.

 plugins/excel/ChangeLog       | 5 +++++
 plugins/excel/ms-excel-read.c | 8 +++++---
 2 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index d2ee37d..429ad5c 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-22  Morten Welinder  <terra gnome org>
+
+       * ms-excel-read.c (excel_read_FONT): Ensure ->script, ->underline,
+       and ->codepage are set.
+
 2013-04-20  Morten Welinder  <terra gnome org>
 
        * ms-excel-read.c (excel_read_name_str): Make sure we don't end up
diff --git a/plugins/excel/ms-excel-read.c b/plugins/excel/ms-excel-read.c
index cc5b939..bcf5f88 100644
--- a/plugins/excel/ms-excel-read.c
+++ b/plugins/excel/ms-excel-read.c
@@ -1618,14 +1618,17 @@ excel_read_FONT (BiffQuery *q, GnmXLImporter *importer)
        XL_CHECK_CONDITION (q->length >= 4);
        fd->height = GSF_LE_GET_GUINT16 (q->data + 0);
        data = GSF_LE_GET_GUINT16 (q->data + 2);
-       fd->italic     = (data & 0x2) == 0x2;
+       fd->italic = (data & 0x2) == 0x2;
        fd->struck_out = (data & 0x8) == 0x8;
+       fd->script = GO_FONT_SCRIPT_STANDARD;
+       fd->underline = XLS_ULINE_NONE;
+       fd->codepage = 1252;
+
        if (ver <= MS_BIFF_V2) {
                int cp;
                guint16 opcode;
                fd->boldness  = (data & 0x1) ? 0x2bc : 0x190;
                fd->underline = (data & 0x4) ? XLS_ULINE_SINGLE : XLS_ULINE_NONE;
-               fd->script = GO_FONT_SCRIPT_STANDARD;
                fd->fontname = excel_biff_text_1 (importer, q, 4);
                if (ms_biff_query_peek_next (q, &opcode) &&
                    opcode == BIFF_FONT_COLOR) {
@@ -1641,7 +1644,6 @@ excel_read_FONT (BiffQuery *q, GnmXLImporter *importer)
                fd->color_idx  = GSF_LE_GET_GUINT16 (q->data + 4);
                fd->boldness  = (data & 0x1) ? 0x2bc : 0x190;
                fd->underline = (data & 0x4) ? XLS_ULINE_SINGLE : XLS_ULINE_NONE;
-               fd->script = GO_FONT_SCRIPT_STANDARD;
                fd->fontname = excel_biff_text_1 (importer, q, 6);
                cp = gnm_font_override_codepage (fd->fontname);
                fd->codepage = (cp > 0 ? cp : 1252);