[gnumeric] xls: handle reading of crazy number of merged cells better.

[Morten Welinder <mortenw src gnome org>]

commit aec9060d01346f28271d03030bbf1d9ddc167581
Author: Morten Welinder <terra gnome org>
Date:   Wed Feb 26 16:10:38 2014 -0500

    xls: handle reading of crazy number of merged cells better.

 plugins/excel/ChangeLog |    4 ++++
 plugins/excel/ms-biff.c |    1 +
 2 files changed, 5 insertions(+), 0 deletions(-)
---
diff --git a/plugins/excel/ChangeLog b/plugins/excel/ChangeLog
index afbddd4..257fc0f 100644
--- a/plugins/excel/ChangeLog
+++ b/plugins/excel/ChangeLog
@@ -1,5 +1,9 @@
 2014-02-26  Morten Welinder  <terra gnome org>
 
+       * ms-biff.c (ms_biff_query_next): Do auto-continue for
+       BIFF_MERGECELLS.  We don't generate that ourselves, but it's
+       valid.
+
        * boot.c (excel_save): Make sure to save macros in the
        _VBA_PROJECT_CUR directory that we loaded them from.
        (excel_save): Restore \001Ole member too.
diff --git a/plugins/excel/ms-biff.c b/plugins/excel/ms-biff.c
index 062180d..b528358 100644
--- a/plugins/excel/ms-biff.c
+++ b/plugins/excel/ms-biff.c
@@ -533,6 +533,7 @@ ms_biff_query_next (BiffQuery *q)
        case BIFF_IMDATA:
        case BIFF_LABEL_v0:
        case BIFF_LABEL_v2:
+       case BIFF_MERGECELLS:
        case BIFF_NAME_v0:
        case BIFF_NAME_v2:
        case BIFF_NOTE: